yf_zhb преди 3 години
родител
ревизия
d72aa92739
променени са 3 файла, в които са добавени 8 реда и са изтрити 6 реда
  1. 5 4
      minggao/config/index.js
  2. 1 0
      minggao/src/page/commandCenter/realTime.vue
  3. 2 2
      minggao/src/util/server.js

+ 5 - 4
minggao/config/index.js

@@ -11,10 +11,11 @@ module.exports = {
     assetsPublicPath: '/',
     proxyTable: {
       '/api': {
-        // target: 'http://192.168.1.52:12345', //翟毅飞
+        ws: false,
+        target: 'http://192.168.1.52:12345', //翟毅飞
         //  target: 'https://www.yhswjc.com', //线上
         // target: 'http://192.168.1.77:12345', //曹世祥
-        target: 'http://114.115.147.140:12345',
+        // target: 'http://114.115.147.140:12345',
         changeOrigin: true,
         pathRewrite: {
           '^/api': '/api' //重写接口
@@ -23,8 +24,8 @@ module.exports = {
     },
 
     // Various Dev Server settings
-    host: 'localhost', // can be overwritten by process.env.HOST
-    // host: '192.168.1.77', // can be overwritten by process.env.HOST
+    // host: 'localhost', // can be overwritten by process.env.HOST
+    host: '192.168.1.77', // can be overwritten by process.env.HOST
     port: 8888, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: false,
     errorOverlay: true,

+ 1 - 0
minggao/src/page/commandCenter/realTime.vue

@@ -879,6 +879,7 @@ export default {
       if (typeof WebSocket === 'undefined') {
         alert('您的浏览器不支持socket!');
       } else {
+        console.log(this.url, 'msg int 00000000000000000 12313441');
         this.websock = new window.WebSocket(
           this.url + '&token=' + localStorage.getItem('session')
         );

+ 2 - 2
minggao/src/util/server.js

@@ -28,8 +28,8 @@ if (location.origin.indexOf('https') !== -1) {
   wsUrl = 'wss' + origin.split('https')[1];
 } else {
   if (process.env.NODE_ENV === 'development') {
-    // wsUrl = 'ws://192.168.1.52:12345';
-    wsUrl = 'ws://114.115.147.140:12345';
+    wsUrl = 'ws://192.168.1.52:12345';
+    // wsUrl = 'ws://114.115.147.140:12345';
   } else {
     wsUrl = 'ws' + origin.split('http')[1];
   }