From 125198a6815805168ea961e291fc151c1494079d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=89=E4=BF=8A=E4=BA=91?= <515906788@qq.com>
Date: Wed, 20 Sep 2023 17:18:57 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=B8=8A=E4=BC=A0=E6=88=90=E5=8A=9F=E6=88=96?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E5=90=8E=E6=8F=90=E9=86=92=E6=9B=B4=E5=8A=A0?=
 =?UTF-8?q?=E4=BA=BA=E6=80=A7=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Settings.vue | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/views/Settings.vue b/src/views/Settings.vue
index 2140cbd..4455fc5 100644
--- a/src/views/Settings.vue
+++ b/src/views/Settings.vue
@@ -368,7 +368,7 @@
 				<div style="width: 100%;">
 					<!-- multiple 暂时去除多文件上传功能 -->
 					<el-upload class="upload-demo" drag action="/uploadFireWare" accept=".bin" :limit="1"
-						:on-progress="beginUpload" :on-success="uploadFinish" :on-error="uploadFinish"
+						:on-progress="beginUpload" :on-success="uploadSuccessFinish" :on-error="uploadErrorFinish"
 						v-loading="uploadLoading" element-loading-text="上传中...">
 						<i class="el-icon-upload"></i>
 						<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em>
@@ -1081,13 +1081,30 @@
 			},
 
 			/**
-			 * 上传结束
+			 * @param {Object} response
+			 * @param {Object} file
+			 * @param {Object} fileList
 			 */
-			uploadFinish: function() {
+			uploadSuccessFinish: function(response, file, fileList) {
 				let _this = this;
-				setTimeout(function() {
-					_this.uploadLoading = false;
-				}, 5000);
+				_this.uploadLoading = false;
+				//成功
+				if (response.result == 'success') {
+					_this.$message.success('上传成功，稍后重启。');
+				} else {
+					_this.$message.error(response.message);
+				}
+				// setTimeout(function() {
+				// 	_this.uploadLoading = false;
+				// }, 5000);
+			},
+
+			/**
+			 * 上传失败处
+			 */
+			uploadErrorFinish: function() {
+				this.uploadLoading = false;
+				this.$message.error('上传失败,请重启设备后重试。');
 			},
 
 			/**