diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index 284ba745f..b18b292ff 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'; @@ -899,7 +899,7 @@ UPDATE `laws_weilai`.`sys_dict_item` SET `en_name` = 'Development' WHERE `id` = UPDATE `laws_weilai`.`sys_dict_item` SET `en_name` = 'Production' WHERE `id` = '1513769467044179970'; --- 表字段 英文修改 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'; @@ -917,10 +917,10 @@ 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'; --- 文档库信息表 2022-08-12 +-- 文档库信息表 2022-08-12 已同步生产环境 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'; --- 参数项收集清单 2022-08-12 +-- 参数项收集清单 2022-08-12 已同步生产环境 UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Para Batch' WHERE `id` = '161c35a16e92682972dd1aeb26151fa2'; UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Para Name' WHERE `id` = 'e586bd87d4d826ce3d7d373caf54c6f6'; UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Status' WHERE `id` = '9050dc65a7b2fe82927b74a9ef4a4bb4'; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/enums/QueryFlagEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/enums/QueryFlagEnum.java new file mode 100644 index 000000000..ec1a9448c --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/enums/QueryFlagEnum.java @@ -0,0 +1,48 @@ +package com.jero.modules.problemKnowledgeBase.enums; + +import com.jero.common.constant.enums.CutEnum; +import org.apache.commons.lang3.StringUtils; + +/** + * 问题知识库-查询标识枚举类 + */ +public enum QueryFlagEnum { + + GET_ALL_APPLY_MARKET("获取所有的适用市场","","0"), + GET_NOT_CREATE_APPLY_MARKET("获取还没有创建过countryCard的适用市场","","1"), + GET_RELEASED_APPLY_MARKET("获取已发布的countryCard的适用市场","","2"), + GET_CREATE_APPLY_MARKET("获取所有已创建的countryCard的适用市场","","3"), + ; + + String cnName; + String enName; + String value; + + private QueryFlagEnum(String cnName, String enName, String value) { + this.cnName = cnName; + this.enName = enName; + this.value = value; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public static String getTextByValue(String value,String cut) { + QueryFlagEnum[] values = values(); + for (QueryFlagEnum queryFlagEnum : values) { + if (queryFlagEnum.value.equals(value)) { + if(StringUtils.equals(cut, CutEnum.CN.getValue())){ + return queryFlagEnum.cnName; + }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + return queryFlagEnum.enName; + } + } + } + return null; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java index c5226def4..8e211b19a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java @@ -9,6 +9,7 @@ import com.jero.common.system.vo.DictModel; import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseDetailEO; import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseEO; import com.jero.modules.problemKnowledgeBase.entity.CountryNationalFlagEO; +import com.jero.modules.problemKnowledgeBase.enums.QueryFlagEnum; import com.jero.modules.problemKnowledgeBase.enums.ReleaseStatusEnum; import com.jero.modules.problemKnowledgeBase.mapper.CountryCardManageReleaseEOMapper; import com.jero.modules.problemKnowledgeBase.service.ICountryCardManageReleaseDetailEOService; @@ -216,9 +217,9 @@ public class CountryCardManageReleaseEOServiceImpl extends ServiceImpl countryCardManageReleaseEOList = this.list(); - //如果查询标识是空，则是在countryCard管理发布页面新增数据时使用：管理发布页新增查询的是，所有未创建countryCard的适用市场。 - //如果查询标识不是空，则是在CountryCard的首页使用：首页查询的是 所有已创建了countryCard的适用市场。 - if (StringUtils.isEmpty(queryFlag)) { + if (StringUtils.equals(queryFlag, QueryFlagEnum.GET_ALL_APPLY_MARKET.getValue())) { + result = dictModelList; + }else if (StringUtils.equals(queryFlag,QueryFlagEnum.GET_NOT_CREATE_APPLY_MARKET.getValue())) { if(CollectionUtils.isEmpty(countryCardManageReleaseEOList)){ result = dictModelList; }else { @@ -236,7 +237,7 @@ public class CountryCardManageReleaseEOServiceImpl extends ServiceImpl queryList() { - return list(); + List result = this.list(); + // 匿名比较器排序 + Collections.sort(result, new Comparator() { + @Override + public int compare(ProblemKnowledgeBaseClassifyEO p1, ProblemKnowledgeBaseClassifyEO p2) { + return p1.getProblemLabel().compareTo(p2.getProblemLabel()); + } + }); + return result; } @Override diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java index cad2b60e5..11921430d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java @@ -308,20 +308,25 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl { boolean flag = false; - if (StringUtils.equals(targetMarket, region.getValue())) { - flag = true; + for (String s : targetMarketArr) { + if (StringUtils.equals(s, region.getValue())) { + flag = true; + } } return flag; }).map(DictModel::getText).collect(Collectors.joining(",")); }else if(StringUtils.equals(cut, CutEnum.EN.getValue())){ targetMarket_dicText = regionList.stream().filter(region -> { boolean flag = false; - if (StringUtils.equals(targetMarket, region.getValue())) { - flag = true; + for (String s : targetMarketArr) { + if (StringUtils.equals(s, region.getValue())) { + flag = true; + } } return flag; }).map(DictModel::getTextEn).collect(Collectors.joining(",")); 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 d5961d3c1..87662c695 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 @@ -41,9 +41,12 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.OutputStream; +import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Arrays; +import java.util.Calendar; +import java.util.Date; import java.util.HashSet; import java.util.LinkedList; import java.util.List; @@ -127,9 +130,63 @@ public class LawsWarnService { bussDocumentLibraryEOService.dictItem(sysDictItems, entry, cut, onlCgformFieldListTemp,null); bussDocumentLibraryEOService.treeDictItem(categoryList, entry, treeFieldList, cut,null); } + //到期前6个月显示红色，到期前12个月显示黄色 + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + String newCarTime = String.valueOf(record.get("xin1_che1_xing2_shi2_shi1_ri4_qi1")); + String implementTime = String.valueOf(record.get("implement_time")); + String currentTime = sdf.format(new Date()); + if(StringUtils.isNotBlank(newCarTime) && !"null".equals(newCarTime)){ + try { + if(Integer.parseInt(String.valueOf(parameter.get("flag"))) == 0){ + Date newCarTimeDate = sdf.parse(newCarTime); + //当前时间的前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)){ + record.put("new_colour","red"); + } + if(newCarTimeDate.after(parseSix) && newCarTimeDate.before(parseTwelve)){ + record.put("new_colour","yellow"); + } + } + } catch (ParseException e) { + e.printStackTrace(); + } + } + if(StringUtils.isNotBlank(implementTime) && !"null".equals(implementTime)){ + try { + if(Integer.parseInt(String.valueOf(parameter.get("flag"))) == 1){ + Date newCarTimeDate = 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)){ + record.put("implement_colour","red"); + } + if(newCarTimeDate.after(parseSix) && newCarTimeDate.before(parseTwelve)){ + record.put("implement_colour","yellow"); + } + } + } catch (ParseException e) { + e.printStackTrace(); + } + } } return infoPage; } + private String beforeTime (int month, Date date){ + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + Calendar calendarBefore = Calendar.getInstance(); + calendarBefore.setTime(date); + calendarBefore.add(Calendar.MONTH, month); + Date dateBefore = calendarBefore.getTime(); + String beforeTime = sdf.format(dateBefore); + return beforeTime; + } public void exportExcel(Map map, HttpServletResponse response, HttpServletRequest request) { String cut = (String) map.get("cut"); diff --git a/jero-web/src/components/search/index.vue b/jero-web/src/components/search/index.vue index 5d0b4c20b..d4cb9c1a2 100644 --- a/jero-web/src/components/search/index.vue +++ b/jero-web/src/components/search/index.vue @@ -299,7 +299,7 @@ .title-text { width: 20%; - min-width: 110px; + min-width: 100px; color: #000F16; display: inline-block; font-weight: 500; diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index 63102879c..63bcabf5f 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -871,6 +871,7 @@ text-overflow: ellipsis; white-space: nowrap; overflow: hidden; + word-break: break-word; color: #040B29; font-weight: 400; } diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue index 4c2368253..5ab1f05dc 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue @@ -10,6 +10,8 @@ { + getAction('/problemKnowledgeBase/countryCardManageReleaseEO/getApplyMarketList', { queryFlag: '2' }).then((res) => { if (res.success) { this.applyMarketList = res.result || [] } else { diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue index 367fa4314..9a0bd9f7f 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue @@ -20,8 +20,9 @@ {{$t('applicableMarket')}} {{$t('releaseStatus')}} { + getAction('/problemKnowledgeBase/countryCardManageReleaseEO/getApplyMarketList', { queryFlag: '3' }).then((res) => { if (res.success) { this.applyMarketList = res.result || [] } else { @@ -474,4 +476,7 @@ .text-operation { margin-right: 8px; } + ::v-deep .ant-select-dropdown{ + z-index: 100; + } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue index 322962110..f021fb817 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue @@ -181,7 +181,7 @@ this.editReplacePage(row) }, getApplyMarketList() { - getAction('/problemKnowledgeBase/countryCardManageReleaseEO/getApplyMarketList', {}).then((res) => { + getAction('/problemKnowledgeBase/countryCardManageReleaseEO/getApplyMarketList', { queryFlag: '1' }).then((res) => { if (res.success) { this.applyMarketList = res.result || [] } else { diff --git a/jero-web/src/views/documentManage/library/docDetail/index.vue b/jero-web/src/views/documentManage/library/docDetail/index.vue index 4189fc701..fea978047 100644 --- a/jero-web/src/views/documentManage/library/docDetail/index.vue +++ b/jero-web/src/views/documentManage/library/docDetail/index.vue @@ -590,6 +590,7 @@ text-overflow: ellipsis; white-space: nowrap; overflow: hidden; + word-break: break-word; color: #040B29; font-weight: 400; } @@ -618,6 +619,7 @@ font-size: 16px; text-overflow: ellipsis; white-space: pre-wrap; + word-break: break-word; overflow: visible; float: left; color: #040B29; diff --git a/jero-web/src/views/processCenter/components/projectInformation.vue b/jero-web/src/views/processCenter/components/projectInformation.vue index 7cc17091d..8c0e6669a 100644 --- a/jero-web/src/views/processCenter/components/projectInformation.vue +++ b/jero-web/src/views/processCenter/components/projectInformation.vue @@ -145,6 +145,7 @@ text-overflow: ellipsis; white-space: nowrap; overflow: hidden; + word-break: break-word; color: #040B29; font-weight: 400; } diff --git a/jero-web/src/views/processCenter/components/standardContent.vue b/jero-web/src/views/processCenter/components/standardContent.vue index 439443130..b90e95627 100644 --- a/jero-web/src/views/processCenter/components/standardContent.vue +++ b/jero-web/src/views/processCenter/components/standardContent.vue @@ -138,6 +138,7 @@ text-overflow: ellipsis; white-space: nowrap; overflow: hidden; + word-break: break-word; color: #040B29; font-weight: 400; } @@ -172,6 +173,7 @@ text-overflow: ellipsis; white-space: pre-wrap; overflow: visible; + word-break: break-word; float: left; color: #040B29; font-weight: 400; diff --git a/jero-web/src/views/projectManagement/components/ProjectDetails.vue b/jero-web/src/views/projectManagement/components/ProjectDetails.vue index 9f8673932..f1c4119a1 100644 --- a/jero-web/src/views/projectManagement/components/ProjectDetails.vue +++ b/jero-web/src/views/projectManagement/components/ProjectDetails.vue @@ -268,6 +268,7 @@ text-overflow: ellipsis; white-space: nowrap; overflow: hidden; + word-break: break-word; color: #040B29; font-weight: 400; } diff --git a/jero-web/src/views/regulatoryEarlyWarning/index.vue b/jero-web/src/views/regulatoryEarlyWarning/index.vue index a2d0ce102..4e9e49ab0 100644 --- a/jero-web/src/views/regulatoryEarlyWarning/index.vue +++ b/jero-web/src/views/regulatoryEarlyWarning/index.vue @@ -35,6 +35,39 @@ :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :columns="columns" > + + + {{text}} + + + {{text}} + + + {{text}} + + + + + {{text}} + + + {{text}} + + + {{text}} + + + + + {{text}} + + + {{text}} + + + {{text}} + +