合并分支 'master' 到 'fix_bug_first_stage'

Master

查看合并请求 laws-nio/laws-weilai!147

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';

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;
+    }
+}

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<CountryCa
 		//获取已经创建了country Card的适用地区，该接口只返回，在country Card里面没有的适用地区。
 		List<CountryCardManageReleaseEO> countryCardManageReleaseEOList = this.list();
 
-		//如果查询标识是空，则是在countryCard管理发布页面新增数据时使用：管理发布页新增查询的是，所有未创建countryCard的适用市场。
+		if (StringUtils.equals(queryFlag, QueryFlagEnum.GET_ALL_APPLY_MARKET.getValue())) {
-		//如果查询标识不是空，则是在CountryCard的首页使用：首页查询的是  所有已创建了countryCard的适用市场。
+			result = dictModelList;
-		if (StringUtils.isEmpty(queryFlag)) {
+		}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<CountryCa
 					}
 				}
 			}
-		}else {
+		}else if(StringUtils.equals(queryFlag,QueryFlagEnum.GET_RELEASED_APPLY_MARKET.getValue())){
 			if(CollectionUtils.isEmpty(countryCardManageReleaseEOList)){
 				result = null;
 			}else {
@@ -250,6 +251,24 @@ public class CountryCardManageReleaseEOServiceImpl extends ServiceImpl<CountryCa
 						}
 					}
 
