From c82c40fe187b210f38913042ff5e7185703cfb60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Mon, 16 Oct 2023 18:01:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=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

---
 jero-web/src/common/lang/en-us.js             |   3 +
 jero-web/src/common/lang/zh-cn.js             |   3 +
 .../components/ProjectDetails.vue             |   2 +-
 .../components/certificationActivity.vue      |  40 ++-
 .../parameterCollectionProgress.vue           |   4 +-
 .../components/regulatoryCompliance.vue       | 224 +++++++++++----
 .../components/statistics.vue                 | 259 +++++++++++++-----
 7 files changed, 406 insertions(+), 129 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 93e296293..80cb0a3be 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1771,6 +1771,7 @@ module.exports = {
   andPendingSubmissionReviewReturned:'And the process status is result pending submission, review returned',
   deliverablesFor:'Deliverables for',
   dutyPersonRejected:'Rejected by the responsible person',
+  acceptanceTheResponsiblePerson:'Acceptance by the responsible person',
   theCurrentlySelectedDataContainsReviewed:'The currently selected data contains reviewed data. Are you sure to return it?',
   reviewTheReasonForReturn:'Review the reason for return',
   reasonForTaskRejection:'Reason for task rejection',
@@ -2019,4 +2020,6 @@ module.exports = {
   Filingcompletiontime:'Filing completion time',
   Platformdevelopmentvalvepoint:'Platform development valve point',
   Compliancemanagementvalvepoint:'Compliance management valve point',
+  designTaskValidation:'Design task validation',
+  verificationTaskValidation:'Verification task validation',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 653497dc2..579f9ec35 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -3778,6 +3778,7 @@ module.exports = {
   andPendingSubmissionReviewReturned: '并且流程状态为结果待提交、审查退回',
   deliverablesFor: '的交付结果',
   dutyPersonRejected: '责任人拒绝',
+  acceptanceTheResponsiblePerson:'责任人接受',
   theCurrentlySelectedDataContainsReviewed: '当前选择的数据中包含审查通过的数据，确认退回吗？',
   reviewTheReasonForReturn: '审查退回原因',
   reasonForTaskRejection: '任务拒绝原因',
@@ -3975,4 +3976,6 @@ module.exports = {
   Filingcompletiontime:'备案完成时间',
   Platformdevelopmentvalvepoint:'平台件开发阀点',
   Compliancemanagementvalvepoint:'合规管理阀点',
+  designTaskValidation:'设计任务确认',
+  verificationTaskValidation:'验证任务确认',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/components/ProjectDetails.vue b/jero-web/src/views/projectManagement/components/ProjectDetails.vue
index 63246a914..ea759280f 100644
--- a/jero-web/src/views/projectManagement/components/ProjectDetails.vue
+++ b/jero-web/src/views/projectManagement/components/ProjectDetails.vue
@@ -71,7 +71,7 @@
       </div>
       <div class="text-field" v-has="'rxswin:view'">
         <span class="text-field-left" style="float: left;margin-top: 3px" :title="'RXSWIN'">RXSWIN</span>
-        <span class="text-field-right text-field-right-color" :title="RXSWIN" style='margin-left: 2px;'
+        <span class="text-field-right text-field-right-color" :title="'RXSWIN'" style='margin-left: 2px;'
         >
           <span v-has="'projectRelatedPersonnel:page'"
                 @click="rxswinClick">
diff --git a/jero-web/src/views/projectManagement/components/certificationActivity.vue b/jero-web/src/views/projectManagement/components/certificationActivity.vue
index b19a1314f..c6b4c388e 100644
--- a/jero-web/src/views/projectManagement/components/certificationActivity.vue
+++ b/jero-web/src/views/projectManagement/components/certificationActivity.vue
@@ -110,34 +110,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
               })
@@ -155,22 +163,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/components/parameterCollectionProgress.vue b/jero-web/src/views/projectManagement/components/parameterCollectionProgress.vue
index 3e7bd272a..2aca019fe 100644
--- a/jero-web/src/views/projectManagement/components/parameterCollectionProgress.vue
+++ b/jero-web/src/views/projectManagement/components/parameterCollectionProgress.vue
@@ -239,7 +239,7 @@
             text: this.$t('parameterCollectionProgress'),
           },
           legend: {
-            data: [this.$t('Notatthe'), this.$t('Inthecollection'), this.$t('Submitted'), this.$t('SynchronizedLibrary')],
+            data: [this.$t('notLaunch'), this.$t('Inthecollection'), this.$t('Submitted'), this.$t('SynchronizedLibrary')],
             icon: 'circle',
             bottom:'0',
             itemWidth: 12,
@@ -294,7 +294,7 @@
           },
           series: [
             {
-              name: this.$t('Notatthe'),
+              name: this.$t('notLaunch'),
               type: 'bar',
               stack: 'one',
               barWidth: 40,
diff --git a/jero-web/src/views/projectManagement/components/regulatoryCompliance.vue b/jero-web/src/views/projectManagement/components/regulatoryCompliance.vue
index 9b6e851cd..824863613 100644
--- a/jero-web/src/views/projectManagement/components/regulatoryCompliance.vue
+++ b/jero-web/src/views/projectManagement/components/regulatoryCompliance.vue
@@ -1,10 +1,16 @@
 <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">
@@ -46,7 +52,8 @@
         url: {
           getProjectDetailsStatistics: '/project/projectLibraryBase/getProjectDetailsStatistics'
         },
-        mainTopNum: 0,
+        mainTopLeftNum: 0,
+        mainTopRightNum:0,
         mainLeftNum: 0,
         mainRightNum: 0,
         columns: [
@@ -91,10 +98,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)
             }
@@ -148,7 +157,14 @@
         })
         myChart.on('click', (params) => {
           let query = {}
-          if (params.seriesName == this.$t('regulatoryTaskConfirmation')) {
+          if (params.seriesName == this.$t('designTaskValidation')) {
+            query = {
+              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,
@@ -174,50 +190,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) {
@@ -227,22 +305,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,
@@ -255,10 +349,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
           })
@@ -273,22 +367,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,
@@ -301,10 +411,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
           })
@@ -356,6 +466,12 @@
         padding: 20px 24px;
         box-sizing: border-box;
       }
