放开设备监控定时器功能

2.修改设备监控页面单位
3.首页添加空调冷源系统EER数据

.env.development

@@ -1,15 +1,17 @@
 # 页面标题
-VUE_APP_TITLE = 铭汉能耗监测控制系统
+VUE_APP_TITLE = 铭汉节能岛系统
 
 # 开发环境配置
 ENV = 'development'
 
 # 开发环境
 # VUE_APP_BASE_API = '/dev-api'
-# 后台
+# # 后台
 # VUE_APP_BASE_API = 'http://192.168.1.222:8080'
-# 海湾酒店-云端
-VUE_APP_BASE_API = 'http://106.55.173.225:8090'
+# # 梅州云端
+# VUE_APP_BASE_API = 'http://106.55.173.225:8091'
+# 保利山庄
+VUE_APP_BASE_API = 'http://106.55.173.225:8093'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

.env.production

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 铭汉能耗监测控制系统
+VUE_APP_TITLE = 铭汉节能岛系统
 
 # 生产环境配置
 ENV = 'production'
@@ -7,4 +7,6 @@ ENV = 'production'
 # 生产环境
 # VUE_APP_BASE_API = '/prod-api'
 # 后台
-VUE_APP_BASE_API = 'http://106.55.173.225:8090'
+# VUE_APP_BASE_API = 'http://106.55.173.225:8091'
+# 广合
+VUE_APP_BASE_API = 'http://106.55.173.225:8092'

.gitignore

@@ -21,3 +21,4 @@ selenium-debug.log
 
 package-lock.json
 yarn.lock
+dist.rar

package.json

@@ -1,7 +1,7 @@
 {
   "name": "mh",
   "version": "3.8.8",
-  "description": "铭汉能耗监测控制系统",
+  "description": "铭汉节能岛系统",
   "author": "铭汉",
   "license": "MIT",
   "scripts": {
@@ -59,7 +59,8 @@
     "vue-meta": "2.4.0",
     "vue-router": "3.4.9",
     "vuedraggable": "2.24.3",
-    "vuex": "3.6.0"
+    "vuex": "3.6.0",
+    "xlsx": "^0.18.5"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "4.4.6",
@@ -72,6 +73,7 @@
     "connect": "3.6.6",
     "eslint": "7.15.0",
     "eslint-plugin-vue": "7.2.0",
+    "html-webpack-plugin": "^5.6.3",
     "lint-staged": "10.5.3",
     "runjs": "4.4.2",
     "sass": "1.32.13",

src/App.vue

@@ -7,18 +7,37 @@
 
 <script>
 import ThemePicker from "@/components/ThemePicker";
+import { exitFullscreen, isFullscreen } from "@/utils/fullscreen";
 
 export default {
   name: "App",
   components: { ThemePicker },
   metaInfo() {
     return {
-      title: this.$store.state.settings.dynamicTitle && this.$store.state.settings.title,
-      titleTemplate: title => {
-        return title ? `${title} - ${process.env.VUE_APP_TITLE}` : process.env.VUE_APP_TITLE
-      }
-    }
+      title:
+        this.$store.state.settings.dynamicTitle &&
+        this.$store.state.settings.title,
+      titleTemplate: (title) => {
+        return title
+          ? `${title} - ${process.env.VUE_APP_TITLE}`
+          : process.env.VUE_APP_TITLE;
+      },
+    };
+  },
+  mounted() {
+    // 监听键盘事件，当用户按 Esc 键时退出全屏
+    window.addEventListener("keydown", this.handleKeyDown);
+  },
+  beforeDestroy() {
+    window.removeEventListener("keydown", this.handleKeyDown);
+  },
+  methods: {
+    handleKeyDown(event) {
+      if (event.key === "Escape" && isFullscreen()) {
+        exitFullscreen();
       }
+    },
+  },
 };
 </script>
 <style scoped>

src/api/boiler/boilerRunReport.js

@@ -0,0 +1,27 @@
+import request from "@/utils/request";
+
+// 查询运行记录
+export function boilerSysList(data) {
+  return request({
+    url: "/reportSteam/list",
+    method: "post",
+    data,
+  });
+}
+// 编辑运行记录
+export function boilerSysEdit(data) {
+  return request({
+    url: "/reportSteam/edit",
+    method: "put",
+    data,
+  });
+}
+// 导出
+export function boilerSysExport(data) {
+  return request({
+    url: "/reportSteam/export",
+    method: "post",
+    data,
+    responseType: "blob",
+  });
+}

src/api/boiler/heatingPump.js

@@ -0,0 +1,27 @@
+import request from "@/utils/request";
+
+// 采暖泵列表
+export function heatPumpList(query) {
+  return request({
+    url: "/device/heatPump/list",
+    method: "get",
+    params: query,
+  });
+}
+// 采暖泵在线情况
+export function heatPumpOnlineList(query) {
+  return request({
+    url: "/device/heatPump/online",
+    method: "get",
+    params: query,
+  });
+}
+// 采暖泵报警列表
+export function heatPumpAlarmList(query) {
+  return request({
+    url: "/device/heatPump/alarmList",
+    method: "get",
+    params: query,
+  });
+}
+

src/api/boiler/heatingRunPeport.js

@@ -0,0 +1,27 @@
+import request from "@/utils/request";
+
+// 查询运行记录
+export function boilerSysList(data) {
+  return request({
+    url: "/reportHeating/list",
+    method: "post",
+    data,
+  });
+}
+// 编辑运行记录
+export function boilerSysEdit(data) {
+  return request({
+    url: "/reportHeating/edit",
+    method: "put",
+    data,
+  });
+}
+// 导出
+export function boilerSysExport(data) {
+  return request({
+    url: "/reportHeating/export",
+    method: "post",
+    data,
+    responseType: "blob",
+  });
+}

src/api/boiler/hotwaterBoiler.js

@@ -0,0 +1,10 @@
+import request from "@/utils/request";
+
+// 热水锅炉设备参数列表
+export function hotWaterBoiler(query) {
+  return request({
+    url: "/device/hotWaterBoiler/list",
+    method: "get",
+    params: query,
+  });
+}

src/api/boiler/steamBoiler.js

@@ -0,0 +1,10 @@
+import request from "@/utils/request";
+
+// 蒸汽锅炉设备参数列表
+export function steamBoilerBoiler(query) {
+  return request({
+    url: "/device/steamBoiler/list",
+    method: "get",
+    params: query,
+  });
+}

src/api/centerairC/hostRunReport.js

@@ -0,0 +1,27 @@
+import request from "@/utils/request";
+
+// 查询运行记录
+export function reportSysList(data) {
+  return request({
+    url: "/reportSys/list",
+    method: "post",
+    data,
+  });
+}
+// 编辑运行记录
+export function reportSysEdit(data) {
+  return request({
+    url: "/reportSys/edit",
+    method: "put",
+    data,
+  });
+}
+// 导出
+export function reportSysExport(data) {
+  return request({
+    url: "/reportSys/export",
+    method: "post",
+    data,
+      responseType: 'blob',
+  });
+}

src/api/device/gather.js

@@ -48,3 +48,12 @@ export function delCPM(cpmIds) {
     method: "delete",
   });
 }
