From c855f42be085ec10819a4a8b899bf018b1386e71 Mon Sep 17 00:00:00 2001
From: wxz <wxz@qq.com>
Date: Thu, 26 Dec 2024 17:05:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9B=EF=BC=9A=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83=E5=99=A8=EF=BC=9A=E5=A2=9E=E5=8A=A0loading?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/modules/sys/publisher-backend.vue   | 20 ++++++++++++++++--
 .../views/modules/sys/publisher-frontend.vue  | 21 +++++++++++++++++--
 2 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/epmet-oper-web/src/views/modules/sys/publisher-backend.vue b/epmet-oper-web/src/views/modules/sys/publisher-backend.vue
index 26ff185..f8f1691 100644
--- a/epmet-oper-web/src/views/modules/sys/publisher-backend.vue
+++ b/epmet-oper-web/src/views/modules/sys/publisher-backend.vue
@@ -4,7 +4,8 @@ import {defineComponent} from 'vue'
 export default {
   data() {
     return {
-      uploadUrl: ''
+      uploadUrl: '',
+      loading: false
     }
   },
 
@@ -27,13 +28,26 @@ export default {
         this.$message.error(this.$t('upload.tip', { format: '.jar' }))
         return false
       }
+
+      // 加载
+      this.loading = true;
     },
     // 上传成功
     uploadSuccessHandle (res, file, fileList) {
+      this.loading = false;
       if (res.code !== 0) {
         return this.$message.error(res.msg)
       }
     },
+
+    // 上传错误
+    uploadErrorHandle(err, file, fileList) {
+      this.loading = false;
+      this.$message({
+        type:'error',
+        message: err
+      })
+    },
   }
 }
 </script>
@@ -44,7 +58,9 @@ export default {
         :action="uploadUrl"
         class="upload-demo"
         drag
-        :before-upload="uploadBeforeUploadHandle" :on-success="uploadSuccessHandle"
+        :before-upload="uploadBeforeUploadHandle"
+        :on-success="uploadSuccessHandle"
+        :on-error="uploadErrorHandle"
         multiple>
       <i class="el-icon-upload"></i>
       <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
diff --git a/epmet-oper-web/src/views/modules/sys/publisher-frontend.vue b/epmet-oper-web/src/views/modules/sys/publisher-frontend.vue
index bf5fe08..4c97631 100644
--- a/epmet-oper-web/src/views/modules/sys/publisher-frontend.vue
+++ b/epmet-oper-web/src/views/modules/sys/publisher-frontend.vue
@@ -3,7 +3,8 @@
 export default {
   data() {
     return {
-      uploadUrl: ''
+      uploadUrl: '',
+      loading: false
     }
   },
 
@@ -29,14 +30,27 @@ export default {
       // let checkResult = await this.preCheck()
       // console.log(":::", checkResult)
       // return checkResult;
+
+      // 加载
+      this.loading = true;
     },
     // 上传成功
     uploadSuccessHandle (res, file, fileList) {
+      this.loading = false;
       if (res.code !== 0) {
         return this.$message.error(res.msg)
       }
     },
 
+    // 上传错误
+    uploadErrorHandle(err, file, fileList) {
+      this.loading = false;
+      this.$message({
+        type:'error',
+        message: err
+      })
+    },
+
     // 预检
     async preCheck() {
       let areYouOk = true;
@@ -59,10 +73,13 @@ export default {
 <template>
   <div>
     <el-upload
+        v-loading="loading"
         :action="uploadUrl"
         class="upload-demo"
         drag
-        :before-upload="uploadBeforeUploadHandle" :on-success="uploadSuccessHandle"
+        :before-upload="uploadBeforeUploadHandle"
+        :on-success="uploadSuccessHandle"
+        :on-error="uploadErrorHandle"
         multiple>
       <i class="el-icon-upload"></i>
       <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>