+      #main-top-left {
+        width: 100%;
+        height: 100%;
+        padding: 20px 24px;
+        box-sizing: border-box;
+      }
     }
 
     .box-content-right {
@@ -372,6 +488,12 @@
         padding: 24px;
         box-sizing: border-box;
       }
+      #main-top-right {
+        width: 100%;
+        height: 100%;
+        padding: 20px 24px;
+        box-sizing: border-box;
+      }
     }
   }
 
diff --git a/jero-web/src/views/projectManagement/projectStatusBoard/components/statistics.vue b/jero-web/src/views/projectManagement/projectStatusBoard/components/statistics.vue
index 728eacdb6..43cece73b 100644
--- a/jero-web/src/views/projectManagement/projectStatusBoard/components/statistics.vue
+++ b/jero-web/src/views/projectManagement/projectStatusBoard/components/statistics.vue
@@ -14,9 +14,16 @@
           <div class="box-content-top"
                v-if="projectQuery.name == this.$t('listPublishing') || projectQuery.name == this.$t('responsibilityConfirmation')">
             <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-top"
+               v-if="projectQuery.name == this.$t('listPublishing') || projectQuery.name == this.$t('responsibilityConfirmation')">
+            <div class="total-text">
+              <span>{{$t('totalTable')+' : '+mainTopRightNum}}</span>
+            </div>
+            <div id="main-top-right"></div>
           </div>
           <div class="box-content-top" v-if="projectQuery.name == this.$t('designVerification')">
             <div class="total-text">
@@ -119,6 +126,8 @@
         mainTopNum: 0,
         mainLeftNum: 0,
         mainRightNum: 0,
