From c47c6979d846cf05a67e76bd613767a39fdf61bd Mon Sep 17 00:00:00 2001
From: qianbao <qianbaoqianbao>
Date: Wed, 5 Apr 2023 19:30:02 +0800
Subject: [PATCH] 上传添加导入添加loading

---
 config/dev.env.js                              | 13 ++++++++++---
 src/utils/request.js                           | 10 ++++++++--
 src/views/bigscreenDesigner/designer/index.vue |  9 ++++-----
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/config/dev.env.js b/config/dev.env.js
index 06bbc83..43bb744 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -1,11 +1,18 @@
 'use strict'
 const merge = require('webpack-merge')
 const prodEnv = require('./prod.env')
+//是否开发状态
 const isDev = true;
-const ipAddresses = isDev?"weberp.xlyprint.cn":"127.0.0.1:8080";
+//开发API地址
+ const devAdrress='"http://weberp.xlyprint.cn/xlyReport"';
+//const devAdrress='"http://127.0.0.1:8080/xlyReport"';
+//正式打包API地址
+const ipAdrress='"http://"+location.host+"/xlyReport"';
+
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://'+ipAddresses+'/xlyReport"',
+  BASE_API: isDev?devAdrress:ipAdrress,
 //  BASE_API: '"http://weberp.xlyprint.cn/xlyReport"',
-  //API_WS: '"ws://127.0.0.1:8080/api/websocket"'
+//   API_WS: '"ws://127.0.0.1:8080/api/websocket"'
 })
+
diff --git a/src/utils/request.js b/src/utils/request.js
index a985ccc..f8a2a04 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -55,12 +55,18 @@ service.interceptors.response.use(
     }
   },
   error => {
+   //  Message({
+   //    message: error.message,
+   //    type: 'error',
+   //    duration: 5 * 1000
+   //  })
+   // return Promise.reject(error)
     Message({
       message: error.message,
       type: 'error',
       duration: 5 * 1000
-    })
-    return Promise.reject(error)
+    });
+    return {code:-1};
   }
 )
 
diff --git a/src/views/bigscreenDesigner/designer/index.vue b/src/views/bigscreenDesigner/designer/index.vue
index 07f94ac..577aa8c 100644
--- a/src/views/bigscreenDesigner/designer/index.vue
+++ b/src/views/bigscreenDesigner/designer/index.vue
@@ -732,6 +732,7 @@ export default {
       exportDashboard(param).then((res) => {
         const that = this;
         const type = res.type;
+        this.$hideLoading();
         if (type == "application/json") {
           let reader = new FileReader();
           reader.readAsText(res, "utf-8");
@@ -742,7 +743,6 @@ export default {
           return;
         }
         const blob = new Blob([res], { type: "application/octet-stream" });
-        this.$hideLoading();
         if (window.navigator.msSaveOrOpenBlob) {
           //msSaveOrOpenBlob方法返回bool值
           navigator.msSaveBlob(blob, fileName); //本地保存
@@ -962,8 +962,6 @@ export default {
             this.$refs.widgets[i].$refs.draggable.setActive(true);
           }
         }
-        this.setOptionsOnClickWidget(index);
-        this.grade = true;
       }else{
         //没有按住shift键标识编辑单个
         for (let i = 0; i < draggableArr.length; i++) {
@@ -973,9 +971,10 @@ export default {
             this.$refs.widgets[i].$refs.draggable.setActive(false);
           }
         }
-        this.setOptionsOnClickWidget(index);
-        this.grade = true;
       }
+      this.setOptionsOnClickWidget(index);
+      this.grade = true;
+      this.widgetIndex = index;
     },
     widgetsMouseup(e) {
       this.grade = false;
--
libgit2 0.22.2