+					if(flag){
+						result.add(dictModel);
+					}
+				}
+			}
+		}else if(StringUtils.equals(queryFlag,QueryFlagEnum.GET_CREATE_APPLY_MARKET.getValue())){
+			if(CollectionUtils.isEmpty(countryCardManageReleaseEOList)){
+				result = null;
+			}else {
+				for (DictModel dictModel : dictModelList) {
+					boolean flag = false;
+					for (CountryCardManageReleaseEO countryCardManageReleaseEO : countryCardManageReleaseEOList) {
+						if(StringUtils.equals(dictModel.getValue(),countryCardManageReleaseEO.getApplyMarket())){
+							flag = true;
+							break;
+						}
+					}
+
 					if(flag){
 						result.add(dictModel);
 					}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseClassifyEOServiceImpl.java

@@ -3,6 +3,7 @@ package com.jero.modules.problemKnowledgeBase.service.impl;
 import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseClassifyEO;
 import com.jero.modules.problemKnowledgeBase.mapper.ProblemKnowledgeBaseClassifyEOMapper;
 import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBaseClassifyEOService;
+import com.jero.modules.project.entity.ConditionAssessmentEO;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.service.ISysUserService;
 import com.jero.modules.system.util.StringUtils;
@@ -10,10 +11,8 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
+import java.text.Collator;
-import java.util.Arrays;
+import java.util.*;
-import java.util.List;
-import java.util.Date;
 import java.util.stream.Collectors;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -99,7 +98,15 @@ public class ProblemKnowledgeBaseClassifyEOServiceImpl extends ServiceImpl<Probl
 	 */
 	@Override
     public List<ProblemKnowledgeBaseClassifyEO> queryList() {
-        return list();
+		List<ProblemKnowledgeBaseClassifyEO> result = this.list();
+		// 匿名比较器排序
+		Collections.sort(result, new Comparator<ProblemKnowledgeBaseClassifyEO>() {
+			@Override
+			public int compare(ProblemKnowledgeBaseClassifyEO p1, ProblemKnowledgeBaseClassifyEO p2) {
+				return p1.getProblemLabel().compareTo(p2.getProblemLabel());
+			}
+		});
+		return result;
     }
 
 	@Override

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<ProblemKnowle
 
 				String targetMarket = data.getTargetMarket();
 				if(StringUtils.isNotEmpty(targetMarket) && CollectionUtils.isNotEmpty(regionList)){
+					String[] targetMarketArr = targetMarket.split(",");
 					String targetMarket_dicText = "";
 					if(StringUtils.equals(cut, CutEnum.CN.getValue())){
 						targetMarket_dicText = regionList.stream().filter(region -> {
 							boolean flag = false;
-							if (StringUtils.equals(targetMarket, region.getValue())) {
+							for (String s : targetMarketArr) {
-								flag = true;
+								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())) {
+							for (String s : targetMarketArr) {
-								flag = true;
+								if (StringUtils.equals(s, region.getValue())) {
+									flag = true;
+								}
 							}
 							return flag;
 						}).map(DictModel::getTextEn).collect(Collectors.joining(","));

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<String, Object> map, HttpServletResponse response, HttpServletRequest request) {
         String cut = (String) map.get("cut");

jero-web/src/components/CollectionType/index.vue

@@ -680,8 +680,9 @@
       uploadFileChangeDown
     },
     mounted() {
+      console.log(this.detailDate)
       this.detailDate.list.forEach((item) => {
-        if (item.type === 'pull_more') {
+        if (item.type === 'pull_more' && !item.dataValue) {
           item.dataValue = []
         }
         // this.detailDatetransformation.push(item)
@@ -737,11 +738,11 @@
     },
     watch: {
       detailDate(newold, oldold) {
-        console.log(newold, oldold, 'll')
+        // console.log(newold, oldold, 'll')
       },
       formInline: {
         handler(newOld, oldval) {
-          console.log(newOld, oldval, 'll')
+          // console.log(newOld, oldval, 'll')
         },
         deep: true
       }

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;

jero-web/src/components/tableCollection/index.vue

@@ -220,10 +220,10 @@
         type: Object,
         default: true
       },
-      queryParamQuery: {
+      // queryParamQuery: {
-        type: Object,
+      //   type: Object,
-        default: true
+      //   default: true
-      },
+      // },
       currentPersonRole: {
         type: String,
         default: true
@@ -649,7 +649,6 @@
               }
             })
             this.columns = [...this.columns]
-            console.log(this.columns)
           }
         })
       },
@@ -726,9 +725,6 @@
         this.selectedRowKeys = []
       },
       getTableList(currentPersonRole) {
-        console.log(currentPersonRole)
-        console.log(this.queryParamQuery)
-        // todo
         let paramsManifestid
         let url
         if (this.$route.query.it === undefined) {
@@ -752,7 +748,6 @@
         this.loading = true
         getAction(url, params).then((res) => {
           if (res.success) {
-            // todo
             // console.log(res.result,'res.result')
             // let tt = []
             // this.dataSource = []
@@ -771,13 +766,14 @@
             // })
             let tt = []
             if (this.currentPersonRole !== 'dre') {
+              console.log(res.result.records,'res.result.records')
               res.result.records.forEach((Obj) => {
                 Object.keys(Obj).forEach((item) => {
                   if (Obj[item] instanceof Object && Obj[item].controlType !== undefined) {
                     Obj[item].list.forEach((itemLi) => {
                       itemLi.isLock = 1
                       if (itemLi.type === 'pull_more') {
-                        itemLi.dataValue = itemLi.dataValue === null ? [] : itemLi.dataValue.split(',')
+                        itemLi.dataValue = !itemLi.dataValue ? [] : itemLi.dataValue.split(',')
                       }
                     })
                   }
@@ -790,7 +786,7 @@
                   if (Obj[item] instanceof Object && Obj[item].controlType !== undefined) {
                     Obj[item].list.forEach((itemLi) => {
                       if (itemLi.type === 'pull_more') {
-                        itemLi.dataValue = itemLi.dataValue === null ? [] : itemLi.dataValue.split(',')
+                        itemLi.dataValue = !itemLi.dataValue ? [] : itemLi.dataValue.split(',')
                       }
                     })
                   }
@@ -798,7 +794,7 @@
                 tt.push(Obj)
               })
             }
-            this.dataSource = tt
+            this.dataSource = JSON.parse(JSON.stringify(tt))
             this.total = res.result.total
             this.selectedRowKeys = []
             this.selectedRowrowValue = []
@@ -875,6 +871,7 @@
         text-overflow: ellipsis;
         white-space: nowrap;
         overflow: hidden;
+        word-break: break-word;
         color: #040B29;
         font-weight: 400;
       }

jero-web/src/components/uploadFileChangeDown/file.vue

@@ -62,7 +62,7 @@ import { mapGetters } from 'vuex'
       }
     },
     created() {
-      console.log(this.detailDate, 'detailDate')
+      // console.log(this.detailDate, 'detailDate')
       // this.detailDate.list.forEach((item) => {
       //   if (item.type == 'file' && item.isLock == '1') {
       //     this.disabled = true

jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue

@@ -10,6 +10,8 @@
               </div>
               <a-select :placeholder="$t('PleaseSelect')+$t('applicableMarket')"
                         :disabled="false"
+                        style="z-index: 100"
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
                         v-model="queryParam.applyMarket">
                 <a-select-option v-for="(item, key) in applyMarketList"
                                  :key="key"
@@ -86,7 +88,7 @@
     },
     methods: {
       getApplyMarketList() {
-        getAction('/problemKnowledgeBase/countryCardManageReleaseEO/getApplyMarketList', { queryFlag: 'countryCard' }).then((res) => {
+        getAction('/problemKnowledgeBase/countryCardManageReleaseEO/getApplyMarketList', { queryFlag: '2' }).then((res) => {
           if (res.success) {
             this.applyMarketList = res.result || []
           } else {

jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue

@@ -20,8 +20,9 @@
                       <span>{{$t('applicableMarket')}}</span>
                     </div>
                     <a-select class="box-input"
+                              :getPopupContainer="triggerNode=> triggerNode.parentNode"
                               :placeholder="$t('PleaseSelect')+$t('applicableMarket')"
-                              style="width: 100%"
+                              style="width: 100%;"
                               v-model="queryParam.applyMarket">
                       <a-select-option v-for="(item, key) in applyMarketList"
                                        :key="key"
@@ -39,8 +40,9 @@
                       <span>{{$t('releaseStatus')}}</span>
                     </div>
                     <a-select class="box-input"
+                              :getPopupContainer="triggerNode=> triggerNode.parentNode"
                               :placeholder="$t('PleaseSelect')+$t('releaseStatus')"
-                              style="width: 100%"
+                              style="width: 100%;"
                               v-model="queryParam.releaseStatus">
                       <a-select-option v-for="(item, key) in releaseStatusList"
                                        :key="key"
@@ -192,7 +194,7 @@
     methods: {
       ...mapGetters(['userInfo']),
       getApplyMarketList() {
-        getAction('/problemKnowledgeBase/countryCardManageReleaseEO/getApplyMarketList', { queryFlag: '1' }).then((res) => {
+        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;
+  }
 </style>

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 {

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;

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;
       }

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;

jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue

@@ -168,7 +168,8 @@
                   {{$t('Adjustareasofresponsibility')}}
                 </div>
               </template>
-              <div class="operator-text" style="position: relative " @click='morepop' v-if='currentPersonRole == "homo" || currentPersonRole == "sdt"'>
+<!--              @click='morepop'-->
+              <div class="operator-text" style="position: relative "  v-if='currentPersonRole == "homo" || currentPersonRole == "sdt"'>
                 <span style="position: absolute;left: -13px;top: -4px">...</span>{{ $t('more') }}
               </div>
             </a-popconfirm>
@@ -226,8 +227,9 @@
           </div>
           <div style="width: 100%">
             <!-- 表格-10控件-->
+<!--            :queryParamQuery='queryParamQuery'-->
             <table-collection ref="CollectionTabel" :url='url' :paramsManifest='paramsManifest' @rowValue='rowValue'
-                              :formInline='formInline' :queryParamQuery='queryParamQuery' :currentPersonRole='currentPersonRole'
+                              :formInline='formInline'  :currentPersonRole='currentPersonRole'
                               @getDataSource="getDataSource"
                               @handlePreservation="handlePreservation"
                               @value='value'

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;
       }

jero-web/src/views/regulatoryEarlyWarning/index.vue

@@ -35,6 +35,39 @@
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         :columns="columns"
       >
+        <span slot="vehicleInProductionDate" slot-scope="text,result">
+              <span v-if="result.xin1_che1_xing2_shi2_shi1_ri4_qi1 == 'yellow'">
+                   {{text}}
+              </span>
+               <span v-else-if="result.xin1_che1_xing2_shi2_shi1_ri4_qi1 == 'red'">
+                   {{text}}
+              </span>
+               <span v-else>
+                   {{text}}
+               </span>
+        </span>
+        <span slot="ImplementationDate" slot-scope="text,result">
+              <span v-if="result.new_colour == 'yellow'" style="color: #fdd835">
+                   {{text}}
+              </span>
+               <span v-else-if="result.new_colour == 'red'" style="color: red">
+                   {{text}}
+              </span>
+               <span v-else>
+                   {{text}}
+               </span>
+        </span>
+        <span slot="vehicleInProductionDate" slot-scope="text,result">
+              <span v-if="result.implement_colour == 'yellow'" style="color: #fdd835">
+                   {{text}}
+              </span>
+               <span v-else-if="result.implement_colour == 'red'" style="color: red">
+                   {{text}}
+              </span>
+               <span v-else>
+                   {{text}}
+               </span>
+        </span>
       </a-table>
       <div class="page" v-if="dataSource && dataSource.length > 0">
         <a-pagination
@@ -138,14 +171,16 @@
             align: 'center',
             ellipsis: true,
             width: 210,
-            dataIndex: 'implement_time'
+            dataIndex: 'implement_time',
+            scopedSlots: { customRender: 'vehicleInProductionDate' }
           },
           {
             title: this.$t('ImplementationDate'),
             align: 'center',
             ellipsis: true,
             width: 210,
-            dataIndex: 'xin1_che1_xing2_shi2_shi1_ri4_qi1'
+            dataIndex: 'xin1_che1_xing2_shi2_shi1_ri4_qi1',
+            scopedSlots: { customRender: 'ImplementationDate' }
           }
         ]
       }