diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index 6a24c7bd5..c408ef57e 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -966,3 +966,8 @@ ADD COLUMN `related_areas_en` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4 ADD COLUMN `source_cn` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '来源中文' AFTER `related_areas_en`, ADD COLUMN `time` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '日期' AFTER `source_cn`, ADD COLUMN `source_en` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '来源英文' AFTER `time`; + + +-- 法规技术评估 条款项评估结果表增加字段。 2022-08-26 +ALTER TABLE `laws_weilai`.`laws_technology_evaluation_item_result` + ADD COLUMN `feedback_time` datetime NULL COMMENT '反馈时间' AFTER `laws_technology_evaluation_id`; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/enums/SearchEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/enums/SearchEnum.java index 40e1d088a..17f23c7bf 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/enums/SearchEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/enums/SearchEnum.java @@ -8,8 +8,8 @@ package com.jero.modules.document.enums; public enum SearchEnum { INDEX_NAME_DOCUMENT("文档库索引名称","documentLibrary"), TYPE_NAME_DOCUMENT("文档库类型","document"), - INDEX_NAME_LAWS_MONTHLY_REPORT("法规月报索引名称","lawsMonthlyReportManage"), - TYPE_NAME_LAWS_MONTHLY_REPORT("法规月报类型名称","lawsMonthlyReport"), + INDEX_NAME_LAWS_MONTHLY_REPORT("法规月报索引名称","lawsmonthlyreportmanage"), + TYPE_NAME_LAWS_MONTHLY_REPORT("法规月报类型名称","lawsmonthlyreport"), FULL_TEXT_SEARCH("全部中文","fulltextsearchcn"), FULL_TEXT_SEARCH_CN("全部中文","fulltextsearchcn"), FULL_TEXT_SEARCH_EN("全部英文","fulltextsearchen"), diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationItemResultEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationItemResultEO.java index 5ab32f3d2..770cf937b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationItemResultEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationItemResultEO.java @@ -135,6 +135,11 @@ public class LawsTechnologyEvaluationItemResultEO implements Serializable { @ApiModelProperty(value = "发起人反馈") private java.lang.String sponsorFeedback; + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "反馈时间") + private java.util.Date feedbackTime; + /**法规技术评估表id*/ @ApiModelProperty(value = "法规技术评估表id") private java.lang.String lawsTechnologyEvaluationId; 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 087d3aabf..ff9e0fa10 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 @@ -222,7 +222,7 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl targetMarketList){ if(StringUtils.equals(cut,CutEnum.CN.getValue())){ - if(StringUtils.isNotEmpty(problemKnowledgeBaseEO.getShowPermissions())){ + /*if(StringUtils.isNotEmpty(problemKnowledgeBaseEO.getShowPermissions())){ String textByValue = ShowPermissionsEnum.getTextByValue(problemKnowledgeBaseEO.getShowPermissions(), cut); sbCn.append("展示权限" + ":" + textByValue + " "); }else { @@ -233,7 +233,7 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl"); - sbCn.append("内容" + ":" + problemKnowledgeBaseEO.getContent() + " "); + sbCn.append("正文" + ":" + problemKnowledgeBaseEO.getContent() + " "); }else { sbCn.append("
"); - sbCn.append("内容" + ":" + "-- "); + sbCn.append("正文" + ":" + "-- "); } if(StringUtils.isNotEmpty(fileText)){ @@ -285,7 +285,7 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl"); - sbEn.append("Content" + ":" + problemKnowledgeBaseEO.getContent() + " "); + sbEn.append("Text" + ":" + problemKnowledgeBaseEO.getContent() + " "); }else { sbEn.append("
"); - sbEn.append("Content" + ":" + "-- "); + sbEn.append("Text" + ":" + "-- "); } if(StringUtils.isNotEmpty(fileText)){ diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java index c96a1553d..85f26e2c4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java @@ -191,20 +191,20 @@ public class LawsMonthlyReportManageEOServiceImpl extends ServiceImpl> mapListTempEn = new ArrayList<>(); //文件相关封装中文的全文内容(es) 非搜索条件下的：flag---SEARCH_FLAG putMap(id, "法规月报", - fileText, monthlyReportManageEO.getName(), fileText, + fileText, monthlyReportManageEO.getName(), ossFile.getFileName(), ossFile.getId(), issueTime, CutEnum.CN.getValue(), stringMapCn, SEARCH_FLAG); - //文件相关封装英文的全文内容(es) 搜索条件下的: flag---null + //文件相关封装英文的全文内容(es) putMap(id, "monthly report", - fileText, monthlyReportManageEO.getName(), fileText, + fileText, monthlyReportManageEO.getName(), ossFile.getFileName(), ossFile.getId(), issueTime, CutEnum.EN.getValue(), stringMapEn, SEARCH_FLAG); - //文件相关封装中文的全文内容(es) + //文件相关封装中文的全文内容(es) 搜索条件下的: flag---null putMap(id + monthlyReportManageEO.getFileId(), "法规月报", - fileText, monthlyReportManageEO.getName(), fileText, + fileText, monthlyReportManageEO.getName(), ossFile.getFileName(), ossFile.getId(), issueTime, CutEnum.CN.getValue(), stringMapCnForSearch, null); //文件相关封装英文的全文内容(es) putMap(id + monthlyReportManageEO.getFileId(), "monthly report", - fileText, monthlyReportManageEO.getName(), fileText, + fileText, monthlyReportManageEO.getName(), ossFile.getFileName(), ossFile.getId(), issueTime, CutEnum.EN.getValue(), stringMapEnForSearch, null); mapListTempCn.add(stringMapCn); @@ -247,7 +247,7 @@ public class LawsMonthlyReportManageEOServiceImpl extends ServiceImpl stringMap, String flag){ @@ -256,7 +256,6 @@ public class LawsMonthlyReportManageEOServiceImpl extends ServiceImpl mapHighlight1 = new HashMap<>(); //封装首次的条件 if (StringUtils.isNotBlank(selectValue)) { + selectValue = selectValue.toLowerCase(); + for (String field : fieldList) { - Map map2 = new HashMap<>(); - Map map3 = new HashMap<>(); - Map map4 = new HashMap<>(); - if("serial_number".equals(field)){ - map3.put("boost",1); - }else if("title".equals(field)){ - map3.put("boost",1); - }else if("file_text".equals(field)){ - map3.put("boost",0.01); - }else if("content".equals(field)){ - map3.put("boost",0.01); - }else if("file_name".equals(field)){ - map3.put("boost",1); - } -// 特殊处理编号字段 - if (field.equals("serial_number")){ - // map2放最内层 - map2.put(field, "*" + selectValue + "*"); + getQueryMapJsonFullText(queryMapJson, selectValue, field); - // map4放query - map4.put("wildcard",map2); - } else { - map3.put("query",selectValue); -// map3.put("minimum_should_match",2); - - map2.put(field, map3); - map4.put("match",map2); - } - queryMapJson.add(map4); //高亮 if(!"flag".equals(field)){ highlight(mapHighlight, field); + } else { + // query_string查询 + Map map25 = new HashMap<>(); + Map map45 = new HashMap<>(); + map25.put("query", selectValue); + map25.put("allow_leading_wildcard", false); //禁用了前置通配符 + map45.put("query_string", map25); + queryMapJson.add(map45); + } } mapHighlight1.put("fields",mapHighlight); @@ -489,39 +475,23 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { } //封装二次的条件 if (StringUtils.isNotBlank(selectValueTwo)) { + selectValueTwo = selectValueTwo.toLowerCase(); + for (String field : fieldList) { - Map queryMap = new HashMap<>(); - Map map2 = new HashMap<>(); - Map map3 = new HashMap<>(); - if("serial_number".equals(field)){ - map3.put("boost",1); - }else if("title".equals(field)){ - map3.put("boost",1); - }else if("file_text".equals(field)){ - map3.put("boost",0.01); - }else if("content".equals(field)){ - map3.put("boost",0.01); - }else if("file_name".equals(field)){ - map3.put("boost",1); - } + getQueryMapJsonFullText(queryMapJsonTwo, selectValueTwo, field); - //特殊处理编号字段 - if (field.equals("serial_number")){ - // map2放最内层 - map2.put(field, "*" + selectValueTwo + "*"); - // map4放query - queryMap.put("wildcard",map2); - } else { - map3.put("query",selectValueTwo); -// map3.put("minimum_should_match",2); - map2.put(field, map3); - queryMap.put("match", map2); - } - - queryMapJsonTwo.add(queryMap); //高亮 if(!"flag".equals(field)){ highlight(mapHighlight, field); + } else { + // query_string查询 + Map map25 = new HashMap<>(); + Map map45 = new HashMap<>(); + map25.put("query", selectValue); + map25.put("allow_leading_wildcard", false); //禁用了前置通配符 + map45.put("query_string", map25); + queryMapJson.add(map45); + } } mapHighlight1.put("fields",mapHighlight); @@ -546,7 +516,7 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { } JSONObject sort = new JSONObject(); - if(StringUtils.isEmpty(selectValue)){ + if(StringUtils.isEmpty(selectValue) || StringUtils.equals(selectValue,SEARCH_FLAG)){ Map createTime = new HashMap<>(); Map createTime1 = new HashMap<>(); createTime.put("order","desc"); @@ -559,6 +529,7 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { score1.put("_score",score); sort.putAll(score1); } + log.info("搜索中心-全部索引，排序方式为：" + sort.toJSONString()); // Map mapSort = new HashMap<>(); // Map mapSortTemp = new HashMap<>(); @@ -573,6 +544,65 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { return page; } + private void getQueryMapJsonFullText(JSONArray queryMapJson, String selectValue, String field) { + // 前缀匹配 缺点是前缀一定不能断开 + //情况举例：用户只记得前面那段字 + Map map21 = new HashMap<>(); + Map map31 = new HashMap<>(); + Map map41 = new HashMap<>(); + if("serial_number".equals(field)){ + map31.put("boost",1); + }else if("title".equals(field)){ + map31.put("boost",1); + }else if("file_text".equals(field)){ + map31.put("boost",0.01); + }else if("content".equals(field)){ + map31.put("boost",0.01); + }else if("file_name".equals(field)){ + map31.put("boost",1); + } + map31.put("value", selectValue); + map21.put(field + ".keyword", map31); + map41.put("prefix", map21); + queryMapJson.add(map41); + + // match_phrase_prefix 词组匹配查询，允许最后词组与文中的任意分词前缀匹配 + Map map22 = new HashMap<>(); + Map map32 = new HashMap<>(); + Map map42 = new HashMap<>(); + if("serial_number".equals(field)){ + map32.put("boost",1); + }else if("title".equals(field)){ + map32.put("boost",1); + }else if("file_text".equals(field)){ + map32.put("boost",0.01); + }else if("content".equals(field)){ + map32.put("boost",0.01); + }else if("file_name".equals(field)){ + map32.put("boost",1); + } + map32.put("query", selectValue); + map22.put(field, map32); + map42.put("match_phrase_prefix", map22); + queryMapJson.add(map42); + + // match分词匹配查询 + // 情况举例：用户可能他知道开头的前缀几个字，知道中间的几个字 + Map map23 = new HashMap<>(); + Map map43 = new HashMap<>(); + map23.put(field, selectValue); + map43.put("match", map23); + queryMapJson.add(map43); + + // wildcard模糊查询 + //情况举例：用户只记得中间那段字 + Map map24 = new HashMap<>(); + Map map44 = new HashMap<>(); + map24.put(field, "*" + selectValue + "*"); + map44.put("wildcard",map24); + queryMapJson.add(map44); + } + @NotNull private IPage getiPage(String selectValue, String selectValueTwo, JSONArray queryMapJson,Map highlightMap, JSONArray should, Integer pageNo, Integer pageSize, String paragraphFlag, @@ -1256,7 +1286,7 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { queryMapJsonAll.add(jsonObjectThree); } JSONObject sort = new JSONObject(); - if(StringUtils.isEmpty(selectValue)){ + if(StringUtils.isEmpty(selectValue) || StringUtils.equals(selectValue,SEARCH_FLAG)){ Map createTime = new HashMap<>(); Map createTime1 = new HashMap<>(); createTime.put("order","desc"); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/LawsMonthlyReportSearchServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/LawsMonthlyReportSearchServiceImpl.java index f046e4f02..d4fea43f6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/LawsMonthlyReportSearchServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/LawsMonthlyReportSearchServiceImpl.java @@ -77,35 +77,28 @@ public class LawsMonthlyReportSearchServiceImpl implements ILawsMonthlyReportSea Map mapHighlight1 = new HashMap<>(); //封装首次的条件 if (StringUtils.isNotBlank(selectValue)) { + selectValue = selectValue.toLowerCase(); for (String field : fieldList) { - Map map2 = new HashMap<>(); - Map map3 = new HashMap<>(); - Map map4 = new HashMap<>(); - if("title".equals(field)){ - map3.put("boost",1); - }else if("content".equals(field)){ - map3.put("boost",0.01); - } - // 标题字段 通配符模糊匹配 - if (field.equals("title")){ - // map2放最内层 - map2.put(field, "*" + selectValue + "*"); - - // map4放query - map4.put("wildcard",map2); - } else { - map3.put("query", selectValue); - map2.put(field, map3); - map4.put("match", map2); - } - queryMapJson.add(map4); + getQueryMapJson(queryMapJson, selectValue, field); //高亮 if(!"flag".equals(field)){ highlight(mapHighlight, field); + } else { + // query_string查询 + Map map25 = new HashMap<>(); + Map map45 = new HashMap<>(); + map25.put("query", selectValue); + map25.put("fields", fieldList.toArray()); + map25.put("allow_leading_wildcard", false); //禁用了前置通配符 + map45.put("query_string", map25); + queryMapJson.add(map45); + } + } mapHighlight1.put("fields",mapHighlight); + } if(CollectionUtils.isNotEmpty(queryMapJson)){ JSONObject jsonObject = jeroElasticsearchTemplate.buildBoolQuery(null, null, queryMapJson); @@ -113,33 +106,22 @@ public class LawsMonthlyReportSearchServiceImpl implements ILawsMonthlyReportSea } //封装二次的条件 if (StringUtils.isNotBlank(selectValueTwo)) { + selectValueTwo = selectValueTwo.toLowerCase(); for (String field : fieldList) { - Map queryMap = new HashMap<>(); - Map map2 = new HashMap<>(); - Map map3 = new HashMap<>(); - if("title".equals(field)){ - map3.put("boost",1); - }else if("content".equals(field)){ - map3.put("boost",0.01); - } + getQueryMapJson(queryMapJsonTwo, selectValueTwo, field); - // 标题字段 通配符模糊匹配 - if (field.equals("title")){ - // map2放最内层 - map2.put(field, "*" + selectValueTwo + "*"); - // map4放query - queryMap.put("wildcard",map2); - } else { - map3.put("query", selectValueTwo); -// map3.put("minimum_should_match",2); - map2.put(field, map3); - queryMap.put("match", map2); - } - - queryMapJsonTwo.add(queryMap); //高亮 if(!"flag".equals(field)){ highlight(mapHighlight, field); + } else { + // query_string查询 + Map map25 = new HashMap<>(); + Map map45 = new HashMap<>(); + map25.put("query", selectValue); + map25.put("allow_leading_wildcard", false); + map45.put("query_string", map25); + queryMapJsonTwo.add(map45); + } } mapHighlight1.put("fields",mapHighlight); @@ -227,11 +209,6 @@ public class LawsMonthlyReportSearchServiceImpl implements ILawsMonthlyReportSea } mapSource.put(key,fieldConyent); } - //如果这一条数据中有高亮字段值,但是file_text中没有高亮值, 则赋空值,否则列表中会展示所有的文件内容, 赋空后,则展示基础数据 - String fileText = (String) mapSource.get("file_text"); - if(StringUtils.isNotBlank(fileText) && !fileText.contains("")){ - mapSource.put("file_text",""); - } } mapList.add(mapSource); } @@ -258,10 +235,57 @@ public class LawsMonthlyReportSearchServiceImpl implements ILawsMonthlyReportSea list1.add(""); mapTemp.put("pre_tags", list); mapTemp.put("post_tags", list1); - mapTemp.put("fragment_size", 550);//高亮字段内容长度，去除html样式标签，统计字数，设置为200 + mapTemp.put("fragment_size", 500);//高亮字段内容长度，去除html样式标签，统计字数，设置为200 mapTemp.put("number_of_fragments", 1);//高亮内容默认分为5段, 此处设置为一段 mapTemp.put("type", "plain"); mapHighlight.put(key, mapTemp); } + private void getQueryMapJson(JSONArray queryMapJson, String selectValue, String field) { + // 前缀匹配 缺点是前缀一定不能断开 + //情况举例：用户只记得前面那段字 + Map map21 = new HashMap<>(); + Map map31 = new HashMap<>(); + Map map41 = new HashMap<>(); + if("title".equals(field)){ + map31.put("boost",1); + }else if("content".equals(field)){ + map31.put("boost",0.01); + } + map31.put("value", selectValue); + map21.put(field + ".keyword", map31); + map41.put("prefix", map21); + queryMapJson.add(map41); + + // match_phrase_prefix 词组匹配查询，允许最后词组与文中的任意分词前缀匹配 + Map map22 = new HashMap<>(); + Map map32 = new HashMap<>(); + Map map42 = new HashMap<>(); + if("title".equals(field)){ + map32.put("boost",1); + }else if("content".equals(field)){ + map32.put("boost",0.01); + } + map32.put("query", selectValue); + map22.put(field, map32); + map42.put("match_phrase_prefix", map22); + queryMapJson.add(map42); + + // match分词匹配查询 + // 情况举例：用户可能他知道开头的前缀几个字，知道中间的几个字 + Map map23 = new HashMap<>(); + Map map43 = new HashMap<>(); + map23.put(field, selectValue); + map43.put("match", map23); + queryMapJson.add(map43); + + // wildcard模糊查询 + //情况举例：用户只记得中间那段字 + Map map24 = new HashMap<>(); + Map map44 = new HashMap<>(); + map24.put(field, "*" + selectValue + "*"); + map44.put("wildcard",map24); + queryMapJson.add(map44); + } + } diff --git a/jero-web/src/components/libraryAddForm/index.vue b/jero-web/src/components/libraryAddForm/index.vue index 5d2f46830..90f7add64 100644 --- a/jero-web/src/components/libraryAddForm/index.vue +++ b/jero-web/src/components/libraryAddForm/index.vue @@ -332,7 +332,12 @@ if (res.success) { this.confirmLoading = false this.$message.success(this.$t('OperationSuccessful')) - eventBUs.$emit('searchReset') + if (this.formInline.id) { + eventBUs.$emit('searchGetData') + } else { + eventBUs.$emit('searchReset') + } + this.$emit('addFormClick') } else { this.confirmLoading = false diff --git a/jero-web/src/components/libraryPush/index.vue b/jero-web/src/components/libraryPush/index.vue index 7d344063b..05d1e547f 100644 --- a/jero-web/src/components/libraryPush/index.vue +++ b/jero-web/src/components/libraryPush/index.vue @@ -115,7 +115,7 @@ this.visible = false this.visibleTree = false this.$emit('clearSelected') - eventBUs.$emit('searchReset') + eventBUs.$emit('searchGetData') } else { this.$message.warning(this.$t('operationFailed')) } @@ -188,7 +188,7 @@ .drawer-bootom-button { position: absolute; bottom: 0; - z-index:100; + z-index: 100; width: 100%; border-top: 1px solid #e8e8e8; padding: 10px 16px; diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue index 5d8242925..8981f9504 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue @@ -333,7 +333,7 @@ value.id = this.getUUID() value.currentUserName = this.userInfo().username Object.keys(value).forEach(res => { - if (value[res] && value[res] instanceof String) { + if (value[res] && typeof value[res] == 'string') { value[res] = value[res].replace(/\"/g, '“') value[res] = value[res].replace(/\'/g, '‘') } @@ -364,7 +364,7 @@ let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') value.handlingTime = handlingTime Object.keys(value).forEach(res => { - if (value[res] && value[res] instanceof String) { + if (value[res] && typeof value[res] == 'string') { value[res] = value[res].replace(/\"/g, '“') value[res] = value[res].replace(/\'/g, '‘') } diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue index 8dd8ec28a..a64a58ba0 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue @@ -217,7 +217,7 @@ }, { title: this.$t('feedbackTime'), - dataIndex: 'updateTime', + dataIndex: 'feedbackTime', align: 'center', ellipsis: true, width: 160 diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue index d851a0ecf..d5ebba0a4 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue @@ -537,7 +537,7 @@ if (value[res] && value[res] instanceof Array) { value[res] = value[res].join(',') } - if (value[res] && value[res] instanceof String) { + if (value[res] && typeof value[res] == 'string') { value[res] = value[res].replace(/\"/g, '“') value[res] = value[res].replace(/\'/g, '‘') } @@ -579,7 +579,7 @@ }, completeTask(value, taskId) { Object.keys(value).forEach(res => { - if (value[res] && value[res] instanceof String) { + if (value[res] && typeof value[res] == 'string') { value[res] = value[res].replace(/\"/g, '“') value[res] = value[res].replace(/\'/g, '‘') } diff --git a/jero-web/src/views/documentManage/library/index.vue b/jero-web/src/views/documentManage/library/index.vue index b5caea42c..9195327c9 100644 --- a/jero-web/src/views/documentManage/library/index.vue +++ b/jero-web/src/views/documentManage/library/index.vue @@ -184,7 +184,7 @@ if (res.success) { _this.$message.success(_this.$t('OperationSuccessful')) _this.idList = [] - eventBUs.$emit('searchReset') + eventBUs.$emit('searchGetData') } else { _this.$message.warning(_this.$t('operationFailed')) } @@ -233,7 +233,7 @@ getAction(_this.url.deleteBatch, { ids: val.id }).then((res) => { if (res.success) { _this.$message.success(_this.$t('OperationSuccessful')) - eventBUs.$emit('searchReset') + eventBUs.$emit('searchGetData') } else { _this.$message.warning(_this.$t('operationFailed')) } diff --git a/jero-web/src/views/documentTools/searchCenter/components/whole.vue b/jero-web/src/views/documentTools/searchCenter/components/whole.vue index 70660ed12..e94a8bea7 100644 --- a/jero-web/src/views/documentTools/searchCenter/components/whole.vue +++ b/jero-web/src/views/documentTools/searchCenter/components/whole.vue @@ -21,7 +21,7 @@