diff --git a/.env.development b/.env.development index 91a0a56..6fc26f8 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,5 @@ # 页面标题 -VUE_APP_TITLE = 铭汉空压热回收系统 +VUE_APP_TITLE = 铭汉能耗监测控制系统 # 开发环境配置 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/.env.production b/.env.production index 87530e2..7200de5 100644 --- a/.env.production +++ b/.env.production @@ -1,5 +1,5 @@ # 页面标题 -VUE_APP_TITLE = 铭汉空压热回收系统 +VUE_APP_TITLE = 铭汉能耗监测控制系统 # 生产环境配置 ENV = 'production' diff --git a/package.json b/package.json index b229024..4a21fe6 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "mh", "version": "3.8.8", - "description": "铭汉空压热回收系统", + "description": "铭汉能耗监测控制系统", "author": "铭汉", "license": "MIT", "scripts": { @@ -90,4 +90,4 @@ "> 1%", "last 2 versions" ] -} +} \ No newline at end of file diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js index 73babbd..71dc32b 100644 --- a/src/store/modules/permission.js +++ b/src/store/modules/permission.js @@ -41,13 +41,11 @@ const permission = { const asyncRoutes = filterDynamicRoutes(dynamicRoutes); rewriteRoutes.push({ path: "*", redirect: "/404", hidden: true }); - router.addRoutes(asyncRoutes); - // 空压热回收 - const result2 = sidebarRoutes.find( + const resultERS = sidebarRoutes.find( (item) => item.name === "HeatRecoverySys" ); - if (result2) { + if (resultERS) { // 定义要添加的多个路由对象数组 const additionalRoutes2 = [ { @@ -70,6 +68,192 @@ const permission = { // console.log("不满足条件"); } + // 有中央空调 + // 如果动态的路由有中央空调-系统监控-系统监测页面,那就添加一个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 === "AircAndWindc" + ); + if (result2) { + // 定义要添加的多个路由对象数组 + const additionalRoutes2 = [ + { + path: "/asSysMonitorDetails", + name: "asSysMonitorDetails", + hidden: true, + component: () => + import( + "@/views/aircAndWindc/awSysMonitor/asSysMonitorDetails" + ), + meta: { title: "系统监控", icon: "screen" }, + }, + // 可以继续添加更多路由对象 + ]; + // 循环添加额外的路由对象到各路由数组 + additionalRoutes2.forEach((route) => { + sidebarRoutes.push(route); + rewriteRoutes.push(route); + asyncRoutes.push(route); + }); + } else { + // console.log("不满足条件"); + } + + // 锅炉 + const result3 = sidebarRoutes.find( + (item) => item.name === "BoilerSys" + ); + if (result3) { + // 定义要添加的多个路由对象数组 + const additionalRoutes3 = [ + { + path: "/boilerMonitorDetails", + name: "boilerMonitorDetails", + hidden: true, + component: () => + import( + "@/views/boilerSys/boilerMonitor/boilerMonitorDetails" + ), + meta: { title: "锅炉监控", icon: "screen" }, + }, + { + path: "/hotWaterBoilerDetails", + name: "hotWaterBoilerDetails", + hidden: true, + component: () => + import( + "@/views/boilerSys/hotWaterBoiler/hotWaterBoilerDetails" + ), + meta: { title: "热水锅炉监控", icon: "screen" }, + }, + { + path: "/heatingPumpDetails", + name: "heatingPumpDetails", + hidden: true, + component: () => + import("@/views/boilerSys/heatingPump/heatingPumpDetails"), + meta: { title: "采暖泵监控", icon: "screen" }, + }, + { + path: "/steamHeatingDetails", + name: "steamHeatingDetails", + hidden: true, + component: () => + import("@/views/boilerSys/steamHeating/steamHeatingDetails"), + meta: { title: "蒸汽采暖运行监控", icon: "screen" }, + }, + // 可以继续添加更多路由对象 + ]; + // 循环添加额外的路由对象到各路由数组 + additionalRoutes3.forEach((route) => { + sidebarRoutes.push(route); + rewriteRoutes.push(route); + asyncRoutes.push(route); + }); + } else { + // console.log("不满足条件"); + } + + // 热水 + const result4 = sidebarRoutes.find( + (item) => item.name === "HotWater" + ); + if (result4) { + // 定义要添加的多个路由对象数组 + const additionalRoutes4 = [ + { + path: "/waterMonitorDetails", + name: "waterMonitorDetails", + hidden: true, + component: () => + import("@/views/hotWater/waterMonitor/waterMonitorDetails"), + meta: { title: "热水监控", icon: "screen" }, + }, + // 可以继续添加更多路由对象 + ]; + // 循环添加额外的路由对象到各路由数组 + additionalRoutes4.forEach((route) => { + sidebarRoutes.push(route); + rewriteRoutes.push(route); + asyncRoutes.push(route); + }); + } else { + // console.log("不满足条件"); + } + + // 温度监测 + const result5 = sidebarRoutes.find((item) => item.name === "TemSys"); + if (result5) { + // 定义要添加的多个路由对象数组 + const additionalRoutes5 = [ + { + path: "/temMonitorDeatils", + name: "temMonitorDeatils", + hidden: true, + component: () => + import("@/views/temSys/temMonitor/temMonitorDeatils"), + meta: { title: "温度监测", icon: "screen" }, + }, + ]; + // 循环添加额外的路由对象到各路由数组 + additionalRoutes5.forEach((route) => { + sidebarRoutes.push(route); + rewriteRoutes.push(route); + asyncRoutes.push(route); + }); + } else { + // console.log("不满足条件"); + } + commit("SET_ROUTES", rewriteRoutes); commit("SET_SIDEBAR_ROUTERS", constantRoutes.concat(sidebarRoutes)); commit("SET_DEFAULT_ROUTES", sidebarRoutes); 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/sysMonitor/monitorCenter.vue b/src/views/centerairC/sysMonitor/monitorCenter.vue index 7caea68..f2115ea 100644 --- a/src/views/centerairC/sysMonitor/monitorCenter.vue +++ b/src/views/centerairC/sysMonitor/monitorCenter.vue @@ -58,7 +58,7 @@ {{ weatherObj.humidity }} %
- +
diff --git a/src/views/heatRecoverySys/deviceMonitor/monitorCenter.vue b/src/views/heatRecoverySys/deviceMonitor/monitorCenter.vue index ab3eb98..23ac298 100644 --- a/src/views/heatRecoverySys/deviceMonitor/monitorCenter.vue +++ b/src/views/heatRecoverySys/deviceMonitor/monitorCenter.vue @@ -17,7 +17,7 @@ src="../../../assets/images/title-right.png" alt="" /> -
铭汉空压热回收系统
+
铭汉能耗监测控制系统
{{ formattedDate }}
diff --git a/src/views/login.vue b/src/views/login.vue index a4201e6..6fd4eb1 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -10,7 +10,7 @@ class="login_img_down" alt="" /> -
铭汉空压热回收系统
+
铭汉能耗监测控制系统