Merge branch 'master' of http://git.fast-fun.cn:92/jaikuai/zk-station-control-frontend

src/layout/components/Navbar.vue

@@ -85,7 +85,8 @@ export default {
     //菜单路由
     menuList(){
       //console.log(this.permission_routes);
-      this.PermissionList = this.permission_routes.slice(5, 11);
+      // this.PermissionList = this.permission_routes.slice(5, 11);
+      this.PermissionList = this.permission_routes.slice(5, 9);
     },
     //当前时间
     timer() {

vue.config.js

@@ -12,7 +12,7 @@ module.exports = {
   lintOnSave: false,
   productionSourceMap: false,
   devServer: {
-    host: '192.168.2.92',
+    host: 'localhost',
     port: 8080,
     open: true,
     overlay: {
@@ -21,19 +21,19 @@ module.exports = {
     },
     proxy: {
       '/api': {
-        target: `http://192.168.2.89:8080`,
+        target: `http://localhost:8080`,
         // target: `http://172.16.12.146:8080`,
         ws: true,
         changeOrigin: true,
       },
       '/ws': {
-         target: `ws://192.168.2.89:8080/ws`,
+         target: `ws://localhost:8080/ws`,
         // target: `ws://172.16.12.146:8080/ws`,
         ws: true,
         changeOrigin: true,
       },
       '/video':{
-        target: `ws://192.168.2.89:8080/`,
+        target: `ws://localhost:8080/`,
         // target: `ws://172.16.12.146:8080/ws`,
         ws: true,
         changeOrigin: true,