diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index e8449941c..14d2c3930 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -3520,7 +3520,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl list = paramsCollectManifestEOMapper.listInfo(paramsCollectManifestEO); // 过滤出 状态为:待发起收集,且工程接口人处为空的参数项 - list = list.stream().filter(e -> CollectManifestStateEnum.WAIT_COLLECT.getValue().equals(e.getState()) && StringUtils.isBlank(e.getSdt())).collect(Collectors.toList()); + list = list.stream().filter(e -> CollectManifestStateEnum.WAIT_COLLECT.getValue().equals(e.getState())).collect(Collectors.toList()); List updateCollectManifestEOList = new ArrayList<>(); if (CollectionUtil.isNotEmpty(list)) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml index 3fba744b4..1b9ee69da 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml @@ -100,6 +100,15 @@ AND prd.params_manifest_id = #{paramsReportDetailVO.paramsManifestId} + + AND prd.is_must = #{paramsReportDetailVO.isMust} + + + AND prd.duty_territory in + + #{item} + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/vo/ParamsReportDetailVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/vo/ParamsReportDetailVO.java index 766c7fa43..54ccc6952 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/vo/ParamsReportDetailVO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/vo/ParamsReportDetailVO.java @@ -72,4 +72,9 @@ public class ParamsReportDetailVO { @TableField(exist = false) private String orderBySql; + + @TableField(exist = false) + private String isMust; + @TableField(exist = false) + private String dutyTerritory; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/enums/AffirmFlagEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/enums/AffirmFlagEnum.java index c7f391a04..f7d8a3485 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/enums/AffirmFlagEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/enums/AffirmFlagEnum.java @@ -6,9 +6,9 @@ package com.jero.modules.head.enums; * @auth zhn */ public enum AffirmFlagEnum { - DESIGN_FLAG("设计符合性确认","Design Compliance Check","1"), + DESIGN_FLAG("设计符合性确认","Design Compliance Confirmation","1"), AFFIRM_FLAG("Pre-Homo确认","Pre-Homo Confirmation","2"), - VERIFY_FLAG("验证符合性确认","Validation Compliance Check","3"); + VERIFY_FLAG("验证符合性确认","Validation Compliance Confirmation","3"); 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 3905ec322..eb54f0a11 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 @@ -11,15 +11,13 @@ public enum ProjectTaskPlanningNameEnum { // ATTESTATION_START_TIME("认证试验结束","Homo Completion"),// name:认证开始 value:Certification begins ATTESTATION_END_TIME("认证批准","Homo KO"),// name:认证结束 value:End of certification - 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"), - CERTIFICATION_SUBMISSION("认证提交","Certification Submission"), - LOCALAPPROVAL_1("地方批准1","Local Approval 1"), - LOCALAPPROVAL_2("地方批准2","Local Approval 2"), + LIST_CONFIRMATION("清单发布","List Release"), + LEGAL_TASK_CONFIRMATION("责任确认","Responsibility Confirm"), + DESIGN_DEADLINE("设计核查","Design Check"), + PREHOMO_DEADLINE("摸底开始","Pre-Homo Starts"), // name:Pre-Homo value:Pre-Homo + ATTESTATION_START_TIME("认证开始","Homo Starts"),// name:认证开始 value:Certification begins + VERIFY_DEADLINE("验证核查","Validation Check"), + CERTIFICATION_SUBMISSION("认证提交","Application Submitted"), G_ZERO("G0","G0"), G_ONE("G1","G1"), G_TWO("G2","G2"), diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java index ff3fd0342..5513b6a31 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java @@ -2064,21 +2064,31 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl--> -
- - - - + + + + + + + + + + + + -
+ + + + {{$t('userManual')}} + + + + {{$t('operationguide')}} + + +
@@ -217,6 +234,9 @@ Jumpflybook(){ window.open('https://eicgyqr5mc.feishu.cn/docx/doxcnY2GbQfMSMqLP0eIFzFlEcd', '_blank'); }, + Jumpoperationguide(){ + window.open('https://eicgyqr5mc.feishu.cn/docx/ZyhWdIz7EoMZ68xhI2bckcWWnMg', '_blank'); + }, /* update_end author:zhaoxin date:20191129 for: 做头部菜单栏导航*/ ...mapActions(['Logout']), ...mapGetters(['username', 'avatar', 'userInfo']), diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue index a64bc49e4..330db7124 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue @@ -159,6 +159,12 @@ :title="form.qttext ? form.qttext : $t('PleaseEnter')" :placeholder="$t('PleaseEnter')">
+
+ +
@@ -220,6 +226,7 @@ export default { flag:false, flagqr:false, flagqrqt:false, + flagly:false, loading: false, disable:false, columns: [ @@ -420,22 +427,27 @@ this.$forceUpdate() } if(this.form.yhqr == '1'){ this.flagqr = true + this.flagly = false this.qrheight = '100px' }else{ this.flagqr = false - this.qrheight = '50px' + this.flagly = true + this.qrheight = '100px' } if(this.form.yhqr == '1' && this.form.flagqr == '344a3320beba45afb3718c59b7a7144a'){ this.qrheight = '150px' this.flagqrqt = true + this.flagly = false }else if(this.form.yhqr == '1' && this.form.flagqr != '344a3320beba45afb3718c59b7a7144a'){ this.flagqr = true this.flagqrqt = false + this.flagly = false this.qrheight = '100px' }else { this.flagqrqt = false this.flagqr = false - this.qrheight = '50px' + this.flagly = true + this.qrheight = '100px' } }) }, @@ -476,12 +488,14 @@ this.$forceUpdate() if(val.target.value == '1'){ this.qrheight = '100px' this.flagqr = true + this.flagly = false if(this.form.flagqr == '344a3320beba45afb3718c59b7a7144a'){ this.qrheight = '150px' this.flagqrqt = true } }else{ - this.qrheight = '50px' + this.qrheight = '100px' + this.flagly = true this.flagqr = false this.flagqrqt = false } @@ -490,9 +504,11 @@ this.$forceUpdate() if(val == '344a3320beba45afb3718c59b7a7144a'){ this.qrheight = '150px' this.flagqrqt = true + this.flagly = false }else { this.qrheight = '100px' this.flagqrqt = false + this.flagly = false } }, } diff --git a/jero-web/src/views/parameter/managementdetails/index.vue b/jero-web/src/views/parameter/managementdetails/index.vue index 936066d2b..d2648473c 100644 --- a/jero-web/src/views/parameter/managementdetails/index.vue +++ b/jero-web/src/views/parameter/managementdetails/index.vue @@ -71,6 +71,38 @@ v-model="formInline.sdtName"/> + +
+
+ {{$t('NareaOfResponsibility')}} +
+ +
+
+ +
+
+ {{$t('Required')}} +
+ + + + + + + + + {{$t('yes')}} + + + {{$t('notOnlyRz')}} + + +
+
@@ -93,10 +125,10 @@ {{$t('preservation')}} -
- - {{$t('dataExport')}} -
+ + + +
{{$t('ConventionalExport')}} diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index e0210dca8..c02eec2f8 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -67,25 +67,25 @@
-
- {{$t('certificationCategory')}} +
+ {{$t('NareaOfResponsibility')}}
- +