diff --git a/jero-web/src/views/projectManagement/ProjectDetails/index.vue b/jero-web/src/views/projectManagement/ProjectDetails/index.vue index ce3f3f29c..c9cc2bb24 100644 --- a/jero-web/src/views/projectManagement/ProjectDetails/index.vue +++ b/jero-web/src/views/projectManagement/ProjectDetails/index.vue @@ -90,7 +90,8 @@
- + @@ -137,7 +138,7 @@ isTrue: true, loading: false, isDisplay: true, - + areaOfResponsibilityList:{}, url: { logList: '/project/projectLawsInventoryLogEO/page', historicalVersionUrl: '', @@ -216,6 +217,8 @@ } }, textClick(num, name) { + this.areaOfResponsibilityList = {} + this.areaOfResponsibility = {} this.textTitle = name let textColor = document.getElementsByClassName('Virtual-detail-left-text-color') if (textColor && textColor.length > 0) { @@ -286,15 +289,20 @@ }) }, TaskListChange(item) { - this.areaOfResponsibility = item - this.textTitle = this.$t('taskList') + if (item.isListing && item.isListing == '1'){ + this.areaOfResponsibilityList = item + this.textTitle = this.$t('listOfRegulations') + }else{ + this.areaOfResponsibility = item + this.textTitle = this.$t('taskList') + } let textColor = document.getElementsByClassName('Virtual-detail-left-text-color') if (textColor && textColor.length > 0) { textColor[0].classList.remove('Virtual-detail-left-text-color') } let text = document.getElementsByClassName('Virtual-detail-left-text') for (let i = 0; i < text.length; i++) { - if (text[i].title == this.$t('taskList')) { + if (text[i].title == this.textTitle) { text[i].classList.add('Virtual-detail-left-text-color') } } diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index b7f6e9a11..8d548556f 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -387,6 +387,7 @@ export default { name: 'listOfRegulations', + props:['areaOfResponsibilityList'], components: { ImportFile, listAddModel, @@ -911,6 +912,9 @@ this.getRoleByUserId(() => { this.getAndUserId() }) + if (this.areaOfResponsibilityList && this.areaOfResponsibilityList.dutyTerritory) { + this.queryParam.dutyTerritory = this.areaOfResponsibilityList.dutyTerritory + } // } else { // this.isDisplay = false // } diff --git a/jero-web/src/views/projectManagement/components/responsibilityList.vue b/jero-web/src/views/projectManagement/components/responsibilityList.vue index 5a0faf9ef..45f070eb9 100644 --- a/jero-web/src/views/projectManagement/components/responsibilityList.vue +++ b/jero-web/src/views/projectManagement/components/responsibilityList.vue @@ -98,6 +98,9 @@ this.visible = false }, areaOfResponsibilityClick(item) { + if (this.queryParam.operatorType == 'queryListingToConfirmStatistics' || this.queryParam.operatorType == 'queryTaskToConfirmStatistics'){ + item.isListing = '1' + } this.$emit('responsibility', item) } }