merge

public/index.html

@@ -27,9 +27,9 @@
   <script type="text/javascript">
     // window.staticHost = 'http://10.230.26.15:8000/mkt'; // 正式
   //  window.staticHost = 'http://10.149.85.91:8000/spfm'; // 测试
-  //  window.staticHost = 'http://43.138.50.94:9600/'; 
+   window.staticHost = 'http://43.138.50.94:9600/'; 
     // window.staticHost = 'http://192.168.0.103:9600/';
-    window.staticHost = 'http://192.168.2.124:9600';
+    // window.staticHost = 'http://192.168.2.124:9600';
 
     // document.title = "hello";
   </script>

public/static/views/onlineShareExcel.html

@@ -205,17 +205,17 @@
                         showsheetbar: false, // 底部sheet显示/隐藏
                         loadUrl:
                             window.location.protocol +
-                            "//192.168.2.124:9600" +
-                            "/market/cOnlineExcel/worksheet/" +
-                            ids+'/'+JSON.parse(window.sessionStorage.userInfo).loginNo,
+                            "//43.138.50.94:7777" +
+                            "/sheet/worksheet/" +
+                            ids + '/' +JSON.parse(window.sessionStorage.userInfo).loginNo,
                         loadSheetUrl:
                             window.location.protocol +
-                            "//192.168.2.124:7777" +
+                            "//43.138.50.94:7777" +
                             "/sheet/loadsheet/" +
                             ids,
                         updateUrl:
                             "ws://" +
-                            "//192.168.2.124:7777" +
+                            "//43.138.50.94:7777" +
                             "/ws/" +
                             JSON.parse(window.sessionStorage.userInfo).loginName +
                             "/" +

vue.config.js

@@ -144,7 +144,7 @@ module.exports = {
                 // target: 'http://192.168.0.156:9600/',
                 // target: 'http://192.168.2.170:9600/',
                 // target: 'http://192.168.2.169:9600/',
-                target: "http://192.168.2.124:9600",
+                target: "http://192.168.2.124:9600/",
                 // target:'http://43.138.50.94:9600',
                 changeOrigin: true,
             },