diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index 4fa0f81cf..e09c41e5a 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -855,18 +855,17 @@ 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-09 -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, '澳大利亚.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 ('12', NULL, NULL, NULL, NULL, NULL, '新西兰', 'New Zealand', 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 ('13', NULL, NULL, NULL, NULL, NULL, '英国', 'UK', 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 ('2', NULL, NULL, NULL, NULL, NULL, '中国', 'China', 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 ('3', NULL, NULL, NULL, NULL, NULL, '中国香港', 'Hong Kong China', 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 ('4', NULL, NULL, NULL, NULL, NULL, '韩国', 'South Korea', 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 ('5', NULL, NULL, NULL, NULL, NULL, '日本', 'Japan', 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 ('6', NULL, NULL, NULL, NULL, NULL, '新加坡', 'Singapore', 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 ('7', NULL, NULL, NULL, NULL, NULL, '马来西亚', 'Malaysia', NULL, '马来西亚.jpg'); +-- 初始化数据 2022-08-10 +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'); +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 ('12', NULL, NULL, NULL, NULL, NULL, '新西兰', 'New Zealand', NULL, '/jero-boot/nationalFlag/NewZealand.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 ('13', NULL, NULL, NULL, NULL, NULL, '英国', 'UK', NULL, '/jero-boot/nationalFlag/UK.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 ('2', NULL, NULL, NULL, NULL, NULL, '中国', 'China', NULL, '/jero-boot/nationalFlag/China.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 ('3', NULL, NULL, NULL, NULL, NULL, '中国香港', 'Hong Kong China', NULL, '/jero-boot/nationalFlag/China.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 ('4', NULL, NULL, NULL, NULL, NULL, '韩国', 'South Korea', NULL, '/jero-boot/nationalFlag/SouthKorea.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 ('5', NULL, NULL, NULL, NULL, NULL, '日本', 'Japan', NULL, '/jero-boot/nationalFlag/Japan.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 ('6', NULL, NULL, NULL, NULL, NULL, '新加坡', 'Singapore', NULL, '/jero-boot/nationalFlag/Singapore.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 ('7', NULL, NULL, NULL, NULL, NULL, '马来西亚', 'Malaysia', NULL, '/jero-boot/nationalFlag/Malaysia.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 ('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, '阿联酋.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 ('1', NULL, NULL, NULL, NULL, NULL, '欧盟', 'EU', 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 ('10', NULL, NULL, NULL, NULL, NULL, '美国', 'US', 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'); diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/exception/JeroBootExceptionHandler.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/exception/JeroBootExceptionHandler.java index f8ac4228e..42b84225e 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/exception/JeroBootExceptionHandler.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/exception/JeroBootExceptionHandler.java @@ -85,11 +85,11 @@ public class JeroBootExceptionHandler { /** * spring默认上传大小100MB 超出大小捕获异常MaxUploadSizeExceededException */ - @ExceptionHandler(MaxUploadSizeExceededException.class) - public Result handleMaxUploadSizeExceededException(MaxUploadSizeExceededException e) { - log.error(e.getMessage(), e); - return Result.error("文件大小超出10MB限制, 请压缩或降低文件质量! "); - } +// @ExceptionHandler(MaxUploadSizeExceededException.class) +// public Result handleMaxUploadSizeExceededException(MaxUploadSizeExceededException e) { +// log.error(e.getMessage(), e); +// return Result.error("文件大小超出100MB限制, 请压缩或降低文件质量! "); +// } @ExceptionHandler(DataIntegrityViolationException.class) public Result handleDataIntegrityViolationException(DataIntegrityViolationException e) { 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 df73c3ae6..a14d95991 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 @@ -72,15 +72,15 @@ public class OSSFileServiceImpl extends ServiceImpl impl public OSSFile uploadLocal(MultipartFile mf, String bizPath, String state, String cut) { //处理文件大小,大于100M抛出异常 - long fileSize = mf.getSize() / 1024 / 1024; - String originalFilename = mf.getOriginalFilename(); - if (fileSize >= 100) { - if (cut.equals(CutEnum.CN.getValue())) { - throw new JeroBootException(originalFilename + "文件大小超出100MB, 请压缩或降低文件质量!"); - } else { - throw new JeroBootException(originalFilename + "File size out 100MB, Please compress or reduce file quality!"); - } - } +// long fileSize = mf.getSize() / 1024 / 1024; +// String originalFilename = mf.getOriginalFilename(); +// if (fileSize >= 100) { +// if (cut.equals(CutEnum.CN.getValue())) { +// throw new JeroBootException(originalFilename + "文件大小超出100MB, 请压缩或降低文件质量!"); +// } else { +// throw new JeroBootException(originalFilename + "File size out 100MB, Please compress or reduce file quality!"); +// } +// } OSSFile oSSFile = new OSSFile(); try { @@ -191,15 +191,15 @@ public class OSSFileServiceImpl extends ServiceImpl impl public OSSFile uploadLocalOfCos(MultipartFile mf, String bizPath, String state, String cut) { //处理文件大小,大于100M抛出异常 - long fileSize = mf.getSize() / 1024 / 1024; - String originalFilename = mf.getOriginalFilename(); - if (fileSize >= 100) { - if (cut.equals(CutEnum.CN.getValue())) { - throw new JeroBootException(originalFilename + "文件大小超出100MB, 请压缩或降低文件质量!"); - } else { - throw new JeroBootException(originalFilename + "File size out 100MB, Please compress or reduce file quality!"); - } - } +// long fileSize = mf.getSize() / 1024 / 1024; +// String originalFilename = mf.getOriginalFilename(); +// if (fileSize >= 100) { +// if (cut.equals(CutEnum.CN.getValue())) { +// throw new JeroBootException(originalFilename + "文件大小超出100MB, 请压缩或降低文件质量!"); +// } else { +// throw new JeroBootException(originalFilename + "File size out 100MB, Please compress or reduce file quality!"); +// } +// } OSSFile oSSFile = new OSSFile(); String ctxPath = uploadCospath; @@ -296,15 +296,15 @@ public class OSSFileServiceImpl extends ServiceImpl impl public OSSFile uploadLocalForSplit(MultipartFile mf, String bizPath, String state, String cut) { //处理文件大小,大于100M抛出异常 - long fileSize = mf.getSize() / 1024 / 1024; - String originalFilename = mf.getOriginalFilename(); - if (fileSize >= 100) { - if (cut.equals(CutEnum.CN.getValue())) { - throw new JeroBootException(originalFilename + "文件大小超出100MB, 请压缩或降低文件质量!"); - } else { - throw new JeroBootException(originalFilename + "File size out 100MB, Please compress or reduce file quality!"); - } - } +// long fileSize = mf.getSize() / 1024 / 1024; +// String originalFilename = mf.getOriginalFilename(); +// if (fileSize >= 100) { +// if (cut.equals(CutEnum.CN.getValue())) { +// throw new JeroBootException(originalFilename + "文件大小超出100MB, 请压缩或降低文件质量!"); +// } else { +// throw new JeroBootException(originalFilename + "File size out 100MB, Please compress or reduce file quality!"); +// } +// } OSSFile oSSFile = new OSSFile(); String ctxPath = uploadCospath; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 89a09fc42..3288a7854 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -293,7 +293,11 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl 1) { + msgEndStr = " have been deleted from the document library."; + } + String msgContent = "The standard " + StringUtils.join(serialNumberListTemp,",") + msgEndStr; homeDocumentDynamicEO.setMsgContent(msgContent); homeDocumentDynamicEO.setMsgContentInfo(msgContent); homeDocumentDynamicEOService.save(homeDocumentDynamicEO); @@ -2143,8 +2147,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl fileIdLIstTemp = new ArrayList<>(); @@ -2634,8 +2638,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl 0){ - String msgContent = msgContentSb.substring(0, msgContentSb.length() - 1); - String msgContentInfo = msgContentInfoSb.substring(0, msgContentInfoSb.length() - 1); + String msgContent = msgContentSb.substring(0, msgContentSb.length() - 1) + "."; + String msgContentInfo = msgContentInfoSb.substring(0, msgContentInfoSb.length() - 1) + "."; HomeDocumentDynamicEO homeDocumentDynamicEO = new HomeDocumentDynamicEO(); homeDocumentDynamicEO.setMsgContent(msgContent); homeDocumentDynamicEO.setMsgContentInfo(msgContentInfo); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java index 8b3d7e4b0..8d06ee3b3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java @@ -74,11 +74,13 @@ public class ExtRepoDataController extends JeroController { + boolean flag = false; + if (StringUtils.equals(data.getContent(), countryCardTempItemEO.getId())) { + flag = true; + } + return flag; + }).map(CountryCardTempItemEO::getItemText).collect(Collectors.joining(",")); + + //设置下拉框的value + data.setContentDropDownValue(contentDropDownValue); + } } }); 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 0345c59cc..e7252d647 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 @@ -235,7 +235,8 @@ public class CountryCardManageReleaseEOServiceImpl extends ServiceImpl regionList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode()); List finalProblemKnowledgeBaseClassifyEOList = problemKnowledgeBaseClassifyEOList; datas.forEach(data -> { @@ -298,6 +305,30 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl { + boolean flag = false; + if (StringUtils.equals(targetMarket, 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; + } + return flag; + }).map(DictModel::getTextEn).collect(Collectors.joining(",")); + } + + data.setTargetMarket_dicText(targetMarket_dicText); + } }); } } @@ -335,5 +366,21 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl problemTypeList = Arrays.asList(problemTypes.split(",")); + queryWrapper.and(query -> { + query.lambda().like(ProblemKnowledgeBaseEO::getProblemType,problemTypes); + if(CollectionUtils.isNotEmpty(problemTypeList)){ + problemTypeList.forEach(type -> { + query.or(q -> { + q.lambda().like(ProblemKnowledgeBaseEO::getProblemType,type); + }); + }); + } + }); + } } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/JumpLinkEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/JumpLinkEnum.java index 54aa3225b..85f2b4d9f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/JumpLinkEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/JumpLinkEnum.java @@ -19,6 +19,9 @@ public enum JumpLinkEnum { DESIGN_AFFIRM_LINK("设计符合性确认链接","4","/ProjectDetails?id=","&type=103"), TASK_AFFIRM_LINK("任务确认链接","2","/ProcessCenter",""), COMPLIANCE_PROCESS_DETAIL_LINK("符合性流程明细页路由","2","/taskListProcess",""), + + PROBLEM_KNOWLEDGE_BASE_DETAIL("问题知识库，详情页","","/problemKnowledgeBaseView",""), + PROBLEM_KNOWLEDGE_BASE("问题知识库，列表页","","/problemknowledgeBase",""), ; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java index d339bf66d..f99726b03 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java @@ -138,17 +138,17 @@ public class InventoryAffirmJob implements Job { /*String msgContentCN = "您" + projectLibraryBase.getProjectName() + "(项目名称)法规清单的任务确认剩余处理时间还有3天，请及时查看处理";*/ // XXX . - String msgContentEN = "The remaining processing time for the regulation list confirmation for " + String msgContentEN = "The remaining processing time for the regulation task confirmation for " + projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName()+ " " + projectLibraryBase.getTargetMarket() - + " are 3 days. Please check and handle it in time."; + + " are 3 days. Please check and address it in a timely manner."; String msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName()+ " " + projectLibraryBase.getTargetMarket() - + ": You have a regulation list confirmation task to complete"; + + ": You have a regulation task confirmation to complete"; FeishuMsgVo feishuMsgVo = new FeishuMsgVo(); feishuMsgVo.setContent("Hello! The remaining processing time for the task are 3 days. Please check and address it in a timely manner."); - feishuMsgVo.setTaskType("Regulation List Confirmation"); + feishuMsgVo.setTaskType("Regulation Task Confirmation"); feishuMsgVo.setProject(projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()); //飞书跳转链接 @@ -172,22 +172,22 @@ public class InventoryAffirmJob implements Job { sendMessageMap.put("contentInfo",contentInfo); //发送消息 - projectLawsInventoryEOService.sendMessage(msgTitle, msgContentEN, threeDaysUserIdList, projectLibraryBase.getId(), sendMessageMap, feishuMsgVo, MessageTypeEnum.LIST_CONFIRMATION,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName()); + projectLawsInventoryEOService.sendMessage(msgTitle, msgContentEN, threeDaysUserIdList, projectLibraryBase.getId(), sendMessageMap, feishuMsgVo, MessageTypeEnum.TASK_CONFIRMATION,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName()); } if(CollectionUtils.isNotEmpty(currentDaysUserIdList)){ currentDaysUserIdList = currentDaysUserIdList.stream().distinct().collect(Collectors.toList()); /*String msgContentCN = "您" + projectLibraryBase.getProjectName() + "(项目名称)法规清单的任务今天即将结束,请及时查看处理*/ - String msgContentEN = "The regulation list confirmation for " + String msgContentEN = "The regulation task confirmation for " + projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket() + " will expire today. Please check and address it in a timely manner."; String msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName()+ " " + projectLibraryBase.getTargetMarket() - + ": You have a regulation list confirmation task to complete"; + + ": You have a regulation task confirmation to complete"; FeishuMsgVo feishuMsgVo = new FeishuMsgVo(); feishuMsgVo.setContent("Hello! The task will expire today. Please check and address it in a timely manner."); - feishuMsgVo.setTaskType("Regulation List Confirmation"); + feishuMsgVo.setTaskType("Regulation Task Confirmation"); feishuMsgVo.setProject(projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()); //飞书跳转链接 @@ -210,7 +210,7 @@ public class InventoryAffirmJob implements Job { sendMessageMap.put("hrefFeishu",hrefFeishu); sendMessageMap.put("contentInfo",contentInfo); //发送消息 - projectLawsInventoryEOService.sendMessage(msgTitle, msgContentEN, currentDaysUserIdList, projectLibraryBase.getId(), sendMessageMap, feishuMsgVo, MessageTypeEnum.LIST_CONFIRMATION,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName()); + projectLawsInventoryEOService.sendMessage(msgTitle, msgContentEN, currentDaysUserIdList, projectLibraryBase.getId(), sendMessageMap, feishuMsgVo, MessageTypeEnum.TASK_CONFIRMATION,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName()); } } } 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 91fbcc37e..023bd336c 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 @@ -1350,7 +1350,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl deleteProcessInstanceByTaskId(@RequestParam("taskId")String taskId){ + return workFlowFeignClient.deleteProcessInstance(taskId); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java index 401da0f62..aa9bdd61b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java @@ -156,4 +156,12 @@ public interface WorkFlowFeignClient { @RequestMapping(value = "/bat-wkflow/task/completeLawsTechnologyEvaluationTaskByPids",method = RequestMethod.GET) Result completeLawsTechnologyEvaluationTaskByPids(@RequestParam("actiProcInstIds") String actiProcInstIds); + + /** + * 根据待办id删除流程 + * @param taskId + * @return + */ + @RequestMapping(value = "/bat-wkflow/deleteProcessInstanceByTaskId",method = RequestMethod.GET) + Result deleteProcessInstanceByTaskId(@RequestParam("taskId") String taskId); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/impl/WorkFlowFeignClientImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/impl/WorkFlowFeignClientImpl.java index 707089e60..ae1940c04 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/impl/WorkFlowFeignClientImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/impl/WorkFlowFeignClientImpl.java @@ -177,4 +177,13 @@ public class WorkFlowFeignClientImpl{ Result stringWrapper = workFlowFeignClient.startTaskToConfirmProcess(jsonObject.toString()); return Result.OK(stringWrapper.getResult()); } + + /** + * 根据待办id删除流程 + * @param taskId + * @return + */ + public Result deleteProcessInstanceByTaskId(@RequestParam("taskId")String taskId){ + return workFlowFeignClient.deleteProcessInstance(taskId); + } } diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml index 512e14819..f3c8ae460 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml +++ b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml @@ -92,7 +92,7 @@ spring: mvc: static-path-pattern: /** resource: - static-locations: classpath:/static/,classpath:/public/,classpath:/home/ + static-locations: classpath:/static/,classpath:/public/,classpath:/home,/classpath:/nationalFlag/ autoconfigure: exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure datasource: diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Australia.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Australia.png new file mode 100644 index 000000000..2c4a076c2 Binary files /dev/null and b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Australia.png differ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/China.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/China.png new file mode 100644 index 000000000..c9634bd83 Binary files /dev/null and b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/China.png differ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/EU.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/EU.png new file mode 100644 index 000000000..af12bb40c Binary files /dev/null and b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/EU.png differ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Japan.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Japan.png new file mode 100644 index 000000000..06c061beb Binary files /dev/null and b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Japan.png differ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Malaysia.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Malaysia.png new file mode 100644 index 000000000..b5031a0b6 Binary files /dev/null and b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Malaysia.png differ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/NewZealand.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/NewZealand.png new file mode 100644 index 000000000..a523fa526 Binary files /dev/null and b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/NewZealand.png differ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Singapore.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Singapore.png new file mode 100644 index 000000000..7ef158e4f Binary files /dev/null and b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Singapore.png differ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/SouthKorea.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/SouthKorea.png new file mode 100644 index 000000000..37cd978e8 Binary files /dev/null and b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/SouthKorea.png differ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/UAE.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/UAE.png new file mode 100644 index 000000000..d14615a6c Binary files /dev/null and b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/UAE.png differ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/UK.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/UK.png new file mode 100644 index 000000000..7119c8dd0 Binary files /dev/null and b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/UK.png differ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/US.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/US.png new file mode 100644 index 000000000..d3c69746f Binary files /dev/null and b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/US.png differ diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 591446f6f..7596c76db 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1252,7 +1252,8 @@ module.exports = { optionDropDownBox:'Option drop - down box', attachmentUpload:'file', textInput:'Text Input', - deleteNode:'If any file information exists, it will be deleted', + deleteNode:'If there is any file information, the file will be deleted. Are you sure to delete this data?', HaveReleased:'Have released', forward:'Forward', + issuedBy:'Issued by', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 6cdb9acde..413c5702b 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1355,7 +1355,8 @@ module.exports = { Paraname: '参数名称', Parabatch: '参数批次', freeze:'请选择冻结配置', - deleteNode:'若有文件信息将同步删除', + deleteNode:'若有文件信息将同步删除，确认删除该条数据？', HaveReleased:'已发布', forward:'转发', + issuedBy:'发布人', } \ No newline at end of file diff --git a/jero-web/src/components/exporthistory/index.vue b/jero-web/src/components/exporthistory/index.vue index ecd48eb3d..6bec68ea0 100644 --- a/jero-web/src/components/exporthistory/index.vue +++ b/jero-web/src/components/exporthistory/index.vue @@ -40,7 +40,7 @@ :dataSource='areaTable' :pagination='false' :loading='loading' - :scroll="{x: '100%',y:'calc(100vh - 130px)'}" + :scroll="{x: '100%',y:600}" :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}' @change='handleTableChange'> diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue index 8201e8ed5..c2042a3c1 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue @@ -350,13 +350,23 @@ } postAction('/workFlow/startProcess', query).then((res) => { if (res.success) { - this.completeTask(value, res.result) + this.completeTask(value, res.result, true) } else { this.JLoading = false } }) }, - completeTask(value, taskId) { + deleteProcessInstanceByTask(taskId) { + getAction('/workFlow/deleteProcessInstanceByTaskId', { taskId: taskId }).then((res) => { + }) + }, + completeTask(value, taskId, isTrue) { + Object.keys(value).forEach(res => { + if (value[res] && value[res] instanceof String) { + value[res] = value[res].replace(/\"/g, '“') + value[res] = value[res].replace(/\'/g, '‘') + } + }) let query = { userid: this.userInfo().id, taskId: taskId, @@ -375,6 +385,9 @@ } else { this.JLoading = false this.$message.warning(this.$t('operationFailed')) + if (isTrue) { + this.deleteProcessInstanceByTask(taskId) + } } }) } diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue index e3e4044bf..61e974e72 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue @@ -37,55 +37,26 @@
-
- +
+ - 中国 + {{item.applyMarket_dictText}}
-
- - - 中国 - -
-
- - - 中国 - -
-
- - - 中国 - -
-
- - - 中国 - -
-
- - - 中国 - -
-
- -
+
+ +
+ {{$t('dataLoading')}}
@@ -101,11 +72,16 @@ applyMarketList: [], pageSize: 10, total: 0, - pageNo: 1 + pageNo: 1, + loading: false, + url: { + getInfoList: '/problemKnowledgeBase/countryCardManageReleaseEO/page' + } } }, mounted() { this.getApplyMarketList() + this.getList() }, methods: { getApplyMarketList() { @@ -118,10 +94,15 @@ }) }, searchQuery() { - + this.pageNo = 1 + this.getApplyMarketList() + this.getList() }, searchReset() { - + this.pageNo = 1 + this.getApplyMarketList() + this.queryParam = {} + this.getList() }, pageOnChange(page, pageSize) { this.pageNo = page @@ -135,14 +116,19 @@ getList() { let query = { pageNo: this.pageNo, - pageSize: this.pageSize + pageSize: this.pageSize, + releaseStatus: 'Have released', + ...this.queryParam } - postAction(this.url.getInfoList, query).then((res) => { + this.loading = true + getAction(this.url.getInfoList, query).then((res) => { if (res.success) { this.conList = res.result.records this.total = res.result.total + this.loading = false } else { this.conList = [] + this.loading = false } }) }, @@ -153,10 +139,13 @@ }) window.open(newUrl.href, '_blank') }, - contentClick() { + contentClick(row) { let newUrl = this.$router.resolve({ path: '/countryCardView', - query: {} + query: { + applyMarket: row.applyMarket, + id: row.id + } }) window.open(newUrl.href, '_blank') } @@ -208,6 +197,7 @@ .content-box { width: 100%; + overflow: hidden; } .content-box-box { @@ -226,14 +216,14 @@ } .content-box-box-img { - width: 70%; + width: 238px; height: 100%; border-right: 1px #d9d9d9 solid; } .content-box-box-text { + width: calc(100% - 238px); display: inline-block; - width: 30%; text-align: center; font-size: 18px; font-weight: 500; @@ -244,6 +234,7 @@ width: 100%; text-align: right; margin-top: 20px; + margin-bottom: 20px; } .operator-text { diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue index a2ed72151..301721aff 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue @@ -234,7 +234,7 @@ url = this.url.edit this.dataList.forEach(res => { content.push({ - countryCardTempId: res.id, + countryCardTempId: res.countryCardTempId, description: res.description, content: res.content, id: res.id diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue index 65273ad93..ace355e4f 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue @@ -23,19 +23,37 @@
-
-
+
+
- - - 中国 - + + + + + {{item2.applyMarket_dictText}} + +
- - - 中国 - + + {{$t('viewFile')}} + + + {{item2.lableName}} + + + + + +
@@ -44,8 +62,11 @@
- + + {{$t('dataLoading')}} +
@@ -53,35 +74,154 @@ import { getAction, postAction, downloadFile } from '@/api/manage' import displayInformationModel from './displayInformationModel' import countryCardViewAdd from './countryCardViewAdd' + import viewFileModel from '@/components/viewFileModel/index' export default { name: 'countryCardView', components: { displayInformationModel, - countryCardViewAdd + countryCardViewAdd, + viewFileModel }, data() { return { clientWidth: '', - isTrue: false + isTrue: false, + loading: false, + dataList: [], + contentList: [], + displayList: [], + queryCountryList: [], + countryCardViewList:[], + applyMarkets: '', + url: { + list: '/problemKnowledgeBase/countryCardTempEO/list', + deleteOne: '' + }, + list: '/problemKnowledgeBase/countryCardManageReleaseEO/queryCountryCardManageReleaseByApplyMarkets' } }, mounted() { - this.isTrue = false - this.$nextTick(() => { - this.clientWidth = 340 * 14 + 'px' - this.isTrue = true + this.queryCountry(() => { + this.replacePage() }) }, methods: { displayInformationClick() { - this.$refs.displayInformationModelRef.getData() + this.$refs.displayInformationModelRef.getData(JSON.parse(JSON.stringify(this.displayList))) + }, + displayInformationModelForm(data) { + this.displayList = data + this.displayList = [...this.displayList] + this.consolidateData() }, newlyAddedClick() { - this.$refs.countryCardViewAddRef.add() + this.$refs.countryCardViewAddRef.add(this.countryCardViewList) }, - countryCardViewAddForm() { - + countryCardViewAddForm(val) { + this.countryCardViewList = JSON.parse(JSON.stringify(val)) + let content = [] + if (val && val.length > 0) { + val.forEach(res => { + if (res.applyMarket) { + content.push(res.applyMarket) + } + }) + } + this.applyMarkets = content.join(',') + this.queryCountry() + }, + replacePage() { + getAction(this.url.list, {}).then((res) => { + if (res.success) { + this.displayList = res.result || [] + this.displayList.forEach(val => { + val.showOrNot = true + }) + this.consolidateData() + this.loading = false + } else { + this.displayList = [] + this.loading = false + } + }) + }, + consolidateData() { + let content = [] + this.contentList = [] + this.contentList.push({}) + if (this.displayList && this.displayList.length > 0) { + this.displayList.forEach(res => { + if (res.showOrNot) { + content.push(res) + } + }) + } + if (this.queryCountryList && this.queryCountryList.length > 0) { + this.contentList[0].list = [] + this.contentList[0].list.push({}) + this.queryCountryList.forEach(val => { + this.contentList[0].name = 'tou' + this.contentList[0].list.push({ + applyMarket_dictText: val.applyMarket_dictText, + img: val.countryNationalFlag + }) + }) + } + if (content && content.length > 0) { + content.forEach((res, index) => { + this.contentList[index + 1] = { name: res.lableName } + this.contentList[index + 1].list = [] + this.contentList[index + 1].list.push({ + lableName: res.lableName, + lableType: res.lableType + }) + }) + } + this.queryCountryList.forEach((res, index) => { + res.countryCardManageReleaseDetailEOList.forEach((val, index1) => { + this.contentList.forEach(res1 => { + if (res1.name == val.lableName) { + res1.list.push({ + lableName: val.content, + lableType: val.lableType + }) + } + }) + }) + }) + }, + queryCountry(callback) { + this.loading = true + let applyMarkets = this.$route.query.applyMarket + if (this.applyMarkets) { + applyMarkets = applyMarkets + ',' + this.applyMarkets + } + let query = { + applyMarkets: applyMarkets + } + postAction(this.list, query).then((res) => { + if (res.success) { + this.queryCountryList = res.result || [] + this.isTrue = false + this.$nextTick(() => { + this.clientWidth = 340 * (this.queryCountryList.length + 1) + 'px' + this.isTrue = true + }) + callback && callback() + if (!callback) { + this.consolidateData() + this.loading = false + } + } else { + callback && callback() + this.contentList = [] + this.loading = false + } + }) + }, + viewFileClick(item) { + this.$refs.viewFileModelRef.clickButtonToUpload(item) } } } @@ -201,6 +341,8 @@ width: 340px; display: inline-block; height: 80px; + line-height: 80px; + text-align: center; background: #fff; border-right: 1px #d9d9d9 solid; border-bottom: 1px #d9d9d9 solid; @@ -232,10 +374,28 @@ background: #fff; } + .content-box-top { + height: 80px; + } + .content-box-top:first-child { position: sticky; top: 0; + height: 160px; z-index: 111; background: #fff; } + + .content-box-box-text-index { + width: 100% !important; + padding: 0 12px; + box-sizing: border-box; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + + .content-box-box-text-admin { + height: 80px !important; + } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardViewAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardViewAdd.vue index da74db64a..39181fe65 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardViewAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardViewAdd.vue @@ -14,14 +14,15 @@
- * {{$t('applicableMarket')}}
- +
@@ -30,19 +31,27 @@
- * {{$t('comparisonMarket')+(index+1)}}
- + + + + {{ item.applyMarket_dictText}} + + + { this.formInline = {} - this.formInline.dataList = [{ - relatedSection: '' - }] + this.formInline.applyMarket = this.$route.query.applyMarket + if (data && data.length > 0) { + this.formInline.dataList = JSON.parse(JSON.stringify(data)) + } else { + this.formInline.dataList = [{ + applyMarket: '' + }] + } + this.getList() this.formInline = { ...this.formInline } this.$refs.ruleForm.clearValidate() }) @@ -113,29 +133,77 @@ this.formInline = { ...this.formInline } }, handleOk() { - this.$refs.ruleForm.validate(valid => { - if (valid) { - - } - }) + this.$emit('countryCardViewAddForm', JSON.parse(JSON.stringify(this.formInline.dataList))) + this.visible = false }, handleCancel() { this.visible = false }, addData() { this.formInline.dataList.push({ - relatedSection: '' + applyMarket: '' }) + this.consolidateData() this.formInline = { ...this.formInline } }, deleteData() { this.formInline.dataList.pop() + this.consolidateData() this.formInline = { ...this.formInline } + }, + getList() { + let query = { + releaseStatus: 'Have released' + } + getAction(this.url.getInfoList, query).then((res) => { + if (res.success) { + this.applyMarketList = res.result + this.consolidateData() + } else { + this.applyMarketList = [] + } + }) + }, + consolidateData() { + let content = [] + content.push(this.$route.query.applyMarket) + content = content.join(',') + this.applyMarketList = this.applyMarketList.filter(res => { + return !content.includes(res.applyMarket) + }) + let contentIndex = [] + if (this.formInline.dataList && this.formInline.dataList.length > 0) { + this.formInline.dataList.forEach(res => { + contentIndex.push(res.applyMarket) + res.applyMarketList = [] + this.applyMarketList.forEach(val => { + res.applyMarketList.push(val) + }) + }) + } + contentIndex = contentIndex.join(',') + for (let i = 0; i < this.formInline.dataList.length; i++) { + for (let j = 0; j < this.formInline.dataList[i].applyMarketList.length; j++) { + if (contentIndex.includes(this.formInline.dataList[i].applyMarketList[j].applyMarket) + && this.formInline.dataList[i].applyMarket != this.formInline.dataList[i].applyMarketList[j].applyMarket) { + this.formInline.dataList[i].applyMarketList.splice(j, 1) + j-- + } + } + } + this.formInline = { ...this.formInline } + }, + applyMarketChange() { + this.consolidateData() } } } - + + \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue index 0a170f8d7..cda30770c 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue @@ -3,7 +3,7 @@
- + {{$t('managePublishing')}} @@ -22,7 +22,7 @@ {{$t('reset')}}
-
+
@@ -36,7 +36,8 @@
-
+
+ {{item.contentOne}}
{{$t('edit')}} @@ -46,26 +47,26 @@
-
- 暂无数据 -
-
- -
+
+ {{$t('noData')}} +
+
+
- {{$t('dataLoading')}}
+ {{$t('dataLoading')}}
+