From 5ca038d888922e93bf45c7bd37f3c6dce849dcff Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 24 十二月 2021 11:36:02 +0800
Subject: [PATCH] update 调整监控依赖 从 common 迁移到 framework

---
 ruoyi-ui/src/views/system/oss/index.vue |   29 +++++++++--------------------
 1 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/ruoyi-ui/src/views/system/oss/index.vue b/ruoyi-ui/src/views/system/oss/index.vue
index 87bedc9..fdfed16 100644
--- a/ruoyi-ui/src/views/system/oss/index.vue
+++ b/ruoyi-ui/src/views/system/oss/index.vue
@@ -120,7 +120,7 @@
 
     <el-table v-loading="loading" :data="ossList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="浜戝瓨鍌ㄤ富閿�" align="center" prop="ossId" v-if="false"/>
+      <el-table-column label="瀵硅薄瀛樺偍涓婚敭" align="center" prop="ossId" v-if="false"/>
       <el-table-column label="鏂囦欢鍚�" align="center" prop="fileName" />
       <el-table-column label="鍘熷悕" align="center" prop="originalName" />
       <el-table-column label="鏂囦欢鍚庣紑" align="center" prop="fileSuffix" />
@@ -170,7 +170,7 @@
       @pagination="getList"
     />
 
-    <!-- 娣诲姞鎴栦慨鏀筄SS浜戝瓨鍌ㄥ璇濇 -->
+    <!-- 娣诲姞鎴栦慨鏀筄SS瀵硅薄瀛樺偍瀵硅瘽妗� -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="鏂囦欢鍚�">
@@ -188,7 +188,6 @@
 
 <script>
 import { listOss, delOss, changePreviewListResource } from "@/api/system/oss";
-import { downLoadOss } from "@/utils/download";
 
 export default {
   name: "Oss",
@@ -210,7 +209,7 @@
       showSearch: true,
       // 鎬绘潯鏁�
       total: 0,
-      // OSS浜戝瓨鍌ㄨ〃鏍兼暟鎹�
+      // OSS瀵硅薄瀛樺偍琛ㄦ牸鏁版嵁
       ossList: [],
       // 寮瑰嚭灞傛爣棰�
       title: "",
@@ -226,7 +225,6 @@
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        reasonable: true,
         fileName: undefined,
         originalName: undefined,
         fileSuffix: undefined,
@@ -249,7 +247,7 @@
     this.getList();
   },
   methods: {
-    /** 鏌ヨOSS浜戝瓨鍌ㄥ垪琛� */
+    /** 鏌ヨOSS瀵硅薄瀛樺偍鍒楄〃 */
     getList() {
       this.loading = true;
       this.queryParams.params = {};
@@ -326,22 +324,18 @@
     },
     /** 涓嬭浇鎸夐挳鎿嶄綔 */
     handleDownload(row) {
-      downLoadOss(row.ossId)
+      this.$download.oss(row.ossId)
     },
     /** 鍒犻櫎鎸夐挳鎿嶄綔 */
     handleDelete(row) {
       const ossIds = row.ossId || this.ids;
-      this.$confirm('鏄惁纭鍒犻櫎OSS浜戝瓨鍌ㄧ紪鍙蜂负"' + ossIds + '"鐨勬暟鎹」?', "璀﹀憡", {
-          confirmButtonText: "纭畾",
-          cancelButtonText: "鍙栨秷",
-          type: "warning"
-      }).then(() => {
+      this.$modal.confirm('鏄惁纭鍒犻櫎OSS瀵硅薄瀛樺偍缂栧彿涓�"' + ossIds + '"鐨勬暟鎹」?').then(() => {
         this.loading = true;
         return delOss(ossIds);
       }).then(() => {
         this.loading = false;
         this.getList();
-        this.msgSuccess("鍒犻櫎鎴愬姛");
+        this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
       }).finally(() => {
         this.loading = false;
       });
@@ -349,16 +343,11 @@
     // 棰勮鍒楄〃鍥剧墖鐘舵�佷慨鏀�
     handlePreviewListResource(previewListResource) {
       let text = previewListResource ? "鍚敤" : "鍋滅敤";
-      this.$confirm(
-        '纭瑕�"' + text + '""棰勮鍒楄〃鍥剧墖"閰嶇疆鍚�?', "璀﹀憡", {
-          confirmButtonText: "纭畾",
-          cancelButtonText: "鍙栨秷",
-          type: "warning",
-      }).then(() => {
+      this.$modal.confirm('纭瑕�"' + text + '""棰勮鍒楄〃鍥剧墖"閰嶇疆鍚�?').then(() => {
         return changePreviewListResource(previewListResource);
       }).then(() => {
         this.getList()
-        this.msgSuccess(text + "鎴愬姛");
+        this.$modal.msgSuccess(text + "鎴愬姛");
       }).catch(() => {
         this.previewListResource = previewListResource !== true;
       })

--
Gitblit v1.9.3