From b8573227007972e4fc135fa0f098f9aea89d906d Mon Sep 17 00:00:00 2001 From: "xuetao.li" Date: Thu, 11 Aug 2022 15:42:33 +0800 Subject: [PATCH 01/62] =?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/62] =?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/62] =?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/62] =?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 @@ -
+ +
...{{ $t('more') }}
@@ -226,8 +227,9 @@
+ Date: Tue, 16 Aug 2022 13:57:47 +0800 Subject: [PATCH 24/62] =?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/countryCardRelease.vue | 4 +++- .../components/initiatingProcess.vue | 12 ++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue index 9a0bd9f7f..335d28489 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue @@ -235,6 +235,7 @@ let query = { pageNo: this.pageNo, pageSize: this.pageSize, + createBy: this.userInfo().username, ...queryParam } this.loading = true @@ -476,7 +477,8 @@ .text-operation { margin-right: 8px; } - ::v-deep .ant-select-dropdown{ + + ::v-deep .ant-select-dropdown { z-index: 100; } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue index cb0b66ab6..d851a0ecf 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue @@ -44,8 +44,10 @@ {{$t('selectedStandard')}}
- {{selectedRowKeysRecord[0] ? selectedRowKeysRecord[0].serialNumber+' - '+selectedRowKeysRecord[0].title:''}} + {{selectedRowKeysRecord[0] ? + selectedRowKeysRecord[0].serialNumber+'-'+selectedRowKeysRecord[0].title:''}}
@@ -323,7 +325,7 @@ this.formInline.lawsTechnologyEvaluationId = this.$route.query.lawsTechnologyEvaluationId this.formInline.remark = this.$route.query.remark this.formInline.standId = this.$route.query.standId - this.formInline = {...this.formInline} + this.formInline = { ...this.formInline } this.getListOne() } eventBUs.$on('searchQuery', search => { @@ -697,6 +699,9 @@ overflow: hidden; text-overflow: ellipsis; white-space: nowrap; + word-break: break-word; + padding: 0 14px; + box-sizing: border-box; } .title-text-right { @@ -710,6 +715,9 @@ overflow: hidden; text-overflow: ellipsis; white-space: nowrap; + word-break: break-word; + padding: 0 14px; + box-sizing: border-box; color: #21c9cc; cursor: pointer; } From 6f4cdc8cb09cfc6034a899be589d47963fb0f8d0 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Tue, 16 Aug 2022 14:03:27 +0800 Subject: [PATCH 25/62] =?UTF-8?q?57251=E3=80=8157319=E3=80=8157314=20?= =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF=E8=AF=84=E4=BC=B0-?= =?UTF-8?q?=E5=8F=91=E8=B5=B7=E6=B5=81=E7=A8=8B-=E5=B8=A6=E5=85=A5?= =?UTF-8?q?=E6=8B=86=E8=A7=A3=E5=8D=95=20=E5=AF=BC=E5=85=A5=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=A0=A1=E9=AA=8C=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsTechnologyEvaluationEOController.java | 3 +- .../ILawsTechnologyEvaluationEOService.java | 2 +- ...LawsTechnologyEvaluationEOServiceImpl.java | 113 +++++++++++++++++- 3 files changed, 113 insertions(+), 5 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java index 7ab5d17ce..9ca5ddf32 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java @@ -208,8 +208,7 @@ public class LawsTechnologyEvaluationEOController extends JeroController importItemExcel(MultipartFile file, @RequestParam(name = "cut") String cut, HttpServletRequest request) throws Exception { - List> result = this.lawsTechnologyEvaluationEOService.importItemExcel(file,cut,request); - return Result.OK(result); + return this.lawsTechnologyEvaluationEOService.importItemExcel(file,cut,request); } @ApiOperation(value="根据id查询明细数据", notes="根据id查询明细数据") diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java index a0b58fab0..bac8a0c3c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java @@ -85,7 +85,7 @@ public interface ILawsTechnologyEvaluationEOService extends IService> importItemExcel(MultipartFile file, String cut, HttpServletRequest request)throws Exception; + Result importItemExcel(MultipartFile file, String cut, HttpServletRequest request)throws Exception; List> queryPageDummyById(Map parameter); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java index b02e02d74..98d18c7dc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java @@ -356,7 +356,7 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl> importItemExcel(MultipartFile file, String cut, HttpServletRequest request)throws Exception { + public Result importItemExcel(MultipartFile file, String cut, HttpServletRequest request)throws Exception { //校验文件格式 int pos = file.getOriginalFilename().lastIndexOf("."); String fileSuffixStr = file.getOriginalFilename().substring(pos+1).toLowerCase(); @@ -406,6 +406,7 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl> dataList,String cut){ + //存放数据验证结果信息 + List stringMessage = new ArrayList<>(); + + int i = 0; + + for (Map map : dataList) { + i++; + + int countError = 0; //记录失败数据数量 + String errorMsg = ""; + if(CutEnum.CN.getValue().equals(cut)){ + errorMsg = "第" + i + "行："; + }else{ + errorMsg = i + " line："; + } + + String itemNum = (String) map.get("itemNum"); + String itemName = (String) map.get("itemName"); + String itemContent = (String) map.get("itemContent"); + + if(StringUtils.isEmpty(itemNum)){ + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + errorMsg += "条款号不能为空;"; + }else if (StringUtils.equals(cut,CutEnum.EN.getValue())){ + errorMsg += "Item num cannot be empty;"; + } + countError++; + }else if(itemNum.length() > 100){ + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + errorMsg += "条款号长度不能超过100;"; + }else if (StringUtils.equals(cut,CutEnum.EN.getValue())){ + errorMsg += "Item num length of the cannot exceed 100;"; + } + countError++; + } + + if(StringUtils.isEmpty(itemName)){ + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + errorMsg += "条款名称不能为空;"; + }else if (StringUtils.equals(cut,CutEnum.EN.getValue())){ + errorMsg += "Item name cannot be empty;"; + } + countError++; + }else if(itemName.length() > 100){ + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + errorMsg += "条款名称长度不能超过100;"; + }else if (StringUtils.equals(cut,CutEnum.EN.getValue())){ + errorMsg += "Item name length of the cannot exceed 100;"; + } + countError++; + } + + if(StringUtils.isEmpty(itemContent)){ + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + errorMsg += "条款内容不能为空;"; + }else if (StringUtils.equals(cut,CutEnum.EN.getValue())){ + errorMsg += "Item Contents cannot be empty;"; + } + countError++; + }else if(itemContent.length() > 400){ + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + errorMsg += "条款内容长度不能超过400;"; + }else if (StringUtils.equals(cut,CutEnum.EN.getValue())){ + errorMsg += "Item Contents length of the cannot exceed 400;"; + } + countError++; + } + + if (countError > 0) { + stringMessage.add(errorMsg); + } + } + + Map result = new HashMap(); + + if(CollectionUtils.isEmpty(dataList)){ + result.put("result", false); + String message = ""; + if (StringUtils.equals(cut, CutEnum.CN.getValue())) { + message = "不能导入空的模板，请检查！"; + }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + message = "Cannot import empty template, please check!"; + } + result.put("message", message); + }else if (stringMessage.isEmpty()) { + result.put("result", true); + result.put("resultList", dataList); + result.put("message", ""); + } else { + result.put("result", false); + String html = ""; + for (String message : stringMessage) { + html += message + "
"; + } + result.put("message", html); + } + return result; + } } From 8f1230375c82c627a4270420de757d2f402fd8b5 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Tue, 16 Aug 2022 14:10:29 +0800 Subject: [PATCH 26/62] =?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/countryCardView.vue | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue index 4c91a6b97..e7ecf4f4c 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue @@ -186,7 +186,6 @@ }) } if (content && content.length > 0) { - console.log(content) content.forEach((res, index) => { this.contentList[index + 1] = { name: res.lableName } this.contentList[index + 1].list = [] @@ -228,7 +227,15 @@ } postAction(this.list, query).then((res) => { if (res.success) { - this.queryCountryList = res.result || [] + this.queryCountryList = [] + applyMarkets.split(',').forEach(val => { + res.result.forEach(ol => { + if (val == ol.applyMarket) { + this.queryCountryList.push(ol) + } + }) + }) + // this.queryCountryList = res.result || [] this.isTrue = false this.$nextTick(() => { this.clientWidth = 340 * (this.queryCountryList.length + 1) + 'px' @@ -350,13 +357,13 @@ border-bottom: 1px #d9d9d9 solid; .content-box-box-img { - width: 70%; + width: 238px; height: 100%; } .content-box-box-text { display: inline-block; - width: 30%; + width: calc(100% - 238px); text-align: center; font-size: 18px; font-weight: 500; @@ -380,13 +387,13 @@ cursor: pointer; .content-box-box-img { - width: 70%; + width: 238px; height: 100%; } .content-box-box-text { display: inline-block; - width: 30%; + width: calc(100% - 238px); text-align: center; font-size: 18px; font-weight: 500; From cf8134d1a85dbeff1d91a44591c3354216033efc Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Tue, 16 Aug 2022 14:25:13 +0800 Subject: [PATCH 27/62] =?UTF-8?q?57325=20=E6=B3=95=E8=A7=84=E6=8A=80?= =?UTF-8?q?=E6=9C=AF=E8=AF=84=E4=BC=B0-=E6=9D=A1=E6=AC=BE=E8=AF=84?= =?UTF-8?q?=E4=BC=B0-=E5=AF=BC=E5=85=A5=E6=9D=A1=E6=AC=BE=E5=A4=84?= =?UTF-8?q?=E7=90=86=E5=AF=BC=E5=85=A5=E6=95=B0=E5=AD=97=E5=B8=A6=E5=B0=8F?= =?UTF-8?q?=E6=95=B0=E7=82=B9=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...LawsTechnologyEvaluationEOServiceImpl.java | 26 +++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java index 98d18c7dc..044b7ccfd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java @@ -410,9 +410,31 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl itemInfoMap = new HashMap<>(); String itemId = UUID.randomUUID().toString().replace("-", ""); itemInfoMap.put("itemId",itemId); From 2303c5936b8c495297108d8778620af680b2121a Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Tue, 16 Aug 2022 14:29:08 +0800 Subject: [PATCH 28/62] =?UTF-8?q?57240=20=E6=8F=90=E7=A4=BA=E5=8F=AA?= =?UTF-8?q?=E8=83=BD=E4=B8=8A=E4=BC=A0=E9=9D=99=E6=80=81=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=96=87=E4=BB=B6=E8=8B=B1=E6=96=87=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E8=AF=AD=EF=BC=8C=E5=A4=84=E7=90=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/oss/service/impl/OSSFileServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java index 6c249ec1e..a602b714c 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java @@ -146,7 +146,7 @@ public class OSSFileServiceImpl extends ServiceImpl impl if (cut.equals(CutEnum.CN.getValue())) { throw new JeroBootException("只能够上传pdf/word/excel/csv/ppt/txt/zip/rar/静态图片类型的文件。请重新选择文件！"); } else { - throw new JeroBootException("Only upload pdf/word/excel/csv/ppt/txt/zip/rar/Static image type file. Please re-select the file!"); + throw new JeroBootException("Only upload pdf/word/excel/csv/ppt/txt/zip/rar/Static image type file. Please re select the file!"); } } } @@ -265,7 +265,7 @@ public class OSSFileServiceImpl extends ServiceImpl impl if (cut.equals(CutEnum.CN.getValue())) { throw new JeroBootException("只能够上传pdf/word/excel/csv/ppt/txt/zip/rar/静态图片类型的文件。请重新选择文件！"); } else { - throw new JeroBootException("Only upload pdf/word/excel/csv/ppt/txt/zip/rar/Static image type file. Please re-select the file!"); + throw new JeroBootException("Only upload pdf/word/excel/csv/ppt/txt/zip/rar/Static image type file. Please re select the file!"); } } } @@ -357,7 +357,7 @@ public class OSSFileServiceImpl extends ServiceImpl impl if (cut.equals(CutEnum.CN.getValue())) { throw new JeroBootException("只能够上传pdf/word/excel/csv/ppt/txt/zip/rar/静态图片类型的文件。请重新选择文件！"); } else { - throw new JeroBootException("Only upload pdf/word/excel/csv/ppt/txt/zip/rar/Static image type file. Please re-select the file!"); + throw new JeroBootException("Only upload pdf/word/excel/csv/ppt/txt/zip/rar/Static image type file. Please re select the file!"); } } } From 664fe351da8ed974ce89989edd4bb607366e4114 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Tue, 16 Aug 2022 15:28:15 +0800 Subject: [PATCH 29/62] =?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/views/documentTools/searchCenter/index.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/jero-web/src/views/documentTools/searchCenter/index.vue b/jero-web/src/views/documentTools/searchCenter/index.vue index 870631efb..6e409f186 100644 --- a/jero-web/src/views/documentTools/searchCenter/index.vue +++ b/jero-web/src/views/documentTools/searchCenter/index.vue @@ -257,6 +257,10 @@ width: 608px; display: inline-block; } + + ::v-deep .input-group .ant-select-selection--single { + height: 40px!important; + } \ No newline at end of file diff --git a/jero-web/src/views/documentTools/searchCenter/components/monthlyReportRegulations.vue b/jero-web/src/views/documentTools/searchCenter/components/monthlyReportRegulations.vue new file mode 100644 index 000000000..85b4932ba --- /dev/null +++ b/jero-web/src/views/documentTools/searchCenter/components/monthlyReportRegulations.vue @@ -0,0 +1,278 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue b/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue new file mode 100644 index 000000000..448483f82 --- /dev/null +++ b/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue @@ -0,0 +1,546 @@ + + + + + + \ No newline at end of file diff --git a/jero-web/src/views/documentTools/searchCenter/index.vue b/jero-web/src/views/documentTools/searchCenter/index.vue index 6e409f186..8d6826fc5 100644 --- a/jero-web/src/views/documentTools/searchCenter/index.vue +++ b/jero-web/src/views/documentTools/searchCenter/index.vue @@ -23,7 +23,8 @@ v-model="selectValueTwo" :maxLength="100" @keyup.enter.native="wholeOnSearch(selectValueTwo)" - v-else-if="active === $t('whole')" + v-else-if="active === $t('whole') || active === $t('problemKnowledgeBase') + || active === $t('monthlyReportRegulations')" class="inputSearch" :placeholder="$t('pleaseEnter')+$t('searchContent')" > @@ -33,18 +34,21 @@ >{{$t('query')}} {{$t('query')}} {{$t('searchInResults')}} {{$t('reset')}} @@ -61,14 +65,18 @@ - - - + + + +
+ +
@@ -78,13 +86,17 @@ \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue index bdaa64268..8ed494f25 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue @@ -20,7 +20,7 @@ size="middle" :loading="loading" :pagination="false" - :scroll="{x: '100%'}" + :scroll="{x: '100%',y:'calc(100vh - 320px)'}" :data-source="dataSource" :columns="columns" > diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue index 2b3175a5f..ec476304d 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue @@ -26,15 +26,15 @@
-
+
{{$t('classificationMaintenance')}}
-
+
{{$t('managePublishing')}}
-
+
{{$t('newlyAdded')}}
From c7350ea5094375ceb1d72f27ea907ed028cef8d6 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 17 Aug 2022 16:31:40 +0800 Subject: [PATCH 57/62] =?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 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/jero-web/src/components/search/index.vue b/jero-web/src/components/search/index.vue index 5a3608ddb..cf5a34acc 100644 --- a/jero-web/src/components/search/index.vue +++ b/jero-web/src/components/search/index.vue @@ -189,6 +189,14 @@ }, methods: { searchQuery() { + if (this.isDefault) { + let startTime = moment(new Date()).format('YYYY-MM-DD') + let endTime = this.haflYear() + if (this.queryParam['WarnTime'].length == 0) { + this.queryParam['WarnTime'] = [startTime, endTime] + } + this.queryParam = { ...this.queryParam } + } eventBUs.$emit('searchQuery', JSON.parse(JSON.stringify(this.queryParam))) }, searchReset() { From 6e84880174f50eaaec41f5b32259796f3166cb5b Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 17 Aug 2022 17:00:11 +0800 Subject: [PATCH 58/62] =?UTF-8?q?=E6=B3=95=E8=A7=84=E9=A2=84=E8=AD=A6--6?= =?UTF-8?q?=E4=B8=AA=E6=9C=88=E5=92=8C12=E4=B8=AA=E6=9C=88=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=A2=9C=E8=89=B2=E5=8C=BA=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/modules/warn/service/LawsWarnService.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java index 87662c695..9c43e54a2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java @@ -144,10 +144,10 @@ public class LawsWarnService { String beforeTimeTwelve = beforeTime(12,new Date()); Date parseSix = sdf.parse(beforeTimeSix); Date parseTwelve = sdf.parse(beforeTimeTwelve); - if(newCarTimeDate.after(new Date()) && newCarTimeDate.before(parseSix)){ + if((newCarTimeDate.after(new Date()) && newCarTimeDate.before(parseSix)) || newCarTime.equals(beforeTimeSix)){ record.put("new_colour","red"); } - if(newCarTimeDate.after(parseSix) && newCarTimeDate.before(parseTwelve)){ + if((newCarTimeDate.after(parseSix) && newCarTimeDate.before(parseTwelve)) || newCarTime.equals(beforeTimeTwelve)){ record.put("new_colour","yellow"); } } @@ -158,16 +158,16 @@ public class LawsWarnService { if(StringUtils.isNotBlank(implementTime) && !"null".equals(implementTime)){ try { if(Integer.parseInt(String.valueOf(parameter.get("flag"))) == 1){ - Date newCarTimeDate = sdf.parse(implementTime); + Date implementTimeDate = sdf.parse(implementTime); //当前时间的前6个月 String beforeTimeSix = beforeTime(6,new Date()); String beforeTimeTwelve = beforeTime(12,new Date()); Date parseSix = sdf.parse(beforeTimeSix); Date parseTwelve = sdf.parse(beforeTimeTwelve); - if(newCarTimeDate.after(new Date()) && newCarTimeDate.before(parseSix)){ + if((implementTimeDate.after(new Date()) && implementTimeDate.before(parseSix)) || implementTime.equals(beforeTimeSix)){ record.put("implement_colour","red"); } - if(newCarTimeDate.after(parseSix) && newCarTimeDate.before(parseTwelve)){ + if((implementTimeDate.after(parseSix) && implementTimeDate.before(parseTwelve)) || implementTime.equals(beforeTimeTwelve)){ record.put("implement_colour","yellow"); } } From 7b1c3fc491a3398cb728e664c58df24f7e090fdc Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 17 Aug 2022 17:05:56 +0800 Subject: [PATCH 59/62] =?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/problemKnowledgeBaseAdd.vue | 5 +++++ .../processCenter/components/evaluatorFeedbackList.vue | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue index 47b816081..b058c8943 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue @@ -587,7 +587,12 @@ ::v-deep .itemModel-explain .ant-form-explain { margin-top: 60px } + ::v-deep .ql-tooltip { z-index: 10 !important; } + + ::v-deep .ql-snow .ql-picker { + height: 36px; + } \ No newline at end of file diff --git a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue index 2f49be832..ae801d9a7 100644 --- a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue +++ b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue @@ -275,6 +275,12 @@ mounted() { if (this.evaluatorFeedbackList && this.evaluatorFeedbackList.length > 0) { this.dataSource = this.evaluatorFeedbackList + if (this.dataSource && this.dataSource.length == 1 && this.$route.query.taskDefinitionKey == 'pgrqr') { + this.$nextTick(() => { + let antTableBody = document.getElementsByClassName('ant-table-body') + antTableBody[0].style = 'position:auto' + }) + } if (this.$route.query.taskDefinitionKey != 'pgrqr') { this.dataSource.forEach(res => { res.sponsorFeedback = '' From 2ac56da6e96fe05eb45ea9061c3a55081dc05cbc Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Wed, 17 Aug 2022 17:27:30 +0800 Subject: [PATCH 60/62] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../regulationsKanban/components/addModel.vue | 83 ++++++++++++++----- 1 file changed, 63 insertions(+), 20 deletions(-) diff --git a/jero-web/src/views/regulationsKanban/components/addModel.vue b/jero-web/src/views/regulationsKanban/components/addModel.vue index f780a80e4..24ebea27a 100644 --- a/jero-web/src/views/regulationsKanban/components/addModel.vue +++ b/jero-web/src/views/regulationsKanban/components/addModel.vue @@ -11,28 +11,44 @@ > - - - - {{element.text}} - - - - - - - +
+
+ {{$t('areaOfResponsibility')}} +
+ + + + + {{element.text}} + + + + + + + +
+ - - - - {{element.projectName}} - - - +
+
+ {{$t('RelatedItems')}} +
+ + + + + {{element.projectName}} + + + +
+ {{ $t('query') }} @@ -321,6 +337,33 @@ export default {