Merge pull request 'pc-master' (#110) from pc-master into portal

Reviewed-on: #110

src/assets/css/main.css

@@ -627,6 +627,12 @@
   width: 120px;
 }
 
+.input-main.input-disabled input {
+  background: transparent;
+  border: 2px solid transparent;
+  padding-left: 0;
+}
+
 .input-main.input-main-w260 input {
   width: 260px;
 }

src/assets/css/main.scss

@@ -661,6 +661,13 @@
             width: 120px;
         }
     }
+    &.input-disabled{
+      input{
+        background: transparent;
+        border: 2px solid transparent;
+        padding-left: 0;
+      }
+    }
     &.input-main-w260{
         input{
             width: 260px;

src/assets/js/charts.js

@@ -371,6 +371,7 @@ export function realTimeLine(id, data,pageId) {
 }
 export function statusCharts(id, data) {
     var chartDom = document.getElementById(id);
+   
     var myChart = echarts.init(chartDom);
     var option;
 

src/views/page/realTime.vue

@@ -148,6 +148,7 @@
                                         alt="">
                                     <img v-else src="../../assets/img/fan-off.png" alt=""> <span>5#风机</span>
                                 </div>
+                                <div style="display: none;"></div>
                             </div>
                         </div>
                         <div v-else class="status-noTrue">
@@ -219,6 +220,7 @@
                                     <img v-else src="../../assets/img/fan-off.png" alt="">
                                     <span>8#补光灯</span>
                                 </div>
+                                <div style="display: none;"></div>
                             </div>
                         </div>
                         <div v-else class="status-noTrue">
@@ -258,8 +260,7 @@
                             </div>
                             <div class="status-fan status-btn" v-else>
                                 <div class="btn" :class="item.index == 1 ? 'blue' : 'off'">
-                                    <img class="light-img" :src="getIcon(item)"
-                                        alt="">
+                                    <img class="light-img" :src="getIcon(item)" alt="">
                                     <!-- <img v-else src="../../assets/img/fan-off.png" alt=""> -->
                                     <span>{{ item.index == 1 ? '开启' : '关闭' }}</span>
                                 </div>
@@ -1346,12 +1347,18 @@ export default {
                         }
 
                     })
+
                     this.statusList = statusList
                     this.$forceUpdate();
+
                     setTimeout(() => {
+
                         this.statusList.forEach((el, index) => {
                             if (el.open != 0 && (el.type == 6 || el.type == 5 || el.type == 2 || el.type == 15 || el.type == 14 || el.type == 13 || el.type == 12)) {
+                              
+                               setTimeout(() => {
                                 statusCharts(`statusCharts${index}`, el.progress)
+                               }, 0);
                             }
                         })
                     }, 10);

src/views/page/sunroofControl.vue

@@ -59,7 +59,7 @@
                  type="text" placeholder="0">
                 <span></span>
             </div>
-                 <div class="input-main input-main-w120">
+                <div class="input-main input-main-w120 input-disabled">
                 <div>PID计算结果</div>
                 <input disabled v-model="statusData[1114+Number(indexs)]"
                  type="text" placeholder="0">