yangbifan пре 2 година
родитељ
комит
f2c8d631ac

+ 3 - 3
public/index.html

@@ -26,10 +26,10 @@
   <!-- 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';
+    // window.staticHost = 'http://192.168.2.124:9600/';
 
     // document.title = "hello";
   </script>

+ 4 - 4
public/static/views/onlineShareExcel.html

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

+ 1 - 1
src/http/index.js

@@ -16,7 +16,7 @@ axios.defaults.transformRequest = [function (data) {
         let localhost = ''
         if (process.env.NODE_ENV == "production") {
             localhost = window.staticHost ? window.staticHost : "/spfm/"
-        }sho
+        }
         config.url = localhost + config.url
         let url = localhost + config.url
         if (url.indexOf('/sysmgr/sys/login/auth/captcha') == -1 && url.indexOf('/sysmgr/sys/login/auth/token') == -1) {

+ 1 - 1
src/pages/main/onlineExcel/index.vue

@@ -95,7 +95,7 @@
                     <div class="container" id="container" v-else>
                         <fullscreen :fullscreen.sync="excelFullScreen" class="container">
                             <iframe id="excelIframe" height="100%" width="100%"
-                                    src="/marketfront/static/views/onlineShareExcel.html"
+                                    src="/static/views/onlineShareExcel.html"
                                     frameborder="0"></iframe>
                         </fullscreen>
                     </div>

+ 2 - 2
vue.config.js

@@ -144,8 +144,8 @@ 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://43.138.50.94:9600',
+                target: "http://192.168.2.124:9600/",
+                // target:'http://43.138.50.94:9600',
                 changeOrigin: true,
             },
         },