diff --git a/.env.development b/.env.development
index 13c7001..a08e7e1 100644
--- a/.env.development
+++ b/.env.development
@@ -7,9 +7,9 @@ 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:8091'
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/src/api/heatRecoverySys/deviceMonitor.js b/src/api/heatRecoverySys/deviceMonitor.js
new file mode 100644
index 0000000..e5d7c61
--- /dev/null
+++ b/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,
+ });
+}
\ No newline at end of file
diff --git a/src/api/heatRecoverySys/thermalAnalysis.js b/src/api/heatRecoverySys/thermalAnalysis.js
new file mode 100644
index 0000000..e69de29
diff --git a/src/api/index.js b/src/api/index.js
index a0e5d44..8d33f89 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -45,3 +45,11 @@ export function viewMainParams() {
method: "get",
});
}
+// 获取热回收系统相关数据
+export function ersDatas(query) {
+ return request({
+ url: "/pro/overview/ersDatas",
+ method: "get",
+ params: query,
+ });
+}
diff --git a/src/assets/icons/svg/heatRecoverySys.svg b/src/assets/icons/svg/heatRecoverySys.svg
new file mode 100644
index 0000000..aaa16a0
--- /dev/null
+++ b/src/assets/icons/svg/heatRecoverySys.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/images/flowchart.png b/src/assets/images/flowchart.png
new file mode 100644
index 0000000..db11d99
Binary files /dev/null and b/src/assets/images/flowchart.png differ
diff --git a/src/assets/images/hot-icon1.png b/src/assets/images/hot-icon1.png
new file mode 100644
index 0000000..e677cae
Binary files /dev/null and b/src/assets/images/hot-icon1.png differ
diff --git a/src/assets/images/hot-icon2.png b/src/assets/images/hot-icon2.png
new file mode 100644
index 0000000..b6cec2a
Binary files /dev/null and b/src/assets/images/hot-icon2.png differ
diff --git a/src/assets/images/hot-icon3.png b/src/assets/images/hot-icon3.png
new file mode 100644
index 0000000..90bf14b
Binary files /dev/null and b/src/assets/images/hot-icon3.png differ
diff --git a/src/assets/images/hot-icon4.png b/src/assets/images/hot-icon4.png
new file mode 100644
index 0000000..1203511
Binary files /dev/null and b/src/assets/images/hot-icon4.png differ
diff --git a/src/assets/images/monitor-border.png b/src/assets/images/monitor-border.png
new file mode 100644
index 0000000..7c3342e
Binary files /dev/null and b/src/assets/images/monitor-border.png differ
diff --git a/src/assets/images/monitor-hot.png b/src/assets/images/monitor-hot.png
new file mode 100644
index 0000000..b1e1a7d
Binary files /dev/null and b/src/assets/images/monitor-hot.png differ
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index d9f53ef..73babbd 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -40,73 +40,23 @@ const permission = {
const rewriteRoutes = filterAsyncRouter(rdata, false, true);
const asyncRoutes = filterDynamicRoutes(dynamicRoutes);
rewriteRoutes.push({ path: "*", redirect: "/404", hidden: true });
- // 有中央空调
- // 如果动态的路由有中央空调-系统监控-系统监测页面,那就添加一个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"
+ (item) => item.name === "HeatRecoverySys"
);
if (result2) {
// 定义要添加的多个路由对象数组
const additionalRoutes2 = [
{
- path: "/asSysMonitorDetails",
- name: "asSysMonitorDetails",
+ path: "/monitorCenter",
+ name: "monitorCenter",
hidden: true,
component: () =>
- import(
- "@/views/aircAndWindc/awSysMonitor/asSysMonitorDetails"
- ),
- meta: { title: "系统监控", icon: "screen" },
+ import("@/views/heatRecoverySys/deviceMonitor/monitorCenter"),
+ meta: { title: "系统监测", icon: "screen" },
},
// 可以继续添加更多路由对象
];
@@ -120,112 +70,6 @@ const permission = {
// 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
deleted file mode 100644
index f775aec..0000000
--- a/src/views/centerairC/enSourceAnalysis/components/machineChart.vue
+++ /dev/null
@@ -1,218 +0,0 @@
-
- 冷水机组 冷冻水泵 冷却水泵 冷却塔
+
+
+
+
+
+
+