对接项目库详情的项目状态

jero-web/src/common/lang/en-us.js

@@ -1813,4 +1813,7 @@ module.exports = {
   certificationActivityManagement:'Certification Activity Management',
   parameterCollectionProgressManagement:'Parameter Collection Progress Management',
   certificationTaskConfirmation:'Certification Task Confirmation',
+  selectTime:'Select Time',
+  designCompliance:'Design Compliance',
+  verifyCompliance:'Verify Compliance',
 }

jero-web/src/common/lang/zh-cn.js

@@ -1915,4 +1915,7 @@ module.exports = {
   certificationActivityManagement:'认证活动管理',
   parameterCollectionProgressManagement:'参数收集进度管理',
   certificationTaskConfirmation:'认证任务确认',
+  selectTime:'选择时间',
+  designCompliance:'设计符合性',
+  verifyCompliance:'验证符合性',
 }

jero-web/src/views/projectManagement/components/regulatoryCompliance.vue

@@ -36,7 +36,6 @@
     data() {
       return {
         loading: false,
-        currentProjectStatusTotal: 0,
         url: {
           getProjectDetailsStatistics: '/project/projectLibraryBase/getProjectDetailsStatistics'
         },
@@ -82,9 +81,12 @@
         getAction(this.url.getProjectDetailsStatistics, { id: id }).then((res) => {
           if (res.success) {
             if (res.result) {
-              let dataSource = res.result.currentProjectStatusMap ? res.result.currentProjectStatusMap.currentProjectStatusMapList : []
-              this.mainLeftEcharts(dataSource)
-              this.currentProjectStatusTotal = res.result.currentProjectStatusMap ? res.result.currentProjectStatusMap.currentProjectStatusTotal : 0
+              let mainTopDataSource = res.result.taskToConfirmMap ? res.result.taskToConfirmMap.taskToConfirmMapList : []
+              let mainLeftDataSource = res.result.designComplianceMap ? res.result.designComplianceMap.designComplianceMapList : []
+              let mainRightDataSource = res.result.verifyComplianceMap ? res.result.verifyComplianceMap.verifyComplianceMapList : []
+              this.mainTopEcharts(mainTopDataSource)
+              this.mainLeftEcharts(mainLeftDataSource)
+              this.mainRightEcharts(mainRightDataSource)
             }
           }
         })
@@ -124,61 +126,137 @@
             }
           ]
         })
-        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)
+        // })
       },
-      mainLeftEcharts(dataSource) {
+
+      mainTopEcharts(dataSource) {
         let data = []
         let color = []
         if (dataSource && dataSource.length > 0) {
           this.dataSource = [{}]
           dataSource.forEach(res => {
-            if (res.color == '4') {
+            if (res.taskAffirmStatus == 'Not started') {
               data.push({
-                value: res.conditionAssessmentCount,
-                name: this.$t('blue'),
-                color: res.color
+                value: res.taskAffirmStatusCount,
+                name: this.$t('notLaunch'),
+                color: '#00B3BE'
               })
               color.push('#00B3BE')
-              this.dataSource[0].blueCount = res.conditionAssessmentCount
-            } else if (res.color == '1') {
+            } else if (res.taskAffirmStatus == 'List to confirm') {
               data.push({
-                value: res.conditionAssessmentCount,
-                name: this.$t('red'),
-                color: res.color
-              })
-              color.push('#E83030')
-              this.dataSource[0].redCount = res.conditionAssessmentCount
-            } else if (res.color == '2') {
-              data.push({
-                value: res.conditionAssessmentCount,
-                name: this.$t('yellow'),
-                color: res.color
+                value: res.taskAffirmStatusCount,
+                name: this.$t('listToConfirm'),
+                color: '#FDA71C'
               })
               color.push('#FDA71C')
-              this.dataSource[0].yellowCount = res.conditionAssessmentCount
-            } else if (res.color == '3') {
+            } else if (res.taskAffirmStatus == 'Accepted') {
               data.push({
-                value: res.conditionAssessmentCount,
-                name: this.$t('green'),
-                color: res.color
+                value: res.taskAffirmStatusCount,
+                name: this.$t('accept'),
+                color: '#26BC4B'
               })
-              this.dataSource[0].greenCount = res.conditionAssessmentCount
-              color.push('#26BD4B')
+              color.push('#26BC4B')
+            } else if (res.taskAffirmStatus == 'Rejected') {
+              data.push({
+                value: res.taskAffirmStatusCount,
+                name: this.$t('refuse'),
+                color: '#E83030'
+              })
+              color.push('#E83030')
             }
           })
         }
-        this.getEcharts('main-left', this.$t('regulatoryTaskConfirmation'), color, data)
-        this.getEcharts('main-right', this.$t('regulatoryTaskConfirmation'), color, data)
         this.getEcharts('main-top', this.$t('regulatoryTaskConfirmation'), color, data)
       },
+
+      mainLeftEcharts(dataSource){
+        let data = []
+        let color = []
+        if (dataSource && dataSource.length > 0) {
+          this.dataSource = [{}]
+          dataSource.forEach(res => {
+            if (res.designFlowTaskStatus == 'Not started') {
+              data.push({
+                value: res.designFlowTaskStatusCount,
+                name: this.$t('notLaunch'),
+                color: '#00B3BE'
+              })
+              color.push('#00B3BE')
+            } else if (res.designFlowTaskStatus == 'List to confirm') {
+              data.push({
+                value: res.designFlowTaskStatusCount,
+                name: this.$t('listToConfirm'),
+                color: '#FDA71C'
+              })
+              color.push('#FDA71C')
+            } else if (res.designFlowTaskStatus == 'Compliance') {
+              data.push({
+                value: res.designFlowTaskStatusCount,
+                name: this.$t('compliance'),
+                color: '#26BC4B'
+              })
+              color.push('#26BC4B')
+            } else if (res.designFlowTaskStatus == 'Non-Compliance') {
+              data.push({
+                value: res.designFlowTaskStatusCount,
+                name: this.$t('nonCompliance'),
+                color: '#707486'
+              })
+              color.push('#707486')
+            }
+          })
+        }
+        this.getEcharts('main-left', this.$t('designCompliance'), color, data)
+      },
+
+      mainRightEcharts(dataSource){
+        let data = []
+        let color = []
+        if (dataSource && dataSource.length > 0) {
+          this.dataSource = [{}]
+          dataSource.forEach(res => {
+            if (res.verifyFlowTaskStatus == 'Not started') {
+              data.push({
+                value: res.verifyFlowTaskStatusCount,
+                name: this.$t('notLaunch'),
+                color: '#00B3BE'
+              })
+              color.push('#00B3BE')
+            } else if (res.verifyFlowTaskStatus == 'List to confirm') {
+              data.push({
+                value: res.verifyFlowTaskStatusCount,
+                name: this.$t('listToConfirm'),
+                color: '#FDA71C'
+              })
+              color.push('#FDA71C')
+            } else if (res.verifyFlowTaskStatus == 'Compliance') {
+              data.push({
+                value: res.verifyFlowTaskStatusCount,
+                name: this.$t('compliance'),
+                color: '#26BC4B'
+              })
+              color.push('#26BC4B')
+            } else if (res.verifyFlowTaskStatus == 'Non-Compliance') {
+              data.push({
+                value: res.verifyFlowTaskStatusCount,
+                name: this.$t('nonCompliance'),
+                color: '#707486'
+              })
+              color.push('#707486')
+            }
+          })
+        }
+        this.getEcharts('main-right', this.$t('verifyCompliance'), color, data)
+      },
+
       responsibility(item) {
         this.$emit('currentStatus', item)
       }