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

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

@@ -60,11 +60,12 @@
             <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">
-            <div class="form-button-big-box">
-              <div :class="queryParams.isSelf==1?'checkDiv':''" style="width:100px;" @click="topRightClickType">
-                <p class="text-p">本人发起</p>
-                <p class="el-icon-check icon-p" v-if="queryParams.isSelf==1"></p>
+          <!--与我相关-->
+          <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>
@@ -169,7 +170,7 @@
           checkTimeSort:0,
           searchValue:"",
           deptId:"",
-          isSelf:0,
+          myRelated:1,
         },
         dateRange:[],
         tableList:[],
@@ -186,6 +187,11 @@
       this.getList();
     },
     methods:{
+      //与我相关按钮
+      topRightClickType(){
+        this.$set(this.queryParams,'myRelated',this.queryParams.myRelated==1?0:1);
+        this.handleQuery();
+      },
       //开始检查
       goAddPage(type,id){
         if(this.pageType != type){
@@ -224,10 +230,6 @@
           this.handleQuery();
         }
       },
-      topRightClickType(){
-        this.$set(this.queryParams,'isSelf',this.queryParams.isSelf==1?0:1);
-        this.handleQuery();
-      },
       //获取数据列表
       getList(){
         let obj = JSON.parse(JSON.stringify(this.queryParams))
@@ -262,7 +264,7 @@
           checkTimeSort:0,
           searchValue:"",
           deptId:"",
-          isSelf:0,
+          myRelated:1,
         });
         this.handleQuery();
       },
@@ -374,6 +376,42 @@
             }
           }
         }
+        .form-button-max-big-box-me{
+          display: inline-block;
+          .form-button-big-box-me{
+            display: flex;
+            div{
+              position: relative;
+              height:40px;
+              width:80px;
+              line-height: 40px;
+              text-align: center;
+              color:#999;
+              font-size:14px;
+              border:1px solid #999;
+              border-radius:4px;
+              margin-left:10px;
+              font-weight:500;
+              cursor: pointer;
+              .icon-p-me{
+                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;
+              }
+            }
+            .checkDiv-me{
+              color:#0183FA!important;
+              border:1px solid #0183FA!important;
+            }
+          }
+        }
       }
       .content-box{
         flex: 1;

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

@@ -50,6 +50,15 @@
             <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"
@@ -143,6 +152,7 @@
           createTimeSort:0,
           searchValue:"",
           checkType:2,
+          myRelated:1,
         },
         dateRange:[],
         tableList:[],
@@ -156,6 +166,11 @@
       this.getList();
     },
     methods:{
+      //与我相关按钮
+      topRightClickType(){
+        this.$set(this.queryParams,'myRelated',this.queryParams.myRelated==1?0:1);
+        this.handleQuery();
+      },
       //切换页面
       goPage(type,data){
         if(this.pageType != type){
@@ -249,6 +264,7 @@
           createTimeSort:0,
           searchValue:"",
           checkType:2,
+          myRelated:1,
         });
         this.handleQuery();
       },
@@ -343,6 +359,42 @@
             }
           }
         }
+        .form-button-max-big-box-me{
+          display: inline-block;
+          .form-button-big-box-me{
+            display: flex;
+            div{
+              position: relative;
+              height:40px;
+              width:80px;
+              line-height: 40px;
+              text-align: center;
+              color:#999;
+              font-size:14px;
+              border:1px solid #999;
+              border-radius:4px;
+              margin-left:10px;
+              font-weight:500;
+              cursor: pointer;
+              .icon-p-me{
+                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;
+              }
+            }
+            .checkDiv-me{
+              color:#0183FA!important;
+              border:1px solid #0183FA!important;
+            }
+          }
+        }
       }
       .content-box{
         flex: 1;

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

@@ -60,11 +60,12 @@
             <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">
-            <div class="form-button-big-box">
-              <div :class="queryParams.isSelf==1?'checkDiv':''" style="width:100px;" @click="topRightClickType">
-                <p class="text-p">本人发起</p>
-                <p class="el-icon-check icon-p" v-if="queryParams.isSelf==1"></p>
+          <!--与我相关-->
+          <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>
@@ -167,7 +168,7 @@
           checkTimeSort:0,
           searchValue:"",
           deptId:"",
-          isSelf:0,
+          myRelated:1,
         },
         dateRange:[],
         tableList:[],
@@ -222,8 +223,9 @@
           this.handleQuery();
         }
       },
+      //与我相关按钮
       topRightClickType(){
-        this.$set(this.queryParams,'isSelf',this.queryParams.isSelf==1?0:1);
+        this.$set(this.queryParams,'myRelated',this.queryParams.myRelated==1?0:1);
         this.handleQuery();
       },
       //获取数据列表
@@ -260,7 +262,7 @@
           checkTimeSort:0,
           searchValue:"",
           deptId:"",
