From a7ae7423f59af1a8385d20b185250f6e3b1d493d Mon Sep 17 00:00:00 2001 From: liyawei Date: Fri, 12 Aug 2022 16:38:50 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E5=8F=91=E8=B5=B7=E4=BA=BA=E9=80=9A=E8=BF=87=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E4=BA=BA(=E8=AE=BE=E8=AE=A1=E7=AC=A6?= =?UTF-8?q?=E5=90=88=E6=80=A7,Pre-Homo,=E9=AA=8C=E8=AF=81=E7=AC=A6?= =?UTF-8?q?=E5=90=88=E6=80=A7)-=E7=BF=BB=E8=AF=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProjectLawsInventoryEOServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 422882210..525b4f7e4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -2320,7 +2320,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl Date: Fri, 12 Aug 2022 16:42:19 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93-37,41=E8=A1=8C-?= =?UTF-8?q?=E7=BF=BB=E8=AF=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 7 +++++++ .../project/enums/ProjectTaskPlanningNameEnum.java | 14 +++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index 6e33bcb04..216ff492a 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -894,6 +894,10 @@ UPDATE `laws_weilai`.`sys_dict_item` SET `en_name` = 'Fail' WHERE `id` = '149678 UPDATE `laws_weilai`.`sys_dict_item` SET `en_name` = 'Depart' WHERE `id` = '1174511244036587521'; UPDATE `laws_weilai`.`sys_dict_item` SET `en_name` = 'Company' WHERE `id` = '1174511197735665665'; UPDATE `laws_weilai`.`sys_dict_item` SET `en_name` = 'Position' WHERE `id` = '1174509082208395266'; +-- 项目状态 project_status +UPDATE `laws_weilai`.`sys_dict_item` SET `en_name` = 'Development' WHERE `id` = '1513769417081630721'; +UPDATE `laws_weilai`.`sys_dict_item` SET `en_name` = 'Production' WHERE `id` = '1513769467044179970'; + -- 表字段 英文修改 2022-08-11 -- OCR识别转换记录表 @@ -913,3 +917,6 @@ UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Item No.' WHER UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Item Name' WHERE `id` = '9e91b704de198ccf2f5fb7297e675404'; UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Item Content' WHERE `id` = '120a92b6d595c2fd68d2b90278357ce4'; UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Technical Field' WHERE `id` = 'ccf68e6578a0a446a6ac34018f0a477d'; +-- 文档库信息表 +UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Standard Type' WHERE `id` = '441588d80cc31ce68fbdf2ce8b36f93c'; +UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Area' WHERE `id` = '9f82d58f22a12792a53e202d64a39f06' 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 34169acd6..13c1ff160 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,16 @@ package com.jero.modules.project.enums; public enum ProjectTaskPlanningNameEnum { - LIST_CONFIRMATION("清单确认"," Checklist confirmation"), - LEGAL_TASK_CONFIRMATION("任务确认","Task confirmation"), - DESIGN_DEADLINE("设计符合性","Design compliance"), + 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 Completion"), // name:Pre-Homo value:Pre-Homo - ATTESTATION_START_TIME("认证试验结束","Homo Test Completion"),// name:认证开始 value:Certification begins - ATTESTATION_END_TIME("认证批准","Type Approval"),// name:认证结束 value:End of certification - VERIFY_DEADLINE("验证符合性","Verify compliance"), + PREHOMO_DEADLINE("Pre-Homo确认","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"), ; String name; String value; From 2e69983ab6eb67ea5994eda6af00e95cbd8717c1 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 12 Aug 2022 16:59:15 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 2 +- .../components/problemKnowledgeBaseAdd.vue | 3 ++ .../components/problemKnowledgeBaseView.vue | 39 +++++++++++-------- 3 files changed, 27 insertions(+), 17 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 91e4e0dfd..8adedf685 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1213,7 +1213,7 @@ module.exports = { displayPermission: 'Display permission', authorizedUser: 'Authorized user', problemClassification: 'Problem classification', - market: 'market', + market: 'Market', documentNumber: 'Document Number', documentTitle: 'Document Title', bringInDocumentInformation: 'Bring in document information', diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue index 87dba98fd..47b816081 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue @@ -587,4 +587,7 @@ ::v-deep .itemModel-explain .ant-form-explain { margin-top: 60px } + ::v-deep .ql-tooltip { + z-index: 10 !important; + } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue index b651cfbe3..377cda7ef 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue @@ -22,7 +22,7 @@ {{$t('issuedBy')}}:{{this.queryForm.createBy}} - {{$t('releaseDate')}}:{{this.queryForm.createTime}} + {{$t('releaseDate')}}:{{this.queryForm.createTime?this.queryForm.createTime.slice(0,11):''}}
@@ -254,21 +254,26 @@ this.$message.warning(this.$t('pleaseEnter')) return } - let query = { - problemKnowledgeBaseId: this.$route.query.id, - commentContent: this.formInline.commentContent, - commentUserId: this.userInfo().id - } - this.loading = true - postAction('/problemKnowledgeBase/problemKnowledgeBaseCommentEO/add', query).then((res) => { - if (res.success) { - this.$message.success(this.$t('OperationSuccessful')) - this.releaseData() - this.formInline = {} - this.loading = false - } else { - this.$message.warning(this.$t('operationFailed')) - this.loading = false + this.$refs.ruleForm.validate(valid => { + if (valid) { + let query = { + problemKnowledgeBaseId: this.$route.query.id, + commentContent: this.formInline.commentContent, + commentUserId: this.userInfo().id + } + this.loading = true + postAction('/problemKnowledgeBase/problemKnowledgeBaseCommentEO/add', query).then((res) => { + if (res.success) { + this.$message.success(this.$t('OperationSuccessful')) + this.$refs.ruleForm.clearValidate() + this.releaseData() + this.formInline = {} + this.loading = false + } else { + this.$message.warning(this.$t('operationFailed')) + this.loading = false + } + }) } }) }, @@ -398,6 +403,7 @@ font-size: 16px; color: #040B29; font-weight: 400; + word-break: break-word; } .content-icon { @@ -510,4 +516,5 @@ font-size: 16px; margin-bottom: 20px; } + \ No newline at end of file From 791c7dd4485e47aa507f732b587905df937d00b1 Mon Sep 17 00:00:00 2001 From: liyawei Date: Fri, 12 Aug 2022 17:18:49 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=A8=A1=E6=9D=BF-4?= =?UTF-8?q?=E8=A1=8C-=E7=BF=BB=E8=AF=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ParamsInfoEOServiceImpl.java | 72 +++++++++---------- .../vo/CertCategoryParamsInfoEnExport.java | 2 +- .../vo/CertCategoryParamsInfoEnImport.java | 2 +- .../cert/template/vo/ParamsInfoEnExport.java | 14 ++-- .../cert/template/vo/ParamsInfoEnImport.java | 14 ++-- 5 files changed, 52 insertions(+), 52 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java index 8316dee8e..b2dadc5c4 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java @@ -386,7 +386,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl resultEn = ExcelImportUtil.importExcelMore(excelfile,ParamsInfoEnImport.class, params); @@ -950,7 +950,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl list = new ArrayList<>(); if (CutEnum.EN.getValue().equals(cut)) { - String fields[] ={ "*NIO Number", "*Number", "*Params Name","Description"}; + String fields[] ={ "*NIO Number", "*Number", "*Para Name","Description"}; params.setImportFields(fields); ExcelImportResult resultEn = ExcelImportUtil.importExcelMore(excelfile, CertCategoryParamsInfoEnImport.class, params); @@ -1235,7 +1235,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl Date: Fri, 12 Aug 2022 17:29:33 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/search/index.vue | 82 +++++-------------- .../components/problemKnowledgeBaseList.vue | 16 +++- jero-web/src/views/externalReports/index.vue | 13 +-- .../views/regulatoryEarlyWarning/index.vue | 82 +++++-------------- 4 files changed, 62 insertions(+), 131 deletions(-) diff --git a/jero-web/src/components/search/index.vue b/jero-web/src/components/search/index.vue index 7ac897a66..d16d3dd57 100644 --- a/jero-web/src/components/search/index.vue +++ b/jero-web/src/components/search/index.vue @@ -195,7 +195,7 @@ this.queryParam = {} if (this.isDefault) { let startTime = moment(new Date()).format('YYYY-MM-DD') - let endTime = this.getNewDate('after', 6) + let endTime = this.haflYear() this.queryParam['WarnTime'] = [startTime, endTime] this.queryParam = { ...this.queryParam } } @@ -217,68 +217,26 @@ } }) }, - getNewDate(flag, many) { - - const thirtyDays = [4, 6, 9, 11] // 30天的月份 - - const thirtyOneDays = [1, 3, 5, 7, 8, 10, 12] // 31天的月份 - - const currDate = new Date() // 今天日期 - - const year = currDate.getFullYear() - - let month = currDate.getMonth() + 1 - - let targetDateMilli = 0 - - let GMTDate = '' // 中国标准时间 - - let targetYear = '' // 年 - - let targetMonth = '' // 月 - - let targetDate = '' // 日 - - let dealTargetDays = '' // 目标日期 - - const isLeapYear = !!((year % 4 == 0 && year % 100 != 0) || year % 400 == 0) // 是否是闰年 - - let countDays = 0 // 累计天数 - - for (let i = 0; i < many; i++) { - - if (flag === 'before') { - - month = month - 1 <= 0 ? 12 : month - 1 - - } else { - - month = month + 1 > 12 ? 1 : month + 1 - - } - - thirtyDays.includes(month) ? (countDays += 30) : thirtyOneDays.includes(month) ? (countDays += 31) : isLeapYear ? (countDays += 29) : (countDays += 28) + haflYear() { + // 先获取当前时间 + var curDate = (new Date()).getTime() + // 将半年的时间单位换算成毫秒 + var halfYear = 365 / 2 * 24 * 3600 * 1000 + // 半年前的时间（毫秒单位） + var pastResult = curDate - halfYear + // 日期函数，定义起点为半年前 + var pastDate = new Date(pastResult) + var pastYear = pastDate.getFullYear() + var pastMonth = pastDate.getMonth() + 1 + var pastDay = pastDate.getDate() + if (pastMonth >= 1 && pastMonth <= 9) { + pastMonth = '0' + pastMonth } - - targetDateMilli = currDate.setDate( - currDate.getDate() - (flag === 'before' ? countDays : countDays * -1) - ) - - GMTDate = new Date(targetDateMilli) - - targetYear = GMTDate.getFullYear() - - targetMonth = GMTDate.getMonth() + 1 - - targetDate = GMTDate.getDate() - - targetMonth = targetMonth.toString().padStart(2, '0') - - targetDate = targetDate.toString().padStart(2, '0') - - dealTargetDays = `${targetYear}-${targetMonth}-${targetDate}` - - return dealTargetDays + if (pastDay >= 0 && pastDay <= 9) { + pastDay = '0' + pastDay + } + var endDate = pastYear + '-' + pastMonth + '-' + pastDay + return endDate }, dateChange(item) { this.queryParam[item] = moment(this.queryParam[item]).format('YYYY-MM-DD') diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue index 0c8e92dd4..2b3175a5f 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue @@ -123,8 +123,8 @@ } }) }, - classificationMaintenanceModelForm(){ - this.replacePage() + classificationMaintenanceModelForm() { + this.replacePage() }, onSearch() { this.pageNo = 1 @@ -361,6 +361,18 @@ text-align: center; line-height: 10; } + + ::v-deep .ant-tag { + padding: 2px 4px; + background: #9B9DA9; + color: #fff!important; + } + ::v-deep .ant-tag-checkable:not(.ant-tag-checkable-checked):hover{ + color: #fff!important; + } + ::v-deep .ant-tag-checkable-checked{ + background: #21c9cc; + }