1

src/assets/css/main.css

@@ -300,6 +300,12 @@
 .table-title .title-text {
   font-size: 16px;
   margin-left: 15px;
+  display: flex;
+  align-items: center;
+}
+
+.table-title .title-text img {
+  margin-right: 5px;
 }
 
 .index {
@@ -413,8 +419,16 @@
   white-space: nowrap;
 }
 
+.index .header .header-warning {
+  width: 75px;
+  height: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
 .index .header .header-right {
-  width: 335px;
+  width: 260px;
   display: flex;
   align-items: center;
   padding-right: 20px;

src/assets/css/main.scss

@@ -327,6 +327,11 @@
     .title-text {
         font-size: 16px;
         margin-left: 15px;
+        display: flex;
+        align-items: center;
+        img{
+            margin-right: 5px;
+        }
     }
 }
 
@@ -440,9 +445,15 @@
             }
 
         }
-
+        .header-warning{
+            width: 75px;
+            height: 100%;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+        }
         .header-right {
-            width: 335px;
+            width: 260px;
             display: flex;
             align-items: center;
             padding-right: 20px;

src/views/index.vue

@@ -4,7 +4,11 @@
             <div class="header-left">
                 <img src="../assets/image/logo.png" alt="">
             </div>
+        
             <div class="header-center">
+                    <div class="header-warning" v-if="statusData[1114]">
+                <img src="../assets/img/warning.gif" alt="">
+            </div>
                 <div @click="toRouter(item)" :class="item.routerList.indexOf(routerNow) != -1 ? 'active' : ''"
                     v-for="item, index in headerList" :key="index">
                     <div class="img"> <img :src="item.img" alt=""></div>
@@ -93,7 +97,8 @@ export default {
             loading: true,//页面加载
             IDTimer: null,
             deviceId: '',
-            limitUserId: []
+            limitUserId: [],
+            statusData:[]
         }
     },
     watch: {
@@ -188,7 +193,8 @@ export default {
         //获取设备
         getEqbyid(selTrue) {
             var userInfo =localStorage.getItem('userInfo')? JSON.parse(localStorage.getItem('userInfo')):{userid:-1}
-            this.api.getEqbyid(userInfo.userid).then((res) => {
+          var store=this.$store.state
+          this.api.getEqbyid(userInfo.userid).then((res) => {
                 if (res.data.code == 200) {
                     this.$store.state.equipmentList = res.data.data.map((item, index) => {
                         return {
@@ -242,7 +248,15 @@ export default {
                     })
                     this.gerRouter()
                     this.getByid()
-
+                      var data = {
+                deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId,
+            };
+             this.api.getControlGetState(data).then(res=>{
+                if(res.data.code==200){
+                      this.statusData = res.data.data;
+                  
+                }
+              })
                 }
             })
         },

src/views/page/alarmSettings.vue

@@ -428,8 +428,7 @@ export default {
                 regAddress: code,
                 num: el.target.value,
             }; //避免开启多个计时器
-            if (this.timer) {
-                this.timer && clearInterval(this.timer);
+        if (store.nowInput != el.target.value) {
                 this.changeData(data);
             }
 

src/views/page/realTime.vue

@@ -92,8 +92,8 @@
             <div class="table-title">
                 <img src="../../assets/image/status.png" alt="" />
                 设备运行状态
-                <div class="title-text" v-if="sunrise">日出:{{ sunrise }}</div>
-      <div class="title-text" v-if="sunset">日落:{{ sunset }}</div>
+                <div class="title-text" v-if="sunrise"><img src="../../assets/img/sunrise.png" alt="">日出:{{ sunrise }}</div>
+      <div class="title-text" v-if="sunset"><img src="../../assets/img/sunset.png" alt="">日落:{{ sunset }}</div>
             </div>
             <div class="flex-view border-none">
                 <div class="status-view" v-for="item, index in statusList" :key="index">

src/views/page/sunroofControl.vue

@@ -58,6 +58,12 @@
                 <input @blur="blurChange(startList[indexs-1]+7, $event)" v-model="inputData[startList[indexs-1]+7]" @input="change(startList[indexs-1]+7, $event)"
                  type="text" placeholder="0">
                 <span></span>
+            </div>
+                 <div class="input-main input-main-w120">
+                <div>PID计算结果</div>
+                <input disabled v-model="statusData[1114+Number(indexs)]"
+                 type="text" placeholder="0">
+                <span></span>
             </div>
         </div>
         <div class="flex-view border-none padding-none">
@@ -193,6 +199,7 @@ export default {
     data() {
         return {
             inputData: [],
+            statusData:[],
             startList: [21250, 21273, 21296, 21319],//每个阀门的起始参数
             indexs: 1,
             actList1: [],
@@ -330,6 +337,7 @@ export default {
             var data = {
                 deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId,
             };
+             var equipmentId = store.equipmentList[store.equipmentIndex - 1].deviceId
             this.api.readskylight(data).then(res => {
                 if (res.data.code == 200) {
                     this.inputData = res.data.data;
@@ -344,6 +352,12 @@ export default {
                     this.getActive1()
                 }
             })
+              this.api.getControlGetState(data).then(res=>{
+                if(res.data.code==200){
+                      this.statusData = res.data.data;
+                  
+                }
+              })
         },
         //二进制转换后的补全
         padString(str, length) {