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 {

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;

src/views/page/air-conditioning.vue

@@ -97,7 +97,7 @@
         </el-dropdown>
       </div>
     </div>
-    <div class="flex-view padding-none shrink-none">
+    <div class="flex-view padding-none border-none shrink-none">
       <div class="input-sel input-sel-w180">
         <span></span><span></span>
         <span>空调的模式</span>
@@ -124,6 +124,40 @@
         </el-dropdown>
       </div>
     </div>
+      <div class="text-tips">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;手自动开启几区空调</div>
+
+        <div class="flex-view">
+            <div class="input-sel input-sel-w180">
+        <span></span><span></span>
+      </div>
+            <div class="input-btn ">
+                <div class="btn btn-w70" @click="changeIndexOpen2(0)" :class="actList2[0] == '1' ? 'blue' : 'off'">
+                    1区
+                </div>
+                <div class="btn btn-w70" @click="changeIndexOpen2(1)" :class="actList2[1] == '1' ? 'blue' : 'off'">
+                    2区
+                </div>
+                <div class="btn btn-w70" @click="changeIndexOpen2(2)" :class="actList2[2] == '1' ? 'blue' : 'off'">
+                    3区
+                </div>
+                <div class="btn btn-w70" @click="changeIndexOpen2(3)" :class="actList2[3] == '1' ? 'blue' : 'off'">
+                    4区
+                </div>
+                <div class="btn btn-w70" @click="changeIndexOpen2(4)" :class="actList2[4] == '1' ? 'blue' : 'off'">
+                    5区
+                </div>
+                <div class="btn btn-w70" @click="changeIndexOpen2(5)" :class="actList2[5] == '1' ? 'blue' : 'off'">
+                    6区
+                </div>
+                <div class="btn btn-w70" @click="changeIndexOpen2(6)" :class="actList2[6] == '1' ? 'blue' : 'off'">
+                    7区
+                </div>
+                <div class="btn btn-w70" @click="changeIndexOpen2(7)" :class="actList2[7] == '1' ? 'blue' : 'off'">
+                    8区
+                </div>
+            </div>
+        </div>
+
     <div class="title-tips-bold"><img src="@/assets/img/title-tips-bold-icon.png" alt="">自动设置</div>
     <div class="flex-view padding-none border-none shrink-none">
       <div class="input-main">
@@ -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]);
         }
       });

src/views/page/alarmSettings.vue

@@ -92,8 +92,8 @@
             </div>
             <div class="input-main input-main-w80">
                 <span>选项一:温度高于目标值</span>
-                <input @blur="blurChange10('20087', $event)" v-model="inputData['20087']"
+                <input @blur="blurChange10('20088', $event)" v-model="inputData['20088']"
-                    @input="changeCount10('20087', $event)" type="text" value="60" placeholder="60" />
+                    @input="changeCount10('20088', $event)" type="text" value="60" placeholder="60" />
                 <span>℃，高温报警。</span>
             </div>
         </div>
@@ -104,8 +104,8 @@
             </div>
             <div class="input-main input-main-w80">
                 <span>选项二:温度低于目标值</span>
-                <input @blur="blurChange10('20088', $event)" v-model="inputData['20088']"
+                <input @blur="blurChange10('20089', $event)" v-model="inputData['20089']"
-                    @input="changeCount10('20088', $event)" type="text" value="60" placeholder="60" />
+                    @input="changeCount10('20089', $event)" type="text" value="60" placeholder="60" />
                 <span>℃，低温报警。</span>
             </div>
         </div>
@@ -116,8 +116,8 @@
             </div>
             <div class="input-main input-main-w80">
                 <span>选项三:温度高于</span>
-                <input @blur="blurChangeCount('20089', $event)" v-model="inputData['20089']"
+                <input @blur="blurChangeCount('20090', $event)" v-model="inputData['20090']"
-                    @input="changeCountData('20089', $event)" type="text" value="60" placeholder="60" />
+                    @input="changeCountData('20090', $event)" type="text" value="60" placeholder="60" />
                 <span>℃，高温报警。报警通道</span>
                 <input @blur="blurChange(20106, $event)" v-model="inputData[20106]" @input="change(20106, $event)"
                     type="text" placeholder="0">
