diff --git a/src/assets/css/main.css b/src/assets/css/main.css index 6d87f60..9f22c6f 100644 --- a/src/assets/css/main.css +++ b/src/assets/css/main.css @@ -1936,7 +1936,11 @@ textarea { display: flex; align-items: center; flex-wrap: wrap; - padding: 50px 30px 0; + padding: 20px 30px 0; +} + +.dataModel .view-new.border { + border-bottom: 1px solid rgba(0, 186, 255, 0.2); } .dataModel .view-new .list-view { @@ -1945,6 +1949,7 @@ textarea { align-items: center; margin-right: 20px; margin-bottom: 20px; + min-width: 160px; } .dataModel .view-new .list-view img { diff --git a/src/assets/css/main.scss b/src/assets/css/main.scss index 5dd82d2..cc44f23 100644 --- a/src/assets/css/main.scss +++ b/src/assets/css/main.scss @@ -2037,8 +2037,11 @@ textarea{ display: flex; align-items: center; flex-wrap: wrap; - padding: 50px 30px 0; + padding: 20px 30px 0; + &.border{ + border-bottom: 1px solid rgba(0, 186, 255, 0.2); + } .list-view { flex-shrink: 0; display: flex; @@ -2046,7 +2049,7 @@ textarea{ align-items: center; margin-right: 20px; margin-bottom: 20px; - + min-width: 160px; img { width: 60px; height: 60px; diff --git a/src/views/page/air-conditioning.vue b/src/views/page/air-conditioning.vue index bc99c1c..8aa5f77 100644 --- a/src/views/page/air-conditioning.vue +++ b/src/views/page/air-conditioning.vue @@ -97,7 +97,7 @@ -
+
空调的模式 @@ -124,6 +124,40 @@
+
          手自动开启几区空调
+ +
+
+ +
+
+
+ 1区 +
+
+ 2区 +
+
+ 3区 +
+
+ 4区 +
+
+ 5区 +
+
+ 6区 +
+
+ 7区 +
+
+ 8区 +
+
+
+
自动设置
@@ -426,6 +460,7 @@ export default { inputDataNew: [], indexs: 1, actList1: [], + actList2:[], loading: null, pageName: "空调", typeList1: [ @@ -479,6 +514,7 @@ export default { } }, methods: { + //失去焦点 计算公式 x/10 blurChange10(code, el) { var store = this.$store.state; @@ -537,6 +573,32 @@ export default { // this.changeData(data); // } }, + //开关无效 + changeIndexOpen2(active) { + if (this.actList2[active] == '1') { + this.actList2[active] = '0' + } else { + this.actList2[active] = '1' + } + this.$forceUpdate(); + var revList = this.actList2.slice().reverse() + var num = revList.join(""); + var dataNum = { + target: { + value: parseInt(num, 2), + }, + }; + this.changeBtn(22063, dataNum); + }, + getActive2() { + this.actList2 = [] + var num = this.inputData[22063] + + var num1 = this.padString(num.toString(2), 8) + var openListNew = [] + openListNew = num1.split("") + this.actList2 = openListNew.reverse(); + }, changeCountData(code, el) { var data = el.target.value * 10 + 400; var sendData = { @@ -656,6 +718,7 @@ export default { this.inputDataNew[22041] = this.getData1(this.inputData[22041]); this.inputDataNew[22042] = this.getData2(this.inputData[22042]); this.getActive1(); + this.getActive2() // this.inputDataNew[22045] = this.getData1(this.inputData[22045]); } }); diff --git a/src/views/page/alarmSettings.vue b/src/views/page/alarmSettings.vue index f0a30da..2199f0e 100644 --- a/src/views/page/alarmSettings.vue +++ b/src/views/page/alarmSettings.vue @@ -92,8 +92,8 @@
选项一:温度高于目标值 - + ℃，高温报警。
@@ -104,8 +104,8 @@
选项二:温度低于目标值 - + ℃，低温报警。
@@ -116,8 +116,8 @@
选项三:温度高于 - + ℃，高温报警。报警通道 @@ -130,8 +130,8 @@
选项四:温度低于 - + ℃，低温报警。报警通道 diff --git a/src/views/page/circulationCan.vue b/src/views/page/circulationCan.vue index b71dd68..78abc24 100644 --- a/src/views/page/circulationCan.vue +++ b/src/views/page/circulationCan.vue @@ -132,7 +132,7 @@ 加湿时，同时运行环流风扇。
-
+
{{ actList1[4] == '1' ? '有效' : '无效' }} @@ -142,6 +142,18 @@ 风机运行时，禁止开环流风扇。
+
+
+ 开启 + + 分 + + 分，进行间隔工作 + +
+