From e972566364099092dc8f40e8fa5bc3440e5976ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Tue, 9 May 2023 11:13:10 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9UAT=E6=8F=90=E5=87=BA?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../components/certificationActivity.vue | 122 +++++--- .../complianceCertificationForm.vue | 19 +- .../components/listOfRegulations.vue | 8 +- .../components/projectStatus.vue | 2 +- .../components/regulatoryCompliance.vue | 78 +++-- .../components/responsibilityList.vue | 124 +++++--- .../components/settingList.vue | 289 +++++++++--------- 9 files changed, 377 insertions(+), 267 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index ead0be870..c0f138fb4 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1827,4 +1827,5 @@ module.exports = { proportion:'Proportion', projectProgressStatistics:'Project Progress Statistics', GRPSystemProjectProgressStatistics:'GRP system project progress statistics', + proportionWithInTheAreaOfResponsibility:'Proportion within the area of responsibility', } \ 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 f6bab58b0..ae671ef2e 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1928,4 +1928,5 @@ module.exports = { proportion:'占比', projectProgressStatistics:'项目进度统计', GRPSystemProjectProgressStatistics:'GRP系统项目进度统计', + proportionWithInTheAreaOfResponsibility:'责任领域内占比', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/certificationActivity.vue b/jero-web/src/views/projectManagement/components/certificationActivity.vue index 499e9893f..7450f2c6e 100644 --- a/jero-web/src/views/projectManagement/components/certificationActivity.vue +++ b/jero-web/src/views/projectManagement/components/certificationActivity.vue @@ -2,14 +2,24 @@
+
+ {{$t('totalTable')+' : '+mainLeftNum}} +
+
+ {{$t('totalTable')+' : '+mainRightNum}} +
+
+ {{$t('totalTable')+' : '+mainBottomNum}} +
{{$t('whole')}} @@ -50,8 +60,12 @@ url: { getProjectDetailsStatistics: '/project/projectLibraryBase/getProjectDetailsStatistics' }, - certificationProgressMap:{}, - num:'0', + certificationProgressMap: {}, + num: '0', + mainLeftNum: 0, + mainRightNum: 0, + mainBottomNum: 0, + long: localStorage.getItem('language') || 'zh-cn' } }, mounted() { @@ -92,6 +106,7 @@ dataEcharts(dataSource) { let data = [] let color = [] + this.mainLeftNum = 0 if (dataSource && dataSource.length > 0) { this.dataSource = [{}] dataSource.forEach(res => { @@ -100,7 +115,7 @@ value: res.taskAffirmStatusCount, name: this.$t('notLaunch'), color: '#00B3BE', - status:res.taskAffirmStatus + status: res.taskAffirmStatus }) color.push('#00B3BE') } else if (res.taskAffirmStatus == 'List to confirm') { @@ -108,7 +123,7 @@ value: res.taskAffirmStatusCount, name: this.$t('listToConfirm'), color: '#FDA71C', - status:res.taskAffirmStatus + status: res.taskAffirmStatus }) color.push('#FDA71C') } else if (res.taskAffirmStatus == 'Accepted') { @@ -116,7 +131,7 @@ value: res.taskAffirmStatusCount, name: this.$t('accept'), color: '#26BC4B', - status:res.taskAffirmStatus + status: res.taskAffirmStatus }) color.push('#26BC4B') } else if (res.taskAffirmStatus == 'Rejected') { @@ -124,17 +139,19 @@ value: res.taskAffirmStatusCount, name: this.$t('refuse'), color: '#E83030', - status:res.taskAffirmStatus + status: res.taskAffirmStatus }) color.push('#E83030') } + this.mainLeftNum += res.taskAffirmStatusCount }) } this.getEcharts('main-left', this.$t('certificationTaskConfirmation'), color, data) }, - mainRightEcharts(dataSource){ + mainRightEcharts(dataSource) { let data = [] let color = [] + this.mainRightNum = 0 if (dataSource && dataSource.length > 0) { this.dataSource = [{}] dataSource.forEach(res => { @@ -143,7 +160,7 @@ value: res.taskAffirmStatusCount, name: this.$t('notLaunch'), color: '#00B3BE', - status:res.taskAffirmStatus + status: res.taskAffirmStatus }) color.push('#00B3BE') } else if (res.taskAffirmStatus == 'List to confirm') { @@ -151,7 +168,7 @@ value: res.taskAffirmStatusCount, name: this.$t('listToConfirm'), color: '#FDA71C', - status:res.taskAffirmStatus + status: res.taskAffirmStatus }) color.push('#FDA71C') } else if (res.taskAffirmStatus == 'Review and pass') { @@ -159,7 +176,7 @@ value: res.taskAffirmStatusCount, name: this.$t('reviewAndPass'), color: '#26BC4B', - status:res.taskAffirmStatus + status: res.taskAffirmStatus }) color.push('#26BC4B') } else if (res.taskAffirmStatus == 'Review and return') { @@ -167,17 +184,19 @@ value: res.taskAffirmStatusCount, name: this.$t('reviewAndReturn'), color: '#E83030', - status:res.taskAffirmStatus + status: res.taskAffirmStatus }) color.push('#E83030') } + this.mainRightNum += res.taskAffirmStatusCount }) } this.getEcharts('main-right', this.$t('preHomoFlow'), color, data) }, - mainBottomEcharts(dataSource){ + mainBottomEcharts(dataSource) { let data = [] let color = [] + this.mainBottomNum = 0 if (dataSource && dataSource.length > 0) { dataSource.forEach(res => { if (res.certificationProgress == 'Not start') { @@ -185,7 +204,7 @@ value: res.certificationProgressCount, name: this.$t('Notatthe'), color: '#00B3BE', - status:res.certificationProgress + status: res.certificationProgress }) color.push('#00B3BE') } else if (res.certificationProgress == 'In progress') { @@ -193,7 +212,7 @@ value: res.certificationProgressCount, name: this.$t('inProgress'), color: '#FDA71C', - status:res.certificationProgress + status: res.certificationProgress }) color.push('#FDA71C') } else if (res.certificationProgress == 'Test passed') { @@ -201,7 +220,7 @@ value: res.certificationProgressCount, name: this.$t('experimentPassed'), color: '#26BC4B', - status:res.certificationProgress + status: res.certificationProgress }) color.push('#26BC4B') } else if (res.certificationProgress == 'Test failed') { @@ -209,34 +228,35 @@ value: res.certificationProgressCount, name: this.$t('experimentFailed'), color: '#E83030', - status:res.certificationProgress + status: res.certificationProgress }) color.push('#E83030') - }else if (res.certificationProgress == 'Component report not submitted') { + } else if (res.certificationProgress == 'Component report not submitted') { data.push({ value: res.certificationProgressCount, name: this.$t('componentReportNotSubmitted'), color: '#FDA71C', - status:res.certificationProgress + status: res.certificationProgress }) color.push('#FDA71C') - }else if (res.certificationProgress == 'Component report submitted') { + } else if (res.certificationProgress == 'Component report submitted') { data.push({ value: res.certificationProgressCount, name: this.$t('componentReportSubmitted'), color: '#6FD682', - status:res.certificationProgress + status: res.certificationProgress }) color.push('#6FD682') - }else if (res.certificationProgress == 'Component report has been stored') { + } else if (res.certificationProgress == 'Component report has been stored') { data.push({ value: res.certificationProgressCount, name: this.$t('componentReportHasBeenStored'), color: '#26BC4B', - status:res.certificationProgress + status: res.certificationProgress }) color.push('#26BC4B') } + this.mainBottomNum += res.certificationProgressCount }) } this.getEcharts('main-bottom', this.$t('CertificationProgress'), color, data) @@ -249,14 +269,14 @@ }, tooltip: { trigger: 'item', - textStyle : { - fontWeight : 'normal', - fontSize : 14, - color:'#040B29', - fontFamily:'BlueSkyNoto', + textStyle: { + fontWeight: 'normal', + fontSize: 14, + color: '#040B29', + fontFamily: 'BlueSkyNoto' }, - formatter: function (parms) { - let str = parms.marker+' '+parms.data.name+'        '+parms.data.value+' ('+parms.percent+'%)' + formatter: function(parms) { + let str = parms.marker + ' ' + parms.data.name + '        ' + parms.data.value + ' (' + parms.percent + '%)' return str } }, @@ -300,11 +320,11 @@ query.operatorType = 'queryPrehomoStatistics' query.status = params.data.status } else if (params.seriesName === this.$t('CertificationProgress')) { - if (this.num == '0'){ + if (this.num == '0') { query.operatorType = 'queryCertificationProgressStatisticsAll' - }else if(this.num == '1'){ + } else if (this.num == '1') { query.operatorType = 'queryCertificationProgressStatisticsCar' - }else if(this.num == '2'){ + } else if (this.num == '2') { query.operatorType = 'queryCertificationProgressStatisticsPart' } query.status = params.data.status @@ -327,12 +347,12 @@ boxContentTextText[num].classList.add('box-content-text-color') } this.num = num - if (num == 0){ - this.mainBottomEcharts( this.certificationProgressMap.allMapList || []) - }else if(num == 1){ - this.mainBottomEcharts( this.certificationProgressMap.carMapList || []) - }else if(num == 2){ - this.mainBottomEcharts( this.certificationProgressMap.partMapList || []) + if (num == 0) { + this.mainBottomEcharts(this.certificationProgressMap.allMapList || []) + } else if (num == 1) { + this.mainBottomEcharts(this.certificationProgressMap.carMapList || []) + } else if (num == 2) { + this.mainBottomEcharts(this.certificationProgressMap.partMapList || []) } } } @@ -350,6 +370,7 @@ .box-content-left { width: calc(50% - 10px); height: 346px; + position: relative; border: 2px #eff1f3 solid; border-radius: 6px; margin-top: 4px; @@ -365,6 +386,7 @@ .box-content-right { width: calc(50% - 10px); height: 346px; + position: relative; border: 2px #eff1f3 solid; border-radius: 6px; margin-top: 4px; @@ -384,6 +406,7 @@ position: relative; border-radius: 6px; margin-top: 20px; + overflow: hidden; .box-content-text { height: 30px; @@ -429,4 +452,27 @@ } } + .total-text { + position: absolute; + right: 28px; + top: 19px; + font-size: 18px; + font-weight: bold; + } + + .total-text-text { + position: absolute; + right: 28px; + top: 21px; + font-size: 18px; + font-weight: bold; + } + + .total-text-text-cntop { + right: 180px; + } + + .total-text-text-entop { + right: 290px; + } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/complianceCertificationForm.vue b/jero-web/src/views/projectManagement/components/complianceCertificationForm.vue index 2790f90d3..1181bfe9e 100644 --- a/jero-web/src/views/projectManagement/components/complianceCertificationForm.vue +++ b/jero-web/src/views/projectManagement/components/complianceCertificationForm.vue @@ -8,11 +8,12 @@
{{ val.name }}
+
{{ val.time.slice(0, 11) }}
@@ -27,12 +28,12 @@
- +
{{ val.time.slice(0, 11) }}
{{ val.name }}
@@ -192,10 +193,10 @@ width: 83px; font-size: 12px; font-weight: 400; - color: #6F7385; + color: #9C9FAC; position: absolute; left: 50%; - top: 36px; + top: -36px; transform: translate(-50%, -50%); overflow: hidden; display: -webkit-box; @@ -229,13 +230,13 @@ .process-content-right-top { font-size: 12px; - color: #040B29; width: 83px; background: #fff; display: inline-block; overflow: hidden; position: absolute; - top: -12px; + color: #9C9FAC; + top: 57px; left: 50%; transform: translate(-50%, -50%); overflow: hidden; @@ -253,10 +254,12 @@ width: 83px; font-size: 12px; font-weight: 400; - color: #6F7385; + color: #040B29; + background: #fff; position: absolute; left: 50%; top: 36px; + line-height: 11px; transform: translate(-50%, -50%); overflow: hidden; display: -webkit-box; diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 5135f18f9..1907dfcfc 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -1431,6 +1431,10 @@ }, mounted() { + if (this.areaOfResponsibilityList && this.areaOfResponsibilityList.dutyTerritory) { + this.queryParam.dutyTerritory = this.areaOfResponsibilityList.dutyTerritory + this.queryParam = { ...this.queryParam } + } this.JLoading = true this.getHeader() this.queryLawEngineerByProjectId() @@ -1440,10 +1444,6 @@ this.getRoleByUserId(() => { this.getAndUserId() }) - if (this.areaOfResponsibilityList && this.areaOfResponsibilityList.dutyTerritory) { - this.queryParam.dutyTerritory = this.areaOfResponsibilityList.dutyTerritory - this.queryParam = { ...this.queryParam } - } }, computed: { columnsFile() { diff --git a/jero-web/src/views/projectManagement/components/projectStatus.vue b/jero-web/src/views/projectManagement/components/projectStatus.vue index 71866f40a..0ebef98b0 100644 --- a/jero-web/src/views/projectManagement/components/projectStatus.vue +++ b/jero-web/src/views/projectManagement/components/projectStatus.vue @@ -59,7 +59,7 @@ this.$emit('projectStatusForm',this.activeKey) }, currentStatus(item) { - this.$emit('TaskListChange', item) + this.$emit('currentStatus', item) }, versionStatisticsClick() { this.$refs.versionStatisticsRef.addModel(JSON.parse(JSON.stringify(this.selectedRowKeys))) diff --git a/jero-web/src/views/projectManagement/components/regulatoryCompliance.vue b/jero-web/src/views/projectManagement/components/regulatoryCompliance.vue index f07000ca8..834ab877d 100644 --- a/jero-web/src/views/projectManagement/components/regulatoryCompliance.vue +++ b/jero-web/src/views/projectManagement/components/regulatoryCompliance.vue @@ -1,15 +1,22 @@