From b8573227007972e4fc135fa0f098f9aea89d906d Mon Sep 17 00:00:00 2001 From: "xuetao.li" Date: Thu, 11 Aug 2022 15:42:33 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=9A=84=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/project/controller/ProjectLibraryBaseController.java | 1 - 1 file changed, 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java index 659adc94d..46058eaca 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java @@ -44,7 +44,6 @@ public class ProjectLibraryBaseController extends JeroController queryPageList(@RequestBody Map params) { IPage pageList= projectLibraryBaseService.queryPageList(params); From 10c46deb04b4733c158bd87424cd950b210ac25c Mon Sep 17 00:00:00 2001 From: xiaowenyu Date: Fri, 12 Aug 2022 09:11:59 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9sql=E6=96=87=E4=BB=B6?= =?UTF-8?q?=EF=BC=8C=E6=A0=87=E6=B3=A8=E5=B7=B2=E5=90=8C=E6=AD=A5=E6=AD=A3?= =?UTF-8?q?=E5=BC=8F=E7=8E=AF=E5=A2=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index 6e33bcb04..c07b722cb 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -824,21 +824,21 @@ CREATE TABLE `sar_file_compare_res_comment` ( PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; --- 法规技术评估-条款信息评估结果表 字段增加长度 2022-08-08 +-- 法规技术评估-条款信息评估结果表 字段增加长度 2022-08-11 已同步生产环境 ALTER TABLE `laws_weilai`.`laws_technology_evaluation_item_result` MODIFY COLUMN `technical_file_name` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '技术文件名称' AFTER `evaluation_methods`, MODIFY COLUMN `section` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '章节' AFTER `technical_file_name`; --- 问题知识库 字段长度修改 2022-08-08 +-- 问题知识库 字段长度修改 2022-08-11 已同步生产环境 ALTER TABLE `laws_weilai`.`problem_knowledge_base` MODIFY COLUMN `buss_document_library_id` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文档库id' AFTER `target_market`, MODIFY COLUMN `stand_number` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标准编号' AFTER `buss_document_library_id`, MODIFY COLUMN `stand_title` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标准标题' AFTER `stand_number`; --- 问题知识库 字段类型修改 2022-08-09 +-- 问题知识库 字段类型修改 2022-08-11 已同步生产环境 ALTER TABLE `laws_weilai`.`problem_knowledge_base` MODIFY COLUMN `content` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '内容（正文）' AFTER `stand_title`; --- 国家与国旗关系表 2022-08-09 +-- 国家与国旗关系表 2022-08-11 已同步生产环境 CREATE TABLE `laws_weilai`.`country_national_flag` ( `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人', @@ -852,7 +852,7 @@ CREATE TABLE `laws_weilai`.`country_national_flag` ( `national_flag_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '国旗url', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '国家与国旗中间表' ROW_FORMAT = Dynamic; --- 初始化数据 2022-08-10 +-- 初始化数据 2022-08-11 已同步生产环境 INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('1', NULL, NULL, NULL, NULL, NULL, '欧盟', 'EU', NULL, '/jero-boot/nationalFlag/EU.png'); INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('10', NULL, NULL, NULL, NULL, NULL, '美国', 'US', NULL, '/jero-boot/nationalFlag/US.png'); INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('11', NULL, NULL, NULL, NULL, NULL, '澳大利亚', 'Australia', NULL, '/jero-boot/nationalFlag/Australia.png'); @@ -867,22 +867,22 @@ INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_ti INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('8', NULL, NULL, NULL, NULL, NULL, '海湾地区', 'GCC', NULL, '海湾地区.jpg'); INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('9', NULL, NULL, NULL, NULL, NULL, '阿联酋', 'UAE', NULL, '/jero-boot/nationalFlag/UAE.png'); --- 法规意见收集-评估结果表字段长度调整 2022-08-11 +-- 法规意见收集-评估结果表字段长度调整 2022-08-11 已同步生产环境 ALTER TABLE `laws_weilai`.`laws_opinion_assessment_result` MODIFY COLUMN `related_section` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '相关章节' AFTER `laws_opinion_gather_id`, MODIFY COLUMN `issue_or_suggest` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '问题/建议' AFTER `related_section`; --- 法规技术评估-评估结果表 字段长度调整 2022-08-11 +-- 法规技术评估-评估结果表 字段长度调整 2022-08-11 已同步生产环境 ALTER TABLE `laws_weilai`.`laws_technology_evaluation_result` MODIFY COLUMN `issue_or_suggest` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '问题/建议' AFTER `related_section`, MODIFY COLUMN `reason` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '理由' AFTER `issue_or_suggest`; --- 展示区域 英文修改 2022-08-11 +-- 展示区域 英文修改 2022-08-11 已同步生产环境 UPDATE `laws_weilai`.`onl_cgform_area` SET `en_name` = 'Relevant Information' WHERE `id` = '1492408622838222850'; UPDATE `laws_weilai`.`onl_cgform_area` SET `en_name` = 'General Information' WHERE `id` = '1499657602378825729'; UPDATE `laws_weilai`.`onl_cgform_area` SET `en_name` = 'Document Files' WHERE `id` = '1499658880093847553'; --- 数据字典 英文修改 2022-08-11 +-- 数据字典 英文修改 2022-08-11 已同步生产环境 -- 同步情况 sync_state UPDATE `laws_weilai`.`sys_dict_item` SET `en_name` = 'No' WHERE `id` = '1507311752583352322'; UPDATE `laws_weilai`.`sys_dict_item` SET `en_name` = 'Yes' WHERE `id` = '1507311835571851265'; @@ -895,7 +895,7 @@ UPDATE `laws_weilai`.`sys_dict_item` SET `en_name` = 'Depart' WHERE `id` = '1174 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'; --- 表字段 英文修改 2022-08-11 +-- 表字段 英文修改 2022-08-11 已同步生产环境 -- OCR识别转换记录表 UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Conversion Result' WHERE `id` = '6b29f1c0e03533bb380c5ead03195785'; UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Conversion Time' WHERE `id` = '85894f5ad04de66ccf45ebd96c97b534'; From 5728db51979d46b759429be1342dc30e38310323 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 12 Aug 2022 17:42:24 +0800 Subject: [PATCH 03/10] =?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 --- .../virtualList/components/editModel.vue | 4 +- .../projectManagement/components/TaskList.vue | 38 +++++++++++-------- .../components/listEditModel.vue | 4 +- .../components/listOfRegulations.vue | 16 +++++--- 4 files changed, 38 insertions(+), 24 deletions(-) diff --git a/jero-web/src/views/documentTools/virtualList/components/editModel.vue b/jero-web/src/views/documentTools/virtualList/components/editModel.vue index 408eff413..443c415c6 100644 --- a/jero-web/src/views/documentTools/virtualList/components/editModel.vue +++ b/jero-web/src/views/documentTools/virtualList/components/editModel.vue @@ -621,8 +621,8 @@ rules: { subtitle: [ { - max: 100, - message: this.$t('subtitle') + this.$t('cannotExceed') + 100 + this.$t('Characters'), + max: 300, + message: this.$t('subtitle') + this.$t('cannotExceed') + 300 + this.$t('Characters'), trigger: 'blur' } ], diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue index dd46f0701..1906d69d8 100644 --- a/jero-web/src/views/projectManagement/components/TaskList.vue +++ b/jero-web/src/views/projectManagement/components/TaskList.vue @@ -14,18 +14,18 @@
-
+
{{$t('areaOfResponsibility')}}
- +
-
+
{{$t('CertificationProgress')}}
- {{result.serialNumber}} + {{result.serialNumber}} {{result.title}}
@@ -364,7 +365,7 @@ DueDate: 'designDueDate', remarks: 'designRemark', projectName: this.$route.query.projectName, - targetMarket:this.$route.query.targetMarket, + targetMarket: this.$route.query.targetMarket, projectNameId: this.$route.query.projectNameId, primaryKeyId: val.designTaskDetailId, PersonChargeFeedback: val.designPersonChargeFeedback @@ -389,7 +390,7 @@ DueDate: 'prehomoDueDate', remarks: 'prehomoRemark', projectName: this.$route.query.projectName, - targetMarket:this.$route.query.targetMarket, + targetMarket: this.$route.query.targetMarket, projectNameId: this.$route.query.projectNameId, primaryKeyId: val.prehomoTaskDetailId, PersonChargeFeedback: val.prehomoPersonChargeFeedback @@ -414,7 +415,7 @@ DueDate: 'verifyDueDate', remarks: 'verifyRemark', projectName: this.$route.query.projectName, - targetMarket:this.$route.query.targetMarket, + targetMarket: this.$route.query.targetMarket, projectNameId: this.$route.query.projectNameId, primaryKeyId: val.verifyTaskDetailId, PersonChargeFeedback: val.verifyPersonChargeFeedback @@ -431,9 +432,15 @@ this.$refs.certificationDirectoryRef.addModel() }, getList() { + let queryParam = JSON.parse(JSON.stringify(this.queryParam)) + Object.keys(queryParam).forEach(val => { + if (queryParam[val] instanceof Array) { + queryParam[val] = queryParam[val].join(',') + } + }) let query = { projectLibraryId: this.$route.query.id, - ...this.queryParam + ...queryParam } this.loading = true getAction(this.url.list, query).then((res) => { @@ -458,15 +465,15 @@ TaskListModelList() { this.getList() }, - standardClick(row){ + standardClick(row) { let newUrl = this.$router.resolve({ path: '/docManage/library/detail', query: { - id:row.standId + id: row.standId } }) window.open(newUrl.href, '_blank') - }, + } } } @@ -659,7 +666,8 @@ .box-content-cou { cursor: pointer; } - .box-content-buttom{ + + .box-content-buttom { width: 100%; overflow: hidden; display: -webkit-box; diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue index ea5608dd6..460c504bd 100644 --- a/jero-web/src/views/projectManagement/components/listEditModel.vue +++ b/jero-web/src/views/projectManagement/components/listEditModel.vue @@ -838,8 +838,8 @@ rulesData: { subtitle: [ { - max: 100, - message: this.$t('subtitle') + this.$t('cannotExceed') + 100 + this.$t('Characters'), + max: 300, + message: this.$t('subtitle') + this.$t('cannotExceed') + 300 + this.$t('Characters'), trigger: 'blur' } ], diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index dbf4800e9..231dbd65a 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -29,10 +29,10 @@
{{ $t('areaOfResponsibility') }}
- +
@@ -1386,9 +1386,15 @@ if (this.formInlineRoleSwitching.roleSwitchingCode == '11' || this.formInlineRoleSwitching.roleSwitchingCode == '12') { roleCode = 0 } + let queryParam = JSON.parse(JSON.stringify(this.queryParam)) + Object.keys(queryParam).forEach(val => { + if (queryParam[val] instanceof Array) { + queryParam[val] = queryParam[val].join(',') + } + }) let query = { ...this.queryParamQuery, - ...this.queryParam, + ...queryParam, projectLibraryId: this.$route.query.id, roleCode: roleCode } From cfa59f30bc0b834ef3e247bdbd93ae7ad44cb342 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 12 Aug 2022 17:51:56 +0800 Subject: [PATCH 04/10] =?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 --- .../components/Standardselection/index.vue | 4 ++-- .../virtualList/components/editModel.vue | 19 ++++++++++++++----- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/jero-web/src/components/Standardselection/index.vue b/jero-web/src/components/Standardselection/index.vue index 2c5c7b703..ced5cdd61 100644 --- a/jero-web/src/components/Standardselection/index.vue +++ b/jero-web/src/components/Standardselection/index.vue @@ -1,7 +1,7 @@