dedsudiyu 6 mesiacov pred
rodič
commit
03faa997c9

+ 5 - 2
src/views/safetyCheck/components/inspectStatistics.vue

@@ -10,7 +10,7 @@
         <div class="page-form-title-box" style="border:none;">
           <el-form :model="queryParams" class="form-box" ref="queryForm"
                    :inline="true" style="width:100%;">
-            <div class="table-school-college-toggle-box">
+            <div class="table-school-college-toggle-box" v-if="!propsData.deptId&&!propsData.subId">
               <p :class="checkStatus==null?'p-check':''" @click="tableCheck(null)">全部</p>
               <p :class="checkStatus==0?'p-check':''" @click="tableCheck(0)">待检查</p>
               <p :class="checkStatus==1?'p-check':''" @click="tableCheck(1)">已检查</p>
@@ -23,7 +23,7 @@
                 style="width: 140px"
               />
             </el-form-item>
-            <el-form-item label="" prop="deptId" v-if="!propsData.deptId">
+            <el-form-item label="" prop="deptId" v-if="!propsData.deptId&&!propsData.subId">
               <el-select v-model="queryParams.deptId" placeholder="学院单位" style="width: 120px">
                 <el-option
                   v-for="dict in deptOption"
@@ -213,6 +213,9 @@ export default {
     }
   },
   created(){
+    if(this.propsData.deptId||this.propsData.subId){
+      this.$set(this,'checkStatus',1);
+    }
     this.getDeptDropList();
   },
   mounted(){

+ 2 - 0
src/views/safetyCheck/components/inspectionItemsStatistics.vue

@@ -330,11 +330,13 @@
         }else if(this.propsData.deptId){
           obj.deptId = this.propsData.deptId;
           eChartsData.deptId = this.propsData.deptId;
+          obj.planId = this.propsData.deptPlanId
           this.$set(this.exportConfig,'customKey','deptId');
           this.$set(this.exportConfig,'customValue',obj.deptId);
         }else if(this.propsData.subId){
           obj.subId = this.propsData.subId;
           eChartsData.subId = this.propsData.subId;
+          obj.planId = this.propsData.subPlanId
           this.$set(this.exportConfig,'customKey','subId');
           this.$set(this.exportConfig,'customValue',obj.subId);
         }

+ 2 - 0
src/views/safetyCheck/dataStatistics/hiddenDangerStatistics.vue

@@ -531,12 +531,14 @@ export default {
         if (this.identityType == 1){
           this.$set(this,'minPropsData',{
             deptId : row.deptId,
+            deptPlanId : this.propsData.planId,
             checkCategory:this.propsData.checkCategory,
             title:row.deptName
           });
         } else{
           this.$set(this,'minPropsData',{
             subId : row.subId,
+            subPlanId : this.propsData.planId,
             checkCategory:this.propsData.checkCategory,
             title:row.subName
           });