From 1828dd253ba1702801742785d250a976f3501504 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
 <7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Fri, 18 Aug 2023 00:53:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/attendance/index.js |  4 ++--
 src/api/special/index.js    |  4 ++--
 src/api/workTrain/index.js  |  4 ++--
 src/pages/projectSafety.vue | 47 +++++++++++--------------------------
 4 files changed, 20 insertions(+), 39 deletions(-)

diff --git a/src/api/attendance/index.js b/src/api/attendance/index.js
index 4a21256..a2da99e 100644
--- a/src/api/attendance/index.js
+++ b/src/api/attendance/index.js
@@ -2,14 +2,14 @@ import request from '@/utils/request'
 
 const getDeptWorksList=(deptId,projectId)=> {
   return request({
-    url: `bgscreen/attendance/getDeptWorksList?deptId=${deptId}&projectId=${projectId}`,
+    url: `bgscreen/attendance/getDeptWorksList?deptId=${deptId||0}&projectId=${projectId||0}`,
     method: 'get'
   })
 }
 
 const getWorkAttendanceList=(deptId,projectId,date)=> {
     return request({
-      url: `bgscreen/attendance/getWorkAttendanceList?deptId=${deptId}&projectId=${projectId}&date=${date}`,
+      url: `bgscreen/attendance/getWorkAttendanceList?deptId=${deptId||0}&projectId=${projectId||0}&date=${date}`,
       method: 'get'
     })
   }
diff --git a/src/api/special/index.js b/src/api/special/index.js
index 52d7e88..876fa7d 100644
--- a/src/api/special/index.js
+++ b/src/api/special/index.js
@@ -2,14 +2,14 @@ import request from '@/utils/request'
 
 const getProjectSpecialView=(deptId,projectId)=> {
   return request({
-    url: `bgscreen/projectspecial/getProjectSpecialView?deptId=${deptId}&projectId=${projectId}`,
+    url: `bgscreen/projectspecial/getProjectSpecialView?deptId=${deptId||0}&projectId=${projectId||0}`,
     method: 'get'
   })
 }
 
 const getProjectSpecialList=(projectId)=> {
     return request({
-      url: `bgscreen/projectspecial/getProjectSpecialList?projectId=${projectId}`,
+      url: `bgscreen/projectspecial/getProjectSpecialList?projectId=${projectId||0}`,
       method: 'get'
     })
   }
diff --git a/src/api/workTrain/index.js b/src/api/workTrain/index.js
index 3771496..7d138d5 100644
--- a/src/api/workTrain/index.js
+++ b/src/api/workTrain/index.js
@@ -1,8 +1,8 @@
 import request from '@/utils/request'
 
