From 2c163200c855e96cb6133a95fa4186f476f14d2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Wed, 26 Apr 2023 15:38:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E9=A1=B9=E7=9B=AE=E5=BA=93?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E7=9A=84=E9=A1=B9=E7=9B=AE=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectDetails/index.vue                  |  5 +-
 .../components/ProjectDetails.vue             | 10 ++--
 .../components/certificationActivity.vue      | 46 +++++++++----------
 .../components/certificationList/index.vue    |  4 ++
 .../components/regulatoryCompliance.vue       | 18 ++++----
 .../components/responsibilityList.vue         |  5 +-
 6 files changed, 48 insertions(+), 40 deletions(-)

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 @@
         </div>
         <div class="Virtual-detail-right"
              :style="{'width':isDisplay?'calc(100% - 240px)':'calc(100% - 66px)'}">
-          <ProjectDetailsName v-if="textTitle === $t('projectDetails')"/>
+          <ProjectDetailsName @TaskListChange="TaskListChange" v-if="textTitle === $t('projectDetails')"/>
           <listOfRegulations v-else-if="textTitle === $t('listOfRegulations')"
                              ref="listOfRegulationsRef"
                              @getRoleSwitch="getRoleSwitch"
@@ -167,6 +167,7 @@
 <!--                         v-else-if="textTitle === $t('projectStatus')"/>-->
           <certificationList ref="certificationListRef"
                              :isDisplayNum="isDisplayNum"
+                             :areaOfResponsibility="areaOfResponsibility"
                              @getRoleSwitch="getRoleSwitch"
                              @getRoleSwitchingList="getRoleSwitchingList"
                              v-else-if="textTitle === $t('certificationList')"/>
@@ -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 @@
         </a-button>
       </div>
     </div>
-    <projectStatus ref="projectStatusRef" @projectStatusForm="projectStatusForm"/>
+    <projectStatus ref="projectStatusRef"
+                   @currentStatus="currentStatus"
+                   @projectStatusForm="projectStatusForm"/>
     <versionStatistics ref="versionStatisticsRef" @versionStatisticsForm="versionStatisticsForm"/>
     <listOfRelevantPersonnel ref="listOfRelevantPersonnelRef"/>
     <addModel :url="url" ref="addModelRef" @addModelList="addModelList"/>
@@ -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)
       }
     }
   }