diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 99d08418e..45638fb4e 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1321,4 +1321,6 @@ module.exports = { secondaryDirectory:'Secondary directory', OnlyPersonsCanBeSelected:'The maximum upper limit is exceeded; Only 100 persons can be selected', projectVersion:'Project Version', + softwareVersion:'Software version', + versionStatistics:'Version statistics', } \ 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 ae714d087..7d84f8caf 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1422,4 +1422,6 @@ module.exports = { secondaryDirectory:'二级目录', OnlyPersonsCanBeSelected:'超出最大上限；最多只能选择100个人员', projectVersion:'项目版本', + softwareVersion:'软件版本', + versionStatistics:'版本统计', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/ProjectDetails/index.vue b/jero-web/src/views/projectManagement/ProjectDetails/index.vue index bbbfdb147..e2a174eb1 100644 --- a/jero-web/src/views/projectManagement/ProjectDetails/index.vue +++ b/jero-web/src/views/projectManagement/ProjectDetails/index.vue @@ -57,6 +57,12 @@ {{$t('TaskParameterCollection')}} +
+ + {{$t('projectStatus')}} +
@@ -85,17 +91,24 @@ @click="textClick(4,$t('TaskParameterCollection'))">
+
+ +
- + + :areaOfResponsibilityList="areaOfResponsibilityList"/> +
@@ -112,6 +125,7 @@ import ProjectDetailsName from '../components/ProjectDetails' import TaskParameterCollection from '../components/TaskParameterCollection' import nonConformance from '../components/nonConformance' + import projectStatus from '../components/projectStatus' import updateLog from '@/components/UpdateLog/index' import historicalVersionList from '../components/historicalVersionList' import commentList from '../components/commentList' @@ -128,7 +142,8 @@ nonConformance, updateLog, historicalVersionList, - commentList + commentList, + projectStatus }, data() { return { @@ -138,7 +153,7 @@ isTrue: true, loading: false, isDisplay: true, - areaOfResponsibilityList:{}, + areaOfResponsibilityList: {}, url: { logList: '/project/projectLawsInventoryLogEO/page', historicalVersionUrl: '', @@ -194,7 +209,6 @@ textColor[0].classList.remove('Virtual-detail-left-text-color') } let text = document.getElementsByClassName('Virtual-detail-left-text') - console.log(text) if (name == 0) { text[name].classList.add('Virtual-detail-left-text-color') this.textTitle = text[name].title @@ -289,10 +303,10 @@ }) }, TaskListChange(item) { - if (item.isListing && item.isListing == '1'){ + if (item.isListing && item.isListing == '1') { this.areaOfResponsibilityList = item this.textTitle = this.$t('listOfRegulations') - }else{ + } else { this.areaOfResponsibility = item this.textTitle = this.$t('taskList') } diff --git a/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue b/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue index 4de64d21f..0f9c8b4f0 100644 --- a/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue +++ b/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue @@ -47,6 +47,12 @@ components: { responsibilityList }, + props: { + idList: { + type: Array, + default: [] + } + }, data() { return { queryParam:{ @@ -99,7 +105,13 @@ }) }, getoptions(){ - getAction('project/projectLibraryBase/getProjectDetailsStatisticsCollectManifestLabel', {id:this.$route.query.id}).then((res) => { + let id = '' + if (this.idList && this.idList.length > 0) { + id = this.$route.query.id +','+this.idList.join(',') + } else { + id = this.$route.query.id + } + getAction('project/projectLibraryBase/getProjectDetailsStatisticsCollectManifestLabel', {id:id}).then((res) => { if (res.success) { this.options = res.result this.queryParam.ctype = this.options[0].value diff --git a/jero-web/src/views/projectManagement/components/ProjectDetails.vue b/jero-web/src/views/projectManagement/components/ProjectDetails.vue index 18212626b..e4b5ccaef 100644 --- a/jero-web/src/views/projectManagement/components/ProjectDetails.vue +++ b/jero-web/src/views/projectManagement/components/ProjectDetails.vue @@ -23,13 +23,18 @@ {{queryForm.targetMarket_dictText}} +
+ {{$t('VersionNumber')}} + {{queryForm.VersionNumber}} +
+ +
{{$t('projectStatus')}} {{queryForm.projectStatus_dictText}}
-
-
{{$t('DigitalPlatform')}}
- {{$t('StudioEngineer')}} - {{queryForm.studioEngineerName}} + {{$t('softwareVersion')}} + {{queryForm.softwareVersion}}
-
- {{$t('certifiedEngineer')}} - {{queryForm.certificationEngineerName}} -
-
-
{{$t('IPDInformation')}} {{queryForm.ipdInfo}}
+
+
{{$t('certificationProgram')}}
-
+
+ {{$t('explain')}} + {{queryForm.explain}} +
+
+
+
+ {{$t('StudioEngineer')}} + {{queryForm.studioEngineerName}} +
+
+ {{$t('certifiedEngineer')}} + {{queryForm.certificationEngineerName}} +
+
{{$t('ListOfRelevantPersonnel')}} - {{$t('ListOfRelevantPersonnel')}}
+
+
+
@@ -114,21 +136,21 @@
- - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -189,9 +211,9 @@ } }) }, - currentStatus(item) { - this.$emit('TaskListChange', item) - }, + // currentStatus(item) { + // this.$emit('TaskListChange', item) + // }, getSetting() { getAction(this.url.queryByProjectId, { projectId: this.$route.query.id }).then((res) => { if (res.success) { @@ -273,6 +295,35 @@ font-weight: 400; } } + + .text-field-content { + width: 100%; + margin-bottom: 8px; + + .text-field-left { + width: 124px; + display: inline-block; + font-size: 14px; + font-weight: 400; + color: #6F7385; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + float: left; + margin-right: 24px; + margin-top: 3px; + } + + .text-field-right { + width: calc(100% - 200px); + display: inline-block; + font-size: 16px; + float: left; + word-break: break-word; + color: #040B29; + font-weight: 400; + } + } } .process-content { @@ -354,4 +405,8 @@ height: 80px; line-height: 80px; } + + .button-text { + padding: 0 13px; + } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/certificationProgressEchart.vue b/jero-web/src/views/projectManagement/components/certificationProgressEchart.vue index f52b7cc03..11dd6a7b4 100644 --- a/jero-web/src/views/projectManagement/components/certificationProgressEchart.vue +++ b/jero-web/src/views/projectManagement/components/certificationProgressEchart.vue @@ -33,6 +33,12 @@ components: { responsibilityList }, + props: { + idList: { + type: Array, + default: [] + } + }, data() { return { loading: false, @@ -79,7 +85,13 @@ this.$emit('currentStatus', item) }, getData() { - getAction(this.url.getProjectDetailsStatistics, { id: this.$route.query.id }).then((res) => { + let id = '' + if (this.idList && this.idList.length > 0) { + id = this.$route.query.id +','+this.idList.join(',') + } else { + id = this.$route.query.id + } + getAction(this.url.getProjectDetailsStatistics, { id: id }).then((res) => { if (res.success) { if (res.result) { let certificationProgressMap = res.result.certificationProgressMap ? res.result.certificationProgressMap.certificationProgressMapList : [] diff --git a/jero-web/src/views/projectManagement/components/currentStatusOfTheProjectEcharts.vue b/jero-web/src/views/projectManagement/components/currentStatusOfTheProjectEcharts.vue index 7c0157783..eeec2b24d 100644 --- a/jero-web/src/views/projectManagement/components/currentStatusOfTheProjectEcharts.vue +++ b/jero-web/src/views/projectManagement/components/currentStatusOfTheProjectEcharts.vue @@ -40,6 +40,12 @@ components: { responsibilityList }, + props: { + idList: { + type: Array, + default: [] + } + }, data() { return { loading: false, @@ -77,7 +83,13 @@ }, methods: { getData() { - getAction(this.url.getProjectDetailsStatistics, { id: this.$route.query.id }).then((res) => { + let id = '' + if (this.idList && this.idList.length > 0) { + id = this.$route.query.id +','+this.idList.join(',') + } else { + id = this.$route.query.id + } + getAction(this.url.getProjectDetailsStatistics, { id: id }).then((res) => { if (res.success) { if (res.result) { let dataSource = res.result.currentProjectStatusMap ? res.result.currentProjectStatusMap.currentProjectStatusMapList : [] diff --git a/jero-web/src/views/projectManagement/components/deliverableStatusEchart.vue b/jero-web/src/views/projectManagement/components/deliverableStatusEchart.vue index 6df3ce6a4..1e74c0818 100644 --- a/jero-web/src/views/projectManagement/components/deliverableStatusEchart.vue +++ b/jero-web/src/views/projectManagement/components/deliverableStatusEchart.vue @@ -36,6 +36,12 @@ components: { responsibilityList }, + props: { + idList: { + type: Array, + default: [] + } + }, data() { return { url: { @@ -52,10 +58,15 @@ }, methods: { getData() { - getAction(this.url.getProjectDetailsStatistics, { id: this.$route.query.id }).then((res) => { + let id = '' + if (this.idList && this.idList.length > 0) { + id = this.$route.query.id +','+this.idList.join(',') + } else { + id = this.$route.query.id + } + getAction(this.url.getProjectDetailsStatistics, { id: id }).then((res) => { if (res.success) { if (res.result) { - let listingToConfirmMap = res.result.listingToConfirmMap ? res.result.listingToConfirmMap.listingToConfirmMapList : [] let taskToConfirmMap = res.result.taskToConfirmMap ? res.result.taskToConfirmMap.taskToConfirmMapList : [] let designComplianceMap = res.result.designComplianceMap ? res.result.designComplianceMap.designComplianceMapList : [] @@ -67,7 +78,6 @@ this.dataEchartsOne(prehomoMap, 2) this.dataEchartsOne(verifyComplianceMap, 3) } - } }) }, diff --git a/jero-web/src/views/projectManagement/components/projectStatus.vue b/jero-web/src/views/projectManagement/components/projectStatus.vue new file mode 100644 index 000000000..311476fba --- /dev/null +++ b/jero-web/src/views/projectManagement/components/projectStatus.vue @@ -0,0 +1,83 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/versionStatistics.vue b/jero-web/src/views/projectManagement/components/versionStatistics.vue new file mode 100644 index 000000000..a635a771b --- /dev/null +++ b/jero-web/src/views/projectManagement/components/versionStatistics.vue @@ -0,0 +1,211 @@ + + + + + \ No newline at end of file