+        mainTopLeftNum:0,
+        mainTopRightNum:0,
         projectQuery: {},
         num: '0',
         mainBottomNum: 0,
@@ -186,7 +195,8 @@
         getAction(this.url.getProjectDetailsStatistics, { id: this.projectQuery.projectId }).then((res) => {
           if (res.success) {
             if (res.result) {
-              let mainTopDataSource = res.result.taskToConfirmMap ? res.result.taskToConfirmMap.taskToConfirmMapList : []
+              let mainTopDataSource = 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 : []
               let rzTaskToConfirmMapList = res.result.rzTaskToConfirmMap ? res.result.rzTaskToConfirmMap.rzTaskToConfirmMapList : []
@@ -196,6 +206,7 @@
               if (this.projectQuery.name == this.$t('listPublishing') ||
                 this.projectQuery.name == this.$t('responsibilityConfirmation')) {
                 this.mainTopEcharts(mainTopDataSource)
+                this.mainTopRighrEcharts(mainTopRightDataSource)
                 this.dataEcharts(rzTaskToConfirmMapList)
               } else if (this.projectQuery.name == this.$t('designVerification')) {
                 this.mainLeftEcharts(mainLeftDataSource)
@@ -315,47 +326,109 @@
       mainTopEcharts(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)
+      },
+
+      mainTopRighrEcharts(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) {
@@ -365,22 +438,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,
@@ -393,10 +482,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
           })
@@ -411,22 +500,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,
@@ -439,10 +544,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
           })
@@ -457,40 +562,48 @@
         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
               })
               color.push('#E83030')
             }
-            this.mainTopNumOne += res.taskAffirmStatusCount
+            this.mainLeftNum += res.taskAffirmStatusCount
           })
         }
         this.getEcharts('main-top-one', this.$t('certificationTaskConfirmation'), color, data)
@@ -503,22 +616,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 == 'List to confirm') {
+            } else if (res.taskAffirmStatus == 'Results to be submitted') {
               data.push({
                 value: res.taskAffirmStatusCount,
-                name: this.$t('listToConfirm'),
+                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,
@@ -536,7 +657,7 @@
               })
               color.push('#E83030')
             }
-            this.mainLeftNumOne += res.taskAffirmStatusCount
+            this.mainRightNum += res.taskAffirmStatusCount
           })
         }
         this.getEcharts('main-right-one', this.$t('preHomoFlow'), color, data)
@@ -551,7 +672,7 @@
             if (res.certificationProgress == 'Not start') {
               data.push({
                 value: res.certificationProgressCount,
-                name: this.$t('Notatthe'),
+                name: this.$t('notLaunch'),
                 color: '#00B3BE',
                 status: res.certificationProgress
               })
@@ -731,7 +852,7 @@
             text: this.$t('parameterCollectionProgress')
           },
           legend: {
-            data: [this.$t('Notatthe'), this.$t('Inthecollection'), this.$t('Submitted'), this.$t('SynchronizedLibrary')],
+            data: [this.$t('notLaunch'), this.$t('Inthecollection'), this.$t('Submitted'), this.$t('SynchronizedLibrary')],
             icon: 'circle',
             bottom: '0',
             itemWidth: 12,
@@ -768,7 +889,7 @@
           },
           series: [
             {
-              name: this.$t('Notatthe'),
+              name: this.$t('notLaunch'),
               type: 'bar',
               stack: 'one',
               barWidth: 40,
@@ -863,6 +984,18 @@
         padding: 20px 24px;
         box-sizing: border-box;
       }
+      #main-top-left {
+        width: 100%;
+        height: 100%;
+        padding: 20px 24px;
+        box-sizing: border-box;
+      }
+      #main-top-right {
+        width: 100%;
+        height: 100%;
+        padding: 20px 24px;
+        box-sizing: border-box;
+      }
 
       #main-top-one {
         width: 100%;