+
+// 设备组列表
+export function devicesList(query) {
+  return request({
+    url: "/space/tree",
+    method: "get",
+    params: query,
+  });
+}

src/api/heatRecoverySys/deviceMonitor.js

@@ -0,0 +1,18 @@
+import request from "@/utils/request";
+
+// 工艺流程图数据列表
+export function monitorList(query) {
+  return request({
+    url: "/device/ers/monitor/list",
+    method: "get",
+    params: query,
+  });
+}
+// 累积热量框数据
+export function monitorTotalDatas(query) {
+  return request({
+    url: "/device/ers/monitor/totalDatas",
+    method: "get",
+    params: query,
+  });
+}

src/api/hotWater/profitAnalysis.js

@@ -1,18 +0,0 @@
-import request from "@/utils/request";
-
-// 顶部
-export function waternErgySum(query) {
-  return request({
-    url: "/hot_water_revenue/energySum",
-    method: "get",
-    params: query,
-  });
-}
-// 数据列表
-export function waterRevenueQuery(query) {
-  return request({
-    url: "/hot_water_revenue/query",
-    method: "get",
-    params: query,
-  });
-}

src/api/index.js

@@ -45,3 +45,18 @@ export function viewMainParams() {
     method: "get",
   });
 }
+// 获取热回收系统相关数据
+export function ersDatas(query) {
+  return request({
+    url: "/pro/overview/ersDatas",
+    method: "get",
+    params: query,
+  });
+}
+// 空调系统eer
+export function getCoeData() {
+  return request({
+    url: "/pro/overview/getCoe",
+    method: "get",
+  });
+}

