From edd67f9be54688e9951d2facfbec9098a90a6c0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E8=90=8C?= <525441437@qq.com> Date: Mon, 22 Jan 2024 15:22:41 +0800 Subject: [PATCH 1/6] 1 --- src/views/page/intrinsicParameter.vue | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/views/page/intrinsicParameter.vue b/src/views/page/intrinsicParameter.vue index f81a1a4..82befe6 100644 --- a/src/views/page/intrinsicParameter.vue +++ b/src/views/page/intrinsicParameter.vue @@ -182,6 +182,15 @@ type="text" placeholder="0"> +
+
+    CO2补气1-2输出通道： + + +
+
冷暖风机1-2组输出通道： @@ -232,8 +241,7 @@
- - 补光灯1-8组输出通道： +    补光灯1-8组输出通道： Date: Mon, 22 Jan 2024 15:54:30 +0800 Subject: [PATCH 2/6] 1 --- src/assets/js/charts.js | 3 +++ src/views/page/LED.vue | 13 +++++++------ src/views/page/circulationCan.vue | 6 +++--- src/views/page/electromagneticControl.vue | 8 ++++---- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/src/assets/js/charts.js b/src/assets/js/charts.js index b68e596..0fe55af 100644 --- a/src/assets/js/charts.js +++ b/src/assets/js/charts.js @@ -1,4 +1,5 @@ import * as echarts from "echarts"; +import { h } from "vue"; export function realTimeLine(id, data) { var chartDom = document.getElementById(id); @@ -236,9 +237,11 @@ export function realTimeLine(id, data) { top:10, itemGap: 10, width:'90%', + height:20, textStyle: { fontSize: 12, color: "#fff", + lineHeight: 30, }, pageTextStyle: { color: '#fff', // 设置翻页文字颜色 diff --git a/src/views/page/LED.vue b/src/views/page/LED.vue index 927a526..2a82a5e 100644 --- a/src/views/page/LED.vue +++ b/src/views/page/LED.vue @@ -54,24 +54,24 @@
-
- {{actList3[0] == '1' ? '有效' : '无效'}} +
+ {{actList3[2] == '1' ? '有效' : '无效'}}
高温报警时，禁止启动补光灯
-
- {{actList3[1] == '1' ? '有效' : '无效'}} +
+ {{actList3[0] == '1' ? '有效' : '无效'}}
使用1#日标温度
-
- {{actList3[2] == '1' ? '有效' : '无效'}} +
+ {{actList3[1] == '1' ? '有效' : '无效'}}
@@ -347,6 +347,7 @@ export default { this.getActive1() this.getActive2() this.getActive3() + this.inputData[21403] =this.countData10(this.inputData[21403]); } }) }, diff --git a/src/views/page/circulationCan.vue b/src/views/page/circulationCan.vue index ccde628..6e190b4 100644 --- a/src/views/page/circulationCan.vue +++ b/src/views/page/circulationCan.vue @@ -113,7 +113,7 @@
-
+
{{ actList1[3] == '1' ? '有效' : '无效' }}
@@ -124,7 +124,7 @@
-
+
{{ actList1[2] == '1' ? '有效' : '无效' }}
@@ -257,7 +257,7 @@ export default { this.actList1 = [] var num = this.inputData[this.startList[this.indexs - 1] + 1] - var num1 = this.padString(num.toString(2), 2) + var num1 = this.padString(num.toString(2), 4) var openListNew = [] openListNew = num1.split("") this.actList1 = openListNew.reverse(); diff --git a/src/views/page/electromagneticControl.vue b/src/views/page/electromagneticControl.vue index 73aebe8..9a9b277 100644 --- a/src/views/page/electromagneticControl.vue +++ b/src/views/page/electromagneticControl.vue @@ -86,13 +86,13 @@ : - - - : - 时间段里启动次数 : -
-- 2.40.1 From 61e5c86f7c4e388e0a3b46ddc735af0b119f840b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E8=90=8C?= <525441437@qq.com> Date: Mon, 22 Jan 2024 16:41:29 +0800 Subject: [PATCH 3/6] 1 --- src/views/page/insizeSunshade.vue | 7 ++++--- src/views/page/wetFan.vue | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/views/page/insizeSunshade.vue b/src/views/page/insizeSunshade.vue index 01507dd..c315bbf 100644 --- a/src/views/page/insizeSunshade.vue +++ b/src/views/page/insizeSunshade.vue @@ -129,7 +129,7 @@ 分钟收拢内遮阳。
-
+
@@ -300,8 +300,9 @@ export default { if (res.data.code == 200) { this.inputData = res.data.data; this.startList.forEach((el, index) => { - this.inputData[el + 2] = this.countData10(this.inputData[el + 2]) + this.inputData[el + 6] = this.countData10(this.inputData[el + 6]) this.inputData[el + 8] = this.countData10(this.inputData[el + 8]) + this.inputData[el + 14] = this.countData10(this.inputData[el + 14]) }) this.getActive1() } diff --git a/src/views/page/wetFan.vue b/src/views/page/wetFan.vue index 1012a21..064c895 100644 --- a/src/views/page/wetFan.vue +++ b/src/views/page/wetFan.vue @@ -118,7 +118,7 @@ 时，跳过通风窗直接启动风机。
-
+
-- 2.40.1 From d65be0e61e4424b64a4097728c3e692e8f135b58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E8=90=8C?= <525441437@qq.com> Date: Mon, 22 Jan 2024 16:46:57 +0800 Subject: [PATCH 4/6] 1 --- src/views/page/wetFan.vue | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/views/page/wetFan.vue b/src/views/page/wetFan.vue index 064c895..ad0e083 100644 --- a/src/views/page/wetFan.vue +++ b/src/views/page/wetFan.vue @@ -630,16 +630,12 @@ export default { this.inputData[21967]=this.countData(this.inputData[21967]) this.inputData[21968]=this.countData(this.inputData[21968]) this.inputData[21969]=this.countData(this.inputData[21969]) + this.inputData[21976]=this.countData(this.inputData[21976]) this.inputData[21977]=this.countData10(this.inputData[21977]) this.inputData[21981]=this.countData(this.inputData[21981]) this.inputData[21982]=this.countData10(this.inputData[21982]) - this.inputData[21976]=this.countData(this.inputData[21976]) - this.inputData[21977]=this.countData10(this.inputData[21977]) - - this.inputData[21981]=this.countData(this.inputData[21981]) - this.inputData[21982]=this.countData10(this.inputData[21982]) this.getActive1() this.getActive2() this.getActive3() -- 2.40.1 From fa855765883d58df7f99f9443affccd7c89808cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E8=90=8C?= <525441437@qq.com> Date: Mon, 22 Jan 2024 16:49:12 +0800 Subject: [PATCH 5/6] 1 --- src/views/page/forceOutput.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/page/forceOutput.vue b/src/views/page/forceOutput.vue index 794e2b8..bd8cd87 100644 --- a/src/views/page/forceOutput.vue +++ b/src/views/page/forceOutput.vue @@ -9,7 +9,7 @@
- 非测试模式 + {{inputData[20600] == 1 ? '测试模式' : '非测试模式'}}
-- 2.40.1 From 5705bf9a65cbcf7117abe6f4da2c849ebcd20b0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E8=90=8C?= <525441437@qq.com> Date: Mon, 22 Jan 2024 16:56:09 +0800 Subject: [PATCH 6/6] 1 --- src/views/page/parameterSet.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/page/parameterSet.vue b/src/views/page/parameterSet.vue index 6264393..24ada30 100644 --- a/src/views/page/parameterSet.vue +++ b/src/views/page/parameterSet.vue @@ -660,7 +660,7 @@ export default { { label: '6#空气温度', value: 8 }, { label: '7#空气温度', value: 7 }, { label: '8#空气温度', value: 8 },], - list1: [21732, 21736, 21740, 21742, 21743, 21744, 21746, 21748, 21752, 21756, 21760, 21764, 21768], + list1: [21732, 21736, 21740, 21742, 21743, 21744, 21746, 21748, 21752, 21756, 21760, 21764, 21768,21772,21774], typeList2: [ { label: '1#平均空气湿度', value: 1 }, { label: '2#平均空气湿度', value: 2 }, @@ -676,7 +676,7 @@ export default { typeList3: [ { label: '目标温度1', value: 1 }, { label: '目标温度2', value: 2 },], - list3: [21733, 21737, 21741, 21745, 21747, 21749, 21753, 21757, 21761, 21765, 21769], + list3: [21733, 21737, 21741, 21745, 21747, 21749, 21753, 21757, 21761, 21765, 21769,21773,21775], typeList4: [ { label: '目标湿度1', value: 1 }, { label: '目标湿度2', value: 2 },], -- 2.40.1