merge

config/dev.env.js

@@ -6,8 +6,8 @@ module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
   ctx:'"http://127.0.0.1:8080"',
-  // ctxForm: '"http://10.149.85.91:8880"',//dev
-  ctxForm: '"http://43.138.50.94:8880"',//test
+  ctxForm: '"http://10.149.85.91:8000"',//dev
+  // ctxForm: '"http://43.138.50.94:8880"',//test
   // ctxForm: '"http://192.168.2.124:8880"',//test
   // ctxForm: '"http://10.230.15.228:8880"',//生产
   excludeMeWhenSelectNextHandler:false,

public/index.html

@@ -26,8 +26,8 @@
   <!-- built files will be auto injected -->
   <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://10.149.85.91:8000/spfm'; // 测试
+  //  window.staticHost = 'http://43.138.50.94:9600/'; 
     // window.staticHost = 'http://192.168.0.103:9600/';
     // window.staticHost = 'http://192.168.2.124:9600';
 

public/static/views/onlineShareExcel.html

@@ -217,17 +217,17 @@
                         showsheetbar: false, // 底部sheet显示/隐藏
                         loadUrl:
                             window.location.protocol +
-                            "//43.138.50.94:7777" +
+                            "//10.149.85.91:7777" +
                             "/sheet/worksheet/" +
                             ids + '/' + JSON.parse(window.sessionStorage.userInfo).loginNo,
                         loadSheetUrl:
                             window.location.protocol +
-                            "//43.138.50.94:7777" +
+                            "//10.149.85.91:7777" +
                             "/sheet/loadsheet/" +
                             ids,
                         updateUrl:
                             "ws://" +
-                            "//43.138.50.94:7777" +
+                            "//10.149.85.91:7777" +
                             "/ws/" +
                             JSON.parse(window.sessionStorage.userInfo).loginName +
                             "/" +
@@ -655,7 +655,7 @@
                         }
                         let res = JSON.stringify(exportJson)
                         console.log(res);
-                        util.ajaxJson("正在导入中", "http://43.138.50.94:7777/sheet/excel/importFile", { exceldata: res, id: excelId }, function (res) {
+                        util.ajaxJson("正在导入中", "http://10.149.85.91:7777/sheet/excel/importFile", { exceldata: res, id: excelId }, function (res) {
 
                             console.log(res);
                         });