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 @@ : - - - : - 时间段里启动次数 : -
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 ? '测试模式' : '非测试模式'}}
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/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组输出通道: 时,跳过通风窗直接启动风机。
-
+
@@ -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()