Merge remote-tracking branch 'origin/web-v2-temp' into web-v2-temp

.env.production

@@ -12,11 +12,11 @@ ENV = 'production'
 
 # ####################外网接口配置####################
 
-VUE_APP_BASE_API = 'lab.sxitdlc.com/labAppTest'
+VUE_APP_BASE_API = 'lab.zjznai.com/appTest'
 
 
 
 # ####################内网接口配置####################
 
-VUE_APP_BASE_LOCAL_API = '192.168.1.43/labSystem'
+VUE_APP_BASE_LOCAL_API = '192.168.1.88/labSystem'
 

src/views/comprehensive/laboratoryManagement/building/newIndex.vue

@@ -4,6 +4,7 @@
     <div class="buildingManagement" v-if="pageType == 1">
       <div class="max-left-box">
         <div class="tree-box scrollbar-box" v-if="treeList[0]">
+          <p style="color:#0183FA;font-size:18px;">{{schoolName}}</p>
           <div class="terr-max-box" v-for="(item,index) in treeList" :key="index">
             <div class="max-name-box">
               <p class="max-name" :class="checkTreeId==item.id?'check-color':''" @click="clickCheckTree(item,1)">
@@ -427,6 +428,7 @@
     },
     data() {
       return {
+        schoolName:'',
         pageType: 1,
         //拖拽起始Y点(用于计算朝向)
         clientY: null,
@@ -496,6 +498,7 @@
 
     },
     mounted() {
+      this.$set(this,'schoolName',localStorage.getItem('schoolName'));
       this.getTreeList()
       this.getDicts('layout_room_type').then(response => {
         this.roomTypeOptions = response.data

src/views/comprehensive/laboratoryManagement/subject/deviceList.vue

@@ -202,25 +202,60 @@
               <el-option key="2" label="智能通风" value="2"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="设备版本" prop="hardwareType">
+          <el-form-item label="硬件名称"  prop="name">
+            <el-input
+              v-model="form.name"
+              placeholder="请输入硬件名称"
+              clearable
+              size="small"
+              maxLength="8"
+            />
+          </el-form-item>
+          <el-form-item label="继电器类型" prop="hardwareType">
             <el-radio-group v-model="form.hardwareType">
               <el-radio :label="1">老继电器</el-radio>
               <el-radio :label="2">新继电器</el-radio>
               <el-radio :label="3">泥人继电器</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item label="设备编号" prop="relayCode">
-            <el-input v-model="form.relayCode" placeholder="请输入设备编号"
-                      maxlength="30" style="width:320px;"/>
+          <el-form-item label="绑定继电器" prop="relayCode" v-if="form.hardwareType==1 || form.hardwareType==3">
+            <el-select v-model="form.relayCode" placeholder="请选择继电器" clearable @change="loadRelayNum" @clear="loadClear">
+              <el-option v-for="relay in relayList"
+                         :key="relay.code"
+                         :label="relay.code"
+                         :value="relay.code">
+              </el-option>
+            </el-select>
           </el-form-item>
-          <el-form-item label="设备路由" prop="bit">
-            <el-input v-model="form.bit" oninput="value=value.replace(/[^0-9.]/g,'')" maxlength="2" placeholder="请输入路由" style="width:320px;"></el-input>
+          <el-form-item label="继电器编号"  prop="relayCode" v-if="form.hardwareType==2">
+            <el-input
+              v-model="form.relayCode"
+              placeholder="请输入继电器编号"
+              clearable
+              size="small"
+              maxlength="20"
+            />
           </el-form-item>
-          <el-form-item label="设备参数" prop="configName" v-if="form.hardwareType == 2">
-            <el-input v-model="form.configName" maxlength="30" placeholder="请输入设备参数" style="width:320px;"></el-input>
+          <el-form-item label="继电器位置" prop="bit" >
+            <el-select v-model="form.bit" placeholder="请选择继电器位置" clearable >
+              <el-option v-for="lab in relayNumList"
+                         :key="lab.name"
+                         :label="lab.name"
+                         :value="lab.name">
+              </el-option>
+            </el-select>
           </el-form-item>
-          <el-form-item label="参数状态" prop="configStatus" v-if="form.hardwareType == 2">
-            <el-input v-model="form.configStatus" maxlength="30" placeholder="请输入参数状态" style="width:320px;"></el-input>
+          <el-form-item label="是否灭火主机" prop="isPcfire">
+            <el-radio-group v-model="form.isPcfire">
+              <el-radio :label="0">否</el-radio>
+              <el-radio :label="1">是</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="配置名称" prop="configName" v-if="form.hardwareType == 2">
+            <el-input v-model="form.configName" maxlength="30" placeholder="请输入配置名称" style="width:320px;"></el-input>
+          </el-form-item>
+          <el-form-item label="配置状态" prop="configStatus" v-if="form.hardwareType == 2">
+            <el-input v-model="form.configStatus" maxlength="30" placeholder="请输入配置状态" style="width:320px;"></el-input>
           </el-form-item>
         </div>
         <div v-if="upType == 4 || upType == 8">
@@ -403,6 +438,7 @@ import {
 } from '@/api/laboratory/subject'
 import { getSensorList } from "@/api/laboratory/sensor";
 import { subjectList } from '@/api/gasManage3_0/gasManage'
+import { listRelay } from '@/api/laboratory/relay'
 export default {
   name: "deviceList",
   props:{
@@ -421,7 +457,21 @@ export default {
       listXxp:[],//电子信息牌
       form:{
       },
-      laboratoryOptions:[],
+      relayList: [],
+      relayNumList:[
+        {name:1},
+        {name:2},
+        {name:3},
+        {name:4},
+        {name:5},
+        {name:6},
+        {name:7},
+        {name:8},
+        {name:9},
+        {name:10},
+        {name:11},
+        {name:12}
+      ],
       // 表单校验
       rules: {
         name:[
@@ -488,6 +538,7 @@ export default {
   created() {
     this.listBySubjectId();
     this.getSensorList();
+    this.getRelayList();
   },
   mounted(){
 
@@ -520,6 +571,67 @@ export default {
     cancel() {
       this.addType = false;
     },
+    // 查询继电器列表
+    getRelayList(){
+      listRelay({"type": 1}).then(response => {
+        this.relayList = response.data;
+        if(this.form.relayCode){
+          let self = this
+          let num = ""
+          for(let i=0;i<self.relayList.length;i++){
+            if(self.relayList[i].code == this.form.relayCode){
+              num = self.relayList[i].routeNum
+            }
+          }
+          let list = [];
+          for(let i=0;i<num;i++){
+            let obj = {
+              name:i+1
+            }
+            list.push(obj);
+          }
+          this.relayNumList = list;
+        }
+      });
+    },
+    loadRelayNum(e){
+      let self = this;
+      let num = ""
+      for(let i=0;i<self.relayList.length;i++){
+        if(self.relayList[i].code == e){
+          num = self.relayList[i].routeNum
+        }
+      }
+      let list = [];
+      for(let i=0;i<num;i++){
+        let obj = {
+          name:i+1
+        }
+        list.push(obj);
+      }
+      console.log(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},
+        ]
+      }
+
+    },
+    //清空按钮
+    loadClear(){
+      this.form.bit = '';
+    },
     // 提交
     submitForm() {
       this.$refs["form"].validate(valid => {
@@ -654,6 +766,7 @@ export default {
     //新增控制设备
     addHardwareTwo(){
       let obj = {
+        name:this.form.name,
         type:this.form.type,
         hardwareType:this.form.hardwareType,
         relayCode:this.form.relayCode,
@@ -663,6 +776,7 @@ export default {
         subjectId:this.subjectData.id,
         deptId:this.subjectData.deptId,
         deptName:this.subjectData.deptName,
+        isPcfire:this.form.isPcfire,
       }
       addHardware(obj).then(response => {
         this.msgSuccess(response.msg)
@@ -682,6 +796,8 @@ export default {
         subjectId:this.form.subjectId,
         deptId:this.form.deptId,
         deptName:this.form.deptName,
+        name:this.form.name,
+        isPcfire:this.form.isPcfire,
       }
       putHardware(obj).then(response => {
         this.msgSuccess(response.msg)
@@ -912,15 +1028,16 @@ export default {
         });
       }else if(type == 3){
         this.title = '新增控制设备';
-        this.form.hardwareType = 1;
         this.disabledType = false;
         this.$set(this,'form',{
+          name:"",
           type:"",
-          hardwareType:"",
+          hardwareType:1,
           relayCode:"",
           bit:"",
           configName:"",
           configStatus:"",
+          isPcfire:0,
         });
       }else if(type == 4){
         this.title = '新增摄像头';

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/login.vue

@@ -134,6 +134,7 @@ export default {
         localStorage.setItem('circularLogo',response.data.circularLogo)
         localStorage.setItem('rectangleLogo',response.data.rectangleLogo)
         localStorage.setItem('videoCover',response.data.videoCover)
+        localStorage.setItem('schoolName',response.data.schoolName)
       });
     },
     getUrlConfig(){

src/views/medicUniversity-3_1/chemicalManagement/alarmRecord/infoPage.vue

@@ -41,7 +41,7 @@
           <p>{{propsInfoData.operate}}</p>
         </div>
       </div>
-      <p class="bottom-button" v-if="propsInfoData.handlingStatus == 1 && propsInfoData.alarmModeStatus == 4" @click="handle">处理</p>
+      <p class="bottom-button" v-if="propsInfoData.handlingStatus == 1 && propsInfoData.alarmModeStatus == 2" @click="handle">处理</p>
     </div>
   </div>
 </template>

src/views/medicUniversity-3_1/chemicalManagement/deviceManagement/smartAlarm/index.vue

@@ -191,7 +191,7 @@
             <el-radio :label="item.value" :key="item.value" v-for="(item,index) in hardwardTypeList">{{item.label}}</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="绑定继电器" prop="relayCode" v-if="form.hardwareType==1">
+        <el-form-item label="绑定继电器" prop="relayCode" v-if="form.hardwareType==1 || form.hardwareType==3">
           <el-select v-model="form.relayCode" placeholder="请选择继电器" clearable style="width:360px;">
             <el-option v-for="relay in relayList"
                        :key="relay.code"
@@ -380,7 +380,8 @@
         ],
         hardwardTypeList:[
           {value:1,label:"老继电器"},
-          {value:2,label:"新继电器"}
+          {value:2,label:"新继电器"},
+          {value:3,label:"泥人继电器"}
         ]
       };
     },

src/views/oneKeyOutfire/planExecuteRecord/planExecuteRecordDetail.vue

@@ -42,22 +42,42 @@
       <div class="addPage_b_b">
         <div class="small_title">风险轨迹</div>
         <div class="addPage_b_b_b">
-          <div class="time-box">
-            <ul>
-              <li :class="(item.riskStatus==1||item.riskStatus==2)?'risk_trend':'hardware'" v-for="(item,index2) in planAxis" :key="index2">
-                <p v-if="(index2 !=0 && index2 !=planAxis.length-1)" :class="(item.riskStatus==1||item.riskStatus==2)?'dot':'dot_tow'"></p>
+          <div class="new-time-box">
+            <div class="for-planAxis" v-for="(item,index) in planAxis">
+              <div class="for-planAxis-min-box">
+                <div class="for-planAxis-top-box">
+                  <p v-if="(item.riskStatus==1||item.riskStatus==2)">{{index == 0?item.riskPlanName+'('+item.riskPlanLevelName+')':item.riskPlanName}}</p>
+                  <p v-if="(item.riskStatus==1||item.riskStatus==2)">{{item.sensorJsonName}}：<span>{{item.sensorJsonValue}}</span></p>
+                  <p v-if="(item.riskStatus==1||item.riskStatus==2)">时间：{{item.createTime}}</p>
+                </div>
+                <div class="for-planAxis-center-box">
+                  <p :class="index == 0 || index == planAxis.length-1?'dot-p-A':'dot-p-B'"></p>
+                  <p class="line-p" v-if="index != planAxis.length-1"></p>
+                </div>
+                <div class="for-planAxis-bottom-box">
+                  <p v-if="(item.riskStatus!=1&& item.riskStatus!=2)">{{item.riskPlanName}}</p>
+                  <p v-if="(item.riskStatus!=1&& item.riskStatus!=2)">{{item.sensorJsonName}}：<span>{{item.sensorJsonValue}}</span></p>
+                  <p v-if="(item.riskStatus!=1&& item.riskStatus!=2)">时间：{{item.createTime}}</p>
+                </div>
+              </div>
+            </div>
+          </div>
+          <!--<div class="time-box">-->
+            <!--<ul>-->
+              <!--<li :class="(item.riskStatus==1||item.riskStatus==2)?'risk_trend':'hardware'" v-for="(item,index2) in planAxis" :key="index2">-->
+                <!--<p v-if="(index2 !=0 && index2 !=planAxis.length-1)" :class="(item.riskStatus==1||item.riskStatus==2)?'dot':'dot_tow'"></p>-->
 
-                <p v-if="(item.riskStatus==1||item.riskStatus==2) && item.riskPlanName !='风险解除'"> {{item.riskPlanName}} ({{item.riskPlanLevelName}})</p>
-                <p v-if="(item.riskStatus==1||item.riskStatus==2) && item.riskPlanName =='风险解除'"> {{item.riskPlanName}}</p>
+                <!--<p v-if="(item.riskStatus==1||item.riskStatus==2) && item.riskPlanName !='风险解除'"> {{item.riskPlanName}} ({{item.riskPlanLevelName}})</p>-->
+                <!--<p v-if="(item.riskStatus==1||item.riskStatus==2) && item.riskPlanName =='风险解除'"> {{item.riskPlanName}}</p>-->
 
-                <p v-if="(item.riskStatus!=1&& item.riskStatus!=2)">{{item.riskPlanName}}</p>
-                <p class="sensor_val">{{item.sensorJsonName}}：<i class="color: #FF3131;">{{item.sensorJsonValue}}</i></p>
-                <p class="sensor_timer">时间：<i>{{item.createTime}}</i></p>
+                <!--<p v-if="(item.riskStatus!=1&& item.riskStatus!=2)">{{item.riskPlanName}}</p>-->
+                <!--<p class="sensor_val">{{item.sensorJsonName}}：<i class="color: #FF3131;">{{item.sensorJsonValue}}</i></p>-->
+                <!--<p class="sensor_timer">时间：<i>{{item.createTime}}</i></p>-->
 
-                <p v-if="index2 !=planAxis.length-1" :class="(item.riskStatus==1||item.riskStatus==2)?'ledgement':'ledgement_tow'"></p>
-              </li>
-            </ul>
-          </div>
+                <!--<p v-if="index2 !=planAxis.length-1" :class="(item.riskStatus==1||item.riskStatus==2)?'ledgement':'ledgement_tow'"></p>-->
+              <!--</li>-->
+            <!--</ul>-->
+          <!--</div>-->
         </div>
       </div>
     </div>
@@ -278,6 +298,88 @@ export default {
     }
     .addPage_b_b{
       margin-top: 84px;
+      .new-time-box{
+        height: 280px;
+        overflow-x: auto;
+        overflow-y: hidden;
+        white-space: nowrap;
+        .for-planAxis{
+          display: inline-block;
+          font-weight:500;
+          overflow: hidden;
+          .for-planAxis-min-box{
+            overflow: hidden;
+            display: flex;
+            flex-direction: column;
+            .for-planAxis-top-box{
+              height:90px;
+              p{
+                margin-left:28px;
+                margin-right:40px;
+                font-size:14px;
+                line-height:30px;
+              }
+              p:nth-child(1){
+                color:#333;
+              }
+              p:nth-child(2){
+                color:#666;
+                span{
+                  color:#FF3131;
+                }
+              }
+              p:nth-child(3){
+                color:#666;
+              }
+            }
+            .for-planAxis-center-box{
+              display: flex;
+              .dot-p-A{
+                width:23px;
+                height:23px;
+                background: #fff;
+                border:2px solid #0183fa;
+                margin:17px;
+                border-radius:50%;
+              }
+              .dot-p-B{
+                width:17px;
+                height:17px;
+                margin:20px;
+                background: #0183fa;
+                border-radius:50%;
+              }
+              .line-p{
+                flex:1;
+                height:1px;
+                margin-top:28px;
+                background: #dedede;
+              }
+            }
+            .for-planAxis-bottom-box{
+              height:90px;
+              p{
+                margin-left:28px;
+                margin-right:40px;
+                font-size:14px;
+                line-height:30px;
+              }
+              p:nth-child(1){
+                color:#333;
+              }
+              p:nth-child(2){
+                color:#666;
+                span{
+                  color:#FF3131;
+                }
+              }
+              p:nth-child(3){
+                color:#666;
+              }
+            }
+          }
+        }
+      }
       .time-box{
         width: 100%;
         overflow-y: auto;
@@ -440,7 +542,6 @@ export default {
         }
 
 
-
       }
     }
   }

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

@@ -6,21 +6,18 @@
         <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>
+              <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>
+          <!--与我相关-->
+          <div class="form-button-max-big-box-me">
+            <div class="form-button-big-box-me">
+              <div :class="queryParams.myRelated==1?'checkDiv-me':''" @click="topRightClickType">
+                <p class="text-p-me">与我有关{{correlationNum}}</p>
+                <p class="el-icon-check icon-p-me" v-if="queryParams.myRelated==1"></p>
               </div>
             </div>
           </div>
@@ -60,15 +57,6 @@
             <p class="inquire-button-one" @click="handleQuery" style="margin-right:10px;">查询</p>
             <p class="reset-button-one" @click="resetQuery">重置</p>
           </el-form-item>
-          <!--与我相关-->
-          <div class="form-button-max-big-box-me">
-            <div class="form-button-big-box-me">
-              <div :class="queryParams.myRelated==1?'checkDiv-me':''" style="width:100px;" @click="topRightClickType">
-                <p class="text-p-me">与我相关</p>
-                <p class="el-icon-check icon-p-me" v-if="queryParams.myRelated==1"></p>
-              </div>
-            </div>
-          </div>
         </el-form>
       </div>
       <div class="content-box">
@@ -175,6 +163,7 @@
         dateRange:[],
         tableList:[],
         total:0,
+        correlationNum:'',
       }
     },
     created(){
@@ -187,6 +176,23 @@
       this.getList();
     },
     methods:{
+      //获取相关数量
+      getCorrelationNum(){
+        checkManageList({
+          pageNum:1,
+          pageSize:20,
+          checkType:2,
+          checkTimeSort:0,
+          myRelated:1,
+          manageStatus:this.queryParams.manageStatus,
+          searchValue:this.queryParams.searchValue,
+          deptId:this.queryParams.deptId,
+          startTime:this.dateRange[0]?this.dateRange[0]:'',
+          endTime:this.dateRange[1]?this.dateRange[1]:'',
+        }).then(response => {
+          this.$set(this,'correlationNum',response.data.total>999?' 999+':(response.data.total<1?'':' '+response.data.total));
+        });
+      },
       //与我相关按钮
       topRightClickType(){
         this.$set(this.queryParams,'myRelated',this.queryParams.myRelated==1?0:1);
@@ -243,6 +249,7 @@
         }else{
           obj.endTime = "";
         }
+        this.getCorrelationNum();
         checkManageList(obj).then(response => {
           this.total = response.data.total;
           this.tableList = response.data.records;
@@ -342,37 +349,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;
             }
           }
         }
@@ -383,7 +398,7 @@
             div{
               position: relative;
               height:40px;
-              width:80px;
+              width:130px;
               line-height: 40px;
               text-align: center;
               color:#999;

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

@@ -6,21 +6,18 @@
         <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>
+              <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>
+          <!--与我相关-->
+          <div class="form-button-max-big-box-me">
+            <div class="form-button-big-box-me">
+              <div :class="queryParams.myRelated==1?'checkDiv-me':''" @click="topRightClickType">
+                <p class="text-p-me">与我有关{{correlationNum}}</p>
+                <p class="el-icon-check icon-p-me" v-if="queryParams.myRelated==1"></p>
               </div>
             </div>
           </div>
@@ -50,15 +47,6 @@
             <p class="inquire-button-one" @click="handleQuery" style="margin-right:10px;">查询</p>
             <p class="reset-button-one" @click="resetQuery">重置</p>
           </el-form-item>
-          <!--与我相关-->
-          <div class="form-button-max-big-box-me">
-            <div class="form-button-big-box-me">
-              <div :class="queryParams.myRelated==1?'checkDiv-me':''" style="width:100px;" @click="topRightClickType">
-                <p class="text-p-me">与我相关</p>
-                <p class="el-icon-check icon-p-me" v-if="queryParams.myRelated==1"></p>
-              </div>
-            </div>
-          </div>
           <el-form-item style="float: right;" v-hasPermi="['security:checkPlan_1:add']">
             <el-col :span="1.5">
               <p class="inquire-button-one"
@@ -157,6 +145,7 @@
         dateRange:[],
         tableList:[],
         total:0,
+        correlationNum:'',
       }
     },
     created(){
@@ -166,6 +155,22 @@
       this.getList();
     },
     methods:{
+      //获取相关数量
+      getCorrelationNum(){
+        checkPlanList({
+          pageNum:1,
+          pageSize:20,
+          createTimeSort:0,
+          checkType:2,
+          myRelated:1,
+          checkStatus:this.queryParams.checkStatus,
+          searchValue:this.queryParams.searchValue,
+          cycleStartTime:this.dateRange[0]?this.dateRange[0]:'',
+          cycleEndTime:this.dateRange[1]?this.dateRange[1]:'',
+        }).then(response => {
+          this.$set(this,'correlationNum',response.data.total>999?' 999+':(response.data.total<1?'':' '+response.data.total));
+        });
+      },
       //与我相关按钮
       topRightClickType(){
         this.$set(this.queryParams,'myRelated',this.queryParams.myRelated==1?0:1);
@@ -244,6 +249,7 @@
         }else{
           obj.cycleEndTime = "";
         }
+        this.getCorrelationNum();
         checkPlanList(obj).then(response => {
           this.total = response.data.total;
           this.tableList = response.data.records;
@@ -325,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;
             }
           }
         }
@@ -366,7 +380,7 @@
             div{
               position: relative;
               height:40px;
-              width:80px;
+              width:130px;
               line-height: 40px;
               text-align: center;
               color:#999;

src/views/safetyCheck/rectificationReport/index.vue

@@ -3,6 +3,15 @@
     <div class="rectificationReport-page" v-if="pageType == 1">
       <div class="title-box">
         <el-form :model="queryParams" class="form-box" ref="queryForm" :inline="true" label-width="80px">
+          <!--与我相关-->
+          <div class="form-button-max-big-box-me" style="margin-left:10px;">
+            <div class="form-button-big-box-me">
+              <div :class="queryParams.myRelated==1?'checkDiv-me':''" @click="topRightClickType">
+                <p class="text-p-me">与我有关{{correlationNum}}</p>
+                <p class="el-icon-check icon-p-me" v-if="queryParams.myRelated==1"></p>
+              </div>
+            </div>
+          </div>
           <el-form-item label="关键字" prop="searchValue">
             <el-input
               maxLength="30"
@@ -47,15 +56,6 @@
               >批量下载</p>
             </el-col>
           </el-form-item>
-          <!--与我相关-->
-          <div class="form-button-max-big-box-me">
-            <div class="form-button-big-box-me">
-              <div :class="queryParams.myRelated==1?'checkDiv-me':''" style="width:100px;" @click="topRightClickType">
-                <p class="text-p-me">与我相关</p>
-                <p class="el-icon-check icon-p-me" v-if="queryParams.myRelated==1"></p>
-              </div>
-            </div>
-          </div>
         </el-form>
       </div>
       <div class="content-box">
@@ -128,6 +128,7 @@
         total:0,
         selectedNum:0,
         ids:[],
+        correlationNum:'',
       }
     },
     created(){
@@ -138,6 +139,20 @@
       this.getList();
     },
     methods:{
+      //获取相关数量
+      getCorrelationNum(){
+        checkRectifyList({
+          pageNum:1,
+          pageSize:20,
+          myRelated:1,
+          deptId:this.queryParams.deptId,
+          searchValue:this.queryParams.searchValue,
+          beginTime:this.dateRange[0]?this.dateRange[0]:'',
+          endTime:this.dateRange[1]?this.dateRange[1]:'',
+        }).then(response => {
+          this.$set(this,'correlationNum',response.data.total>999?' 999+':(response.data.total<1?'':' '+response.data.total));
+        });
+      },
       //与我相关按钮
       topRightClickType(){
         this.$set(this.queryParams,'myRelated',this.queryParams.myRelated==1?0:1);
@@ -200,6 +215,7 @@
         }else{
           obj.endTime = ""
         }
+        this.getCorrelationNum();
         checkRectifyList(obj).then(response => {
           this.total = response.data.total;
           this.tableList = response.data.records;
@@ -289,7 +305,7 @@
             div{
               position: relative;
               height:40px;
-              width:80px;
+              width:130px;
               line-height: 40px;
               text-align: center;
               color:#999;

src/views/safetyCheck/safetyHazard/cannotListPage.vue

@@ -5,11 +5,16 @@
       <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>
+            <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>
+        <!--与我相关-->
+        <div class="form-button-max-big-box-me">
+          <div class="form-button-big-box-me">
+            <div :class="queryParams.myRelated==1?'checkDiv-me':''" @click="topRightClickType">
+              <p class="text-p-me">与我有关{{correlationNum}}</p>
+              <p class="el-icon-check icon-p-me" v-if="queryParams.myRelated==1"></p>
             </div>
           </div>
         </div>
@@ -39,15 +44,6 @@
           <p class="inquire-button-one" @click="handleQuery" style="margin-right:10px;">查询</p>
           <p class="reset-button-one" @click="resetQuery">重置</p>
         </el-form-item>
-        <!--与我相关-->
-        <div class="form-button-max-big-box-me">
-          <div class="form-button-big-box-me">
-            <div :class="queryParams.myRelated==1?'checkDiv-me':''" style="width:100px;" @click="topRightClickType">
-              <p class="text-p-me">与我相关</p>
-              <p class="el-icon-check icon-p-me" v-if="queryParams.myRelated==1"></p>
-            </div>
-          </div>
-        </div>
       </el-form>
     </div>
     <div class="content-box">
@@ -110,6 +106,7 @@
         dateRange:[],
         tableList:[],
         total:0,
+        correlationNum:'',
       }
     },
     created(){},
@@ -117,6 +114,22 @@
       this.getList();
     },
     methods:{
+      //获取相关数量
+      getCorrelationNum(){
+        unableRectifyList({
+          pageNum:1,
+          pageSize:20,
+          rectifyStatus:4,
+          checkTimeOrder:"",
+          myRelated:1,
+          hazardType:this.queryParams.hazardType,
+          searchValue:this.queryParams.searchValue,
+          beginTime:this.dateRange[0]?this.dateRange[0]:'',
+          endTime:this.dateRange[1]?this.dateRange[1]:'',
+        }).then(response => {
+          this.$set(this,'correlationNum',response.data.total>999?' 999+':(response.data.total<1?'':' '+response.data.total));
+        });
+      },
       //与我相关按钮
       topRightClickType(){
         this.$set(this.queryParams,'myRelated',this.queryParams.myRelated==1?0:1);
@@ -166,6 +179,7 @@
         }else{
           obj.endTime = "";
         }
+        this.getCorrelationNum();
         unableRectifyList(obj).then(response => {
           this.total = response.data.total;
           this.tableList = response.data.records;
@@ -204,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;
           }
         }
       }
@@ -234,7 +259,7 @@
           div{
             position: relative;
             height:40px;
-            width:80px;
+            width:130px;
             line-height: 40px;
             text-align: center;
             color:#999;

src/views/safetyCheck/safetyHazard/departmentListPage.vue

@@ -6,17 +6,17 @@
         <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>
+              <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>
+          <!--与我相关-->
+          <div class="form-button-max-big-box-me">
+            <div class="form-button-big-box-me">
+              <div :class="queryParams.myRelated==1?'checkDiv-me':''" @click="topRightClickType">
+                <p class="text-p-me">与我有关{{correlationNum}}</p>
+                <p class="el-icon-check icon-p-me" v-if="queryParams.myRelated==1"></p>
               </div>
             </div>
           </div>
@@ -64,15 +64,6 @@
               >批量审核</p>
             </el-col>
           </el-form-item>
-          <!--与我相关-->
-          <div class="form-button-max-big-box-me">
-            <div class="form-button-big-box-me">
-              <div :class="queryParams.myRelated==1?'checkDiv-me':''" style="width:100px;" @click="topRightClickType">
-                <p class="text-p-me">与我相关</p>
-                <p class="el-icon-check icon-p-me" v-if="queryParams.myRelated==1"></p>
-              </div>
-            </div>
-          </div>
         </el-form>
       </div>
       <div class="content-box">
@@ -161,6 +152,7 @@
         dateRange:[],
         tableList:[],
         total:0,
+        correlationNum:'',
       }
     },
     created(){},
@@ -168,6 +160,25 @@
       this.getList();
     },
     methods:{
+      //获取相关数量
+      getCorrelationNum(){
+        rectifyList({
+          pageNum:1,
+          pageSize:20,
+          hazardType:2,
+          checkTimeOrder:"",
+          zgTimeOrder:"",
+          zgTermOrder:"",
+          myRelated:1,
+          rectifyStatus:this.queryParams.rectifyStatus,
+          examineResult:this.queryParams.examineResult,
+          searchValue:this.queryParams.searchValue,
+          beginTime:this.dateRange[0]?this.dateRange[0]:'',
+          endTime:this.dateRange[1]?this.dateRange[1]:'',
+        }).then(response => {
+          this.$set(this,'correlationNum',response.data.total>999?' 999+':(response.data.total<1?'':' '+response.data.total));
+        });
+      },
       //与我相关按钮
       topRightClickType(){
         this.$set(this.queryParams,'myRelated',this.queryParams.myRelated==1?0:1);
@@ -244,6 +255,7 @@
         }else{
           obj.endTime = "";
         }
+        this.getCorrelationNum();
         if(this.queryParams.rectifyStatus == 2){
           rectifyList(obj).then(response => {
             this.total = response.data.total;
@@ -302,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;
             }
           }
         }
@@ -343,7 +359,7 @@
             div{
               position: relative;
               height:40px;
-              width:80px;
+              width:130px;
               line-height: 40px;
               text-align: center;
               color:#999;

src/views/safetyCheck/safetyHazard/schoolListPage.vue

@@ -6,17 +6,17 @@
         <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>
+              <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>
+          <!--与我相关-->
+          <div class="form-button-max-big-box-me">
+            <div class="form-button-big-box-me">
+              <div :class="queryParams.myRelated==1?'checkDiv-me':''" @click="topRightClickType">
+                <p class="text-p-me">与我有关{{correlationNum}}</p>
+                <p class="el-icon-check icon-p-me" v-if="queryParams.myRelated==1"></p>
               </div>
             </div>
           </div>
@@ -64,15 +64,6 @@
               >批量审核</p>
             </el-col>
           </el-form-item>
-          <!--与我相关-->
-          <div class="form-button-max-big-box-me">
-            <div class="form-button-big-box-me">
-              <div :class="queryParams.myRelated==1?'checkDiv-me':''" style="width:100px;" @click="topRightClickType">
-                <p class="text-p-me">与我相关</p>
-                <p class="el-icon-check icon-p-me" v-if="queryParams.myRelated==1"></p>
-              </div>
-            </div>
-          </div>
         </el-form>
       </div>
       <div class="content-box">
@@ -161,6 +152,7 @@
         dateRange:[],
         tableList:[],
         total:0,
+        correlationNum:'',
       }
     },
     created(){},
@@ -168,6 +160,25 @@
       this.getList();
     },
     methods:{
+      //获取相关数量
+      getCorrelationNum(){
+        rectifyList({
+          pageNum:1,
+          pageSize:20,
+          hazardType:1,
+          checkTimeOrder:"",
+          zgTimeOrder:"",
+          zgTermOrder:"",
+          myRelated:1,
+          rectifyStatus:this.queryParams.rectifyStatus,
+          examineResult:this.queryParams.examineResult,
+          searchValue:this.queryParams.searchValue,
+          beginTime:this.dateRange[0]?this.dateRange[0]:'',
+          endTime:this.dateRange[1]?this.dateRange[1]:'',
+        }).then(response => {
+          this.$set(this,'correlationNum',response.data.total>999?' 999+':(response.data.total<1?'':' '+response.data.total));
+        });
+      },
       //与我相关按钮
       topRightClickType(){
         this.$set(this.queryParams,'myRelated',this.queryParams.myRelated==1?0:1);
@@ -244,6 +255,7 @@
         }else{
           obj.endTime = "";
         }
+        this.getCorrelationNum();
         if(this.queryParams.rectifyStatus == 2){
           rectifyList(obj).then(response => {
             this.total = response.data.total;
@@ -302,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;
             }
           }
         }
@@ -343,7 +359,7 @@
             div{
               position: relative;
               height:40px;
-              width:80px;
+              width:130px;
               line-height: 40px;
               text-align: center;
               color:#999;

src/views/safetyCheck/schoolInspection/inspectionManagement/index.vue

@@ -6,21 +6,18 @@
         <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>
+              <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>
+          <!--与我相关-->
+          <div class="form-button-max-big-box-me">
+            <div class="form-button-big-box-me">
+              <div :class="queryParams.myRelated==1?'checkDiv-me':''" @click="topRightClickType">
+                <p class="text-p-me">与我相关{{correlationNum}}</p>
+                <p class="el-icon-check icon-p-me" v-if="queryParams.myRelated==1"></p>
               </div>
             </div>
           </div>
@@ -60,15 +57,6 @@
             <p class="inquire-button-one" @click="handleQuery" style="margin-right:10px;">查询</p>
             <p class="reset-button-one" @click="resetQuery">重置</p>
           </el-form-item>
-          <!--与我相关-->
-          <div class="form-button-max-big-box-me">
-            <div class="form-button-big-box-me">
-              <div :class="queryParams.myRelated==1?'checkDiv-me':''" style="width:100px;" @click="topRightClickType">
-                <p class="text-p-me">与我相关</p>
-                <p class="el-icon-check icon-p-me" v-if="queryParams.myRelated==1"></p>
-              </div>
-            </div>
-          </div>
         </el-form>
       </div>
       <div class="content-box">
@@ -173,6 +161,7 @@
         dateRange:[],
         tableList:[],
         total:0,
+        correlationNum:'',
       }
     },
     created(){
@@ -185,6 +174,23 @@
       this.getList();
     },
     methods:{
+      //获取相关数量
+      getCorrelationNum(){
+        checkManageList({
+          pageNum:1,
+          pageSize:20,
+          checkType:1,
+          checkTimeSort:0,
+          myRelated:1,
+          manageStatus:this.queryParams.manageStatus,
+          searchValue:this.queryParams.searchValue,
+          deptId:this.queryParams.deptId,
+          startTime:this.dateRange[0]?this.dateRange[0]:'',
+          endTime:this.dateRange[1]?this.dateRange[1]:'',
+        }).then(response => {
+          this.$set(this,'correlationNum',response.data.total>999?' 999+':(response.data.total<1?'':' '+response.data.total));
+        });
+      },
       //开始检查
       goAddPage(type,id){
         if(this.pageType != type){
@@ -241,6 +247,7 @@
         }else{
           obj.endTime = "";
         }
+        this.getCorrelationNum();
         checkManageList(obj).then(response => {
           this.total = response.data.total;
           this.tableList = response.data.records;
@@ -340,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;
             }
           }
         }
@@ -381,7 +396,7 @@
             div{
               position: relative;
               height:40px;
-              width:80px;
+              width:130px;
               line-height: 40px;
               text-align: center;
               color:#999;

src/views/safetyCheck/schoolInspection/inspectionPlan/index.vue

@@ -6,21 +6,18 @@
         <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>
+              <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>
+          <!--与我相关-->
+          <div class="form-button-max-big-box-me">
+            <div class="form-button-big-box-me">
+              <div :class="queryParams.myRelated==1?'checkDiv-me':''" @click="topRightClickType">
+                <p class="text-p-me">与我有关{{correlationNum}}</p>
+                <p class="el-icon-check icon-p-me" v-if="queryParams.myRelated==1"></p>
               </div>
             </div>
           </div>
@@ -50,15 +47,6 @@
             <p class="inquire-button-one" @click="handleQuery" style="margin-right:10px;">查询</p>
             <p class="reset-button-one" @click="resetQuery">重置</p>
           </el-form-item>
-          <!--与我相关-->
-          <div class="form-button-max-big-box-me">
-            <div class="form-button-big-box-me">
-              <div :class="queryParams.myRelated==1?'checkDiv-me':''" style="width:100px;" @click="topRightClickType">
-                <p class="text-p-me">与我相关</p>
-                <p class="el-icon-check icon-p-me" v-if="queryParams.myRelated==1"></p>
-              </div>
-            </div>
-          </div>
           <el-form-item style="float: right;" v-hasPermi="['security:checkPlan:add']">
             <el-col :span="1.5">
               <p class="inquire-button-one"
@@ -157,6 +145,7 @@
         dateRange:[],
         tableList:[],
         total:0,
+        correlationNum:'',
       }
     },
     created(){
@@ -166,6 +155,22 @@
       this.getList();
     },
     methods:{
+      //获取相关数量
+      getCorrelationNum(){
+        checkPlanList({
+          pageNum:1,
+          pageSize:20,
+          createTimeSort:0,
+          checkType:1,
+          myRelated:1,
+          checkStatus:this.queryParams.checkStatus,
+          searchValue:this.queryParams.searchValue,
+          cycleStartTime:this.dateRange[0]?this.dateRange[0]:'',
+          cycleEndTime:this.dateRange[1]?this.dateRange[1]:'',
+        }).then(response => {
+          this.$set(this,'correlationNum',response.data.total>999?' 999+':(response.data.total<1?'':' '+response.data.total));
+        });
+      },
       //与我相关按钮
       topRightClickType(){
         this.$set(this.queryParams,'myRelated',this.queryParams.myRelated==1?0:1);
@@ -244,6 +249,7 @@
         }else{
           obj.cycleEndTime = "";
         }
+        this.getCorrelationNum();
         checkPlanList(obj).then(response => {
           this.total = response.data.total;
           this.tableList = response.data.records;
@@ -325,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;
             }
           }
         }
@@ -366,7 +380,7 @@
             div{
               position: relative;
               height:40px;
-              width:80px;
+              width:130px;
               line-height: 40px;
               text-align: center;
               color:#999;

src/views/safetyCheck/snapshotManagement/index.vue

@@ -5,21 +5,18 @@
         <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" style="margin-left:10px;">
-              <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>
+              <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>
+          <!--与我相关-->
+          <div class="form-button-max-big-box-me">
+            <div class="form-button-big-box-me">
+              <div :class="queryParams.myRelated==1?'checkDiv-me':''" @click="topRightClickType">
+                <p class="text-p-me">与我有关{{correlationNum}}</p>
+                <p class="el-icon-check icon-p-me" v-if="queryParams.myRelated==1"></p>
               </div>
             </div>
           </div>
@@ -61,28 +58,19 @@
           <el-form-item style="float: right;" v-hasPermi="['safety:rectifyClap:add']">
             <el-col :span="1.5">
               <p class="inquire-button-one"
-                 style="width:90px;margin-right:0;"
+                 style="width:70px;margin-right:0;"
                  @click="addButton"
-              ><i class="el-icon-plus"></i> 随手拍</p>
+              >随手拍</p>
             </el-col>
           </el-form-item>
           <el-form-item style="float: right;">
             <el-col :span="1.5">
               <p class="add-button-one-90"
-                 style="width:90px;"
+                 style="width:80px;"
                  @click="goPage(2)"
               >上报记录</p>
             </el-col>
           </el-form-item>
-          <!--与我相关-->
-          <div class="form-button-max-big-box-me">
-            <div class="form-button-big-box-me">
-              <div :class="queryParams.myRelated==1?'checkDiv-me':''" style="width:90px;" @click="topRightClickType">
-                <p class="text-p-me">与我相关</p>
-                <p class="el-icon-check icon-p-me" v-if="queryParams.myRelated==1"></p>
-              </div>
-            </div>
-          </div>
         </el-form>
       </div>
       <div class="content-box">
@@ -236,6 +224,7 @@
         dateRange:[],
         tableList:[],
         total:0,
+        correlationNum:'',
         //新增窗口
         addDialogType:false,
         addDialogForm:{
@@ -274,6 +263,23 @@
       this.getList();
     },
     methods:{
+      //获取相关数量
+      getCorrelationNum(){
+        securityCheckClapList({
+          pageNum:1,
+          pageSize:20,
+          upTimeOrder:"",
+          zgTimeOrder:"",
+          myRelated:1,
+          deptId:this.queryParams.deptId,
+          searchValue:this.queryParams.searchValue,
+          rectifyStatus:this.queryParams.rectifyStatus,
+          beginTime:this.dateRange[0]?this.dateRange[0]:'',
+          endTime:this.dateRange[1]?this.dateRange[1]:'',
+        }).then(response => {
+          this.$set(this,'correlationNum',response.data.total>999?' 999+':(response.data.total<1?'':' '+response.data.total));
+        });
+      },
       //与我相关按钮
       topRightClickType(){
         this.$set(this.queryParams,'myRelated',this.queryParams.myRelated==1?0:1);
@@ -326,6 +332,7 @@
         }else{
           obj.endTime = ""
         }
+        this.getCorrelationNum();
         securityCheckClapList(obj).then(response => {
           this.total = response.data.total;
           this.tableList = response.data.records;
@@ -487,48 +494,57 @@
         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;
             }
           }
         }
         .form-button-max-big-box-me{
+          margin-left:10px;
           display: inline-block;
           .form-button-big-box-me{
             display: flex;
             div{
               position: relative;
               height:40px;
-              width:80px;
+              width:130px;
               line-height: 40px;
               text-align: center;
               color:#999;