diff --git a/.env.development b/.env.development index 91a0a56..9579ac2 100644 --- a/.env.development +++ b/.env.development @@ -7,11 +7,11 @@ ENV = 'development' # 开发环境 # VUE_APP_BASE_API = '/dev-api' # 后台 -# VUE_APP_BASE_API = 'http://192.168.1.222:8080' +VUE_APP_BASE_API = 'http://192.168.1.222:8080' # 梅州云端 # VUE_APP_BASE_API = 'http://106.55.173.225:8091' # 广合 -VUE_APP_BASE_API = 'http://106.55.173.225:8092' +# VUE_APP_BASE_API = 'http://106.55.173.225:8092' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js index 73babbd..1e63170 100644 --- a/src/store/modules/permission.js +++ b/src/store/modules/permission.js @@ -43,6 +43,57 @@ const permission = { router.addRoutes(asyncRoutes); + // 有中央空调 + // 如果动态的路由有中央空调-系统监控-系统监测页面,那就添加一个hidden为true非Layout的大屏页面 + const result = checkRouteArray( + sidebarRoutes, + "centerairC", + "monitorControl", + "sysMonitor" + ); + router.addRoutes(asyncRoutes); + if (result) { + // console.log( + // "满足条件,添加中央空调-系统监控-系统监测相关的大屏页面路由" + // ); + // 定义要添加的多个路由对象数组 + const additionalRoutes = [ + { + path: "/monitorCenter", + name: "monitorCenter", + hidden: true, + component: () => + import("@/views/centerairC/sysMonitor/monitorCenter"), + meta: { title: "系统监测", icon: "screen" }, + }, + { + path: "/hostDetails", + name: "hostDetails", + hidden: true, + component: () => + import("@/views/centerairC/sysMonitor/hostDetails"), + meta: { title: "主机性能", icon: "new2" }, + }, + { + path: "/performance", + name: "performance", + hidden: true, + component: () => + import("@/views/centerairC/sysMonitor/performance"), + meta: { title: "冷机性能性能", icon: "new2" }, + }, + // 可以继续添加更多路由对象 + ]; + // 循环添加额外的路由对象到各路由数组 + additionalRoutes.forEach((route) => { + sidebarRoutes.push(route); + rewriteRoutes.push(route); + asyncRoutes.push(route); + }); + } else { + // console.log("不满足条件"); + } + // 空压热回收 const result2 = sidebarRoutes.find( (item) => item.name === "HeatRecoverySys" diff --git a/src/views/centerairC/enSourceAnalysis/components/equipment.vue b/src/views/centerairC/enSourceAnalysis/components/equipment.vue index 2947695..184c3e1 100644 --- a/src/views/centerairC/enSourceAnalysis/components/equipment.vue +++ b/src/views/centerairC/enSourceAnalysis/components/equipment.vue @@ -512,7 +512,7 @@ export default { }; }), ]; - this.pageParm.total = res.data.totalSize; + this.pageParm.total = res.data[3].total; console.log("header", this.headers); } else { this.tableData = []; diff --git a/src/views/centerairC/enSourceAnalysis/components/machineChart.vue b/src/views/centerairC/enSourceAnalysis/components/machineChart.vue new file mode 100644 index 0000000..f775aec --- /dev/null +++ b/src/views/centerairC/enSourceAnalysis/components/machineChart.vue @@ -0,0 +1,218 @@ + + + + + diff --git a/src/views/centerairC/enSourceAnalysis/components/machineRoom.vue b/src/views/centerairC/enSourceAnalysis/components/machineRoom.vue new file mode 100644 index 0000000..4bb259f --- /dev/null +++ b/src/views/centerairC/enSourceAnalysis/components/machineRoom.vue @@ -0,0 +1,672 @@ + + + + diff --git a/src/views/centerairC/enSourceAnalysis/index.vue b/src/views/centerairC/enSourceAnalysis/index.vue index e1ddb29..3fb881d 100644 --- a/src/views/centerairC/enSourceAnalysis/index.vue +++ b/src/views/centerairC/enSourceAnalysis/index.vue @@ -3,10 +3,17 @@
- + + + + - + @@ -16,19 +23,30 @@ diff --git a/src/views/centerairC/energyAnalysis/index.vue b/src/views/centerairC/energyAnalysis/index.vue index 8333fc3..4ca8403 100644 --- a/src/views/centerairC/energyAnalysis/index.vue +++ b/src/views/centerairC/energyAnalysis/index.vue @@ -3,7 +3,7 @@
- + diff --git a/src/views/centerairC/overview/index.vue b/src/views/centerairC/overview/index.vue index 7a5f7c3..c326b4e 100644 --- a/src/views/centerairC/overview/index.vue +++ b/src/views/centerairC/overview/index.vue @@ -427,7 +427,7 @@ export default { electData: res.data[1].meter[index].toString(), // 转换为字符串 copData: res.data[2].cop[index].toString(), // 转换为字符串 })); - this.pageParm.total = res.data.totalSize; + this.pageParm.total = res.data[5].total; } else { this.tableData = []; }