-const getWorkTrainList=(trainType,deptId)=> {
+const getWorkTrainList=(trainType,deptId,projectId)=> {
   return request({
-    url: `bgscreen/workTrain/getWorkTrainList?trainType=${trainType}&deptId=${deptId}`,
+    url: `bgscreen/workTrain/getWorkTrainList?trainType=${trainType}&deptId=${deptId||0}&projectId=${projectId||0}`,
     method: 'get'
   })
 }
diff --git a/src/pages/projectSafety.vue b/src/pages/projectSafety.vue
index 56b7b9e..9c2df89 100644
--- a/src/pages/projectSafety.vue
+++ b/src/pages/projectSafety.vue
@@ -142,7 +142,7 @@
                                     ref="fbsubordinateUnit" @row-click="doSpecialRowClick">
                                     <el-table-column prop="projectName" label="项目名称" min-width="180"></el-table-column>
                                     <el-table-column prop="total" label="操作证数"> </el-table-column>
-                                    <el-table-column prop="expired" label="即将过期"> </el-table-column>
+                                    <!-- <el-table-column prop="expired" label="即将过期"> </el-table-column> -->
                                     <el-table-column prop="void" label="已过期">
                                         <template slot-scope="scope">
                                             <span style="color:#01A9FF">{{ scope.row.void }}</span>
@@ -207,7 +207,7 @@
                         </module-one-1-1>
                         <module-one-1-1 label="保险采购明细">
                             <div class="quality-table special-table">
-                                <el-table :data="insuranceDataList" style="width: 100%;background: transparent;" height="265"
+                                <el-table :data="insuranceDataList" class="my-table" style="width: 100%;background: transparent;" height="265"
                                     ref="fbsubordinateUnit">
 
                                     <el-table-column prop="projectName" label="项目名称" align="left" min-width="180"> </el-table-column>
@@ -342,11 +342,11 @@ export default {
         this.$bus.$on("projectChange", res => {
             this.projectInfo=res;
             this.doDeptChane();
-            //this.getWorkTrainList();
-            //this.getEmergencyDrillList();
-            //this.getProjectSpecialView();
-            //this.getDeptWorksList();
-            //this.getProjectInsuranceList();
+            this.getWorkTrainList();
+            this.getEmergencyDrillList();
+            this.getProjectSpecialView();
+            this.getDeptWorksList();
+            this.getProjectInsuranceList();
         });
         this.$bus.$on("deptChange", dept => {
             this.dept = dept;
@@ -391,43 +391,27 @@ export default {
         },
         // 获取专项培训列表
         getWorkTrainList() {
-            let deptId = '';
-            if (this.dept && this.dept.id != 0) {
-                deptId = this.dept.id;
-            }
-            this.$api.workTrain.getWorkTrainList(0, deptId).then(d => {
+            this.$api.workTrain.getWorkTrainList(0, this.dept?.id||0,this.projectInfo?.id||0).then(d => {
                 this.workTrainList = d.rows;
             });
         },
         // 获取专项培训列表
         getEmergencyDrillList() {
-            let deptId = '';
-            if (this.dept && this.dept.id != 0) {
-                deptId = this.dept.id;
-            }
-            this.$api.workTrain.getWorkTrainList(1, deptId).then(d => {
+            this.$api.workTrain.getWorkTrainList(1, this.dept?.id||0,this.projectInfo?.id||0).then(d => {
                 this.emergencyDrillList = d.rows;
             });
         },
         // 获取特种人员数据列表
         getProjectSpecialView(){
-            let deptId = '';
-            if (this.dept && this.dept.id != 0) {
-                deptId = this.dept.id;
-            }
-            this.$api.special.getProjectSpecialView(deptId).then(d => {
+            this.$api.special.getProjectSpecialView(this.dept?.id||0,this.projectInfo?.id||0).then(d => {
                 this.specialDataList = d.rows;
             });
         },
         //查询在岗人数
         getDeptWorksList(){
-            let deptId = '';
-            if (this.dept && this.dept.id != 0) {
-                deptId = this.dept.id;
-            }
             if (this.infoNav == 0) {
                 //查询在岗人数
-                this.$api.attendance.getDeptWorksList(deptId).then(d => {
+                this.$api.attendance.getDeptWorksList(this.dept?.id||0,this.projectInfo?.id||0).then(d => {
                 this.laborPersonnelTotal=0;
                 this.laborPersonnelData=[];
                 if(d.rows.length>0 && d.rows[0]!=null){
@@ -441,7 +425,7 @@ export default {
             });
             } else {
                 //查询出勤人数
-                this.$api.attendance.getWorkAttendanceList(deptId).then(d => {
+                this.$api.attendance.getWorkAttendanceList(this.dept?.id||0,this.projectInfo?.id||0).then(d => {
                 this.laborPersonnelTotal=0;
                 this.laborPersonnelData=[];
                 if(d.rows.length>0 && d.rows[0]!=null){
@@ -456,11 +440,7 @@ export default {
             }
         },
         getProjectInsuranceList(){
-            let deptId = '';
-            if (this.dept && this.dept.id != 0) {
-                deptId = this.dept.id;
-            }
-            this.$api.insurance.getProjectInsuranceList(deptId).then(d => {
+            this.$api.insurance.getProjectInsuranceList(this.dept?.id||0,this.projectInfo?.id||0).then(d => {
                 this.insuranceDataList=[];
                 if(d.rows.length>0 && d.rows[0]!=null){
                     this.insuranceDataList = d.rows;
@@ -561,6 +541,7 @@ export default {
             this.warningTypeInterval = setInterval(this.automaticRollType, 5000);
 
             //定时器|一分钟执行一次
+            this.getWorkFileList();
             setInterval(this.getWorkFileList, 60000);
             setInterval(this.getWorkTrainList, 60000);
             setInterval(this.getEmergencyDrillList, 60000);