diff --git a/src/api/index.js b/src/api/index.js index 7916ead..b4b83ee 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -437,6 +437,10 @@ readfilllight(data) { co2replenishment(data) { return sendGetRequest(`/readControl/co2replenishment`, data) }, +//冷暖风机 +heatfan(data) { + return sendGetRequest(`/readControl/heatfan`, data) +}, //内保温 interiorthermalinsulation(data) { return sendGetRequest(`/readControl/interiorthermalinsulation`, data) diff --git a/src/components/setParamsControl.vue b/src/components/setParamsControl.vue index f05bf9c..d6de034 100644 --- a/src/components/setParamsControl.vue +++ b/src/components/setParamsControl.vue @@ -418,6 +418,15 @@ export default { router: "LED", isRouter: true, }); + }else if (el.id == 31) { + this.routerList.push({ + id: el.id, + sort: el.sort, + name: el.nickName, + list: [], + router: "heatFan", + isRouter: true, + }); } else if (el.id == 23) { var list = [ { @@ -755,7 +764,7 @@ export default { list: newList, router: "CO2", }); - } + } }); // this.routerList.sort((a, b) => a.sort - b.sort); diff --git a/src/router/index.js b/src/router/index.js index 0ba6ec9..76d76c5 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -151,6 +151,10 @@ const routes = [ path: '/CO2', name: 'CO2', component: () => import('../views/page/CO2.vue') + },{ + path: '/heatFan', + name: 'heatFan', + component: () => import('../views/page/heatFan.vue') },{ path: '/skylight', name: 'skylight', diff --git a/src/views/page/heatFan.vue b/src/views/page/heatFan.vue new file mode 100644 index 0000000..4ae1480 --- /dev/null +++ b/src/views/page/heatFan.vue @@ -0,0 +1,523 @@ + + + \ No newline at end of file diff --git a/src/views/page/largeScreen.vue b/src/views/page/largeScreen.vue index 56f7cfe..8a9ca12 100644 --- a/src/views/page/largeScreen.vue +++ b/src/views/page/largeScreen.vue @@ -56,9 +56,9 @@ -
+
-
+
温室环境数据
@@ -84,7 +84,7 @@
-
+
本周温度统计
@@ -1946,7 +1946,12 @@ export default { .environmentData { width: 3.98rem; height: 3.27rem; - + &.environmentData-11{ + height: calc(100% - 0.77rem); + .detail{ + height: calc(100% - 0.19rem); + } + } .detail { width: 3.98rem; height: 3.08rem; diff --git a/src/views/page/parameterSet.vue b/src/views/page/parameterSet.vue index 587db7c..5b275c3 100644 --- a/src/views/page/parameterSet.vue +++ b/src/views/page/parameterSet.vue @@ -1516,6 +1516,82 @@
+
+
+ 冷暖风机:温度来源选择 + + + + {{ item.label }} + + +
+
+
+
+ 空调:温度来源选择 + + + + {{ item.label }} + + +
+
+ 湿度来源选择 + + + + {{ item.label }} + + +
+