Merge branch 'xiaohb' into scene_conversion_ms

build/webpack.dev.conf.js

@@ -51,6 +51,13 @@ const devWebpackConfig = merge(baseWebpackConfig, {
       '/manage/scene':{
         target: 'http://192.168.0.135:8010',
         changeOrigin: true,
+      },
+      '/download':{
+        target: 'http://192.168.0.135:8010',
+        changeOrigin: true,
+        pathRewrite:{
+          '/download':''
+        }
       }
     },
   },

src/pages/list/index.vue

@@ -328,10 +328,10 @@ export default {
               let res = await this.$http.get(`/manage/scene/download/${type}/${item.sceneCode}`,{ params: { code: item.sceneCode } });
               this.fullscreenLoading = false;
               if (res && res["code"] === 0) {
-                window.open(`http://${res["data"]}`);
+                let url = process.env.NODE_ENV === 'development'? `/download${res["data"]}`:`${res["data"]}`
+                window.open(url);
               } else {}
-          }
-          catch(e){
+          }catch(e){
             this.fullscreenLoading = false;
             console.log('e',e)
           }
@@ -346,7 +346,8 @@ export default {
         target.forEach(item=>{
           this.$http.get(`/manage/scene/download/${type}/${item.sceneCode}`,{ params: { code: item.sceneCode } }).then(res=>{
             if (res && res["code"] === 0) {
-              window.open(`http://${res["data"]}`);
+              let url = process.env.NODE_ENV === 'development'? `/download${res["data"]}`:`${res["data"]}`
+              window.open(url);
             } else {}
           })
         })