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

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

@@ -349,6 +349,7 @@
         border-bottom:1px solid #dedede;
         .form-button-max-big-box{
           display: inline-block;
+          margin-left:10px;
           .form-button-big-box{
             display: flex;
             p:nth-child(1){

src/views/safetyCheck/laboratorySelfTest/selfInspectionTask/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.checkStatus==0?'checkDiv':''" @click="topLeftClickType(0)">
-                <p class="text-p">全部</p>
-                <p class="el-icon-check icon-p" v-if="queryParams.checkStatus==0"></p>
-              </div>
-              <div :class="queryParams.checkStatus==1?'checkDiv':''" @click="topLeftClickType(1)">
-                <p class="text-p">未开始</p>
-                <p class="el-icon-check icon-p" v-if="queryParams.checkStatus==1"></p>
-              </div>
-              <div :class="queryParams.checkStatus==2?'checkDiv':''" @click="topLeftClickType(2)">
-                <p class="text-p">进行中</p>
-                <p class="el-icon-check icon-p" v-if="queryParams.checkStatus==2"></p>
-              </div>
-              <div :class="queryParams.checkStatus==3?'checkDiv':''" @click="topLeftClickType(3)">
-                <p class="text-p">已结束</p>
-                <p class="el-icon-check icon-p" v-if="queryParams.checkStatus==3"></p>
-              </div>
+              <p class="text-p" :class="queryParams.checkStatus=='0'?'checkDiv':''" @click="topLeftClickType('0')">全部</p>
+              <p class="text-p" :class="queryParams.checkStatus=='1'?'checkDiv':''" @click="topLeftClickType('1')">未开始</p>
+              <p class="text-p" :class="queryParams.checkStatus=='2'?'checkDiv':''" @click="topLeftClickType('2')">进行中</p>
+              <p class="text-p" :class="queryParams.checkStatus=='3'?'checkDiv':''" @click="topLeftClickType('3')">已结束</p>
             </div>
           </div>
           <!--与我相关-->
@@ -343,37 +331,45 @@
         border-bottom:1px solid #dedede;
         .form-button-max-big-box{
           display: inline-block;
+          margin-left:10px;
           .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;
             }
           }
         }

src/views/safetyCheck/safetyHazard/cannotListPage.vue

@@ -5,12 +5,8 @@
       <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.hazardType==1?'checkDiv':''" @click="topLeftClickType(1)">
-              <p class="text-p">校院巡查</p>
-            </div>
-            <div :class="queryParams.hazardType==2?'checkDiv':''" @click="topLeftClickType(2)">
-              <p class="text-p">实验室自查</p>
-            </div>
+            <p class="text-p" :class="queryParams.hazardType=='1'?'checkDiv':''" @click="topLeftClickType('1')">校院巡查</p>
+            <p class="text-p" :class="queryParams.hazardType=='2'?'checkDiv':''" @click="topLeftClickType('2')">实验室自查</p>
           </div>
         </div>
         <!--与我相关-->
@@ -222,26 +218,37 @@
       padding-top:20px;
       .form-button-max-big-box{
         display: inline-block;
+        margin-left:10px;
         .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-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:100px;
             line-height: 40px;
             text-align: center;
-            color:#0045AF;
+            color:#666666;
             font-size:14px;
-            border:1px solid #0045AF;
-            border-radius:4px;
-            margin-left:10px;
             font-weight:500;
             cursor: pointer;
+            border-left:1px solid #E0E0E0;
           }
           .checkDiv{
-            color:#fff;
-            background-color:#0045AF;
-            border:1px solid #0045AF;
+            color:#fff!important;
+            border:1px solid #0183FA!important;
+            background-color: #0183FA;
           }
         }
       }

src/views/safetyCheck/safetyHazard/departmentListPage.vue

@@ -6,18 +6,9 @@
         <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.rectifyStatus==2?'checkDiv':''" @click="topLeftClickType(2)">
-                <p class="text-p">待整改</p>
-                <p class="el-icon-check icon-p" v-if="queryParams.rectifyStatus==2"></p>
-              </div>
-              <div :class="queryParams.rectifyStatus==3?'checkDiv':''" @click="topLeftClickType(3)">
-                <p class="text-p">待复核</p>
-                <p class="el-icon-check icon-p" v-if="queryParams.rectifyStatus==3"></p>
-              </div>
-              <div :class="queryParams.rectifyStatus==1?'checkDiv':''" @click="topLeftClickType(1)">
-                <p class="text-p">已完成</p>
-                <p class="el-icon-check icon-p" v-if="queryParams.rectifyStatus==1"></p>
-              </div>
+              <p class="text-p" :class="queryParams.rectifyStatus=='2'?'checkDiv':''" @click="topLeftClickType('2')">待整改</p>
+              <p class="text-p" :class="queryParams.rectifyStatus=='3'?'checkDiv':''" @click="topLeftClickType('3')">待复核</p>
+              <p class="text-p" :class="queryParams.rectifyStatus=='1'?'checkDiv':''" @click="topLeftClickType('1')">已完成</p>
             </div>
           </div>
           <!--与我相关-->
@@ -323,37 +314,41 @@
         padding-top:20px;
         .form-button-max-big-box{
           display: inline-block;
+          margin-left:10px;
           .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-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;
             }
           }
         }

src/views/safetyCheck/safetyHazard/schoolListPage.vue

@@ -6,18 +6,9 @@
         <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.rectifyStatus==2?'checkDiv':''" @click="topLeftClickType(2)">