src/assets/icons/svg/boilerSys.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1757379307805" class="icon" viewBox="0 0 1335 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1517" xmlns:xlink="http://www.w3.org/1999/xlink" width="260.7421875" height="200"><path d="M1233.548986 825.047188V692.461449C1293.801739 651.456928 1335.652174 562.176 1335.652174 458.722319c0-137.676058-73.935768-250.078609-167.179131-257.335652v-0.415537l-165.917681-25.822608V115.533913h-56.750376v50.665739L810.889275 139.664696V75.790841h-60.697971v54.494608L514.285449 87.010319V0h-66.337391v76.636754l-105.768812-16.458203v0.296811c60.549565 8.221681 103.231072 167.045565 96.048232 359.780174-7.182841 192.734609-61.677449 347.863188-122.672232 351.573334l87.188406-2.849392v40.158609l-159.016811 8.102956v66.841971l370.554434-30.660637 1.409855 25.555478-195.628521 13.341681 23.240348 11.353044v113.975652l861.792463-106.733449v-84.027363l-34.934724-4.541217-36.61171 2.700985z m-553.360696-32.218898v-34.489507l160.975768-6.678261v32.085333l-160.975768 9.082435zM528.517565 204.503188l27.870609-13.623652v-0.845913l1.409855 0.148406 0.430377-0.148406v0.281971l147.737971 23.552v295.787594l-145.91258-4.11084-31.551072 3.546898V204.503188z m-53.099594 600.791189l8.310725-39.179131 125.19513-4.11084 2.122203 36.478145-135.642899 6.826666z m204.770319 38.882319l269.148753-24.976696v-40.870957l-43.52742 2.270609 4.927073-31.22458 231.824695-14.766376 15.909102 93.822145-478.133797 42.859594-0.148406-27.098899z m-406.854493-73.579595c-56.008348-2.122203-97.458087-133.179362-99.980985-302.955594l-35.008928-2.700985c-21.563362 8.934029-17.066667 54.895304-17.066667 54.895304H0c0-138.150957 105.160348-144.814377 105.160348-144.814377l70.848927 1.27629c12.184116-180.134957 65.402435-319.280232 123.785276-316.994782 62.033623 2.404174 106.421797 163.528348 99.135072 359.973101-7.271884 196.429913-63.562203 353.740058-125.595826 351.321043zM250.227014 320.853333c-11.620174 0-21.696928 22.973217-26.742724 56.869102l30.942609 0.712348-0.281971 92.620058-30.245102-1.27629c4.897391 32.204058 14.988986 54.168116 26.327188 54.168116 16.384 0 29.681159-45.516058 29.68116-101.539247 0-56.023188-13.297159-101.554087-29.68116-101.554087z" fill="" p-id="1518"></path></svg>

src/assets/icons/svg/elect.svg

@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1778635796144" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9277" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M799.256365 357.474588c-6.383475-12.76695-12.76695-19.150424-25.533899-19.150425h-191.504243L760.955516 38.300849c6.383475-12.76695 6.383475-31.917374-12.766949-38.300849H467.315677c-12.76695 0-25.533899 6.383475-25.5339 19.150424l-204.271193 510.677983c-6.383475 12.76695 0 31.917374 12.76695 38.300848h140.436445l-153.203395 414.925861c-6.383475 12.76695 0 31.917374 19.150425 38.300849 12.76695 6.383475 25.533899 0 31.917374-6.383475l510.677982-625.580528c0-12.76695 6.383475-25.533899 0-31.917374z" p-id="9278"></path></svg>

src/assets/icons/svg/heatRecoverySys.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1769656588898" class="icon" viewBox="0 0 1034 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5427" xmlns:xlink="http://www.w3.org/1999/xlink" width="201.953125" height="200"><path d="M390.656 0c37.888 0 69.12 30.208 69.12 67.584V112.64h115.2v-45.056c0-37.376 30.72-67.584 69.12-67.584h206.848c37.888 0 69.12 30.208 69.12 67.584V112.64h28.672c47.616 0 86.016 37.888 86.016 84.48v732.16c0 46.592-38.4 84.48-86.016 84.48H86.016C38.4 1013.76 0 975.872 0 929.28v-732.16C0 150.528 38.4 112.64 86.016 112.64h28.672v-45.056c0-37.376 30.72-67.584 69.12-67.584h206.848z m48.128 744.448c-7.168-2.56-15.36 1.024-17.92 8.192v0.512c-14.848 40.96-11.264 62.464 5.632 89.6l4.096 6.656c3.072 4.608 5.12 10.24 6.144 15.36 3.072 18.944-9.728 35.84-27.648 47.104-6.656 3.584-9.216 12.288-5.12 18.944 3.584 6.656 12.288 9.216 18.944 5.12 0.512 0 0.512-0.512 1.024-0.512 26.624-16.384 45.568-41.984 40.448-74.752-1.536-10.24-5.12-17.92-12.288-29.696l-4.096-6.656c-10.752-18.432-11.776-31.744-1.024-61.952 3.072-7.168-0.512-15.36-8.192-17.92 0.512 0 0 0 0 0z m82.944 0c-7.168-2.56-15.36 1.024-17.92 8.192v0.512c-14.848 40.96-11.264 62.464 5.632 89.6l4.096 6.656c3.072 4.608 5.12 10.24 6.144 15.36 3.072 18.944-9.728 35.84-27.648 47.104-6.656 3.584-9.216 12.288-5.12 18.944 3.584 6.656 12.288 9.216 18.944 5.12 0.512 0 0.512-0.512 1.024-0.512 26.624-16.384 45.568-41.984 40.448-74.752-1.536-10.24-5.12-17.92-12.288-29.696l-4.096-6.656c-10.752-18.432-11.776-31.744-1.024-61.952 3.072-7.168-0.512-15.36-8.192-17.92 0.512 0 0.512 0 0 0z m64 8.192c-15.36 40.96-11.776 62.464 6.144 89.6l4.096 6.656c3.072 4.608 5.632 10.24 6.656 15.36 3.072 18.944-10.24 35.84-28.672 47.104-6.656 3.584-8.704 11.776-5.12 18.432 0 0 0 0.512 0.512 0.512 4.096 6.656 13.312 8.192 19.968 4.096 27.136-16.384 47.104-41.984 41.472-74.752-1.536-10.24-5.12-17.92-12.8-29.696l-4.096-6.656c-11.264-18.432-12.288-31.744-1.024-61.952 2.56-7.168-0.512-14.848-7.68-17.92h-0.512c-7.68-2.048-15.872 2.048-18.944 9.216zM445.952 194.048H135.68c-3.584 0-5.632 4.096-6.144 12.8v439.808h323.072v-435.2c0-9.728-1.536-15.872-4.608-16.896l-2.048-0.512z m452.608 0h-310.784c-3.584 0-5.632 4.096-6.144 12.8v439.808h323.072v-435.2c0-9.728-1.536-15.872-4.608-16.896l-1.536-0.512z m-48.128-126.464h-206.848V112.64h206.848v-45.056z m-459.776 0H183.808V112.64h206.848v-45.056z" p-id="5428"></path></svg>

