From a90f6846d53e703fcfa1fd0c71f469c2a9683cdf Mon Sep 17 00:00:00 2001 From: haha Date: Thu, 17 Aug 2023 22:47:44 +0800 Subject: [PATCH] update code --- src/api/insurance/index.js | 2 +- src/api/problemmodify/index.js | 16 +- src/components/header.js | 9 +- src/pages/progress/problemProgress.vue | 20 +- src/pages/projectDetail.vue | 1921 +++++++++++++----------- src/pages/projectProgress.vue | 60 +- src/pages/projectQuality.vue | 9 +- src/pages/projectSafety.vue | 18 +- 8 files changed, 1175 insertions(+), 880 deletions(-) diff --git a/src/api/insurance/index.js b/src/api/insurance/index.js index a6c6dff..9454c14 100644 --- a/src/api/insurance/index.js +++ b/src/api/insurance/index.js @@ -2,7 +2,7 @@ import request from '@/utils/request' const getProjectInsuranceList=(deptId,projectId)=> { return request({ - url: `bgscreen/insurance/getProjectInsuranceList?deptId=${deptId}&projectId=${projectId}`, + url: `bgscreen/insurance/getProjectInsuranceList?deptId=${deptId||0}&projectId=${projectId||0}`, method: 'get' }) } diff --git a/src/api/problemmodify/index.js b/src/api/problemmodify/index.js index 7f22b69..b37f5e1 100644 --- a/src/api/problemmodify/index.js +++ b/src/api/problemmodify/index.js @@ -3,34 +3,34 @@ import request from '@/utils/request' //质量整改-安全分类汇总(按分类) -const safetySummary=(deptId,roleType)=>{ +const safetySummary=(deptId,roleType,projectId)=>{ return request({ - url: `bgscreen/problemmodify/safetySummary?deptId=${deptId}&roleType=${roleType}`, + url: `bgscreen/problemmodify/safetySummary?deptId=${deptId}&roleType=${roleType}&projectId=${projectId||0}`, method: 'get' }) } //质量整改-质量分类汇总(按分类) -const qualitySummary=(deptId,roleType)=>{ +const qualitySummary=(deptId,roleType,projectId)=>{ return request({ - url: `bgscreen/problemmodify/qualitySummary?deptId=${deptId}&roleType=${roleType}`, + url: `bgscreen/problemmodify/qualitySummary?deptId=${deptId}&roleType=${roleType}&projectId=${projectId||0}`, method: 'get' }) } //质量整改-安全分类汇总(按项目) -const safetySummaryByProject=(deptId,roleType)=>{ +const safetySummaryByProject=(deptId,roleType,projectId)=>{ return request({ - url: `bgscreen/problemmodify/safetySummaryByProject?deptId=${deptId}&roleType=${roleType}`, + url: `bgscreen/problemmodify/safetySummaryByProject?deptId=${deptId}&roleType=${roleType}&projectId=${projectId||0}`, method: 'get' }) } //质量整改-安全分类汇总(按项目) -const qualitySummaryByProject=(deptId,roleType)=>{ +const qualitySummaryByProject=(deptId,roleType,projectId)=>{ return request({ - url: `bgscreen/problemmodify/qualitySummaryByProject?deptId=${deptId}&roleType=${roleType}`, + url: `bgscreen/problemmodify/qualitySummaryByProject?deptId=${deptId}&roleType=${roleType}&projectId=${projectId||0}`, method: 'get' }) } diff --git a/src/components/header.js b/src/components/header.js index e544500..7b8325d 100644 --- a/src/components/header.js +++ b/src/components/header.js @@ -179,10 +179,11 @@ Vue.component("screen-header", { }, loadProject(init){ this.$api.project.findProjectByDept( this.localStorage1.id).then(d=>{ - this.data=(d?.data||[]).map(it=>{ - it.text=it.projectName; - return it; - }).filter(it=>+it.progressVisible==0); + let objs=(d?.data||[]).map(it=>{ + it.text=it.projectName; + return it; + }).filter(it=>+it.progressVisible==0); + this.data=[{id:0,text:'所有项目'},...objs]; this.$bus.$emit("loadProjects",this.data); if(this.data.length>0){ this.setScreenLiSel2(this.data[0],init); diff --git a/src/pages/progress/problemProgress.vue b/src/pages/progress/problemProgress.vue index 65207db..8200e4d 100644 --- a/src/pages/progress/problemProgress.vue +++ b/src/pages/progress/problemProgress.vue @@ -1,6 +1,6 @@