-                <p class="text-p">待整改</p>
-                <p class="el-icon-check icon-p" v-if="queryParams.rectifyStatus==2"></p>
-              </div>
-              <div :class="queryParams.rectifyStatus==3?'checkDiv':''" @click="topLeftClickType(3)">
-                <p class="text-p">待复核</p>
-                <p class="el-icon-check icon-p" v-if="queryParams.rectifyStatus==3"></p>
-              </div>
-              <div :class="queryParams.rectifyStatus==1?'checkDiv':''" @click="topLeftClickType(1)">
-                <p class="text-p">已完成</p>
-                <p class="el-icon-check icon-p" v-if="queryParams.rectifyStatus==1"></p>
-              </div>
+              <p class="text-p" :class="queryParams.rectifyStatus=='2'?'checkDiv':''" @click="topLeftClickType('2')">待整改</p>
+              <p class="text-p" :class="queryParams.rectifyStatus=='3'?'checkDiv':''" @click="topLeftClickType('3')">待复核</p>
+              <p class="text-p" :class="queryParams.rectifyStatus=='1'?'checkDiv':''" @click="topLeftClickType('1')">已完成</p>
             </div>
           </div>
           <!--与我相关-->
@@ -323,37 +314,41 @@
         padding-top:20px;
         .form-button-max-big-box{
           display: inline-block;
+          margin-left:10px;
           .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-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;
             }
           }
         }

src/views/safetyCheck/schoolInspection/inspectionManagement/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>
           <!--与我相关-->
@@ -359,37 +347,45 @@
         border-bottom:1px solid #dedede;
         .form-button-max-big-box{
           display: inline-block;
+          margin-left:10px;
           .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;
             }
           }
         }

src/views/safetyCheck/schoolInspection/inspectionPlan/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.checkStatus==0?'checkDiv':''" @click="topLeftClickType(0)">
-                <p class="text-p">全部</p>
-                <p class="el-icon-check icon-p" v-if="queryParams.checkStatus==0"></p>
-              </div>
-              <div :class="queryParams.checkStatus==1?'checkDiv':''" @click="topLeftClickType(1)">
-                <p class="text-p">未开始</p>
-                <p class="el-icon-check icon-p" v-if="queryParams.checkStatus==1"></p>
-              </div>
-              <div :class="queryParams.checkStatus==2?'checkDiv':''" @click="topLeftClickType(2)">
-                <p class="text-p">进行中</p>
-                <p class="el-icon-check icon-p" v-if="queryParams.checkStatus==2"></p>
-              </div>
-              <div :class="queryParams.checkStatus==3?'checkDiv':''" @click="topLeftClickType(3)">
-                <p class="text-p">已结束</p>
-                <p class="el-icon-check icon-p" v-if="queryParams.checkStatus==3"></p>
-              </div>
+              <p class="text-p" :class="queryParams.checkStatus=='0'?'checkDiv':''" @click="topLeftClickType('0')">全部</p>
+              <p class="text-p" :class="queryParams.checkStatus=='1'?'checkDiv':''" @click="topLeftClickType('1')">未开始</p>
+              <p class="text-p" :class="queryParams.checkStatus=='2'?'checkDiv':''" @click="topLeftClickType('2')">进行中</p>
+              <p class="text-p" :class="queryParams.checkStatus=='3'?'checkDiv':''" @click="topLeftClickType('3')">已结束</p>
             </div>
           </div>
           <!--与我相关-->
@@ -343,37 +331,45 @@
         border-bottom:1px solid #dedede;
         .form-button-max-big-box{
           display: inline-block;
+          margin-left:10px;
           .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;
             }
           }
         }

src/views/safetyCheck/snapshotManagement/index.vue

@@ -4,23 +4,11 @@
       <div class="title-box">
         <el-form :model="queryParams" class="form-box" ref="queryForm" :inline="true" label-width="70px">
           <div class="form-button-max-big-box">
-            <div class="form-button-big-box">
-              <div :class="queryParams.rectifyStatus===''?'checkDiv':''" @click="topLeftClickType('')">
-                <p class="text-p">全部</p>
-                <p class="el-icon-check icon-p" v-if="queryParams.rectifyStatus===''"></p>
-              </div>
-              <div :class="queryParams.rectifyStatus===0?'checkDiv':''" @click="topLeftClickType(0)">
-                <p class="text-p">待整改</p>
-                <p class="el-icon-check icon-p" v-if="queryParams.rectifyStatus===0"></p>
-              </div>
-              <div :class="queryParams.rectifyStatus===1?'checkDiv':''" @click="topLeftClickType(1)">
-                <p class="text-p">已整改</p>
-                <p class="el-icon-check icon-p" v-if="queryParams.rectifyStatus===1"></p>
-              </div>
-              <div :class="queryParams.rectifyStatus===2?'checkDiv':''" @click="topLeftClickType(2)">
-                <p class="text-p">暂无法整改</p>
-                <p class="el-icon-check icon-p" v-if="queryParams.rectifyStatus===2"></p>
-              </div>
+            <div class="form-button-big-box" style="margin-left:10px;">
+              <p class="text-p" :class="queryParams.rectifyStatus==''?'checkDiv':''" @click="topLeftClickType('')">全部</p>
+              <p class="text-p" :class="queryParams.rectifyStatus=='0'?'checkDiv':''" @click="topLeftClickType('0')">待整改</p>
+              <p class="text-p" :class="queryParams.rectifyStatus=='1'?'checkDiv':''" @click="topLeftClickType('1')">已整改</p>
+              <p class="text-p" :class="queryParams.rectifyStatus=='2'?'checkDiv':''" @click="topLeftClickType('2')">暂无法整改</p>
             </div>
           </div>
           <!--与我相关-->
@@ -506,37 +494,45 @@
         border-bottom:1px solid #dedede;
         .form-button-max-big-box{
           display: inline-block;
+          margin-left:10px;
           .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;
             }
           }
         }