From 40e94c9f77f603d1da9fb222333a721085ab4e26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Tue, 21 Mar 2023 11:09:54 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=B7=A5=E5=85=B7-?= =?UTF-8?q?=E8=99=9A=E6=8B=9F=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E6=B8=85=E5=8D=95-=E6=9B=B4=E6=96=B0log?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../certificationListMaintenance.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue index aa547a86c..03e278663 100644 --- a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue +++ b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue @@ -258,7 +258,7 @@ export default { dataSource: [], url:{ list: '/authDummy/authDummyInventoryInfoEO/page', - logList: '',//更新log + logList: '/authDummy/authDummyLog/page',//更新log exportTemplate: '/authDummy/authDummyInventoryInfoEO/exportTemplate',//模板下载 exportData: '/authDummy/authDummyInventoryInfoEO/exportData',//导出 addModel: '/authDummy/authDummyInventoryInfoEO/batchAdd',//添加 From aef30f14155630e15133f33d8835512a29c4ef07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Tue, 21 Mar 2023 11:26:33 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=B7=A5=E5=85=B7-?= =?UTF-8?q?=E8=99=9A=E6=8B=9F=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/virtualAuthenticationList/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/virtualAuthenticationList/index.vue b/jero-web/src/views/virtualAuthenticationList/index.vue index 0a32fa3b6..09a3abb36 100644 --- a/jero-web/src/views/virtualAuthenticationList/index.vue +++ b/jero-web/src/views/virtualAuthenticationList/index.vue @@ -75,7 +75,7 @@ @click="maintenanceList(record)">{{$t('maintenanceList')}} + @click="subscribe(record)"> {{!record.readFlag || record.readFlag == 0 ? $t('subscribe') :$t('CancelSubscribe')}} From 97540b8779143e7229cbeb4864834ffafab135f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Tue, 21 Mar 2023 11:47:44 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=B7=A5=E5=85=B7-?= =?UTF-8?q?=E8=99=9A=E6=8B=9F=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/virtualAuthenticationList/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/virtualAuthenticationList/index.vue b/jero-web/src/views/virtualAuthenticationList/index.vue index 09a3abb36..ebd0b8252 100644 --- a/jero-web/src/views/virtualAuthenticationList/index.vue +++ b/jero-web/src/views/virtualAuthenticationList/index.vue @@ -206,7 +206,7 @@ export default { add: '/authDummy/authDummyInventoryBaseEO/add',//添加 edit: '/authDummy/authDummyInventoryBaseEO/edit',//编辑 deleteBatch: '/authDummy/authDummyInventoryBaseEO/deleteBatch',//批量删除 - urlWithdraw: '/authDummy/authDummyInventoryBaseEO/batchIssueOrWithdraw'//批量发布或撤回 + urlWithdraw: '/authDummy/authDummyInventoryBaseEO/issue'//批量发布或撤回 }, dataSource: [], columns: [ @@ -316,7 +316,7 @@ export default { item.state = 2 content = this.$t('confirmWithdraw') } - item.ids = val.id + item.id = val.id let _this = this this.$confirm({ content: content, From e2a45b5d55c585a6ce38d94b34374600e9310192 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Tue, 21 Mar 2023 11:51:30 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E5=B7=A5=E7=A8=8B=E5=B8=88=E5=8F=91=E8=B5=B7?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=EF=BC=8C=E8=B4=A3=E4=BB=BB=E4=BA=BA=E6=94=B6?= =?UTF-8?q?=E5=88=B0=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feishu/enums/TemplateInfoEnum2.java | 1 + ...ctCertificationInventoryEOServiceImpl.java | 70 +++++++++++++++++++ 2 files changed, 71 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/enums/TemplateInfoEnum2.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/enums/TemplateInfoEnum2.java index e9c503949..2d41f0066 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/enums/TemplateInfoEnum2.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/enums/TemplateInfoEnum2.java @@ -15,6 +15,7 @@ public enum TemplateInfoEnum2 { CERTIFICATION_MESSAGE7("认证清单-任务提醒，截止日期当天","ctp_AAuDmfXCHc1I"), CERTIFICATION_MESSAGE8("认证清单-任务提醒，已逾期","ctp_AAuDMwOPU71H"), //CERTIFICATION_MESSAGE9("认证清单-责任人分发（转办），第二责任人收到消息","ctp_AAuDM8YP6soc"), + CERTIFICATION_MESSAGE10("认证工程师发起流程，责任人收到消息","ctp_AAuePL6rUK1L"), ; String name; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index f19422585..25bc52893 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -1565,6 +1565,15 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl hrefFeishuMap = this.getCertificationInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN, PRN_EN); + String hrefFeishu_CN = (String) hrefFeishuMap.get("hrefFeishu_CN"); + String hrefFeishu_EN = (String) hrefFeishuMap.get("hrefFeishu_EN"); + + Map> certifycationInventoryListByDutyPersonMap = projectCertificationInventoryEOList.stream().collect(Collectors.groupingBy(ProjectCertificationInventoryEO::getDutyPerson)); try { List projectCertificationInventoryLogEOList = new ArrayList<>(); // 给责任人分配待办中心的任务 @@ -1600,6 +1609,51 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl dutyPersonIdList = projectCertificationInventoryEOList.stream().map(ProjectCertificationInventoryEO::getDutyPerson).distinct().collect(Collectors.toList()); + List dutyPersonList = this.sysUserService.querySysUserListByIdList(dutyPersonIdList); + + for (Map.Entry> dataByDutyPersonMap : certifycationInventoryListByDutyPersonMap.entrySet()) { + String dutyPersonUserId = dataByDutyPersonMap.getKey(); + List dutyPersonDataList = dataByDutyPersonMap.getValue(); + if(CollectionUtils.isEmpty(dutyPersonDataList)){ + continue; + } + + Map standNameAndItemName = this.projectCertificationInventoryEOService.getStandNameAndItemName(dutyPersonDataList); + String standName = (String) standNameAndItemName.get("standName"); + String itemName = (String) standNameAndItemName.get("itemName"); + try { + String thirdId = this.sysUserService.getUserThirdIdByUserId(dutyPersonList,dutyPersonUserId); + + if(StringUtils.isNotEmpty(thirdId)){ + // 根据结束时间进行排序，获取最近的时间，发消息时使用。 + this.certificationInventoryEOListSortByEndTimeAsc(projectCertificationInventoryEOList); + Date endTime = projectCertificationInventoryEOList.get(0).getEndTime(); + + JSONObject larkMesJson = new JSONObject(); + larkMesJson.put("template_id", TemplateInfoEnum2.CERTIFICATION_MESSAGE10.getValue()); + larkMesJson.put("userIds",thirdId); + + Map templateVariableMap = new HashMap<>(); + templateVariableMap.put("projectNameCn",PRN_CN); + templateVariableMap.put("projectNameEn",PRN_EN); + templateVariableMap.put("standName",standName); + templateVariableMap.put("itemName",itemName); + templateVariableMap.put("Initiator",projectLibraryBase.getStudioEngineerName()); + templateVariableMap.put("endTime",DateUtils.formatDate(endTime)); + templateVariableMap.put("viewBtnUrlCn",hrefFeishu_CN); + templateVariableMap.put("viewBtnUrlEn",hrefFeishu_EN); + templateVariableMap.put("certificationEngineer",currentUser.getUsername()); + + larkMesJson.put("templateVariableMap",templateVariableMap); + this.feishuService.batchSendLarkCardMsgByTemplate2(larkMesJson); + } + } catch (Exception e) { + log.error("飞书消息推送失败"); + } + } + }catch (Exception ex){ ex.printStackTrace(); log.error("认证工程师-发起认证清单任务失败：" + ex.getMessage()); @@ -1609,6 +1663,22 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl projectCertificationInventoryEOList) { + Collections.sort(projectCertificationInventoryEOList, new Comparator() { + @Override + public int compare(ProjectCertificationInventoryEO p1, ProjectCertificationInventoryEO p2) { + if(p1.getEndTime() != null && p2.getEndTime() != null){ + return p1.getEndTime().compareTo(p2.getEndTime()); + } + return 1; + } + }); + } + @Override public Result saveBatch(JSONObject json) { if (!json.containsKey("dataList")) { From c6a9c695b53b6b57099de8874ab371695ddead00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Tue, 21 Mar 2023 11:52:19 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/SentList.vue | 53 +++++++---- .../components/circulationHistory.vue | 90 +++++++++++++++++-- .../components/designCompliance.vue | 15 +++- .../components/doneList.vue | 47 +++++----- 4 files changed, 157 insertions(+), 48 deletions(-) diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue index 9398cb80a..79c2974bd 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue @@ -40,16 +40,20 @@ @showSizeChange="SizeChange" /> + \ No newline at end of file diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue index 41f65af28..b0ce6b6d0 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue @@ -7,7 +7,7 @@ :loading="loading" :pagination="false" :scroll="{x: '100%',y:'calc(100vh - 140px)'}" - rowKey="id" + :rowKey="(record)=>JSON.stringify(record)" :data-source="dataSource" :columns="columns" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" @@ -46,6 +46,8 @@ /> + @@ -194,13 +196,25 @@ this.getList() }, methods: { + getData(name) { + if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { + this.$refs.confirmationdrawer.confirmation(JSON.parse(JSON.stringify(this.selectedRowKeys)), name) + } else { + this.$message.warning(this.$t('selectLeastOne')) + } + }, onSelectChange(value) { this.selectedRowKeys = value - console.log(this.selectedRowKeys) }, - designComplianceList(){ + designComplianceList() { this.getList() }, + + confirmationdrawerList() { + this.selectedRowKeys = [] + this.getList() + }, + RelatedItemsClick(item) { let newUrl = this.$router.resolve({ path: '/ProjectDetails', diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue index dedfb5f39..cf6340b07 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue @@ -26,13 +26,13 @@ :url="url" :standardContentQuery="queryProject" /> -
- -
+
+ +
@@ -131,8 +131,8 @@ return true }, isConfirm() { - if (!this.queryData.isDisplay){ - return false + if (!this.queryData.isDisplay) { + return false } return true } @@ -150,6 +150,8 @@ }) }, completeTask(value) { + this.textLoading = this.$t('Submitting') + this.loading = true let json = Object.assign(this.queryBy, value) let data = JSON.stringify(json).replace(/\"/g, '\'') Object.keys(value).forEach(res => { @@ -167,6 +169,7 @@ if (res.success) { this.$message.success(this.$t('OperationSuccessful')) this.visible = false + this.loading = false this.$emit('designComplianceList') } else { this.loading = false @@ -294,10 +297,12 @@ background: #fff; border-radius: 0 0 2px 2px; } - .circulationHistory{ + + .circulationHistory { margin-bottom: 436px; } - .circulationHistoryOne{ + + .circulationHistoryOne { margin-bottom: 30px; } \ No newline at end of file diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue index 2887164b3..6e94a9c68 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue @@ -100,7 +100,6 @@ - @@ -109,78 +108,74 @@ import dealtWith from './components/dealtWith' import doneList from './components/doneList' import SentList from './components/SentList' - import confirmationDrawer from './components/confirmationDrawer' export default { name: 'index', components: { dealtWith, doneList, - SentList, - confirmationDrawer + SentList }, data() { return { title: '', queryParam: { - projectName:this.$route.query.projectName?this.$route.query.projectName:'' + projectName: this.$route.query.projectName ? this.$route.query.projectName : '' }, toggleSearchStatus: false, taskTypeList: [ { - name:this.$t('confirmationOfRegulationsList'), - value:'10', + name: this.$t('confirmationOfRegulationsList'), + value: '10' }, { - name:this.$t('listTaskConfirmation'), - value:'1', + name: this.$t('listTaskConfirmation'), + value: '1' }, { - name:this.$t('designComplianceReview'), - value:'2', + name: this.$t('designComplianceReview'), + value: '2' }, { - name:this.$t('preHomeConfirmation'), - value:'3', + name: this.$t('preHomeConfirmation'), + value: '3' }, { - name:this.$t('verificationComplianceReview'), - value:'4', - }, + name: this.$t('verificationComplianceReview'), + value: '4' + } ], taskStatusList: [ { - name:this.$t('listToConfirm'), - value:'List to confirm', + name: this.$t('listToConfirm'), + value: 'List to confirm' }, { - name:this.$t('Finished'), - value:'Completed', + name: this.$t('Finished'), + value: 'Completed' }, { - name:this.$t('inquiry'), - value:'Inquiry', + name: this.$t('inquiry'), + value: 'Inquiry' }, { - name:this.$t('toSubmit'), - value:'To submit', + name: this.$t('toSubmit'), + value: 'To submit' }, { - name:this.$t('toAudit'), - value:'To audit', - }, + name: this.$t('toAudit'), + value: 'To audit' + } ], tabActive: this.$t('toDoProcess') } }, methods: { TaskresponsibilityrecognitionClick() { - this.$refs.confirmationdrawer.confirmation(1) - // this.title = this.$t('Taskresponsibilityrecognition') + this.$refs.dealtWithRef.getData(this.$t('Taskresponsibilityrecognition')) }, complianceConfirmationClick() { - this.$refs.confirmationdrawer.confirmation(2) - // this.title = this.$t('complianceConfirmation') + this.$refs.dealtWithRef.getData(this.$t('complianceConfirmation')) }, callback(value) { this.tabActive = value @@ -190,11 +185,11 @@ }, searchQuery() { if (this.tabActive == this.$t('toDoProcess')) { - this.$refs.dealtWithRef.searchQuery(this.queryParam ) + this.$refs.dealtWithRef.searchQuery(this.queryParam) } else if (this.tabActive == this.$t('processDone')) { - this.$refs.doneListRef.searchQuery(this.queryParam ) + this.$refs.doneListRef.searchQuery(this.queryParam) } else if (this.tabActive == this.$t('sentProcess')) { - this.$refs.SentListRef.searchQuery(this.queryParam ) + this.$refs.SentListRef.searchQuery(this.queryParam) } }, searchReset() { @@ -206,7 +201,7 @@ } else if (this.tabActive == this.$t('sentProcess')) { this.$refs.SentListRef.searchReset() } - }, + } // taskConfirmationHandlingClick() { // this.$router.push({ // path: '/toDoTaskConfirmation' From 8e2ae69df92ceff0a041d52899d054e25f244c50 Mon Sep 17 00:00:00 2001 From: cuijiaming <1410452759@qq.com> Date: Tue, 21 Mar 2023 17:36:05 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93-=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=BA=93=E8=AF=A6=E6=83=85-=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enums/ProjectTaskPlanningNameEnum.java | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java index cdc9ad495..4d7cbc3ac 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java @@ -1,16 +1,23 @@ package com.jero.modules.project.enums; public enum ProjectTaskPlanningNameEnum { - LIST_CONFIRMATION("法规清单确认","Regulation List Confirmation"), - LEGAL_TASK_CONFIRMATION("法规任务确认","Regulation Task Confirmation"), - DESIGN_DEADLINE("设计符合性确认","Design Compliance Confirmation"), +// LIST_CONFIRMATION("法规清单确认","Regulation List Confirmation"), +// LEGAL_TASK_CONFIRMATION("法规任务确认","Regulation Task Confirmation"), +// DESIGN_DEADLINE("设计符合性确认","Design Compliance Confirmation"), // PREHOMO_DEADLINE("Pre-Homo","Pre-Homo"), // ATTESTATION_START_TIME("认证开始","Certification begins"), // ATTESTATION_END_TIME("认证结束"," End of certification"), - PREHOMO_DEADLINE("摸底试验结束","Pre-Homo Confirmation"), // name:Pre-Homo value:Pre-Homo - ATTESTATION_START_TIME("认证试验结束","Homo Completion"),// name:认证开始 value:Certification begins +// PREHOMO_DEADLINE("摸底试验结束","Pre-Homo Confirmation"), // name:Pre-Homo value:Pre-Homo +// ATTESTATION_START_TIME("认证试验结束","Homo Completion"),// name:认证开始 value:Certification begins ATTESTATION_END_TIME("认证批准","Homo KO"),// name:认证结束 value:End of certification - VERIFY_DEADLINE("验证符合性确认","Validation Compliance Confirmation"), +// VERIFY_DEADLINE("验证符合性确认","Validation Compliance Confirmation"), + + LIST_CONFIRMATION("清单发布","List Publishing"), + LEGAL_TASK_CONFIRMATION("责任确认","Responsibility Confirmation"), + DESIGN_DEADLINE("设计核查","Design Verification"), + PREHOMO_DEADLINE("摸底开始","Get Started"), // name:Pre-Homo value:Pre-Homo + ATTESTATION_START_TIME("认证开始","Certification Start"),// name:认证开始 value:Certification begins + VERIFY_DEADLINE("验证核查","Verification And Verification"), ; String name; String value; From 3704058fbf96529f8404f78f40dbf1103ad13c92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Tue, 21 Mar 2023 17:48:40 +0800 Subject: [PATCH 9/9] =?UTF-8?q?OTA=E7=AE=A1=E7=90=86=E5=B7=A5=E5=85=B7-?= =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E5=9F=BA=E6=9C=AC=E4=BF=A1-=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E6=8E=AA=E6=96=BD-=E7=B3=BB=E7=BB=9F=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E4=B8=8E=E5=8F=82=E6=95=B0-=E9=A9=BE=E9=A9=B6?= =?UTF-8?q?=E8=BE=85=E5=8A=A9=E5=8A=9F=E8=83=BD=E5=90=8D=E7=A7=B0=E4=B8=8E?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 5 +- jero-web/src/common/lang/zh-cn.js | 3 + .../components/beupgradedonline.vue | 462 +++++++--------- .../components/safetyPrecautions.vue | 459 +++++++--------- .../components/upgradedonline.vue | 494 ++++++++---------- 5 files changed, 604 insertions(+), 819 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 19e21e2ce..dcd256104 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1483,7 +1483,9 @@ module.exports = { technicalparameters:'Upgrade Bulletin technical parameters that may change (if any)', architecturetopologydiagram:'System - Electronic Controller Architecture Topology diagram (Attachment includes topology diagram description)', controllerparameter:'Controller parameter', - electroniccontrollername:'Electronic controller name "Hardware"', + electronic:'Electronic controller name', + electronicController:'Electronic controller name (Hardware)', + electroniccontrollername:'Electronic Controller Vehicle Safety Integrity Level (ASIL)', electroniccontrollerproductionenterprises:'Electronic controller production enterprises', electroniccontrollertype:'Electronic controller type', hardwareversioninformation:'Hardware version information', @@ -1683,4 +1685,5 @@ module.exports = { missionAccomplished:'Mission Accomplished', taskTypeMismatch:'Task Type Mismatch', taskNodeMismatch:'Task Node Mismatch', + ifNot:'If not, fill in "none" or "not involved"', } \ 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 7203f5c5f..2cea9fc04 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1585,6 +1585,8 @@ module.exports = { technicalparameters:'升级可能变更的《公告》技术参数(如有)', architecturetopologydiagram:'系统-电子控制器架构拓扑图(附件需含拓扑图介绍)', controllerparameter:'控制器参数', + electronic:'电子控制器名称', + electronicController:'电子控制器名称(硬件)', electroniccontrollername:'电子控制器汽车安全完整性等级(ASIL)', electroniccontrollerproductionenterprises:'电子控制器生产企业', electroniccontrollertype:'电子控制器型号', @@ -1783,4 +1785,5 @@ module.exports = { missionAccomplished:'任务完成', taskTypeMismatch:'任务类型不匹配', taskNodeMismatch:'任务节点不匹配', + ifNot:'如无，则填写“无”或“不涉及”', } \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue index 26d9d7611..d0cf8e1dc 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue @@ -1,320 +1,227 @@ - \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue index e76e6451d..f59092b64 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue @@ -1,118 +1,148 @@ - \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue index 26d9d7611..e8ae9052e 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue @@ -1,359 +1,279 @@ \ No newline at end of file