-          isSelf:0,
+          myRelated:1,
         });
         this.handleQuery();
       },
@@ -372,6 +374,42 @@
             }
           }
         }
+        .form-button-max-big-box-me{
+          display: inline-block;
+          .form-button-big-box-me{
+            display: flex;
+            div{
+              position: relative;
+              height:40px;
+              width:80px;
+              line-height: 40px;
+              text-align: center;
+              color:#999;
+              font-size:14px;
+              border:1px solid #999;
+              border-radius:4px;
+              margin-left:10px;
+              font-weight:500;
+              cursor: pointer;
+              .icon-p-me{
+                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;
+              }
+            }
+            .checkDiv-me{
+              color:#0183FA!important;
+              border:1px solid #0183FA!important;
+            }
+          }
+        }
       }
       .content-box{
         flex: 1;

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

@@ -50,6 +50,15 @@
             <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"
@@ -143,6 +152,7 @@
           createTimeSort:0,
           searchValue:"",
           checkType:1,
+          myRelated:1,
         },
         dateRange:[],
         tableList:[],
@@ -156,6 +166,11 @@
       this.getList();
     },
     methods:{
+      //与我相关按钮
+      topRightClickType(){
+        this.$set(this.queryParams,'myRelated',this.queryParams.myRelated==1?0:1);
+        this.handleQuery();
+      },
       //切换页面
       goPage(type,data){
         if(this.pageType != type){
@@ -249,6 +264,7 @@
           createTimeSort:0,
           searchValue:"",
           checkType:1,
+          myRelated:1,
         });
         this.handleQuery();
       },
@@ -343,6 +359,42 @@
             }
           }
         }
+        .form-button-max-big-box-me{
+          display: inline-block;
+          .form-button-big-box-me{
+            display: flex;
+            div{
+              position: relative;
+              height:40px;
+              width:80px;
+              line-height: 40px;
+              text-align: center;
+              color:#999;
+              font-size:14px;
+              border:1px solid #999;
+              border-radius:4px;
+              margin-left:10px;
+              font-weight:500;
+              cursor: pointer;
+              .icon-p-me{
+                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;
+              }
+            }
+            .checkDiv-me{
+              color:#0183FA!important;
+              border:1px solid #0183FA!important;
+            }
+          }
+        }
       }
       .content-box{
         flex: 1;

src/views/safetyCheck/worktable/toDoListBox.vue

@@ -25,8 +25,7 @@
       <div  class="for-list-box"
             v-for="(item,index) in tableList" :key="index">
         <div class="for-name-box">
-          <p class="name-p" v-if="queryParams.manageStatus != 2">{{item.subjectName}}-{{item.roomNumber}}</p>
-          <p class="name-p" v-if="queryParams.manageStatus == 2">{{item.subRoom}}</p>
+          <p class="name-p">{{item.subjectName}}-{{item.roomNumber}}</p>
           <p class="type-p" v-if="item.isOverdue == 1">已逾期</p>
           <p class="null-p"></p>
           <img v-if="item.isAttachment == 1" @click="lookDocumentListButton(1,item)"
@@ -42,10 +41,10 @@
         </div>
         <div class="for-time-box">
           <p>计划周期：{{item.cycleStartTime}} 至 {{item.cycleEndTime}}</p>
-          <p v-if="queryParams.manageStatus == 0 && item.isCheck == 1" @click="goPage(item)">开始检查</p>
-          <p v-if="queryParams.manageStatus == 0 && item.isCheck != 1" class="noButton" @click="goPage(item)">计划未开始</p>
-          <p v-if="queryParams.manageStatus == 1" @click="goPage(item)">编辑</p>
-          <p v-if="queryParams.manageStatus == 2 && item.applyGentle" @click="addDialogOpen(true,item)">复核</p>
+          <p v-if="item.manageStatus == 0 && item.checkIsStatus" @click="goPage(item)">开始检查</p>
+          <p v-if="item.manageStatus == 0 && !item.checkIsStatus" class="noButton" @click="goPage(item)">计划未开始</p>
+          <p v-if="item.manageStatus == 1" @click="goPage(item)">编辑</p>
+          <p v-if="item.manageStatus == 2" @click="addDialogOpen(true,item)">复核</p>
         </div>
         <img class="position-img" v-if="item.checkRange == 1" src="@/assets/ZDimages/safetyCheck/icon_xyxc_qx.png">
         <img class="position-img" v-if="item.checkRange == 2" src="@/assets/ZDimages/safetyCheck/icon_xyxc_xy.png">
@@ -155,7 +154,7 @@
         if(this.infoDialogType != type){
           if(type){
             let obj = {
-              id:data.id
+              id:data.hazardId
             }
             this.$set(this,'propsInfoDialogData',obj);
             this.$set(this,'infoDialogType',type);