src/assets/icons/svg/heatingPump.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1757380960233" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3007" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M428.8 704h153.6c236.8-134.4 57.6-339.2 25.6-358.4 12.8 25.6 12.8 64-6.4 76.8-38.4-128-121.6-160-121.6-160 12.8 70.4-38.4 147.2-83.2 204.8 0-25.6-6.4-44.8-19.2-70.4-6.4 44.8-44.8 89.6-51.2 140.8-19.2 64 6.4 115.2 102.4 166.4z m0 0" fill="" p-id="3008"></path><path d="M1024 76.8H512c-57.6 0-115.2 12.8-166.4 32-51.2 25.6-102.4 57.6-140.8 96-38.4 38.4-70.4 83.2-96 140.8-19.2 51.2-32 108.8-32 166.4 0 57.6 12.8 115.2 32 166.4 6.4 19.2 12.8 32 25.6 51.2H0v217.6h512c57.6 0 115.2-12.8 166.4-32s96-51.2 140.8-96c38.4-38.4 70.4-83.2 96-140.8 25.6-51.2 32-108.8 32-166.4 0-76.8-19.2-153.6-57.6-217.6H1024V76.8M460.8 896H51.2v-115.2h185.6c-12.8-12.8-32-32-44.8-51.2-38.4-64-64-134.4-64-217.6 0-211.2 172.8-384 384-384h460.8v115.2h-179.2l32 38.4C870.4 352 896 428.8 896 512c0 211.2-172.8 384-384 384h-51.2z m0 0" fill="" p-id="3009"></path></svg>

src/assets/icons/svg/hz-icon.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1758105515572" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7076" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M480.256 16.384C219.648 16.384 8.192 227.84 8.192 488.448c0 260.608 211.456 472.064 472.064 472.064 260.608 0 472.064-211.456 472.064-472.064 0.512-260.608-210.944-472.064-472.064-472.064z m0 881.664c-225.792 0-409.088-183.296-409.088-409.088 0-225.792 183.296-409.088 409.088-409.088 225.792 0 409.088 183.296 409.088 409.088 0.512 225.792-182.784 409.088-409.088 409.088z" p-id="7077"></path><path d="M203.264 281.088h50.688v160.256h199.68V281.088h50.688v383.488h-50.688V484.864h-199.68v179.712h-50.688V281.088zM562.176 625.664l160.768-199.68h-152.576v-40.448H778.24v40.448l-158.72 198.144h165.888l-7.68 40.448h-215.552v-38.912z" p-id="7078"></path></svg>

src/assets/icons/svg/income.svg

