1.上传成功或失败后提醒更加人性化

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('上传失败,请重启设备后重试。');
 			},
 
 			/**