diff --git a/src/api/http/http-api.js b/src/api/http/http-api.js index c9da053..7e9b573 100644 --- a/src/api/http/http-api.js +++ b/src/api/http/http-api.js @@ -68,17 +68,17 @@ export default { }, getAllCameras1:{ method: "GET", - url: "/realTime/allCameras1", + url: "/realTime/allCameras/1", name: "获取全部球机" }, getAllCameras2:{ method: "GET", - url: "/realTime/allCameras2", + url: "/realTime/allCameras/2", name: "获取全部球机" }, getAllCameras3:{ method: "GET", - url: "/realTime/allCameras3", + url: "/realTime/allCameras/3", name: "获取全部球机" }, getWallStyle:{ diff --git a/src/layouts/AsideMenu.vue b/src/layouts/AsideMenu.vue index be956a0..5eacc29 100644 --- a/src/layouts/AsideMenu.vue +++ b/src/layouts/AsideMenu.vue @@ -71,7 +71,15 @@ export default { parents = this.$router.options.routes[0].children.filter(ele => { if ( this.userInfo.permissionList.some(item => { - return item.rights === ele.name && ele.name.indexOf("center") < 0 && item.rights === ele.name && ele.name.indexOf("ioTable") < 0 && item.rights === ele.name && ele.name.indexOf("realTimeMonitoringModel") < 0 && item.rights === ele.name && ele.name.indexOf("plcStatus") < 0 && item.rights === ele.name && ele.name.indexOf("cameraManageModel") < 0 && item.rights === ele.name && ele.name.indexOf("checkOperation") < 0; + return item.rights === ele.name + && ele.name.indexOf("center") < 0 + && item.rights === ele.name + && ele.name.indexOf("ioTable") < 0 + && item.rights === ele.name + && ele.name.indexOf("realTimeMonitoringModel") < 0 + && item.rights === ele.name && ele.name.indexOf("plcStatus") < 0 + && item.rights === ele.name && ele.name.indexOf("cameraManageModel") < 0 + && item.rights === ele.name && ele.name.indexOf("checkOperation") < 0; }) ) { return ele; @@ -92,7 +100,13 @@ export default { recursionRoute(parents); }else { parents = this.$router.options.routes[0].children.filter(item => { - return !item.name.startsWith("center") && !item.name.startsWith("ioTable") && !item.name.startsWith("realTimeMonitoringModel") && !item.name.startsWith("plcStatus") && !item.name.startsWith("cameraManageModel") && !item.name.startsWith("checkOperation") && !item.name.startsWith("stockLog") ; + return !item.name.startsWith("center") + && !item.name.startsWith("ioTable") + && !item.name.startsWith("realTimeMonitoringModel") + && !item.name.startsWith("plcStatus") + && !item.name.startsWith("cameraManageModel") + && !item.name.startsWith("checkOperation") + && !item.name.startsWith("stockLog") ; }); } this.routes = parents; diff --git a/src/layouts/PageHeader.vue b/src/layouts/PageHeader.vue index 8a06236..ed83215 100644 --- a/src/layouts/PageHeader.vue +++ b/src/layouts/PageHeader.vue @@ -61,11 +61,12 @@ export default { }, mounted() { this.title = this.$route.meta.title || this.$route.meta.name; - this.getplcStatus() - const that = this - setInterval(function () { - that.getplcStatus() - }, 10000) + // 古井贡酒不采用心跳 + // this.getplcStatus() + // const that = this + // setInterval(function () { + // that.getplcStatus() + // }, 10000) }, methods: { ...mapMutations(["setState"]),