@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1778635839438" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="12219" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M851.564767 353.359585c-21.222798-21.222798-46.690155-46.690155-72.157513-67.912953 42.445596-21.222798 72.157513-63.668394 72.157513-110.358549 0-67.912953-67.912953-127.336788-148.559586-127.336788-16.978238 0-33.956477 4.24456-50.934715 8.48912-4.24456 0-8.489119 4.24456-12.733678 4.244559l-25.467358-25.467357c-55.179275-46.690155-127.336788-46.690155-182.516062 0-8.489119 12.733679-16.978238 25.467358-25.467358 33.956476-4.24456 0-8.489119-4.24456-12.733678-4.244559-16.978238-8.489119-33.956477-12.733679-50.934715-12.733679-80.646632 0-148.559585 55.179275-148.559586 127.336787 4.24456 38.201036 21.222798 76.402073 55.179275 97.624871C223.369948 298.180311 197.902591 323.647668 172.435233 344.870466c-80.646632 84.891192-118.847668 174.026943-118.847668 267.407254 0 246.184456 178.271503 407.47772 454.167875 407.47772 110.358549 0 207.98342-25.467358 284.385493-67.912953 118.847668-67.912953 178.271503-182.516062 178.271502-339.564767 0-84.891192-42.445596-174.026943-118.847668-258.918135zM304.01658 344.870466c8.489119-4.24456 16.978238-12.733679 21.222798-16.978238l8.489119-4.24456c21.222798-12.733679 29.711917-33.956477 29.711918-50.934715 0-16.978238-8.489119-33.956477-25.467358-42.445595L320.994819 217.533679c-25.467358-4.24456-38.201036-21.222798-38.201037-38.201037 0-21.222798 25.467358-42.445596 63.668394-42.445595 8.489119 0 12.733679 0 21.222798 4.244559 4.24456 0 4.24456 0 4.24456 4.24456l4.244559 4.244559c29.711917 16.978238 72.157513 4.24456 97.624871-21.222798l4.244559-4.244559c0-4.24456 8.489119-8.489119 12.733679-16.978238 21.222798-21.222798 46.690155-21.222798 67.912953 0 8.489119 8.489119 12.733679 12.733679 12.733679 16.978238l4.24456 4.244559c21.222798 25.467358 63.668394 33.956477 97.62487 16.978239l4.24456-4.24456s4.24456 0 4.244559-4.244559c8.489119-4.24456 12.733679-4.24456 21.222798-4.24456 38.201036 0 63.668394 21.222798 63.668394 42.445596 0 16.978238-16.978238 29.711917-38.201036 38.201036H724.227979c-8.489119 4.24456-12.733679 4.24456-12.733678 4.24456-25.467358 8.489119-42.445596 25.467358-46.690156 46.690155-4.24456 21.222798 8.489119 42.445596 25.467358 55.179275l8.489119 4.244559c8.489119 4.24456 12.733679 8.489119 21.222798 16.978239 25.467358 21.222798 46.690155 38.201036 67.912953 63.668394 63.668394 67.912953 97.62487 135.825907 97.624871 203.73886 0 267.407254-203.73886 322.586528-377.765804 322.586528-178.271503 0-369.276684-84.891192-369.276684-322.586528 0-72.157513 33.956477-144.315026 97.624871-212.22798 21.222798-12.733679 42.445596-33.956477 67.912953-50.934715z" fill="" p-id="12220"></path><path d="M384.663212 633.500518c-21.222798 0-38.201036 16.978238-38.201036 38.201036s16.978238 38.201036 38.201036 38.201037h84.891192v76.402072c0 16.978238 16.978238 33.956477 38.201036 33.956477s38.201036-12.733679 38.201037-33.956477v-76.402072h89.135751c21.222798 0 38.201036-16.978238 38.201036-38.201037s-16.978238-38.201036-38.201036-38.201036h-89.135751v-21.222798h89.135751c21.222798 0 38.201036-16.978238 38.201036-38.201036s-16.978238-38.201036-38.201036-38.201036h-72.157513l72.157513-76.402073c12.733679-12.733679 12.733679-38.201036 0-55.179274-12.733679-12.733679-38.201036-12.733679-50.934715 0L512 480.696373l-72.157513-76.402072c-12.733679-12.733679-38.201036-12.733679-50.934715 0-12.733679 12.733679-12.733679 38.201036 0 55.179274l72.157513 76.402073H384.663212c-21.222798 0-38.201036 16.978238-38.201036 38.201036s16.978238 38.201036 38.201036 38.201036h84.891192v21.222798H384.663212z" fill="" p-id="12221"></path></svg>

src/assets/icons/svg/meterRecord.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1761011231553" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2521" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M925.425633 514.798111a38.910648 38.910648 0 0 0-25.59911-9.727662 38.398666 38.398666 0 0 0-28.415013 12.543564l-138.747178 153.594662a62.973812 62.973812 0 0 0-62.973812 62.973812 38.398666 38.398666 0 0 0 0 5.631804l-28.926995 31.742897a38.398666 38.398666 0 0 0 56.830026 51.198221l24.319155-26.879066a69.373589 69.373589 0 0 0 10.239644 0 62.973812 62.973812 0 0 0 63.229802-63.229802A66.045705 66.045705 0 0 0 793.590215 716.775092l106.74829-117.243926a214.008563 214.008563 0 1 1-167.674173-80.893189 38.398666 38.398666 0 0 0 0-76.797331 291.061886 291.061886 0 1 0 192.50531 72.701474z" p-id="2522"></path><path d="M365.317097 732.902532a367.859217 367.859217 0 0 1 367.603226-367.603226 112.124104 112.124104 0 0 1 38.398666 6.655769v-207.352795a38.398666 38.398666 0 0 0-38.398666-38.398666H455.681957V63.997776A63.997776 63.997776 0 0 0 391.684181 0H64.015567A63.997776 63.997776 0 0 0 0.017791 63.997776v921.567976A38.398666 38.398666 0 0 0 38.416457 1023.964417h470.51165a366.835252 366.835252 0 0 1-143.61101-291.061885zM293.639588 793.572423H167.179982a38.398666 38.398666 0 0 1 0-76.797331h126.459606a38.398666 38.398666 0 0 1 0 76.797331z m0-255.991104H167.179982a38.398666 38.398666 0 0 1 0-76.797331h126.459606a38.398666 38.398666 0 0 1 0 76.797331z m0-255.991104H167.179982a38.398666 38.398666 0 0 1 0-76.797332h126.459606a38.398666 38.398666 0 0 1 0 76.797332z" p-id="2523"></path></svg>

