Merge branch 'web-v2-temp' into web-v2-pro

src/views/emergencyManagement/smartLoT/hardware/powerControl.vue

@@ -491,7 +491,22 @@
               }
               list.push(obj);
             }
-            this.relayNumList = list;
+            if(list.length>0){
+              this.relayNumList = list;
+            }else{
+              this.relayNumList =[
+                {name:1},
+                {name:2},
+                {name:3},
+                {name:4},
+                {name:5},
+                {name:6},
+                {name:7},
+                {name:8},
+                {name:9},
+                {name:10},
+              ]
+            }
           }
         });
       },

src/views/emergencyManagement/smartLoT/hardware/smartVentilation.vue

@@ -487,7 +487,22 @@
               }
               list.push(obj);
             }
-            this.relayNumList = list;
+            if(list.length>0){
+              this.relayNumList = list;
+            }else{
+              this.relayNumList =[
+                {name:1},
+                {name:2},
+                {name:3},
+                {name:4},
+                {name:5},
+                {name:6},
+                {name:7},
+                {name:8},
+                {name:9},
+                {name:10},
+              ]
+            }
           }
         });
       },

src/views/safetyCheck/laboratorySelfTest/selfInspectionManagement/index.vue

@@ -6,22 +6,10 @@
         <el-form :model="queryParams" class="form-box" ref="queryForm" :inline="true" label-width="80px">
           <div class="form-button-max-big-box">
             <div class="form-button-big-box" style="margin-left:10px;">
-              <div :class="queryParams.manageStatus=='-1'?'checkDiv':''" @click="topLeftClickType('-1')">
-                <p class="text-p">全部</p>
-                <p class="el-icon-check icon-p" v-if="queryParams.manageStatus=='-1'"></p>
-              </div>
-              <div :class="queryParams.manageStatus==0?'checkDiv':''" @click="topLeftClickType(0)">
-                <p class="text-p">待检查</p>
-                <p class="el-icon-check icon-p" v-if="queryParams.manageStatus==0"></p>
-              </div>
-              <div :class="queryParams.manageStatus==1?'checkDiv':''" @click="topLeftClickType(1)">
-                <p class="text-p">检查中</p>
-                <p class="el-icon-check icon-p" v-if="queryParams.manageStatus==1"></p>
-              </div>
-              <div :class="queryParams.manageStatus==2?'checkDiv':''" @click="topLeftClickType(2)">
-                <p class="text-p">已检查</p>
-                <p class="el-icon-check icon-p" v-if="queryParams.manageStatus==2"></p>
-              </div>
+              <p class="text-p" :class="queryParams.manageStatus=='-1'?'checkDiv':''" @click="topLeftClickType('-1')">全部</p>
+              <p class="text-p" :class="queryParams.manageStatus=='0'?'checkDiv':''" @click="topLeftClickType('0')">待检查</p>
+              <p class="text-p" :class="queryParams.manageStatus=='1'?'checkDiv':''" @click="topLeftClickType('1')">检查中</p>
+              <p class="text-p" :class="queryParams.manageStatus=='2'?'checkDiv':''" @click="topLeftClickType('2')">已检查</p>
             </div>
           </div>
           <!--与我相关-->
@@ -363,35 +351,42 @@
           display: inline-block;
           .form-button-big-box{
             display: flex;
-            div{
-              position: relative;
+            p:nth-child(1){
+              border-top-left-radius: 4px;
+              border-bottom-left-radius: 4px;
+              border-top:1px solid #E0E0E0;
+              border-bottom:1px solid #E0E0E0;
+            }
+            p:nth-child(2){
+              border-top:1px solid #E0E0E0;
+              border-bottom:1px solid #E0E0E0;
+            }
+            p:nth-child(3){
+              border-top:1px solid #E0E0E0;
+              border-bottom:1px solid #E0E0E0;
+            }
+            p:nth-child(4){
+              border-top-right-radius: 4px;
+              border-bottom-right-radius: 4px;
+              border-top:1px solid #E0E0E0;
+              border-bottom:1px solid #E0E0E0;
+              border-right:1px solid #E0E0E0;
+            }
+            p{
               height:40px;
               width:80px;
               line-height: 40px;
               text-align: center;
-              color:#999;
+              color:#666666;
               font-size:14px;
-              border:1px solid #999;
-              border-radius:4px;
-              margin-left:10px;
               font-weight:500;
               cursor: pointer;
-              .icon-p{
-                width:15px;
-                height:15px;
-                line-height:15px;
-                text-align: center;
-                position: absolute;
-                right:0;
-                bottom:0;
-                color:#fff;
-                background: #0183fa;
-                border-top-left-radius:4px;
-              }
+              border-left:1px solid #E0E0E0;
             }
             .checkDiv{
-              color:#0183FA;
-              border:1px solid #0183FA;
+              color:#fff!important;
+              border:1px solid #0183FA!important;
+              background-color: #0183FA;
             }
           }
         }