From 5909a6269c2a11c784ce059d9305114d637ccbff Mon Sep 17 00:00:00 2001
From: "BOOL\\25024" <http://192.168.2.2:8099/jsowell/jsowell-uniapp.git>
Date: Thu, 21 Nov 2024 15:18:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=93=9D=E7=89=99=E5=9B=BA?=
 =?UTF-8?q?=E4=BB=B6=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jsowell-ui/src/views/pile/firmware/index.vue | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/jsowell-ui/src/views/pile/firmware/index.vue b/jsowell-ui/src/views/pile/firmware/index.vue
index f0d302e12..ead274d9c 100644
--- a/jsowell-ui/src/views/pile/firmware/index.vue
+++ b/jsowell-ui/src/views/pile/firmware/index.vue
@@ -173,8 +173,8 @@
             :action="uploadBluetooth.url"
             :headers="uploadBluetooth.headers"
             :file-list="uploadBluetooth.fileList"
-            :on-progress="handleFileUploadProgress"
-            :on-success="handleFileSuccess"
+            :on-progress="handleFileUploadProgressBluetooth"
+            :on-success="handleFileSuccessBluetooth"
             :auto-upload="false"
           >
             <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
@@ -182,7 +182,7 @@
               style="margin-left: 10px"
               size="small"
               type="success"
-              :loading="upload.isUploading"
+              :loading="uploadBluetooth.isUploading"
               @click="submitUploadBluetooth"
               >上传到服务器</el-button
             >
@@ -392,7 +392,17 @@ export default {
     handleFileSuccess(response, file, fileList) {
       this.upload.isUploading = false;
       this.form.filePath = response.fileName;
-      this.msgSuccess(response.msg);
+      this.$modal.msgSuccess(response.msg);
+    },
+    // 文件上传中处理
+    handleFileUploadProgressBluetooth(event, file, fileList) {
+      this.uploadBluetooth.isUploading = true;
+    },
+    // 文件上传成功处理
+    handleFileSuccessBluetooth(response, file, fileList) {
+      this.uploadBluetooth.isUploading = false;
+      this.form.filePath = response.fileName;
+      this.$modal.msgSuccess(response.msg);
     },
   },
 };