src/assets/icons/svg/unit.svg

@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1778635879182" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="13234" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M156.381564 593.519095h28.67242a103.005669 103.005669 0 0 1 103.005669 103.005669v206.047179a103.005669 103.005669 0 0 1-103.005669 103.005669h-28.67242a103.005669 103.005669 0 0 1-103.005669-103.005669v-206.047179a103.005669 103.005669 0 0 1 103.005669-103.005669z m334.033694-84.798682h28.67242a103.005669 103.005669 0 0 1 103.005669 103.005669v309.052847a103.005669 103.005669 0 0 1-103.005669 103.005669h-28.67242a103.005669 103.005669 0 0 1-103.005669-103.005669v-309.017007a103.005669 103.005669 0 0 1 102.969828-103.005669z m333.997853-211.960865h28.67242a103.005669 103.005669 0 0 1 103.005669 103.005669v515.100026a103.005669 103.005669 0 0 1-102.826466 103.005669h-28.672421a103.005669 103.005669 0 0 1-103.184871-103.005669V399.765217a103.005669 103.005669 0 0 1 103.005669-103.005669z m-39.030332-204.900282L723.557873 20.859186 970.499091 0l-55.015206 241.63682-63.151005-72.648744-313.712116 256.976564a49.639127 49.639127 0 0 1-75.265103-13.081791L392.176379 291.741874l-257.048246 203.574182a49.531606 49.531606 0 0 1-70.713356-8.064118 52.327167 52.327167 0 0 1 7.884915-72.433701l301.956424-240.131518a49.639127 49.639127 0 0 1 74.584133 13.691081L519.23104 308.228516l266.151739-216.476772z" fill="" p-id="13235"></path></svg>

src/assets/icons/svg/water.svg

@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1778635748668" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5697" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M512 1024C295.2192 1024 119.466667 846.848 119.466667 628.394667 119.466667 482.645333 250.299733 273.2032 512 0 773.700267 273.237333 904.533333 482.679467 904.533333 628.394667 904.533333 846.848 728.7808 1024 512 1024z m-287.675733-340.923733a337.134933 337.134933 0 0 0 213.060266 238.6944 34.577067 34.577067 0 0 0 44.270934-21.162667 34.986667 34.986667 0 0 0-20.992-44.612267 267.502933 267.502933 0 0 1-168.96-189.269333 34.6112 34.6112 0 1 0-67.3792 16.384z" fill="" p-id="5698"></path></svg>

src/assets/styles/bigScreen.scss

@@ -680,10 +680,6 @@
     padding: 0.14rem 0.15rem 0.07rem !important;
     min-height: 0.4rem !important;
 }
-  .el-form-item__error {
-    font-size: 0.12rem !important;
-    padding-top: 0.04rem !important;
-}
 }
 @media (min-width: 2000px) {
   // 页面公共样式
@@ -753,6 +749,26 @@
   // 首页
   .project-data {
     margin: 0.16rem 0 !important;
+
+    .sysBg {
+      border-radius: 0.08rem !important;
+
+      .sysBg-title {
+        padding: 0.12rem 0.16rem !important;
+        font-size: 0.16rem !important;
+        letter-spacing: 0.02rem !important;
+
+        &::before {
+          width: 0.03rem !important;
+        }
+
+        &::after {
+          right: 0.12rem !important;
+          width: 0.08rem !important;
+          height: 0.08rem !important;
+        }
+      }
+    }
   }
   .form-header {
     font-size: 0.15rem !important;

src/assets/styles/element-ui.scss

@@ -1452,7 +1452,7 @@
 .el-table__expand-icon{
   color: #fff !important;
 }
-.el-tag {
+.el-tag.el-tag--danger {
   font-weight: bold !important;
 }
 .el-tag.el-tag--success{

src/assets/styles/index.scss

@@ -775,3 +775,10 @@ table th {
     }
   }
 }
+/* 手机端样式 */
+@media (min-width: 0px) and (max-width: 990px) {
+  .app-main {
+    height: 100% !important;
+    overflow-y: hidden !important;
+  }
+}

src/assets/styles/ruoyi.scss

@@ -88,9 +88,9 @@ h6 {
   word-break: break-word;
 }
 
-.el-dialog:not(.is-fullscreen) {
-  margin-top: 6vh !important;
-}
+// .el-dialog:not(.is-fullscreen) {
+//   margin-top: 6vh !important;
+// }
 
 .el-dialog__wrapper.scrollbar .el-dialog .el-dialog__body {
   overflow: auto;

src/assets/styles/sidebar.scss

@@ -116,7 +116,7 @@
     }
 
     & .nest-menu .el-submenu > .el-submenu__title,
-    & .el-submenu .el-menu-item {
+    & .nest-menu .el-menu-item {
       min-width: var(--base-sidebar-width) !important;
       padding: 0 35px !important;
 
@@ -124,6 +124,9 @@
         background-color: rgba(0, 0, 0, 0.06) !important;
       }
     }
+    & .nest-menu .el-menu > .nest-menu .el-menu-item {
+      padding: 0 55px !important;
+    }
 
     & .theme-dark .nest-menu .el-submenu > .el-submenu__title,
     & .theme-dark .el-submenu .el-menu-item {
@@ -339,7 +342,10 @@
     padding: 0 0.2rem !important;
   }
   #app .sidebar-container .nest-menu .el-submenu > .el-submenu__title,
-  #app .sidebar-container .el-submenu .el-menu-item {
+  #app .sidebar-container .nest-menu .el-menu-item {
     padding: 0 0.35rem !important;
   }
+  #app .sidebar-container .nest-menu .el-menu > .nest-menu .el-menu-item {
+    padding: 0 0.55rem !important;
+  }
 }

