修改IP

src/store/modules/user.js

@@ -73,7 +73,7 @@ const actions = {
         commit('SET_STATE', data.state)
         resolve(data)
       }).catch(error => {
-        reject('用户或密码错误')
+        reject('登录失败')
       })
     })
   },

src/styles/element-ui.scss

@@ -155,7 +155,7 @@
   display: none;
 }
 .el-table__fixed-body-wrapper{
-  height: calc(100% - 65px) !important;
+  height: calc(100% - 70px) !important;
 }
 .el-table tr{
   background: #111827;

src/utils/request.js

@@ -30,7 +30,6 @@ service.interceptors.request.use(
     return config
   },
   error => {
-    // do something with request error
     console.log(error) // for debug
     return Promise.reject(error)
   }
@@ -38,25 +37,22 @@ service.interceptors.request.use(
 
 // response interceptor
 service.interceptors.response.use(
-  /**
-   * If you want to get http information such as headers or status
-   * Please return  response => response
-  */
-
-  /**
-   * Determine the request status by custom code
-   * Here is just an example
-   * You can also judge the status by HTTP Status Code
-   */
   response => {
     const res = response.data
-    if (res.code !== 0) {
+    if (res.code === 1) {
       Message({
         message: res.msg || 'Error',
         type: 'error',
         duration: 5 * 1000
       })
-    } else {
+    }else if(res.code === -3){
+      Message({
+        message: '登录过期!',
+        type: 'error',
+      })
+      window.location.href = '/login'
+    }
+     else {
       return res
     }
   },

src/views/equipment-monitoring/index.vue

@@ -291,7 +291,8 @@ export default {
       }, 3000)
     },
     websocketConnect() {
-      this.ws = new WebSocket(wsUrl.devServer.proxy['/ws'].target)
+      const wstoken = getToken()
+      this.ws = new WebSocket(wsUrl.devServer.proxy['/ws'].target+'/'+wstoken)
       this.ws.onopen = this.websocketOnOpen
       this.ws.onerror = this.websocketOnError
       this.ws.onmessage = this.websocketOnMessage

src/views/power-change-monitoring/index.vue

@@ -440,7 +440,7 @@ export default {
     },
     websocketOnMessage(m) {
       const d = JSON.parse(m.data)
-      console.log(d)
+      // console.log(d)
       if (d.driverInfoVo) {
         this.driverInfo = d.driverInfoVo
       }
@@ -512,7 +512,8 @@ export default {
       }, 3000)
     },
     websocketConnect() {
-      this.ws = new WebSocket(wsUrl.devServer.proxy['/ws'].target)
+      const wstoken = getToken()
+      this.ws = new WebSocket(wsUrl.devServer.proxy['/ws'].target+'/'+wstoken)
       this.ws.onopen = this.websocketOnOpen
       this.ws.onerror = this.websocketOnError
       this.ws.onmessage = this.websocketOnMessage

vue.config.js

@@ -21,19 +21,19 @@ module.exports = {
     },
     proxy: {
       '/api': {
-        target: `http://192.168.2.10:8080`,
+        target: `http://192.168.3.177:8080`,
         // target: `http://172.16.12.146:8080`,
         ws: true,
         changeOrigin: true,
       },
       '/ws': {
-         target: `ws://192.168.2.10:8080/ws`,
+         target: `ws://192.168.3.177:8080/ws`,
         // target: `ws://172.16.12.146:8080/ws`,
         ws: true,
         changeOrigin: true,
       },
       '/video':{
-        target: `ws://192.168.2.10:8080/`,
+        target: `ws://192.168.3.177:8080/`,
         // target: `ws://172.16.12.146:8080/ws`,
         ws: true,
         changeOrigin: true,