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

src/views/safetyCheck/rectificationReport/index.vue

@@ -47,6 +47,15 @@
               >批量下载</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">
@@ -112,6 +121,7 @@
           pageSize:20,
           deptId:'',
           searchValue:'',
+          myRelated:1,
         },
         dateRange:[],
         tableList:[],
@@ -128,6 +138,11 @@
       this.getList();
     },
     methods:{
+      //与我相关按钮
+      topRightClickType(){
+        this.$set(this.queryParams,'myRelated',this.queryParams.myRelated==1?0:1);
+        this.handleQuery();
+      },
       // 批量下载
       allDownload(){
         let self = this;
@@ -203,6 +218,7 @@
           pageSize:20,
           deptId:'',
           searchValue:'',
+          myRelated:1,
         });
         this.handleQuery();
       },
@@ -266,6 +282,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/safetyHazard/cannotListPage.vue

@@ -39,6 +39,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>
     </div>
     <div class="content-box">
@@ -96,6 +105,7 @@
           hazardType:1,
           searchValue:"",
           checkTimeOrder:"",
+          myRelated:1,
         },
         dateRange:[],
         tableList:[],
@@ -107,6 +117,11 @@
       this.getList();
     },
     methods:{
+      //与我相关按钮
+      topRightClickType(){
+        this.$set(this.queryParams,'myRelated',this.queryParams.myRelated==1?0:1);
+        this.handleQuery();
+      },
       //开关详情页面
       addDialogOpen(type,data){
         if(this.infoDialogType != type){
@@ -171,6 +186,7 @@
           hazardType:1,
           searchValue:"",
           checkTimeOrder:"",
+          myRelated:1,
         });
         this.handleQuery();
       },
@@ -211,6 +227,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/safetyHazard/departmentListPage.vue

@@ -64,6 +64,15 @@
               >批量审核</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">
@@ -146,7 +155,8 @@
           searchValue:"",
           checkTimeOrder:"",
           zgTimeOrder:"",
-          zgTermOrder:""
+          zgTermOrder:"",
+          myRelated:1,
         },
         dateRange:[],
         tableList:[],
@@ -158,6 +168,11 @@
       this.getList();
     },
     methods:{
+      //与我相关按钮
+      topRightClickType(){
+        this.$set(this.queryParams,'myRelated',this.queryParams.myRelated==1?0:1);
+        this.handleQuery();
+      },
       //开关详情页面
       addDialogOpen(type,data){
         if(this.infoDialogType != type){
@@ -263,7 +278,8 @@
           searchValue:"",
           checkTimeOrder:"",
           zgTimeOrder:"",
-          zgTermOrder:""
+          zgTermOrder:"",
+          myRelated:1,
         });
         this.handleQuery();
       },
@@ -320,6 +336,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/safetyHazard/schoolListPage.vue

@@ -64,6 +64,15 @@
               >批量审核</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">
@@ -146,7 +155,8 @@
           searchValue:"",
           checkTimeOrder:"",
           zgTimeOrder:"",
-          zgTermOrder:""
+          zgTermOrder:"",
+          myRelated:1,
         },
         dateRange:[],
         tableList:[],
@@ -158,6 +168,11 @@
       this.getList();
     },
     methods:{
+      //与我相关按钮
+      topRightClickType(){
+        this.$set(this.queryParams,'myRelated',this.queryParams.myRelated==1?0:1);
+        this.handleQuery();
+      },
       //开关详情页面
       addDialogOpen(type,data){
         if(this.infoDialogType != type){
@@ -263,7 +278,8 @@
           searchValue:"",
           checkTimeOrder:"",
           zgTimeOrder:"",
-          zgTermOrder:""
+          zgTermOrder:"",
+          myRelated:1,
         });
         this.handleQuery();
       },
@@ -320,6 +336,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/snapshotManagement/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container snapshotManagement">
     <div class="snapshotManagement-page" v-if="pageType == 1">
       <div class="title-box">
-        <el-form :model="queryParams" class="form-box" ref="queryForm" :inline="true" label-width="80px">
+        <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('')">
@@ -31,8 +31,8 @@
               clearable
               style="width: 180px"/>
           </el-form-item>
-          <el-form-item label="学院" prop="deptId" label-width="50px">
-            <el-select v-model="queryParams.deptId" clearable placeholder="学院" style="width: 150px">
+          <el-form-item label="学院" prop="deptId" label-width="40px">
+            <el-select v-model="queryParams.deptId" clearable placeholder="学院" style="width: 130px">
               <el-option
                 v-for="item in deptSelectList"
                 :key="item.deptId"
@@ -41,7 +41,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="上报时间" prop="dateRange" style="margin-left:10px;" label-width="70px">
+          <el-form-item label="上报时间" prop="dateRange"  label-width="70px">
             <el-date-picker
               :clearable="false"
               v-model="dateRange"
@@ -61,7 +61,7 @@
           <el-form-item style="float: right;" v-hasPermi="['safety:rectifyClap:add']">
             <el-col :span="1.5">
               <p class="inquire-button-one"
-                 style="width:100px;margin-right:0;"
+                 style="width:90px;margin-right:0;"
                  @click="addButton"
               ><i class="el-icon-plus"></i> 随手拍</p>
             </el-col>
@@ -69,11 +69,20 @@
           <el-form-item style="float: right;">
             <el-col :span="1.5">
               <p class="add-button-one-90"
-                 style="width:100px;"
+                 style="width:90px;"
                  @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">
@@ -222,6 +231,7 @@
           rectifyStatus:'',
           upTimeOrder:"",
           zgTimeOrder:"",
+          myRelated:1,
         },
         dateRange:[],
         tableList:[],
@@ -264,6 +274,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){
           if (type==1){
@@ -332,6 +347,7 @@
           rectifyStatus:'',
           upTimeOrder:"",
           zgTimeOrder:"",
+          myRelated:1,
         });
         this.handleQuery();
       },
@@ -505,6 +521,41 @@
             }
           }
         }
+        .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;
+              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;