src/permission.js

@@ -1,63 +1,87 @@
-import router from './router'
-import store from './store'
-import { Message } from 'element-ui'
-import NProgress from 'nprogress'
-import 'nprogress/nprogress.css'
-import { getToken } from '@/utils/auth'
-import { isPathMatch } from '@/utils/validate'
-import { isRelogin } from '@/utils/request'
+import router from "./router";
+import store from "./store";
+import { Message } from "element-ui";
+import NProgress from "nprogress";
+import "nprogress/nprogress.css";
+import { getToken } from "@/utils/auth";
+import { isPathMatch } from "@/utils/validate";
+import { isRelogin } from "@/utils/request";
+import {
+  isFullscreenSupported,
+  requestFullscreen,
+  isFullscreen,
+} from "@/utils/fullscreen";
+NProgress.configure({ showSpinner: false });
 
-NProgress.configure({ showSpinner: false })
-
-const whiteList = ['/login', '/register']
+const whiteList = ["/login", "/register"];
 
 const isWhiteList = (path) => {
-  return whiteList.some(pattern => isPathMatch(pattern, path))
+  return whiteList.some((pattern) => isPathMatch(pattern, path));
+};
+
+let userManuallyExitedFullscreen = false;
+
+// 监听全屏状态变化事件
+document.addEventListener("fullscreenchange", () => {
+  if (!isFullscreen()) {
+    userManuallyExitedFullscreen = true;
   }
+});
 
 router.beforeEach((to, from, next) => {
-  NProgress.start()
+  NProgress.start();
   if (getToken()) {
-    to.meta.title && store.dispatch('settings/setTitle', to.meta.title)
+    to.meta.title && store.dispatch("settings/setTitle", to.meta.title);
     /* has token*/
-    if (to.path === '/login') {
-      next({ path: '/' })
-      NProgress.done()
+    if (to.path === "/login") {
+      next({ path: "/" });
+      NProgress.done();
     } else if (isWhiteList(to.path)) {
-      next()
+      if (isFullscreenSupported() && !userManuallyExitedFullscreen) {
+        const element = document.documentElement;
+        requestFullscreen(element);
+      }
+      next();
     } else {
       if (store.getters.roles.length === 0) {
-        isRelogin.show = true
+        isRelogin.show = true;
         // 判断当前用户是否已拉取完user_info信息
-        store.dispatch('GetInfo').then(() => {
-          isRelogin.show = false
-          store.dispatch('GenerateRoutes').then(accessRoutes => {
+        store
+          .dispatch("GetInfo")
+          .then(() => {
+            isRelogin.show = false;
+            store.dispatch("GenerateRoutes").then((accessRoutes) => {
               // 根据roles权限生成可访问的路由表
-            router.addRoutes(accessRoutes) // 动态添加可访问路由表
-            next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
-          })
-        }).catch(err => {
-            store.dispatch('LogOut').then(() => {
-              Message.error(err)
-              next({ path: '/' })
-            })
+              router.addRoutes(accessRoutes); // 动态添加可访问路由表
+              next({ ...to, replace: true }); // hack方法 确保addRoutes已完成
+            });
           })
+          .catch((err) => {
+            store.dispatch("LogOut").then(() => {
+              Message.error(err);
+              next({ path: "/" });
+            });
+          });
       } else {
-        next()
+        if (isFullscreenSupported() && !userManuallyExitedFullscreen) {
+          const element = document.documentElement;
+          requestFullscreen(element);
+        }
+        next();
       }
     }
   } else {
     // 没有token
     if (isWhiteList(to.path)) {
       // 在免登录白名单，直接进入
-      next()
+      next();
     } else {
-      next(`/login?redirect=${encodeURIComponent(to.fullPath)}`) // 否则全部重定向到登录页
-      NProgress.done()
+      next(`/login?redirect=${encodeURIComponent(to.fullPath)}`); // 否则全部重定向到登录页
+      NProgress.done();
     }
   }
-})
+});
 
 router.afterEach(() => {
-  NProgress.done()
-})
+  NProgress.done();
+});

