diff --git a/jero-web/src/views/projectManagement/ProjectDetails/index.vue b/jero-web/src/views/projectManagement/ProjectDetails/index.vue index 6e06d955c..72e5bb2bd 100644 --- a/jero-web/src/views/projectManagement/ProjectDetails/index.vue +++ b/jero-web/src/views/projectManagement/ProjectDetails/index.vue @@ -153,7 +153,7 @@
- + --> @@ -417,7 +418,7 @@ this.textTitle = this.$t('listOfRegulations') } else { this.areaOfResponsibility = item - this.textTitle = this.$t('taskList') + this.textTitle = this.$t('certificationList') } let textColor = document.getElementsByClassName('Virtual-detail-left-text-color') if (textColor && textColor.length > 0) { diff --git a/jero-web/src/views/projectManagement/components/ProjectDetails.vue b/jero-web/src/views/projectManagement/components/ProjectDetails.vue index acb4d8f8f..7dfe78a4b 100644 --- a/jero-web/src/views/projectManagement/components/ProjectDetails.vue +++ b/jero-web/src/views/projectManagement/components/ProjectDetails.vue @@ -148,7 +148,9 @@
- + @@ -225,9 +227,9 @@ } }) }, - // currentStatus(item) { - // this.$emit('TaskListChange', item) - // }, + currentStatus(item) { + this.$emit('TaskListChange', item) + }, getSetting() { getAction(this.url.queryByProjectId, { projectId: this.$route.query.id }).then((res) => { if (res.success) { diff --git a/jero-web/src/views/projectManagement/components/certificationActivity.vue b/jero-web/src/views/projectManagement/components/certificationActivity.vue index 1221cbfbc..b34fa45b3 100644 --- a/jero-web/src/views/projectManagement/components/certificationActivity.vue +++ b/jero-web/src/views/projectManagement/components/certificationActivity.vue @@ -259,29 +259,29 @@ } ] }) - // myChart.on('click', (params) => { - // let query = { - // title: params.seriesName, - // projectLibraryId: this.$route.query.id - // } - // if (num === 1) { - // query.operatorType = 'queryListingToConfirmStatistics' - // query.inventoryAffirmStatus = params.data.status - // } else if (num === 2) { - // query.operatorType = 'queryTaskToConfirmStatistics' - // query.taskAffirmStatus = params.data.status - // } else if (num === 3) { - // query.operatorType = 'queryDesignStatistics' - // query.designFlowTaskStatus = params.data.status - // } else if (num === 4) { - // query.operatorType = 'queryPrehomoStatistics' - // query.prehomoFlowTaskStatus = params.data.status - // } else if (num === 5) { - // query.operatorType = 'queryVerifyStatistics' - // query.verifyFlowTaskStatus = params.data.status - // } - // this.$refs.responsibilityListRef.getData(query) - // }) + myChart.on('click', (params) => { + let query = { + title: params.seriesName, + projectLibraryId: this.$route.query.id + } + // if (num === 1) { + // query.operatorType = 'queryListingToConfirmStatistics' + // query.inventoryAffirmStatus = params.data.status + // } else if (num === 2) { + // query.operatorType = 'queryTaskToConfirmStatistics' + // query.taskAffirmStatus = params.data.status + // } else if (num === 3) { + // query.operatorType = 'queryDesignStatistics' + // query.designFlowTaskStatus = params.data.status + // } else if (num === 4) { + // query.operatorType = 'queryPrehomoStatistics' + // query.prehomoFlowTaskStatus = params.data.status + // } else if (num === 5) { + // query.operatorType = 'queryVerifyStatistics' + // query.verifyFlowTaskStatus = params.data.status + // } + this.$refs.responsibilityListRef.getData(query) + }) }, responsibility(item) { diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index ee9217fda..1e118b23e 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -826,6 +826,10 @@ this.long = localStorage.getItem('language') || 'zh-cn' this.loading = true this.userInfoQuery = this.userInfo() + if (this.areaOfResponsibility && this.areaOfResponsibility.dutyTerritory) { + this.queryParam.dutyTerritory = this.areaOfResponsibility.dutyTerritory + this.queryParam = { ...this.queryParam } + } this.getProcessStatus() this.getDeliverableTree() this.getRoleByUserId(() => { diff --git a/jero-web/src/views/projectManagement/components/regulatoryCompliance.vue b/jero-web/src/views/projectManagement/components/regulatoryCompliance.vue index ea81954a7..a1a783b49 100644 --- a/jero-web/src/views/projectManagement/components/regulatoryCompliance.vue +++ b/jero-web/src/views/projectManagement/components/regulatoryCompliance.vue @@ -126,15 +126,15 @@ } ] }) - // myChart.on('click', (params) => { - // let query = { - // title: params.seriesName, - // projectLibraryId: this.$route.query.id, - // operatorType: 'queryCurrentProjectStatusStatistics', - // conditionAssessment: params.data.color - // } - // this.$refs.responsibilityListRef.getData(query) - // }) + myChart.on('click', (params) => { + let query = { + title: params.seriesName, + projectLibraryId: this.$route.query.id, + operatorType: 'queryCurrentProjectStatusStatistics', + conditionAssessment: params.data.color + } + this.$refs.responsibilityListRef.getData(query) + }) }, mainTopEcharts(dataSource) { diff --git a/jero-web/src/views/projectManagement/components/responsibilityList.vue b/jero-web/src/views/projectManagement/components/responsibilityList.vue index 5f57dedd5..d49d20017 100644 --- a/jero-web/src/views/projectManagement/components/responsibilityList.vue +++ b/jero-web/src/views/projectManagement/components/responsibilityList.vue @@ -101,10 +101,11 @@ this.visible = false }, areaOfResponsibilityClick(item) { - if (this.queryParam.operatorType == 'queryListingToConfirmStatistics' || this.queryParam.operatorType == 'queryTaskToConfirmStatistics'){ + if (this.queryParam.operatorType == 'queryListingToConfirmStatistics' || + this.queryParam.operatorType == 'queryTaskToConfirmStatistics'){ item.isListing = '1' } - // this.$emit('responsibility', item) + this.$emit('responsibility', item) } } }