From 60a3973cb4434cb643ad20ecf254ba0ca2b77227 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Mon, 24 Apr 2023 17:17:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B8=83=E5=B1=80=E9=A1=B9=E7=9B=AE=E8=AF=A6?= =?UTF-8?q?=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 4 + jero-web/src/common/lang/zh-cn.js | 4 + .../components/ProjectDetails.vue | 82 +----- ...usEchart.vue => certificationActivity.vue} | 71 ++--- .../certificationProgressEchart.vue | 248 ------------------ ...rt.vue => parameterCollectionProgress.vue} | 0 .../components/projectStatus.vue | 47 ++-- ...ctEcharts.vue => regulatoryCompliance.vue} | 63 ++--- 8 files changed, 94 insertions(+), 425 deletions(-) rename jero-web/src/views/projectManagement/components/{deliverableStatusEchart.vue => certificationActivity.vue} (88%) delete mode 100644 jero-web/src/views/projectManagement/components/certificationProgressEchart.vue rename jero-web/src/views/projectManagement/components/{ParameterCollectionEchart.vue => parameterCollectionProgress.vue} (100%) rename jero-web/src/views/projectManagement/components/{currentStatusOfTheProjectEcharts.vue => regulatoryCompliance.vue} (84%) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index ca68b2ff2..2924c0d11 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1809,4 +1809,8 @@ module.exports = { upgradeOrNot:'Upgrade or not', operationRecords:'Operation Records', versionUpdatedRecord:'Version Updated Record', + regulatoryComplianceManagement:'Regulatory Compliance Management', + certificationActivityManagement:'Certification Activity Management', + parameterCollectionProgressManagement:'Parameter Collection Progress Management', + certificationTaskConfirmation:'Certification Task Confirmation', } \ 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 f7a7221b3..d74c33f43 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1911,4 +1911,8 @@ module.exports = { upgradeOrNot:'是否升版', operationRecords:'操作记录', versionUpdatedRecord:'版本更新记录', + regulatoryComplianceManagement:'法规符合性管理', + certificationActivityManagement:'认证活动管理', + parameterCollectionProgressManagement:'参数收集进度管理', + certificationTaskConfirmation:'认证任务确认', } \ 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 7c7970d5b..a657e3730 100644 --- a/jero-web/src/views/projectManagement/components/ProjectDetails.vue +++ b/jero-web/src/views/projectManagement/components/ProjectDetails.vue @@ -28,23 +28,8 @@ {{queryForm.projectStatus_dictText}} - - - - - - - - - -
- - - - -
{{$t('StudioEngineer')}} {{queryForm.softwareVersion}}
- - - - - - - - - - - -
@@ -127,33 +100,6 @@ >{{queryForm.explanation}}
- - - - - - - - - - - - - - - - - - - - - - - - - - -
{{$t('complianceCertificationProgram')}} @@ -181,21 +127,9 @@
- - - - - - - - - - - - - - - + + + @@ -208,22 +142,16 @@ import { getAction, postAction, downloadFile, putAction } from '@/api/manage' import addModel from './addModel' import settingList from './settingList' - import currentStatusOfTheProjectEcharts from './currentStatusOfTheProjectEcharts' - import deliverableStatusEchart from './deliverableStatusEchart' - import ParameterCollectionEchart from './ParameterCollectionEchart' - import certificationProgressEchart from './certificationProgressEchart' + import projectStatus from './projectStatus' import { mapGetters } from 'vuex' export default { name: 'ProjectDetails', components: { listOfRelevantPersonnel, - ParameterCollectionEchart, addModel, settingList, - currentStatusOfTheProjectEcharts, - deliverableStatusEchart, - certificationProgressEchart + projectStatus }, data() { return { diff --git a/jero-web/src/views/projectManagement/components/deliverableStatusEchart.vue b/jero-web/src/views/projectManagement/components/certificationActivity.vue similarity index 88% rename from jero-web/src/views/projectManagement/components/deliverableStatusEchart.vue rename to jero-web/src/views/projectManagement/components/certificationActivity.vue index f0498d93d..3b2ec79d1 100644 --- a/jero-web/src/views/projectManagement/components/deliverableStatusEchart.vue +++ b/jero-web/src/views/projectManagement/components/certificationActivity.vue @@ -9,15 +9,7 @@
-
-
-
-
-
-
-
-
-
+
@@ -32,7 +24,7 @@ import responsibilityList from './responsibilityList' export default { - name: 'DeliverableStatusEchart', + name: 'certificationActivity', components: { responsibilityList }, @@ -50,9 +42,7 @@ } }, mounted() { - this.mainLeftContentEcharts() this.mainRightEcharts() - this.mainRightContentEcharts() this.mainBottomEcharts() this.getData() }, @@ -243,23 +233,15 @@ } , mainLeftEcharts(data, color) { - this.getEcharts('main-left', this.$t('listConfirmationProgress'), color, data, 1) + this.getEcharts('main-left', this.$t('certificationTaskConfirmation'), color, data, 1) } , mainRightEcharts(data, color) { - this.getEcharts('main-right', this.$t('taskConfirmationProgress'), color, data, 2) - } - , - mainLeftContentEcharts(data, color) { - this.getEcharts('main-left-content', this.$t('designComplianceConfirmationProgress'), color, data, 3) - } - , - mainRightContentEcharts(data, color) { - this.getEcharts('main-right-content', this.$t('preHomeConfirmProgress'), color, data, 4) + this.getEcharts('main-right', this.$t('preHomoFlow'), color, data, 2) } , mainBottomEcharts(data, color) { - this.getEcharts('main-bottom', this.$t('verificationComplianceConfirmationProgress'), color, data, 5) + this.getEcharts('main-bottom', this.$t('CertificationProgress'), color, data, 5) }, responsibility(item) { this.$emit('currentStatus', item) @@ -276,48 +258,41 @@ margin-bottom: 20px; .box-content-left { - width: calc(50% - 12px); - height: 398px; + width: calc(50% - 10px); + height: 346px; border: 2px #eff1f3 solid; - + border-radius: 6px; + margin-top: 4px; #main-left { width: 100%; height: 100%; - padding: 24px; - box-sizing: border-box; - } - - #main-left-content { - width: 100%; - height: 100%; - padding: 24px; - box-sizing: border-box; - } - - #main-bottom { - width: 100%; - height: 100%; - padding: 24px; + padding: 20px 24px; box-sizing: border-box; } } .box-content-right { - width: calc(50% - 12px); - height: 398px; + width: calc(50% - 10px); + height: 346px; border: 2px #eff1f3 solid; - + border-radius: 6px; + margin-top: 4px; #main-right { width: 100%; height: 100%; - padding: 24px; + padding: 20px 24px; box-sizing: border-box; } - - #main-right-content { + } + .box-content-bottom{ + width: 100%; + height: 346px; + border: 2px #eff1f3 solid; + border-radius: 6px; + #main-bottom { width: 100%; height: 100%; - padding: 24px; + padding: 20px 24px; box-sizing: border-box; } } diff --git a/jero-web/src/views/projectManagement/components/certificationProgressEchart.vue b/jero-web/src/views/projectManagement/components/certificationProgressEchart.vue deleted file mode 100644 index fc704f2a0..000000000 --- a/jero-web/src/views/projectManagement/components/certificationProgressEchart.vue +++ /dev/null @@ -1,248 +0,0 @@ - - - - - \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue b/jero-web/src/views/projectManagement/components/parameterCollectionProgress.vue similarity index 100% rename from jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue rename to jero-web/src/views/projectManagement/components/parameterCollectionProgress.vue diff --git a/jero-web/src/views/projectManagement/components/projectStatus.vue b/jero-web/src/views/projectManagement/components/projectStatus.vue index b76f998bc..2cde6b587 100644 --- a/jero-web/src/views/projectManagement/components/projectStatus.vue +++ b/jero-web/src/views/projectManagement/components/projectStatus.vue @@ -12,22 +12,22 @@
- - + + v-if="activeKey == $t('regulatoryComplianceManagement')"/> - - + + - - + + - - + + @@ -35,25 +35,25 @@