src/router/index.js

@@ -96,14 +96,6 @@ export const constantRoutes = [
       component: () => import("@/views/bigScreen/bigScreen"),
       meta: { title: "大屏总览", icon: "screen" },
     },
-    // 轮播监测
-    {
-       path: '/path/to/monitor/:page?',
-      name:"monitor",
-      hidden: true,
-      component: () => import("@/views/components/monitor/index"),
-      meta: { title: "系统监测", icon: "monitor" },
-    },
 ];
 
 // 动态路由，基于用户权限动态去加载

src/store/modules/permission.js

@@ -40,6 +40,9 @@ const permission = {
           const rewriteRoutes = filterAsyncRouter(rdata, false, true);
           const asyncRoutes = filterDynamicRoutes(dynamicRoutes);
           rewriteRoutes.push({ path: "*", redirect: "/404", hidden: true });
+
+          router.addRoutes(asyncRoutes);
+
           // 有中央空调
           // 如果动态的路由有中央空调-系统监控-系统监测页面，那就添加一个hidden为true非Layout的大屏页面
           const result = checkRouteArray(
@@ -55,6 +58,14 @@ const permission = {
             // );
             // 定义要添加的多个路由对象数组
             const additionalRoutes = [
+              {
+                path: "/monitorCenter",
+                name: "monitorCenter",
+                hidden: true,
+                component: () =>
+                  import("@/views/centerairC/sysMonitor/monitorCenter"),
+                meta: { title: "系统监测", icon: "screen" },
+              },
               {
                 path: "/hostDetails",
                 name: "hostDetails",
@@ -83,25 +94,25 @@ const permission = {
             // console.log("不满足条件");
           }
 
-          // 热水
-          const result4 = sidebarRoutes.find(
-            (item) => item.name === "HotWater"
+          // 空压热回收
+          const result2 = sidebarRoutes.find(
+            (item) => item.name === "HeatRecoverySys"
           );
-          if (result4) {
+          if (result2) {
             // 定义要添加的多个路由对象数组
-            const additionalRoutes4 = [
+            const additionalRoutes2 = [
               {
-                path: "/waterMonitorDetails",
-                name: "waterMonitorDetails",
+                path: "/hrMonitorCenter",
+                name: "hrMonitorCenter",
                 hidden: true,
                 component: () =>
-                  import("@/views/hotWater/waterMonitor/waterMonitorDetails"),
-                meta: { title: "热水监控", icon: "screen" },
+                  import("@/views/heatRecoverySys/deviceMonitor/hrMonitorCenter"),
+                meta: { title: "系统监测", icon: "screen" },
               },
               // 可以继续添加更多路由对象
             ];
             // 循环添加额外的路由对象到各路由数组
-            additionalRoutes4.forEach((route) => {
+            additionalRoutes2.forEach((route) => {
               sidebarRoutes.push(route);
               rewriteRoutes.push(route);
               asyncRoutes.push(route);

src/utils/fullscreen.js

@@ -0,0 +1,53 @@
+// 检查浏览器是否支持全屏 API
+function isFullscreenSupported() {
+  return (
+    document.fullscreenEnabled ||
+    document.webkitFullscreenEnabled ||
+    document.mozFullScreenEnabled ||
+    document.msFullscreenEnabled
+  );
+}
+
+// 进入全屏模式
+function requestFullscreen(element) {
+  if (element.requestFullscreen) {
+    element.requestFullscreen();
+  } else if (element.webkitRequestFullscreen) {
+    element.webkitRequestFullscreen();
+  } else if (element.mozRequestFullScreen) {
+    element.mozRequestFullScreen();
+  } else if (element.msRequestFullscreen) {
+    element.msRequestFullscreen();
+  }
+}
+
+// 退出全屏模式
+function exitFullscreen() {
+  if (document.exitFullscreen) {
+    document.exitFullscreen();
+  } else if (document.webkitExitFullscreen) {
+    document.webkitExitFullscreen();
+  } else if (document.mozCancelFullScreen) {
+    document.mozCancelFullScreen();
+  } else if (document.msExitFullscreen) {
+    document.msExitFullscreen();
+  }
+}
+
+// 检查当前是否处于全屏状态
+function isFullscreen() {
+  return (
+    document.fullscreenElement ||
+    document.webkitFullscreenElement ||
+    document.mozFullScreenElement ||
+    document.msFullscreenElement
+  );
+}
+
+
+export {
+  isFullscreenSupported,
+  requestFullscreen,
+  exitFullscreen,
+  isFullscreen,
+};

src/utils/global.js

@@ -1,6 +1,6 @@
 
 // 图片url
-export const imgUrl = "http://106.55.173.225:8090";
+export const imgUrl = "http://106.55.173.225:8093";
 
 
 export default {