@@ -130,8 +130,8 @@
             </div>
             <div class="input-main input-main-w80">
                 <span>选项四:温度低于</span>
-                <input @blur="blurChangeCount('20090', $event)" v-model="inputData['20090']"
+                <input @blur="blurChangeCount('20091', $event)" v-model="inputData['20091']"
-                    @input="changeCountData('20090', $event)" type="text" value="60" placeholder="60" />
+                    @input="changeCountData('20091', $event)" type="text" value="60" placeholder="60" />
                 <span>℃，低温报警。报警通道</span>
                 <input @blur="blurChange(20107, $event)" v-model="inputData[20107]" @input="change(20107, $event)"
                     type="text" placeholder="0">

src/views/page/circulationCan.vue

@@ -132,7 +132,7 @@
                 <span>加湿时，同时运行环流风扇。</span>
             </div>
         </div>
-  <div class="flex-view border-none  shrink-none padding-none">
+  <div class="flex-view  shrink-none padding-none">
             <div class="input-btn">
                 <div class="btn btn-w70" @click="changeIndexOpen(4)" :class="actList1[4] == '1' ? 'blue' : 'off'">
                     {{ actList1[4] == '1' ? '有效' : '无效' }}
@@ -142,6 +142,18 @@
                 <span>风机运行时，禁止开环流风扇。</span>
             </div>
         </div>
+         <div class="flex-view shrink-none padding-none">
+            <div class="input-main-60">
+                <span>开启</span>
+                <input @blur="blurChange(startListnew[indexs - 1] + 0, $event)" v-model="inputData[startListnew[indexs - 1] + 0]"
+                    @input="change(startListnew[indexs - 1] + 0, $event)" type="text" placeholder="0">
+                <span>分</span>
+                <input @blur="blurChange(startListnew[indexs - 1] + 1, $event)" v-model="inputData[startListnew[indexs - 1] + 1]"
+                    @input="change(startListnew[indexs - 1] + 1, $event)" type="text" placeholder="0">
+                <span>分，进行间隔工作</span>
+               
+            </div>
+        </div>
     </div>
 </template>
 <script>
@@ -150,6 +162,7 @@ export default {
         return {
             inputData: [],
             startList: [21450, 21470],//每个阀门的起始参数
+              startListnew: [21490, 21492],//每个阀门的起始参数
             indexs: 1,
             actList1: [],
       loading:null,

src/views/page/realTime.vue

@@ -426,14 +426,38 @@
             <el-button class="model-return-btn" type="primary" @click="dataModel = false">返 回</el-button>
             <div class="vrcode-model-title vrcode-model-title-282">实时数据</div>
             <div class="dataModel">
-                <div class="view-new">
+                <div class="view-new border">
-                    <div class="list-view" v-for="item, index in list " :key="index">
+                   <template  v-for="item, index in list">
+                     <div class="list-view" :key="index" v-if="item.targetValue==1"> 
                         <img :src="item.img" alt="">
                         <div>
                             <div class="text">{{ item.name }}</div>
                             <div class="number" :style="item.num=='故障'?'color:rgba(252, 125, 106, 1)':''"> {{ getControlData(item) }}</div>
                         </div>
                     </div>
+                   </template>
+                </div>
+                <div class="view-new border">
+                   <template  v-for="item, index in list">
+                     <div class="list-view" :key="index" v-if="item.targetValue==0&&(item.equipmentNumber==0||item.equipmentNumber==15)"> 
+                        <img :src="item.img" alt="">
+                        <div>
+                            <div class="text">{{ item.name }}</div>
+                            <div class="number" :style="item.num=='故障'?'color:rgba(252, 125, 106, 1)':''"> {{ getControlData(item) }}</div>
+                        </div>
+                    </div>
+                   </template>
+                </div>
+                <div class="view-new">
+                   <template  v-for="item, index in list">
+                     <div class="list-view" :key="index" v-if="item.targetValue==0&&(item.equipmentNumber!=0&&item.equipmentNumber!=15)"> 
+                        <img :src="item.img" alt="">
+                        <div>
+                            <div class="text">{{ item.name }}</div>
+                            <div class="number" :style="item.num=='故障'?'color:rgba(252, 125, 106, 1)':''"> {{ getControlData(item) }}</div>
+                        </div>
+                    </div>
+                   </template>
                 </div>
             </div>