From 12b88d2a93552261cb342ce182fdf2dfd225e812 Mon Sep 17 00:00:00 2001
From: kerwincui <164770707@qq.com>
Date: Sun, 5 Jun 2022 14:51:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=92=8C=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue/src/api/iot/tool.js                  | 19 -------------------
 vue/src/components/FileUpload/index.vue  |  2 +-
 vue/src/components/ImageUpload/index.vue |  2 +-
 vue/src/views/iot/firmware/index.vue     | 11 +++++------
 4 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/vue/src/api/iot/tool.js b/vue/src/api/iot/tool.js
index 27c03144..bd9dc176 100644
--- a/vue/src/api/iot/tool.js
+++ b/vue/src/api/iot/tool.js
@@ -18,22 +18,3 @@ export function register(data) {
     data: data
   })
 }
-
-// 下载文件
-export function download(resource) {  
-  var url = baseURL + "/iot/tool/download?fileName=" + encodeURI(resource);  
-  axios({
-    method: 'get',
-    url: url,
-    responseType: 'blob',
-    headers: { 'Authorization': 'Bearer ' + getToken() }
-  }).then(async (res) => {
-    const isLogin = await blobValidate(res.data);
-    if (isLogin) {
-      const blob = new Blob([res.data])
-      saveAs(blob, decodeURI(res.headers['download-filename']))
-    } else {
-      Message.error('无效的会话，或者会话已过期，请重新登录。');
-    }
-  })
-}
diff --git a/vue/src/components/FileUpload/index.vue b/vue/src/components/FileUpload/index.vue
index 04338382..150f1612 100644
--- a/vue/src/components/FileUpload/index.vue
+++ b/vue/src/components/FileUpload/index.vue
@@ -70,7 +70,7 @@ export default {
   data() {
     return {
       baseUrl: process.env.VUE_APP_BASE_API,
-      uploadFileUrl: process.env.VUE_APP_BASE_API + "/iot/tool/upload", // 上传的图片服务器地址
+      uploadFileUrl: process.env.VUE_APP_BASE_API + "/iot/tool/upload", // 上传文件服务器地址
       headers: {
         Authorization: "Bearer " + getToken(),
       },
diff --git a/vue/src/components/ImageUpload/index.vue b/vue/src/components/ImageUpload/index.vue
index d927a2c3..ca1dd491 100644
--- a/vue/src/components/ImageUpload/index.vue
+++ b/vue/src/components/ImageUpload/index.vue
@@ -124,7 +124,7 @@ export default {
     },
     // 上传成功回调
     handleUploadSuccess(res) {
-      this.fileList.push({ name: res.fileName, url: process.env.VUE_APP_BASE_API + "/iot/tool/download?fileName="+res.fileName });
+      this.fileList.push({ name: res.fileName, url: process.env.VUE_APP_BASE_API +res.fileName });
       this.$emit("input", this.listToString(this.fileList));
       this.loading.close();
     },
diff --git a/vue/src/views/iot/firmware/index.vue b/vue/src/views/iot/firmware/index.vue
index 69e6f1fd..b79c22e5 100644
--- a/vue/src/views/iot/firmware/index.vue
+++ b/vue/src/views/iot/firmware/index.vue
@@ -77,9 +77,6 @@
 </template>
 
 <script>
-import {
-    download
-} from '@/api/iot/tool'
 import fileUpload from '../../../components/FileUpload/index'
 import {
     listShortProduct
@@ -133,7 +130,9 @@ export default {
                 isSys: null,
             },
             // 表单参数
-            form: {},
+            form: {
+                version: 1.0
+            },
             // 表单校验
             rules: {
                 firmwareName: [{
@@ -213,7 +212,7 @@ export default {
                 tenantId: null,
                 tenantName: null,
                 isSys: null,
-                version: null,
+                version: 1.0,
                 filePath: null,
                 delFlag: null,
                 createBy: null,
@@ -329,7 +328,7 @@ export default {
         },
         // 文件下载处理
         handleDownload(row) {
-            download(row.filePath);
+            window.open(process.env.VUE_APP_BASE_API+row.filePath);
         }
 
     },