From 401388caa4794731a4f6faea7cd8f1e44a410f81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Tue, 17 Oct 2023 17:15:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B9=B3=E5=8F=B0=E4=BB=B6?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85=E7=9A=84=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/certificationActivity.vue      |  40 ++-
 .../components/regulatoryCompliance.vue       | 233 ++++++++++++++----
 2 files changed, 207 insertions(+), 66 deletions(-)

diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationActivity.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationActivity.vue
index a2da1a598..8eb6ebc8c 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationActivity.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationActivity.vue
@@ -109,34 +109,42 @@
         if (dataSource && dataSource.length > 0) {
           this.dataSource = [{}]
           dataSource.forEach(res => {
-            if (res.taskAffirmStatus == 'Not started') {
+            if (res.taskAffirmStatus == 'List to be released') {
               data.push({
                 value: res.taskAffirmStatusCount,
-                name: this.$t('notLaunch'),
+                name: this.$t('listToBeReleased'),
                 color: '#00B3BE',
                 status: res.taskAffirmStatus
               })
               color.push('#00B3BE')
-            } else if (res.taskAffirmStatus == 'List to confirm') {
+            } else if (res.taskAffirmStatus == 'List to be checked') {
               data.push({
                 value: res.taskAffirmStatusCount,
-                name: this.$t('listToConfirm'),
+                name: this.$t('listToBeChecked'),
+                color: '#4B82FF',
+                status: res.taskAffirmStatus
+              })
+              color.push('#4B82FF')
+            } else if (res.taskAffirmStatus == 'Task to be confirmed') {
+              data.push({
+                value: res.taskAffirmStatusCount,
+                name: this.$t('taskToBeConfirmed'),
                 color: '#FDA71C',
                 status: res.taskAffirmStatus
               })
               color.push('#FDA71C')
-            } else if (res.taskAffirmStatus == 'Accepted') {
+            } else if (res.taskAffirmStatus == 'Refusal of responsible person') {
               data.push({
                 value: res.taskAffirmStatusCount,
-                name: this.$t('accept'),
+                name: this.$t('acceptanceTheResponsiblePerson'),
                 color: '#26BC4B',
                 status: res.taskAffirmStatus
               })
               color.push('#26BC4B')
-            } else if (res.taskAffirmStatus == 'Rejected') {
+            }else if (res.taskAffirmStatus == 'Accepted of responsible person') {
               data.push({
                 value: res.taskAffirmStatusCount,
-                name: this.$t('refuse'),
+                name: this.$t('dutyPersonRejected'),
                 color: '#E83030',
                 status: res.taskAffirmStatus
               })
@@ -154,22 +162,30 @@
         if (dataSource && dataSource.length > 0) {
           this.dataSource = [{}]
           dataSource.forEach(res => {
-            if (res.taskAffirmStatus == 'Not started') {
+            if (res.taskAffirmStatus == 'Task to be confirmed') {
               data.push({
                 value: res.taskAffirmStatusCount,
-                name: this.$t('notLaunch'),
+                name: this.$t('taskToBeConfirmed'),
                 color: '#00B3BE',
                 status: res.taskAffirmStatus
               })
               color.push('#00B3BE')
-            } else if (res.taskAffirmStatus == 'To submit') {
+            } else if (res.taskAffirmStatus == 'Results to be submitted') {
               data.push({
                 value: res.taskAffirmStatusCount,
-                name: this.$t('toSubmit'),
+                name: this.$t('resultsToBeSubmitted'),
                 color: '#FDA71C',
                 status: res.taskAffirmStatus
               })
               color.push('#FDA71C')
+            }else if (res.taskAffirmStatus == 'Results to be reviewed') {
+              data.push({
+                value: res.taskAffirmStatusCount,
+                name: this.$t('resultsToBeReviewed'),
+                color: '#745ADB',
+                status: res.taskAffirmStatus
+              })
+              color.push('#745ADB')
             } else if (res.taskAffirmStatus == 'Review and pass') {
               data.push({
                 value: res.taskAffirmStatusCount,
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/regulatoryCompliance.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/regulatoryCompliance.vue
index 6d1a894a1..8ad75198f 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/regulatoryCompliance.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/regulatoryCompliance.vue
@@ -1,11 +1,17 @@
 <!--平台件-->
 <template>
   <div class="box-content">
-    <div class="box-content-top">
+    <div class="box-content-left">
       <div class="total-text">
-        <span>{{$t('totalTable')+' : '+mainTopNum}}</span>
+        <span>{{$t('totalTable')+' : '+mainTopLeftNum}}</span>
       </div>
-      <div id="main-top"></div>
+      <div id="main-top-left"></div>
+    </div>
+    <div class="box-content-right">
+      <div class="total-text">
+        <span>{{$t('totalTable')+' : '+mainTopRightNum}}</span>
+      </div>
+      <div id="main-top-right"></div>
     </div>
     <div class="box-content-left">
       <div class="total-text">
@@ -17,7 +23,7 @@
       <div class="total-text">
         <span>{{$t('totalTable')+' : '+mainRightNum}}</span>
       </div>
-      <div id="main-right"> </div>
+      <div id="main-right"></div>
     </div>
     <responsibilityList @responsibility="responsibility" ref="responsibilityListRef"/>
   </div>
@@ -50,6 +56,8 @@
         mainTopNum: 0,
         mainLeftNum: 0,
         mainRightNum: 0,
+        mainTopLeftNum: 0,
+        mainTopRightNum: 0,
         columns: [
           {
             title: this.$t('red'),
@@ -92,10 +100,12 @@
         getAction(this.url.getProjectDetailsStatistics, { id: id }).then((res) => {
           if (res.success) {
             if (res.result) {
-              let mainTopDataSource = res.result.taskToConfirmMap ? res.result.taskToConfirmMap.taskToConfirmMapList : []
+              let mainTopLeftDataSource = res.result.designTaskToConfirmMap ? res.result.designTaskToConfirmMap.designTaskToConfirmMapList : []
+              let mainTopRightDataSource = res.result.verifyTaskToConfirmMap ? res.result.verifyTaskToConfirmMap.verifyTaskToConfirmMapList : []
               let mainLeftDataSource = res.result.designComplianceMap ? res.result.designComplianceMap.designComplianceMapList : []
               let mainRightDataSource = res.result.verifyComplianceMap ? res.result.verifyComplianceMap.verifyComplianceMapList : []
-              this.mainTopEcharts(mainTopDataSource)
+              this.mainTopLeftEcharts(mainTopLeftDataSource)
+              this.mainTopRightEcharts(mainTopRightDataSource)
               this.mainLeftEcharts(mainLeftDataSource)
               this.mainRightEcharts(mainRightDataSource)
             }
@@ -149,23 +159,30 @@
         })
         myChart.on('click', (params) => {
           let query = {}
-          if (params.seriesName == this.$t('regulatoryTaskConfirmation')) {
+          if (params.seriesName == this.$t('designTaskValidation')) {
             query = {
-              title: params.seriesName+'-'+params.name,
+              title: params.seriesName + '-' + params.name,
+              projectLibraryId: this.$route.query.id,
+              operatorType: 'queryFGTaskToConfirmStatistics',
+              status: params.data.status
+            }
+          } else if (params.seriesName == this.$t('verificationTaskValidation')) {
+            query = {
+              title: params.seriesName + '-' + params.name,
               projectLibraryId: this.$route.query.id,
               operatorType: 'queryFGTaskToConfirmStatistics',
               status: params.data.status
             }
           } else if (params.seriesName == this.$t('designCompliance')) {
             query = {
-              title: params.seriesName+'-'+params.name,
+              title: params.seriesName + '-' + params.name,
               projectLibraryId: this.$route.query.id,
               operatorType: 'queryDesignStatistics',
               status: params.data.status
             }
           } else if (params.seriesName == this.$t('verifyCompliance')) {
             query = {
-              title: params.seriesName+'-'+params.name,
+              title: params.seriesName + '-' + params.name,
               projectLibraryId: this.$route.query.id,
               operatorType: 'queryVerifyStatistics',
               status: params.data.status
@@ -175,50 +192,112 @@
         })
       },
 
-      mainTopEcharts(dataSource) {
+      mainTopLeftEcharts(dataSource) {
         let data = []
         let color = []
-        this.mainTopNum = 0
+        this.mainTopLeftNum = 0
         if (dataSource && dataSource.length > 0) {
           this.dataSource = [{}]
           dataSource.forEach(res => {
-            if (res.taskAffirmStatus == 'Not started') {
+            if (res.designTaskAffirmStatus == 'List to be released') {
               data.push({
-                value: res.taskAffirmStatusCount,
-                name: this.$t('notLaunch'),
+                value: res.designTaskAffirmStatusCount,
+                name: this.$t('listToBeReleased'),
                 color: '#00B3BE',
-                status: res.taskAffirmStatus
+                status: res.designTaskAffirmStatus
               })
               color.push('#00B3BE')
-            } else if (res.taskAffirmStatus == 'List to confirm') {
+            } else if (res.designTaskAffirmStatus == 'List to be checked') {
               data.push({
-                value: res.taskAffirmStatusCount,
-                name: this.$t('listToConfirm'),
+                value: res.designTaskAffirmStatusCount,
+                name: this.$t('listToBeChecked'),
+                color: '#4B82FF',
+                status: res.designTaskAffirmStatus
+              })
+              color.push('#4B82FF')
+            } else if (res.designTaskAffirmStatus == 'Task to be confirmed') {
+              data.push({
+                value: res.designTaskAffirmStatusCount,
+                name: this.$t('taskToBeConfirmed'),
                 color: '#FDA71C',
-                status: res.taskAffirmStatus
+                status: res.designTaskAffirmStatus
               })
               color.push('#FDA71C')
-            } else if (res.taskAffirmStatus == 'Accepted') {
+            } else if (res.designTaskAffirmStatus == 'Duty Person Accepted') {
               data.push({
-                value: res.taskAffirmStatusCount,
-                name: this.$t('accept'),
+                value: res.designTaskAffirmStatusCount,
+                name: this.$t('acceptanceTheResponsiblePerson'),
                 color: '#26BC4B',
-                status: res.taskAffirmStatus
+                status: res.designTaskAffirmStatus
               })
               color.push('#26BC4B')
-            } else if (res.taskAffirmStatus == 'Rejected') {
+            } else if (res.designTaskAffirmStatus == 'Duty Person Rejected') {
               data.push({
-                value: res.taskAffirmStatusCount,
-                name: this.$t('refuse'),
+                value: res.designTaskAffirmStatusCount,
+                name: this.$t('dutyPersonRejected'),
                 color: '#E83030',
-                status: res.taskAffirmStatus
+                status: res.designTaskAffirmStatus
               })
               color.push('#E83030')
             }
-            this.mainTopNum += res.taskAffirmStatusCount
+            this.mainTopLeftNum += res.designTaskAffirmStatusCount
           })
         }
-        this.getEcharts('main-top', this.$t('regulatoryTaskConfirmation'), color, data)
+        this.getEcharts('main-top-left', this.$t('designTaskValidation'), color, data)
+      },
+
+      mainTopRightEcharts(dataSource) {
+        let data = []
+        let color = []
+        this.mainTopRightNum = 0
+        if (dataSource && dataSource.length > 0) {
+          this.dataSource = [{}]
+          dataSource.forEach(res => {
+            if (res.verifyTaskAffirmStatus == 'List to be released') {
+              data.push({
+                value: res.verifyTaskAffirmStatusCount,
+                name: this.$t('listToBeReleased'),
+                color: '#00B3BE',
+                status: res.verifyTaskAffirmStatus
+              })
+              color.push('#00B3BE')
+            } else if (res.verifyTaskAffirmStatus == 'List to be checked') {
+              data.push({
+                value: res.verifyTaskAffirmStatusCount,
+                name: this.$t('listToBeChecked'),
+                color: '#4B82FF',
+                status: res.verifyTaskAffirmStatus
+              })
+              color.push('#4B82FF')
+            } else if (res.verifyTaskAffirmStatus == 'Task to be confirmed') {
+              data.push({
+                value: res.verifyTaskAffirmStatusCount,
+                name: this.$t('taskToBeConfirmed'),
+                color: '#FDA71C',
+                status: res.verifyTaskAffirmStatus
+              })
+              color.push('#FDA71C')
+            } else if (res.verifyTaskAffirmStatus == 'Duty Person Accepted') {
+              data.push({
+                value: res.verifyTaskAffirmStatusCount,
+                name: this.$t('acceptanceTheResponsiblePerson'),
+                color: '#26BC4B',
+                status: res.verifyTaskAffirmStatus
+              })
+              color.push('#26BC4B')
+            } else if (res.verifyTaskAffirmStatus == 'Duty Person Rejected') {
+              data.push({
+                value: res.verifyTaskAffirmStatusCount,
+                name: this.$t('dutyPersonRejected'),
+                color: '#E83030',
+                status: res.verifyTaskAffirmStatus
+              })
+              color.push('#E83030')
+            }
+            this.mainTopRightNum += res.verifyTaskAffirmStatusCount
+          })
+        }
+        this.getEcharts('main-top-right', this.$t('verificationTaskValidation'), color, data)
       },
 
       mainLeftEcharts(dataSource) {
@@ -228,22 +307,38 @@
         if (dataSource && dataSource.length > 0) {
           this.dataSource = [{}]
           dataSource.forEach(res => {
-            if (res.designFlowTaskStatus == 'Not started') {
+            if (res.designFlowTaskStatus == 'Task to be confirmed') {
               data.push({
                 value: res.designFlowTaskStatusCount,
-                name: this.$t('notLaunch'),
-                color: '#00B3BE',
-                status: res.designFlowTaskStatus
-              })
-              color.push('#00B3BE')
-            } else if (res.designFlowTaskStatus == 'List to confirm') {
-              data.push({
-                value: res.designFlowTaskStatusCount,
-                name: this.$t('listToConfirm'),
+                name: this.$t('taskToBeConfirmed'),
                 color: '#FDA71C',
                 status: res.designFlowTaskStatus
               })
               color.push('#FDA71C')
+            } else if (res.designFlowTaskStatus == 'Results to be submitted') {
+              data.push({
+                value: res.designFlowTaskStatusCount,
+                name: this.$t('resultsToBeSubmitted'),
+                color: '#4C83FF',
+                status: res.designFlowTaskStatus
+              })
+              color.push('#4C83FF')
+            } else if (res.designFlowTaskStatus == 'Results to be reviewed') {
+              data.push({
+                value: res.designFlowTaskStatusCount,
+                name: this.$t('resultsToBeReviewed'),
+                color: '#745ADB',
+                status: res.designFlowTaskStatus
+              })
+              color.push('#745ADB')
+            } else if (res.designFlowTaskStatus == 'To be tracked') {
+              data.push({
+                value: res.designFlowTaskStatusCount,
+                name: this.$t('toBeTracked'),
+                color: '#FD9F48',
+                status: res.designFlowTaskStatus
+              })
+              color.push('#FD9F48')
             } else if (res.designFlowTaskStatus == 'Compliance') {
               data.push({
                 value: res.designFlowTaskStatusCount,
@@ -256,10 +351,10 @@
               data.push({
                 value: res.designFlowTaskStatusCount,
                 name: this.$t('nonCompliance'),
-                color: '#707486',
+                color: '#E83030',
                 status: res.designFlowTaskStatus
               })
-              color.push('#707486')
+              color.push('#E83030')
             }
             this.mainLeftNum += res.designFlowTaskStatusCount
           })
@@ -274,22 +369,38 @@
         if (dataSource && dataSource.length > 0) {
           this.dataSource = [{}]
           dataSource.forEach(res => {
-            if (res.verifyFlowTaskStatus == 'Not started') {
+            if (res.verifyFlowTaskStatus == 'Task to be confirmed') {
               data.push({
                 value: res.verifyFlowTaskStatusCount,
-                name: this.$t('notLaunch'),
-                color: '#00B3BE',
-                status: res.verifyFlowTaskStatus
-              })
-              color.push('#00B3BE')
-            } else if (res.verifyFlowTaskStatus == 'List to confirm') {
-              data.push({
-                value: res.verifyFlowTaskStatusCount,
-                name: this.$t('listToConfirm'),
+                name: this.$t('taskToBeConfirmed'),
                 color: '#FDA71C',
                 status: res.verifyFlowTaskStatus
               })
               color.push('#FDA71C')
+            } else if (res.verifyFlowTaskStatus == 'Results to be submitted') {
+              data.push({
+                value: res.verifyFlowTaskStatusCount,
+                name: this.$t('resultsToBeSubmitted'),
+                color: '#4C83FF',
+                status: res.verifyFlowTaskStatus
+              })
+              color.push('#4C83FF')
+            } else if (res.verifyFlowTaskStatus == 'Results to be reviewed') {
+              data.push({
+                value: res.verifyFlowTaskStatusCount,
+                name: this.$t('resultsToBeReviewed'),
+                color: '#745ADB',
+                status: res.verifyFlowTaskStatus
+              })
+              color.push('#745ADB')
+            } else if (res.verifyFlowTaskStatus == 'To be tracked') {
+              data.push({
+                value: res.verifyFlowTaskStatusCount,
+                name: this.$t('toBeTracked'),
+                color: '#FD9F48',
+                status: res.verifyFlowTaskStatus
+              })
+              color.push('#FD9F48')
             } else if (res.verifyFlowTaskStatus == 'Compliance') {
               data.push({
                 value: res.verifyFlowTaskStatusCount,
@@ -302,10 +413,10 @@
               data.push({
                 value: res.verifyFlowTaskStatusCount,
                 name: this.$t('nonCompliance'),
-                color: '#707486',
+                color: '#E83030',
                 status: res.verifyFlowTaskStatus
               })
-              color.push('#707486')
+              color.push('#E83030')
             }
             this.mainRightNum += res.verifyFlowTaskStatusCount
           })
@@ -357,6 +468,13 @@
         padding: 20px 24px;
         box-sizing: border-box;
       }
+
+      #main-top-left {
+        width: 100%;
+        height: 100%;
+        padding: 20px 24px;
+        box-sizing: border-box;
+      }
     }
 
     .box-content-right {
@@ -373,6 +491,13 @@
         padding: 24px;
         box-sizing: border-box;
       }
+
+      #main-top-right {
+        width: 100%;
+        height: 100%;
+        padding: 20px 24px;
+        box-sizing: border-box;
+      }
     }
   }