From 16ecc185997ebf5b82432ec37783777297924e7d Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Thu, 21 Apr 2022 14:37:40 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E8=A1=A8=E6=9B=B4=E6=96=B0=E9=A1=B9=E7=9B=AE=E5=90=8D?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/modules/project/entity/ProjectLibraryBase.java | 2 ++ .../modules/project/mapper/xml/ProjectLibraryBaseMapper.xml | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java index 6bc0aea30..b521d4bc8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java @@ -33,6 +33,8 @@ public class ProjectLibraryBase implements Serializable { private java.lang.String id; /**项目名称*/ + private java.lang.String projectNameId; + @TableField(exist = false) private java.lang.String projectName; /**目标市场*/ diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml index a96ebddaf..9743fac94 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml @@ -4,7 +4,7 @@ - + @@ -24,6 +24,7 @@ select plb.id, + plb.project_name_id, pni.project_name as project_name, plb.target_market, plb.project_status, @@ -41,7 +42,7 @@ plb.update_by, plb.update_time from project_library_base as plb - left join project_name_info as pni on plb.project_name=pni.id + left join project_name_info as pni on plb.project_name_id=pni.id left join sys_user as studiouser on plb.studio_engineer=studiouser.id From 8b5ddc68db07c6508c995a8118faff553b56e42f Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 21 Apr 2022 14:47:27 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9F=BA=E6=9C=AC?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=9A=84=E5=B8=83=E5=B1=80=E8=B0=83=E6=95=B4?= =?UTF-8?q?=202.=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95=E7=9A=84=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E4=BC=A0=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/virtualListDetails.vue | 2 +- .../components/ProjectDetails.vue | 24 ++++++++++++------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue index 794a5d4c4..ce8155086 100644 --- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue +++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue @@ -571,7 +571,7 @@ let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys)) let query = { ...this.queryParam, - id: selectedRowKeys.join(',') + ids: selectedRowKeys.join(',') } downloadFile(this.url.exportData, '虚拟清单名称.zip', query, this.Deselect) }, diff --git a/jero-web/src/views/projectManagement/components/ProjectDetails.vue b/jero-web/src/views/projectManagement/components/ProjectDetails.vue index d390b8a38..691f6fd63 100644 --- a/jero-web/src/views/projectManagement/components/ProjectDetails.vue +++ b/jero-web/src/views/projectManagement/components/ProjectDetails.vue @@ -25,11 +25,8 @@ {{queryForm.projectStatus_dictText}} -
- {{$t('IPDInformation')}} - {{queryForm.ipdInfo}} -
+ +
{{$t('DigitalPlatform')}} {{queryForm.vehiclePlatform_dictText}}
+
+
{{$t('StudioEngineer')}} {{queryForm.certificationEngineerName}}
+
+
- {{$t('dehicleDevelopmentPlan')}} - {{queryForm.vehicleDevelopmentPlan}} + {{$t('IPDInformation')}} + {{queryForm.ipdInfo}}
{{$t('certificationProgram')}} {{queryForm.attestationPlan}}
+
+ {{$t('dehicleDevelopmentPlan')}} + {{queryForm.vehicleDevelopmentPlan}} +
+
+
{{$t('ListOfRelevantPersonnel')}} Date: Thu, 21 Apr 2022 15:38:46 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=B8=83=E5=B1=80=E8=AE=BE=E5=AE=9A=202.?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=B8=E5=85=B3=E4=BA=BA=E5=91=98=E5=90=8D?= =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A8=E4=B8=8D=E5=AF=B9=E9=BD=90=203.?= =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E8=AE=A4=E8=AF=81=E4=BB=BB=E5=8A=A1=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E6=8E=A5=E5=8F=A3?= 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 | 8 +- jero-web/src/components/ImportFile/index.vue | 11 ++- .../components/ProjectDetails.vue | 25 +++++- .../projectManagement/components/addModel.vue | 2 +- .../components/listOfRelevantPersonnel.vue | 76 +++++++++++-------- 6 files changed, 85 insertions(+), 41 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index a84c34585..1aa911c5c 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -695,4 +695,8 @@ module.exports = { incorrectsubmitted:'The data status is incorrect; Only data with status to be confirmed can be submitted', date:'date', time:'time', + confirmationOfRegulationsList:'Confirmation of regulations list', + regulatoryTaskConfirmation:'Regulatory task confirmation', + certificationStart:'Certification start', + certificationEnd:'Certification end', } \ 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 a31106cf5..f442c1729 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -595,7 +595,7 @@ module.exports = { confirmationOfDesignConformity: '设计符合性确认', Deliverables: '交付物', personLiable: '责任人', - PrehomoConfirmation: 'Prehomo确认', + PrehomoConfirmation: 'PreHomo确认', verificationAndConformityconfirmation: '验证符合性确认', StandardImplementationDate: '标准实施日期', regulatoryEngineer: '法规工程师', @@ -698,5 +698,9 @@ module.exports = { finalizationTime:'定版时间', setting:'设定', date:'日期', - time:'时间' + time:'时间', + confirmationOfRegulationsList:'法规清单确认', + regulatoryTaskConfirmation:'法规任务确认', + certificationStart:'认证开始', + certificationEnd:'认证结束', } \ No newline at end of file diff --git a/jero-web/src/components/ImportFile/index.vue b/jero-web/src/components/ImportFile/index.vue index 3dff98886..6dff278bb 100644 --- a/jero-web/src/components/ImportFile/index.vue +++ b/jero-web/src/components/ImportFile/index.vue @@ -23,6 +23,11 @@ url: { type: Object, default: {} + }, + //判断当前文档库还是其余的页面 + isTrue:{ + type: Boolean, + default: false } }, data() { @@ -71,7 +76,11 @@ ) }) } else { - eventBUs.$emit('searchReset') + if (this.isTrue){ + this.$emit('getList') + }else{ + eventBUs.$emit('searchReset') + } this.$message.success(info.file.response.message || `${info.file.name} 文件导入成功`) } this.spinning = false diff --git a/jero-web/src/views/projectManagement/components/ProjectDetails.vue b/jero-web/src/views/projectManagement/components/ProjectDetails.vue index 691f6fd63..f4eaaa4c7 100644 --- a/jero-web/src/views/projectManagement/components/ProjectDetails.vue +++ b/jero-web/src/views/projectManagement/components/ProjectDetails.vue @@ -84,7 +84,7 @@ {{$t('regulatoryCertificationTaskPlan')}}
- {{$t('setting')}} + {{$t('setting')}}
@@ -171,6 +171,7 @@ +
@@ -179,12 +180,14 @@ import listOfRelevantPersonnel from './listOfRelevantPersonnel' import { getAction, postAction, downloadFile, putAction } from '@/api/manage' import addModel from './addModel' + import settingList from './settingList' export default { name: 'ProjectDetails', components: { listOfRelevantPersonnel, - addModel + addModel, + settingList }, data() { return { @@ -192,12 +195,14 @@ url: { queryById: 'project/projectLibraryBase/queryById', add: 'project/projectLibraryBase/add', - edit: 'project/projectLibraryBase/edit' + edit: 'project/projectLibraryBase/edit', + queryByprojectId:'project/projectTaskPlanning/queryByprojectId', } } }, mounted() { this.getForm() + this.getSetting() this.mainEcharts() }, methods: { @@ -210,6 +215,15 @@ } }) }, + getSetting(){ + getAction(this.url.queryByprojectId, { id: this.$route.query.id }).then((res) => { + if (res.success) { + console.log(res) + } else { + + } + }) + }, mainEcharts() { var myChart = echarts.init(document.getElementById('main')) myChart.setOption({ @@ -243,7 +257,10 @@ }, addModelList() { this.getForm() - } + }, + settingClick(){ + this.$refs.settingListRef.edit() + }, } } diff --git a/jero-web/src/views/projectManagement/components/addModel.vue b/jero-web/src/views/projectManagement/components/addModel.vue index 56055a103..b22d04d55 100644 --- a/jero-web/src/views/projectManagement/components/addModel.vue +++ b/jero-web/src/views/projectManagement/components/addModel.vue @@ -19,7 +19,7 @@ + v-model="formInline.projectNameId"> diff --git a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue index c768d2a4e..3d7e39d46 100644 --- a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue +++ b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue @@ -18,7 +18,7 @@ {{$t('export')}}
- +
@@ -37,17 +37,17 @@ -
- -
+ + + + + + + + + + + { if (valid) { @@ -297,29 +301,27 @@ this.formInline[value] = id this.formInline = { ...this.formInline } }, - pageOnChange(page, pageSize) { - this.pageNo = page - this.getList() - }, - SizeChange(page, pageSize) { - this.pageNo = 1 - this.pageSize = pageSize - this.getList() - }, + // pageOnChange(page, pageSize) { + // this.pageNo = page + // this.getList() + // }, + // SizeChange(page, pageSize) { + // this.pageNo = 1 + // this.pageSize = pageSize + // this.getList() + // }, onSelectChange(value) { this.selectedRowKeys = value }, getList() { let query = { - pageNo: this.pageNo, - pageSize: this.pageSize, projectId: this.$route.query.id } this.loading = true - postAction(this.url.page, query).then((res) => { + getAction(this.url.list, query).then((res) => { if (res.success) { - this.dataSource = res.result.records || [] - this.total = res.result.total + this.dataSource = res.result || [] + // this.total = res.result.total this.loading = false } else { this.loading = false @@ -327,7 +329,15 @@ }) }, handleExport() { - + let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys)) + let query = { + ids: selectedRowKeys.join(','), + projectId: this.$route.query.id + } + downloadFile(this.url.exportData, this.$t('ListOfRelevantPersonnel') + '.xls', query, this.Deselect) + }, + Deselect() { + this.selectedRowKeys = [] }, handleModule() { From 9de9409fbdd7746198b9ca12f6e828d4dcf093c3 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 21 Apr 2022 15:39:06 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=B8=83=E5=B1=80=E8=AE=BE=E5=AE=9A=202.?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=B8=E5=85=B3=E4=BA=BA=E5=91=98=E5=90=8D?= =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A8=E4=B8=8D=E5=AF=B9=E9=BD=90=203.?= =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E8=AE=A4=E8=AF=81=E4=BB=BB=E5=8A=A1=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/settingList.vue | 287 ++++++++++++++++++ 1 file changed, 287 insertions(+) create mode 100644 jero-web/src/views/projectManagement/components/settingList.vue diff --git a/jero-web/src/views/projectManagement/components/settingList.vue b/jero-web/src/views/projectManagement/components/settingList.vue new file mode 100644 index 000000000..d75cf3621 --- /dev/null +++ b/jero-web/src/views/projectManagement/components/settingList.vue @@ -0,0 +1,287 @@ + + + + + + \ No newline at end of file From a11ff6ca66c017ad67afe627b4465f507382462d Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 21 Apr 2022 15:47:11 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=99=9A=E6=8B=9F?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E5=AF=BC=E5=87=BA=E7=9A=84=E4=BC=A0=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../documentTools/virtualList/components/virtualListDetails.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue index ce8155086..f8a096f17 100644 --- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue +++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue @@ -571,6 +571,7 @@ let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys)) let query = { ...this.queryParam, + name:this.$route.query.name, ids: selectedRowKeys.join(',') } downloadFile(this.url.exportData, '虚拟清单名称.zip', query, this.Deselect)