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

Reviewed-on: #231

src/assets/css/main.css

@@ -1931,6 +1931,10 @@ textarea {
   cursor: pointer;
 }
 
+.dataModel {
+  height: 650px;
+}
+
 .dataModel .view-new {
   width: 100%;
   display: flex;

src/assets/css/main.scss

@@ -2032,6 +2032,7 @@ textarea{
 }
 
 .dataModel {
+    height: 650px;
     .view-new {
         width: 100%;
         display: flex;

src/views/page/CO2.vue

@@ -10,11 +10,11 @@
           class="btn btn-tips"
           @click="changeOpen(0)"
           :class="
-            inputData[this.startList[this.indexs - 1]] == 0 ? 'blue' : 'green'
+            inputData[this.startList[this.indexs - 1]] == 0 ? 'green' : 'blue'
           "
         >
           {{
-            inputData[this.startList[this.indexs - 1]] == 0 ? "无效" : "有效"
+            inputData[this.startList[this.indexs - 1]] == 0 ? '无效' : '有效'
           }}
         </div>
       </div>

src/views/page/LED.vue

@@ -5,7 +5,7 @@
         </div>
         <div class="title-tips">工作方式选择
             <div class="input-btn">
-                <div class="btn btn-tips" @click="changeOpen(0)" :class="inputData[21400] == 0 ? 'blue' : 'green'">
+                <div class="btn btn-tips" @click="changeOpen(0)" :class="inputData[21400] == 0 ? 'green' : 'blue'">
                     {{ inputData[21400] == 0 ? '无效' : '有效' }}
                 </div>
             </div>

src/views/page/air-conditioning.vue

@@ -9,9 +9,9 @@
         <div
           class="btn btn-tips"
           @click="changeOpen(0)"
-          :class="inputData[22040] == 0 ? 'blue' : 'green'"
+          :class="inputData[22040] == 0 ? 'green' : 'blue'"
         >
-          {{ inputData[22040] == 0 ? "无效" : "有效" }}
+          {{ inputData[22040] == 0 ? '无效' : '有效' }}
         </div>
       </div>
     </div>

src/views/page/circulationCan.vue

@@ -6,7 +6,7 @@
         </div>
         <div class="title-tips">工作方式选择
             <div class="input-btn">
-                <div class="btn btn-tips"  @click="changeOpen(0)" :class="inputData[startList[indexs - 1]] == 0 ? 'blue' : 'green'">
+                <div class="btn btn-tips"  @click="changeOpen(0)" :class="inputData[startList[indexs - 1]] == 0 ? 'green' : 'blue'">
                     {{ inputData[startList[indexs - 1]] == 0 ? '无效' : '有效' }}
                 </div>
             </div>

src/views/page/coercionMist.vue

@@ -5,7 +5,7 @@
         </div>
         <div class="title-tips">工作方式选择
             <div class="input-btn">
-                <div class="btn btn-tips"  @click="changeOpen(0)" :class="inputData[startList[indexs - 1]] == 0 ? 'blue' : 'green'">
+                <div class="btn btn-tips"  @click="changeOpen(0)" :class="inputData[startList[indexs - 1]] == 0 ? 'green' : 'blue'">
                     {{ inputData[startList[indexs - 1]] == 0 ? '无效' : '有效' }}
                 </div>
             </div>

src/views/page/electromagneticControl.vue

@@ -5,7 +5,7 @@
         </div>
         <div class="title-tips">工作方式选择
             <div class="input-btn">
-                <div class="btn btn-tips"  @click="changeOpen(0)" :class="inputData[startList[indexs - 1]] == 0 ? 'blue' : 'green'">
+                <div class="btn btn-tips"  @click="changeOpen(0)" :class="inputData[startList[indexs - 1]] == 0 ? 'green' : 'blue'">
                     {{ inputData[startList[indexs - 1]] == 0 ? '无效' : '有效' }}
                 </div>
             </div>

src/views/page/facadeInsulation.vue

@@ -5,7 +5,7 @@
         </div>
         <div class="title-tips">工作方式选择
             <div class="input-btn">
-                <div class="btn btn-tips"  @click="changeOpen(0)" :class="inputData[startList[indexs - 1]] == 0 ? 'blue' : 'green'">
+                <div class="btn btn-tips"  @click="changeOpen(0)" :class="inputData[startList[indexs - 1]] == 0 ? 'green' : 'blue'">
                     {{ inputData[startList[indexs - 1]] == 0 ? '无效' : '有效' }}
                 </div>
             </div>

src/views/page/fan.vue

@@ -5,7 +5,7 @@
         </div>
         <div class="title-tips">
             <div class="input-btn">
-                <div class="btn btn-tips"  @click="changeOpen(0)" :class="openIndex == 0 ? 'blue' : 'green'">
+                <div class="btn btn-tips"  @click="changeOpen(0)" :class="openIndex == 0 ? 'green' : 'blue'">
                     {{ openIndex == 0 ? '无效' : '有效' }}
                 </div>
             </div>

src/views/page/heatFan.vue

@@ -5,7 +5,7 @@
         </div>
         <div class="title-tips">工作方式选择
             <div class="input-btn">
-                <div class="btn btn-tips" @click="changeOpen(0)" :class="inputData[22250] == 0 ? 'blue' : 'green'">
+                <div class="btn btn-tips" @click="changeOpen(0)" :class="inputData[22250] == 0 ? 'green' : 'blue'">
                     {{ inputData[22250] == 0 ? '无效' : '有效' }}
                 </div>
             </div>

src/views/page/insizeSunshade.vue

@@ -5,7 +5,7 @@
         </div>
         <div class="title-tips">工作方式选择
             <div class="input-btn">
-                <div class="btn btn-tips"  @click="changeOpen(0)" :class="inputData[startList[indexs - 1]] == 0 ? 'blue' : 'green'">
+                <div class="btn btn-tips"  @click="changeOpen(0)" :class="inputData[startList[indexs - 1]] == 0 ? 'green' : 'blue'">
                     {{ inputData[startList[indexs - 1]] == 0 ? '无效' : '有效' }}
                 </div>
             </div>

src/views/page/internalInsulation.vue

@@ -5,7 +5,7 @@
         </div>
         <div class="title-tips">工作方式选择
             <div class="input-btn">
-                <div class="btn btn-tips"  @click="changeOpen(0)" :class="inputData[startList[indexs - 1]] == 0 ? 'blue' : 'green'">
+                <div class="btn btn-tips"  @click="changeOpen(0)" :class="inputData[startList[indexs - 1]] == 0 ? 'green' : 'blue'">
                     {{ inputData[startList[indexs - 1]] == 0 ? '无效' : '有效' }}
                 </div>
             </div>

src/views/page/outsizeSunshade.vue

@@ -5,7 +5,7 @@
         </div>
         <div class="title-tips">工作方式选择
             <div class="input-btn">
-                <div class="btn btn-tips"  @click="changeOpen(0)" :class="inputData[startList[indexs - 1]] == 0 ? 'blue' : 'green'">
+                <div class="btn btn-tips"  @click="changeOpen(0)" :class="inputData[startList[indexs - 1]] == 0 ? 'green' : 'blue'">
                     {{ inputData[startList[indexs - 1]] == 0 ? '无效' : '有效' }}
                 </div>
             </div>

src/views/page/realTime.vue

@@ -425,7 +425,7 @@
         <el-dialog title="实时数据" class="vrcode-model" :append-to-body="true" :visible.sync="dataModel" width="1030px">
             <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="dataModel scroll">
                 <div class="view-new border">
                    <template  v-for="item, index in list">
                      <div class="list-view" :key="index" v-if="item.targetValue==1"> 
@@ -448,9 +448,10 @@
                     </div>
                    </template>
                 </div>
-                <div class="view-new">
+               <template v-for="item1,index1 in 13" >
+                <div class="view-new border" :key="index1" v-if="list.some(item => item.targetValue==0 && item.equipmentNumber==(index1+1))">
                    <template  v-for="item, index in list">
-                     <div class="list-view" :key="index" v-if="item.targetValue==0&&(item.equipmentNumber!=0&&item.equipmentNumber!=15)"> 
+                     <div class="list-view" :key="index" v-if="item.targetValue==0&&(item.equipmentNumber==(index1+1))"> 
                         <img :src="item.img" alt="">
                         <div>
                             <div class="text">{{ item.name }}</div>
@@ -459,6 +460,9 @@
                     </div>
                    </template>
                 </div>
+               </template>
+                
+             
             </div>
 
         </el-dialog>

src/views/page/skylight.vue

@@ -5,7 +5,7 @@
     </div>
     <div class="title-tips">
             <div class="input-btn">
-                <div class="btn btn-tips"  @click="changeOpen(0)" :class="openIndex == 0 ? 'blue' : 'green'">
+                <div class="btn btn-tips"  @click="changeOpen(0)" :class="openIndex == 0 ? 'green' : 'blue'">
                     {{ openIndex == 0 ? '无效' : '有效' }}
                 </div>
             </div>

src/views/page/sunroofControl.vue

@@ -5,7 +5,7 @@
         </div>
         <div class="title-tips">工作方式选择
             <div class="input-btn">
-                <div class="btn btn-tips"  @click="changeOpen(0)" :class="inputData[startList[indexs - 1]] == 0 ? 'blue' : 'green'">
+                <div class="btn btn-tips"  @click="changeOpen(0)" :class="inputData[startList[indexs - 1]] == 0 ? 'green' : 'blue'">
                     {{ inputData[startList[indexs - 1]] ==0 ? '无效' : '有效' }}
                 </div>
             </div>

src/views/page/wetFan.vue

@@ -7,7 +7,7 @@
         <template v-if="indexs==1">
             <div class="title-tips">工作方式选择
             <div class="input-btn">
-                <div class="btn btn-tips"  @click="changeOpen(0,21950)" :class="inputData[21950] == 0 ? 'blue' : 'green'">
+                <div class="btn btn-tips"  @click="changeOpen(0,21950)" :class="inputData[21950] == 0 ? 'green' : 'blue'">
                     {{ inputData[21950] == 0 ? '无效' : '有效' }}
                 </div>
             </div>

src/views/wufang/downtake.vue

@@ -5,7 +5,7 @@
     </div>
     <div class="title-tips">下风口有效性设置
             <div class="input-btn">
-                <div class="btn btn-tips"  @click="changeOpen(0)" :class="openIndex == 0 ? 'blue' : 'green'">
+                <div class="btn btn-tips"  @click="changeOpen(0)" :class="openIndex == 0 ? 'green' : 'blue'">
                     {{ openIndex == 0 ? '无效' : '有效' }}
                 </div>
             </div>

src/views/wufang/geothermalFan.vue

@@ -5,7 +5,7 @@
         </div>
         <div class="title-tips">地热风机有效性设置
             <div class="input-btn">
-                <div class="btn btn-tips"  @click="changeOpen(0)" :class="openIndex == 0 ? 'blue' : 'green'">
+                <div class="btn btn-tips"  @click="changeOpen(0)" :class="openIndex == 0 ? 'green' : 'blue'">
                     {{ openIndex == 0 ? '无效' : '有效' }}
                 </div>
             </div>

src/views/wufang/rollByRoll.vue

@@ -7,7 +7,7 @@
     </div>
     <div class="title-tips">卷被有效性设置
             <div class="input-btn">
-                <div class="btn btn-tips"  @click="changeOpen(0)" :class="openIndex == 0 ? 'blue' : 'green'">
+                <div class="btn btn-tips"  @click="changeOpen(0)" :class="openIndex == 0 ? 'green' : 'blue'">
                     {{ openIndex == 0 ? '无效' : '有效' }}
                 </div>
             </div>

src/views/wufang/snowRemoval.vue

@@ -5,7 +5,7 @@
     </div>
     <div class="title-tips">除雪有效性设置
             <div class="input-btn">
-                <div class="btn btn-tips"  @click="changeOpen(0)" :class="openIndex == 0 ? 'blue' : 'green'">
+                <div class="btn btn-tips"  @click="changeOpen(0)" :class="openIndex == 0 ? 'green' : 'blue'">
                     {{ openIndex == 0 ? '无效' : '有效' }}
                 </div>
             </div>

src/views/wufang/uptake.vue

@@ -5,7 +5,7 @@
     </div>
     <div class="title-tips">上风口有效性设置
             <div class="input-btn">
-                <div class="btn btn-tips"  @click="changeOpen(0)" :class="openIndex == 0 ? 'blue' : 'green'">
+                <div class="btn btn-tips"  @click="changeOpen(0)" :class="openIndex == 0 ? 'green' : 'blue'">
                     {{ openIndex == 0 ? '无效' : '有效' }}
                 </div>
             </div>

src/views/wufang/waterPump.vue

@@ -5,7 +5,7 @@
         </div>
         <div class="title-tips">
             <div class="input-btn">
-                <div class="btn btn-tips"  @click="changeOpen(0)" :class="openIndex == 0 ? 'blue' : 'green'">
+                <div class="btn btn-tips"  @click="changeOpen(0)" :class="openIndex == 0 ? 'green' : 'blue'">
                     {{ openIndex == 0 ? '无效' : '有效' }}
                 </div>
             </div>