-
-
-
-
-
{{$t('StudioEngineer')}}
{{queryForm.softwareVersion}}
-
-
-
-
-
-
-
-
-
-
-
-
@@ -127,33 +100,6 @@
>{{queryForm.explanation}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -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 @@
-
-
-
-
-
-
-
- {{$t('totalTable')}}:{{certificationProgressTotal}}
-
-
-
-
-
-
-
-
-
-
-
\ 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 @@