diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml
index f26174908..de267b0bb 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml
@@ -86,7 +86,7 @@
 
     <select id="listInfoOfTodoCenter" resultMap="ParamsCollectManifestEOResultMap">
         select id,nio_number,state,sdt,dre,params_manifest_id from params_collect_manifest
-        where params_manifest_id in
+        where control_type != '11' and params_manifest_id in
             <foreach collection="manifestIdList" index="index" item="item" open="(" separator="," close=")">
                 #{item}
             </foreach>
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index 24926b2ef..c77f3013a 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
@@ -2521,18 +2521,20 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 						+ "2.All fields is filled in according to Validate Component and Component Value\n"
 						+ "3.If the control type is drop-down multi-selection, multiple entries are separated by English or Chinese exclamation points\n"
 						+ "4.Configuration data is filled in according to the sequence of control type, and if there are multiple control types, it needs to be separated by \"#\"\n"
-						+ "5.When filling in, start in column G and do not modify information such as NIO number and parameter name\n"
-						+ "6.File fields are file type, must create a folder in the directory of the same level as the file with the name of the nio number and place the file in the folder. Assume that the file is saved in the A number B.pdf,Should fill in A/B.pdf\n"
-						+ "7.When importing into the system, you need to put the Excel into a folder, place other attachment files correctly as required, and finally compress the folder into zip format for import\n";
+						+ "5.When the control contains multiple component types, if you fill in only some of the information, you need to distinguish blank data with \"#\"\n"
+						+ "6.When filling in, start in column G and do not modify information such as NIO number and parameter name\n"
+						+ "7.File fields are file type, must create a folder in the directory of the same level as the file with the name of the nio number and place the file in the folder. Assume that the file is saved in the A number B.pdf,Should fill in A/B.pdf\n"
+						+ "8.When importing into the system, you need to put the Excel into a folder, place other attachment files correctly as required, and finally compress the folder into zip format for import\n";
 			} else {
 				explanation = "填写说明\n"
 						+ "1.导入数据从第三行开始,第一行为表头,第二行为填写说明,第三行是示例数据，需要从第四行开始填写\n"
 						+ "2.填写时需按照控件校验和控件备选值进行填写\n"
 						+ "3.控件类型为下拉多选时，填写多个时采用英文或中文感叹号分割\n"
 						+ "4.配置数据按照控件类型顺序进行填写，若存在多种控件类型填写时需要通过“#”隔开\n"
-						+ "5.填写时从G列开始，请勿修改NIO编号和参数名称等信息\n"
-						+ "6.上传附件为文件属性,填写时需要在本文件同级目录下以NIO编号为名称建立文件夹,并在文件夹下放置文件且该文件夹下只能有一层级,假设在NIO.XXXX下放置了B.pdf,则应填写NIO.XXXX/B.pdf\n"
-						+ "7.导入系统时，需要将该Excel放入文件夹内，并按照要求正确放置其他附件文件，最后将文件夹压缩为zip格式进行导入\n";
+						+ "5.控件中包含多种组件类型时，若只填写其中部分信息需要用#区分空白数据\n"
+						+ "6.填写时从G列开始，请勿修改NIO编号和参数名称等信息\n"
+						+ "7.上传附件为文件属性,填写时需要在本文件同级目录下以NIO编号为名称建立文件夹,并在文件夹下放置文件且该文件夹下只能有一层级,假设在NIO.XXXX下放置了B.pdf,则应填写NIO.XXXX/B.pdf\n"
+						+ "8.导入系统时，需要将该Excel放入文件夹内，并按照要求正确放置其他附件文件，最后将文件夹压缩为zip格式进行导入\n";
 			}
 			XSSFRow row2 = sheetItems.createRow(1);
 			row2.setHeight((short) 2500);
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/service/impl/HomeFunctionModuleEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/service/impl/HomeFunctionModuleEOServiceImpl.java
index 5b74357c8..ea18ace2b 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/service/impl/HomeFunctionModuleEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/service/impl/HomeFunctionModuleEOServiceImpl.java
@@ -115,6 +115,7 @@ public class HomeFunctionModuleEOServiceImpl extends ServiceImpl<HomeFunctionMod
 		//用户拥有权限的菜单
 		List<SysPermission> metaList = sysPermissionService.queryByUser(loginUser.getUsername());
 
+		metaList = metaList.stream().filter(e->!"2".equals(String.valueOf(e.getMenuType()))).collect(Collectors.toList());
 		//所有的图表(state=0)
 		LambdaQueryWrapper<HomeFunctionModuleEO> wrapper = new LambdaQueryWrapper<>();
 		wrapper.in(HomeFunctionModuleEO::getState,"0").isNull(HomeFunctionModuleEO::getCreateBy);
@@ -142,13 +143,20 @@ public class HomeFunctionModuleEOServiceImpl extends ServiceImpl<HomeFunctionMod
 			}
 			return homeFunctionModuleEOListTemp;
 		}else{
+			List<HomeFunctionModuleEO> homeFunctionModuleEOSTemp = new ArrayList<>();
+			for (SysPermission sysPermission : metaList) {
+				List<HomeFunctionModuleEO> collect = homeFunctionModuleEOS.stream().filter(e -> e.getIconName().equals(sysPermission.getName())).collect(Collectors.toList());
+				if(ObjectUtils.isNotEmpty(collect)){
+					homeFunctionModuleEOSTemp.addAll(collect);
+				}
+			}
+			homeFunctionModuleEOSTemp = homeFunctionModuleEOSTemp.stream().distinct().collect(Collectors.toList());
 			if(CutEnum.EN.getValue().equals(cut)){
-				for (HomeFunctionModuleEO homeFunctionModuleEO : homeFunctionModuleEOS) {
+				for (HomeFunctionModuleEO homeFunctionModuleEO : homeFunctionModuleEOSTemp) {
 					homeFunctionModuleEO.setIconName(homeFunctionModuleEO.getIconNameEn());
 				}
 			}
-			return homeFunctionModuleEOS;
+			return homeFunctionModuleEOSTemp;
 		}
-
     }
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/job/LawsTechnologyEvaluationRemindJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/job/LawsTechnologyEvaluationRemindJob.java
index e2cdfab4b..e63518c3f 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/job/LawsTechnologyEvaluationRemindJob.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/job/LawsTechnologyEvaluationRemindJob.java
@@ -19,10 +19,7 @@ import org.quartz.JobExecutionException;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -104,13 +101,18 @@ public class LawsTechnologyEvaluationRemindJob implements Job {
                     }).map(LawsTechnologyEvaluationFlowDetailEO::getActiProcInstId).distinct().collect(Collectors.joining(","));
 
                     if(StringUtils.isNotEmpty(actiProcInstIds)){
-                        List<String> userIdList = this.workFlowFeignClient.getTaskAssigneeListByPrcIds(actiProcInstIds);
-                        if(CollectionUtils.isNotEmpty(userIdList)){
-                            JSONObject sendJsonObject = new JSONObject();
-                            sendJsonObject.put("msgType", MsgTypeEnum.LAWS_TECHNOLOGY_EVALUATION_EXPIRE_REMIND_THREE_DAYS_BEFORE_MSG.getValue());
-                            sendJsonObject.put("lawsTechnologyEvaluationId",lawsTechnologyEvaluationEO.getId());
-                            sendJsonObject.put("userIdList",userIdList);
-                            this.lawsTechnologyEvaluationEOService.workFlowSendMsg(sendJsonObject);
+                        //List<String> userIdList = this.workFlowFeignClient.getTaskAssigneeListByPrcIds(actiProcInstIds);
+                        for (String actiProcInstId : actiProcInstIds.split(",")) {
+                            Map<String, String> map = this.workFlowFeignClient.getTaskInfo(actiProcInstId);
+                            if (!map.isEmpty()) {
+                                JSONObject sendJsonObject = new JSONObject();
+                                sendJsonObject.put("msgType", MsgTypeEnum.LAWS_TECHNOLOGY_EVALUATION_EXPIRE_REMIND_THREE_DAYS_BEFORE_MSG.getValue());
+                                sendJsonObject.put("lawsTechnologyEvaluationId",lawsTechnologyEvaluationEO.getId());
+                                sendJsonObject.put("userId",map.get("userId"));
+                                sendJsonObject.put("taskId",map.get("taskId"));
+                                sendJsonObject.put("taskDefKey",map.get("taskDefKey"));
+                                this.lawsTechnologyEvaluationEOService.workFlowSendMsg(sendJsonObject);
+                            }
                         }
                     }
                 } else if (endTime.equals(now)){
@@ -124,13 +126,18 @@ public class LawsTechnologyEvaluationRemindJob implements Job {
                     }).map(LawsTechnologyEvaluationFlowDetailEO::getActiProcInstId).distinct().collect(Collectors.joining(","));
 
                     if(StringUtils.isNotEmpty(actiProcInstIds)){
-                        List<String> userIdList = this.workFlowFeignClient.getTaskAssigneeListByPrcIds(actiProcInstIds);
-                        if(CollectionUtils.isNotEmpty(userIdList)){
-                            JSONObject sendJsonObject = new JSONObject();
-                            sendJsonObject.put("msgType", MsgTypeEnum.LAWS_TECHNOLOGY_EVALUATION_EXPIRE_REMIND_TODAY_MSG.getValue());
-                            sendJsonObject.put("lawsTechnologyEvaluationId",lawsTechnologyEvaluationEO.getId());
-                            sendJsonObject.put("userIdList",userIdList);
-                            this.lawsTechnologyEvaluationEOService.workFlowSendMsg(sendJsonObject);
+                        //List<String> userIdList = this.workFlowFeignClient.getTaskAssigneeListByPrcIds(actiProcInstIds);
+                        for (String actiProcInstId : actiProcInstIds.split(",")) {
+                            Map<String, String> map = this.workFlowFeignClient.getTaskInfo(actiProcInstId);
+                            if (!map.isEmpty()) {
+                                JSONObject sendJsonObject = new JSONObject();
+                                sendJsonObject.put("msgType", MsgTypeEnum.LAWS_TECHNOLOGY_EVALUATION_EXPIRE_REMIND_TODAY_MSG.getValue());
+                                sendJsonObject.put("lawsTechnologyEvaluationId",lawsTechnologyEvaluationEO.getId());
+                                sendJsonObject.put("userId",map.get("userId"));
+                                sendJsonObject.put("taskId",map.get("taskId"));
+                                sendJsonObject.put("taskDefKey",map.get("taskDefKey"));
+                                this.lawsTechnologyEvaluationEOService.workFlowSendMsg(sendJsonObject);
+                            }
                         }
                     }
                 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/LawsTechnologyEvaluationFlowDetailEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/LawsTechnologyEvaluationFlowDetailEOMapper.java
index f2c103e1f..aee4a72d2 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/LawsTechnologyEvaluationFlowDetailEOMapper.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/LawsTechnologyEvaluationFlowDetailEOMapper.java
@@ -14,6 +14,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface LawsTechnologyEvaluationFlowDetailEOMapper extends BaseMapper<LawsTechnologyEvaluationFlowDetailEO> {
 
-    LawsTechnologyEvaluationFlowDetailEO queryByEvaluationId(@Param("lawsTechnologyEvaluationId") String lawsTechnologyEvaluationId);
+    LawsTechnologyEvaluationFlowDetailEO queryByEvaluationId(@Param("lawsTechnologyEvaluationId") String lawsTechnologyEvaluationId,
+                                                             @Param("evaluator") String evaluator);
 
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/xml/LawsTechnologyEvaluationFlowDetailEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/xml/LawsTechnologyEvaluationFlowDetailEOMapper.xml
index c1fdf969b..a3c8145e4 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/xml/LawsTechnologyEvaluationFlowDetailEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/xml/LawsTechnologyEvaluationFlowDetailEOMapper.xml
@@ -17,7 +17,7 @@
 
     <select id="queryByEvaluationId" resultMap="LawsTechnologyEvaluationFlowDetailEOResultMap">
 
-        select * from laws_technology_evaluation_flow_detail where laws_technology_evaluation_id = #{lawsTechnologyEvaluationId}
+        select * from laws_technology_evaluation_flow_detail where laws_technology_evaluation_id = #{lawsTechnologyEvaluationId} and evaluator_id = #{evaluator}
 
     </select>
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java
index 39dfd81ee..8c0810429 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java
@@ -623,17 +623,18 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
 		//String serialNumber = jsonObject.getString("serialNumber"); //文档库编号
 
 		List<String> userIdList = new ArrayList<>();
-
+		String taskId = jsonObject.getString("taskId");
+		//飞书跳转链接
+		String hrefFeishu = "";
 		//String msgContentEN  = "";
 		//String msgTitle = "";
 		String initiator = "";
 		String lawsTechnologyEvaluationId = jsonObject.getString("lawsTechnologyEvaluationId");
 		LawsTechnologyEvaluationEO lawsTechnologyEvaluationEO = queryById(lawsTechnologyEvaluationId);
-		//LawsTechnologyEvaluationFlowDetailEO flowDetailEO = flowDetailEOMapper.queryByEvaluationId(lawsTechnologyEvaluationId);
+
 		//String number = flowDetailEO.getPrcNum();
 		//String name = flowDetailEO.getPrcName();
 		String endTime = new SimpleDateFormat("yyyy-MM-dd").format(lawsTechnologyEvaluationEO.getEndTime());
-
 		//英文标题
 		BussDocumentLibraryEO bussDocumentLibraryEO = bussDocumentLibraryEOService.queryById(lawsTechnologyEvaluationEO.getStandId());
 
@@ -643,7 +644,7 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
 		String enContentUpper = "";
 		String enContentLower = "";
 		if(StringUtils.equals(msgType, MsgTypeEnum.LAWS_TECHNOLOGY_EVALUATION_START_MSG.getValue())){
-			userIdList.add(jsonObject.getString("evaluationId"));
+			//userIdList.add(jsonObject.getString("evaluationId"));
 			//String endTime = jsonObject.getString("endTime"); //截止日期
 			//您收到GB 7258 的法规技术评估流程任务，请及时查看处理。
 			//msgContentEN  = "You recieved the Regulatory and technical assessment of "+serialNumber+" . The due date is "+endTime+". Please check and address it in a timely manner.";
@@ -663,28 +664,83 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
 					"\nTitle: " + bussDocumentLibraryEO.getTitleEn() +
 					"\nInitiator: " + initiator +
 					"\nDue Date: " + endTime;
+
+			LawsTechnologyEvaluationFlowDetailEO flowDetailEO = flowDetailEOMapper.queryByEvaluationId(lawsTechnologyEvaluationId,jsonObject.getString("evaluators"));
+			if (ObjectUtils.isNotEmpty(flowDetailEO)) {
+				hrefFeishu = backUrl + "/evaluationProcess?taskDefinitionKey=pgrqr&taskIds="+ taskId +"&prcType=6&prcNum="+ flowDetailEO.getPrcNum() +"&prcId="+ flowDetailEO.getActiProcInstId() +"&router=%2FregulatoryAssessmentTasks&isDisabled=false";
+
+				String[] thirdId = new String[1];
+				SysUser sysUser = sysUserService.getById(jsonObject.getString("evaluators"));
+				if (ObjectUtils.isNotEmpty(sysUser)) {
+					thirdId[0] = sysUser.getThirdId();
+				}
+				try {
+					FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo();
+					feishuMsgVo.setTitle(title);
+					feishuMsgVo.setCnContentUpper(cnContentUpper);
+					feishuMsgVo.setCnContentLower(cnContentLower);
+					feishuMsgVo.setEnContentUpper(enContentUpper);
+					feishuMsgVo.setEnContentLower(enContentLower);
+					feishuMsgVo.setUrl(hrefFeishu);
+					feishuMsgVo.setColor(MsgColorEnum.GREEN.getValue()); // 颜色
+					feishuService.sendCard(thirdId, feishuMsgVo);
+				} catch (IOException e) {
+					log.error("飞书消息推送失败");
+				}
+			}
+
+
+
 		}else if(StringUtils.equals(msgType,MsgTypeEnum.LAWS_TECHNOLOGY_EVALUATION_ENALUATOR_SUBMIT_MSG.getValue())){
 			String currentUserId = jsonObject.getString("currentUserId"); //当前操作用户id
 			SysUser currentUser = this.sysUserService.getBaseMapper().selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getId, currentUserId));
 
-			userIdList.add(jsonObject.getString("initiatorUserId"));
+			//userIdList.add(jsonObject.getString("initiatorUserId"));
 			//XXX（人员账号）已提交GB 7258 的法规意见收集流程，请及时查看审核。
 			//msgContentEN  = currentUser.getUsername() + " has submitted the collection process of Regulatory and technical assessment of "+serialNumber+", Please check and address it in time.";
 			//msgTitle = "You have a Regulatory and technical assessment task to complete";
 
 			initiator = currentUser.getUsername();
-			cnContentUpper = "您好，"+ currentUser.getUsername() +"已提交评估结果，请审核";
+			cnContentUpper = "您好，"+ initiator +"已提交评估结果，请审核";
 			cnContentLower = "编号：" + lawsTechnologyEvaluationEO.getSerialNumber() +
 					"\n标题: " + lawsTechnologyEvaluationEO.getTitle() +
 					"\n发起人: " + initiator +
 					"\n截止时间: " + endTime;
-			enContentUpper = "Hello! "+ currentUser.getUsername() +" has submitted the assessment result. Please review it";
+			enContentUpper = "Hello! "+ initiator +" has submitted the assessment result. Please review it";
 			enContentLower = "Regulation No :" + lawsTechnologyEvaluationEO.getSerialNumber() +
 					"\nTitle: " + bussDocumentLibraryEO.getTitleEn() +
 					"\nInitiator: " + initiator +
 					"\nDue Date: " + endTime;
+
+			LawsTechnologyEvaluationFlowDetailEO flowDetailEO = flowDetailEOMapper.queryByEvaluationId(lawsTechnologyEvaluationId,jsonObject.getString("evaluators"));
+			if (ObjectUtils.isNotEmpty(flowDetailEO)) {
+				hrefFeishu = backUrl + "/evaluationProcess?taskDefinitionKey=fqrsc&taskIds="+ taskId +"&prcType=6&prcNum="+ flowDetailEO.getPrcNum() +"&prcId="+ flowDetailEO.getActiProcInstId() +"&router=%2FregulatoryAssessmentTasks&isDisabled=false";
+
+				String[] thirdId = new String[1];
+				SysUser sysUser = sysUserService.getById(jsonObject.getString("evaluators"));
+				if (ObjectUtils.isNotEmpty(sysUser)) {
+					thirdId[0] = sysUser.getThirdId();
+				}
+				try {
+					FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo();
+					feishuMsgVo.setTitle(title);
+					feishuMsgVo.setCnContentUpper(cnContentUpper);
+					feishuMsgVo.setCnContentLower(cnContentLower);
+					feishuMsgVo.setEnContentUpper(enContentUpper);
+					feishuMsgVo.setEnContentLower(enContentLower);
+					feishuMsgVo.setUrl(hrefFeishu);
+					feishuMsgVo.setColor(MsgColorEnum.GREEN.getValue()); // 颜色
+					feishuService.sendCard(thirdId, feishuMsgVo);
+				} catch (IOException e) {
+					log.error("飞书消息推送失败");
+				}
+			}
+
+
+
+
 		}else if(StringUtils.equals(msgType, MsgTypeEnum.LAWS_TECHNOLOGY_EVALUATION_AUDIT_ACCEPTED_MSG.getValue())){
-			userIdList.add(jsonObject.getString("evaluationId"));
+			//userIdList.add(jsonObject.getString("evaluationId"));
 			//您提交的GB 7258 的法规技术评估流程已通过。
 			//msgContentEN  = "The regulatory and technical assessment process for "+serialNumber+" you submitted has passed.";
 			//msgTitle = "You have a Regulatory and technical assessment task completed";
@@ -701,8 +757,33 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
 					"\nTitle: " + bussDocumentLibraryEO.getTitleEn() +
 					"\nInitiator: " + initiator +
 					"\nDue Date: " + endTime;
+			LawsTechnologyEvaluationFlowDetailEO flowDetailEO = flowDetailEOMapper.queryByEvaluationId(lawsTechnologyEvaluationId,jsonObject.getString("evaluationId"));
+			if (ObjectUtils.isNotEmpty(flowDetailEO)) {
+				hrefFeishu = backUrl + "/evaluationProcess?taskDefinitionKey=fqrsc&taskIds="+ taskId +"&prcType=6&prcNum="+ flowDetailEO.getPrcNum() +"&prcId="+ flowDetailEO.getActiProcInstId() +"&router=%2FregulatoryAssessmentTasks&isDisabled=true";
+
+				String[] thirdId = new String[1];
+				SysUser sysUser = sysUserService.getById(jsonObject.getString("evaluationId"));
+				if (ObjectUtils.isNotEmpty(sysUser)) {
+					thirdId[0] = sysUser.getThirdId();
+				}
+				try {
+					FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo();
+					feishuMsgVo.setTitle(title);
+					feishuMsgVo.setCnContentUpper(cnContentUpper);
+					feishuMsgVo.setCnContentLower(cnContentLower);
+					feishuMsgVo.setEnContentUpper(enContentUpper);
+					feishuMsgVo.setEnContentLower(enContentLower);
+					feishuMsgVo.setUrl(hrefFeishu);
+					feishuMsgVo.setColor(MsgColorEnum.GREEN.getValue()); // 颜色
+					feishuService.sendCard(thirdId, feishuMsgVo);
+				} catch (IOException e) {
+					log.error("飞书消息推送失败");
+				}
+			}
+
+
 		}else if(StringUtils.equals(msgType, MsgTypeEnum.LAWS_TECHNOLOGY_EVALUATION_AUDIT_REJECTED_MSG.getValue())){
-			userIdList.add(jsonObject.getString("evaluationId"));
+			//userIdList.add(jsonObject.getString("evaluationId"));
 			//您提交的GB 7258 的法规技术评估流程已被退回，请及时查看处理。
 			//msgContentEN  = "The regulatory and technical assessment process of "+serialNumber+" you submitted has been returned, Please check and address it in time.";
 			//msgTitle = "You have a Regulatory and technical assessment task to complete";
@@ -719,6 +800,30 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
 					"\nTitle: " + bussDocumentLibraryEO.getTitleEn() +
 					"\nInitiator: " + initiator +
 					"\nDue Date: " + endTime;
+
+			LawsTechnologyEvaluationFlowDetailEO flowDetailEO = flowDetailEOMapper.queryByEvaluationId(lawsTechnologyEvaluationId,jsonObject.getString("evaluators"));
+			if (ObjectUtils.isNotEmpty(flowDetailEO)) {
+				hrefFeishu = backUrl + "/evaluationProcess?taskDefinitionKey=pgrqr&taskIds="+ taskId +"&prcType=6&prcNum="+ flowDetailEO.getPrcNum() +"&prcId="+ flowDetailEO.getActiProcInstId() +"&router=%2FregulatoryAssessmentTasks&isDisabled=false";
+				String[] thirdId = new String[1];
+				SysUser sysUser = sysUserService.getById(jsonObject.getString("evaluators"));
+				if (ObjectUtils.isNotEmpty(sysUser)) {
+					thirdId[0] = sysUser.getThirdId();
+				}
+				try {
+					FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo();
+					feishuMsgVo.setTitle(title);
+					feishuMsgVo.setCnContentUpper(cnContentUpper);
+					feishuMsgVo.setCnContentLower(cnContentLower);
+					feishuMsgVo.setEnContentUpper(enContentUpper);
+					feishuMsgVo.setEnContentLower(enContentLower);
+					feishuMsgVo.setUrl(hrefFeishu);
+					feishuMsgVo.setColor(MsgColorEnum.GREEN.getValue()); // 颜色
+					feishuService.sendCard(thirdId, feishuMsgVo);
+				} catch (IOException e) {
+					log.error("飞书消息推送失败");
+				}
+			}
+
 		} else if (StringUtils.equals(msgType, MsgTypeEnum.LAWS_TECHNOLOGY_EVALUATION_EXPIRE_REMIND_THREE_DAYS_BEFORE_MSG.getValue())) {
 			cnContentUpper = "您好，该任务将于3天后到期，请及时查看处理，谢谢！";
 			cnContentLower = "编号：" + lawsTechnologyEvaluationEO.getSerialNumber() +
@@ -728,7 +833,29 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
 			enContentLower = "Regulation No :" + lawsTechnologyEvaluationEO.getSerialNumber() +
 					"\nTitle: " + bussDocumentLibraryEO.getTitleEn() +
 					"\nInitiator: " + MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
-			userIdList = (List<String>) jsonObject.get("userIdList");
+
+			LawsTechnologyEvaluationFlowDetailEO flowDetailEO = flowDetailEOMapper.queryByEvaluationId(lawsTechnologyEvaluationId,jsonObject.getString("userId"));
+			if (ObjectUtils.isNotEmpty(flowDetailEO)) {
+				hrefFeishu = backUrl + "/evaluationProcess?taskDefinitionKey="+ jsonObject.getString("taskDefKey") +"&taskIds="+ taskId +"&prcType=6&prcNum="+ flowDetailEO.getPrcNum() +"&prcId="+ flowDetailEO.getActiProcInstId() +"&router=%2FregulatoryAssessmentTasks&isDisabled=false";
+				String[] thirdId = new String[1];
+				SysUser sysUser = sysUserService.getById(jsonObject.getString("userId"));
+				if (ObjectUtils.isNotEmpty(sysUser)) {
+					thirdId[0] = sysUser.getThirdId();
+				}
+				try {
+					FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo();
+					feishuMsgVo.setTitle(title);
+					feishuMsgVo.setCnContentUpper(cnContentUpper);
+					feishuMsgVo.setCnContentLower(cnContentLower);
+					feishuMsgVo.setEnContentUpper(enContentUpper);
+					feishuMsgVo.setEnContentLower(enContentLower);
+					feishuMsgVo.setUrl(hrefFeishu);
+					feishuMsgVo.setColor(MsgColorEnum.GREEN.getValue()); // 颜色
+					feishuService.sendCard(thirdId, feishuMsgVo);
+				} catch (IOException e) {
+					log.error("飞书消息推送失败");
+				}
+			}
 
 		} else if (StringUtils.equals(msgType, MsgTypeEnum.LAWS_TECHNOLOGY_EVALUATION_EXPIRE_REMIND_TODAY_MSG.getValue())) {
 			cnContentUpper = "您好，该任务将于今天到期，请尽快查看处理，谢谢！";
@@ -739,7 +866,29 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
 			enContentLower = "Regulation No :" + lawsTechnologyEvaluationEO.getSerialNumber() +
 					"\nTitle: " + bussDocumentLibraryEO.getTitleEn() +
 					"\nInitiator: " + MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
-			userIdList = (List<String>) jsonObject.get("userIdList");
+
+			LawsTechnologyEvaluationFlowDetailEO flowDetailEO = flowDetailEOMapper.queryByEvaluationId(lawsTechnologyEvaluationId,jsonObject.getString("userId"));
+			if (ObjectUtils.isNotEmpty(flowDetailEO)) {
+				hrefFeishu = backUrl + "/evaluationProcess?taskDefinitionKey="+ jsonObject.getString("taskDefKey") +"&taskIds="+ taskId +"&prcType=6&prcNum="+ flowDetailEO.getPrcNum() +"&prcId="+ flowDetailEO.getActiProcInstId() +"&router=%2FregulatoryAssessmentTasks&isDisabled=false";
+				String[] thirdId = new String[1];
+				SysUser sysUser = sysUserService.getById(jsonObject.getString("userId"));
+				if (ObjectUtils.isNotEmpty(sysUser)) {
+					thirdId[0] = sysUser.getThirdId();
+				}
+				try {
+					FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo();
+					feishuMsgVo.setTitle(title);
+					feishuMsgVo.setCnContentUpper(cnContentUpper);
+					feishuMsgVo.setCnContentLower(cnContentLower);
+					feishuMsgVo.setEnContentUpper(enContentUpper);
+					feishuMsgVo.setEnContentLower(enContentLower);
+					feishuMsgVo.setUrl(hrefFeishu);
+					feishuMsgVo.setColor(MsgColorEnum.GREEN.getValue()); // 颜色
+					feishuService.sendCard(thirdId, feishuMsgVo);
+				} catch (IOException e) {
+					log.error("飞书消息推送失败");
+				}
+			}
 
 		} /*else if (StringUtils.equals(msgType, MsgTypeEnum.LAWS_TECHNOLOGY_EVALUATION_EXPIRE_REMIND_MSG.getValue())) {
 			userIdList = (List<String>) jsonObject.get("userIdList");
@@ -750,26 +899,6 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
 			initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
 		} */
 
-		List<String> thirdIdList = new ArrayList<>();
-		List<SysUser> sysUsers = sysUserService.listByIds(userIdList);
-		if (ObjectUtils.isNotEmpty(sysUsers)) {
-			thirdIdList = sysUsers.stream().map(SysUser::getThirdId).collect(Collectors.toList());
-		}
-		//飞书跳转链接
-		String hrefFeishu =  backUrl + JumpLinkEnum.FGPG_TODO_CENTER_LINK.getLink();
-		try {
-			FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo();
-			feishuMsgVo.setTitle(title);
-			feishuMsgVo.setCnContentUpper(cnContentUpper);
-			feishuMsgVo.setCnContentLower(cnContentLower);
-			feishuMsgVo.setEnContentUpper(enContentUpper);
-			feishuMsgVo.setEnContentLower(enContentLower);
-			feishuMsgVo.setUrl(hrefFeishu);
-			feishuMsgVo.setColor(MsgColorEnum.GREEN.getValue()); // 颜色
-			feishuService.sendCard(thirdIdList.toArray(new String[thirdIdList.size()]), feishuMsgVo);
-		} catch (IOException e) {
-			log.error("飞书消息推送失败");
-		}
 		//系统内部跳转链接
 		//String href = "<a href='" + JumpLinkEnum.TASK_AFFIRM_LINK.getLink() + "'>" + " View details" + "</a>";
 		//String contentInfo = msgContentEN + " " + href;
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseCommentEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseCommentEOServiceImpl.java
index 82050c16a..d19c2d5b0 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseCommentEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseCommentEOServiceImpl.java
@@ -91,7 +91,7 @@ public class ProblemKnowledgeBaseCommentEOServiceImpl extends ServiceImpl<Proble
 		SysUser sysUser = sysUserService.getUserByName(createBy);
 		String contentCNNo = "您发布的问题知识库信息"+problemKnowledgeBaseEO.getTitle()+"有新评论,请注意查看.";
 		String contentENNo = "In the Q&A knowledge "+problemKnowledgeBaseEO.getTitle()+" you created, a new comment has been added. Please be reminded to check it out.";
-		String url = backUrl +"/problemknowledgeBase";
+		String url = backUrl +"/problemknowledgeBase?id="+problemKnowledgeBaseEO.getId();
 
 		String href = "<a href='"+url + "'"+ " target='_blank'>"+ problemKnowledgeBaseEO.getTitle() + "</a>";
 		String contentINfoCNNo = "您发布的问题知识库信息"+href+"有新评论,请注意查看.";
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitMenuEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitMenuEOServiceImpl.java
index 0385006f7..81959ef91 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitMenuEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitMenuEOServiceImpl.java
@@ -8,6 +8,7 @@ import com.jero.modules.split.mapper.SarFileSplitMenuEOMapper;
 import com.jero.modules.split.page.SarFileSplitMenuEOPage;
 import com.jero.modules.split.service.IFileSplitItemsEOService;
 import com.jero.modules.split.service.ISarFileSplitMenuEOService;
+import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -55,7 +56,9 @@ public class SarFileSplitMenuEOServiceImpl extends ServiceImpl<SarFileSplitMenuE
         int count = dao.insertSelective(sarFileSplitMenuEO);
         // 新增对应条款
         Map<String, Object> parameter = new HashMap<>();
-        parameter.put("items_num", sarFileSplitMenuEO.getName());
+        if (StringUtils.isNotEmpty(sarFileSplitMenuEO.getName())) {
+            parameter.put("items_num", sarFileSplitMenuEO.getName());
+        }
         parameter.put("items_name", sarFileSplitMenuEO.getItemName());
         parameter.put("info_id", sarFileSplitMenuEO.getInfoId());
         parameter.put("menu_id", sarFileSplitMenuEO.getId());
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ParamsManifestTodoCenterServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ParamsManifestTodoCenterServiceImpl.java
index 8c4a807f0..24ad795fd 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ParamsManifestTodoCenterServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ParamsManifestTodoCenterServiceImpl.java
@@ -92,7 +92,7 @@ public class ParamsManifestTodoCenterServiceImpl implements IParamsManifestTodoC
                 if (count > 0) {
                     paramsManifestEO.setWaitFillNum(count);
                 }
-            } else { // 工程接口人和填写人  只能看到 工程接口人是自己 或 填写人是自己 的数量
+            } else { // 工程接口只能看到工程接口人是自己的；填写人只能看到填写人是自己 的数量
                 // 统计待分配数量 包括状态：待工程接口人处理,填写人退回
                 count = (int) pcmList.stream().filter(e-> (CollectManifestStateEnum.WAIT_SDT.getValue().equals(e.getState())
                         || CollectManifestStateEnum.DRE_BACK.getValue().equals(e.getState()))
@@ -104,7 +104,7 @@ public class ParamsManifestTodoCenterServiceImpl implements IParamsManifestTodoC
                 // 统计待填写数量 包括状态：待填写,认证工程师退回
                 count = (int) pcmList.stream().filter(e-> (CollectManifestStateEnum.WAIT_FILL.getValue().equals(e.getState())
                         || CollectManifestStateEnum.CERT_BACK.getValue().equals(e.getState()))
-                        && loginUser.getUsername().equals(e.getDre())).count();
+                        && (loginUser.getUsername().equals(e.getDre()) || loginUser.getUsername().equals(e.getSdt()))).count();
                 if (count > 0) {
                     paramsManifestEO.setWaitFillNum(count);
                 }
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 28a479a45..32b08b47e 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
@@ -198,4 +198,9 @@ public interface WorkFlowFeignClient {
      */
     @RequestMapping(value = "/bat-wkflow/datas/bus-process-new/dispostHistoryBusProcessNewData",method = RequestMethod.GET)
     Result dispostHistoryBusProcessNewData();
+
+    @RequestMapping(value = "/bat-wkflow/task/getTaskInfo",method = RequestMethod.GET)
+    Map<String, String> getTaskInfo(@RequestParam("actiProcInstId") String actiProcInstId);
+
+
 }
diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue
index edf3c31da..b65366ba9 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue
@@ -65,12 +65,15 @@
                   <div class="text-content">
                     {{item.contentOne}}
                   </div>
-                  <div class="text-text-right-text-Two">
+                  <div class="text-text-right-text-The">
                     {{item.showPermissions_dicText}}
                   </div>
-                  <div class="text-text-right-text-One">
+                  <div class="text-text-right-text-Two">
                     {{item.releaseStatus == 'Draft'?$t('draft'):$t('HaveReleased')}}
                   </div>
+                  <div class="text-text-right-text-One">
+                    {{item.createBy}}
+                  </div>
                   <div class="text-text-right-text">
                     <a style="margin-right: 10px" @click="edit(item)"
                        v-if="userInfoQuery.username == item.createBy || administrators">{{$t('edit')}}</a>
@@ -325,7 +328,7 @@
 
   .text-text-right {
     padding: 19px 19px;
-    width: calc(100% - 420px);
+    width: calc(100% - 540px);
     box-sizing: border-box;
     /*margin-left: 38px;*/
   }
@@ -340,6 +343,16 @@
     transform: translate-Y(-50%);
   }
 
+  .text-text-right-text-The {
+    width: 120px;
+    height: 100%;
+    text-align: center;
+    position: absolute;
+    right: 420px;
+    top: 50%;
+    transform: translate-Y(-50%);
+  }
+
   .text-text-right-text-One {
     width: 120px;
     height: 100%;
diff --git a/jero-web/src/views/dashboard/components/documentDynamics.vue b/jero-web/src/views/dashboard/components/documentDynamics.vue
index c55e2b116..85a3d9073 100644
--- a/jero-web/src/views/dashboard/components/documentDynamics.vue
+++ b/jero-web/src/views/dashboard/components/documentDynamics.vue
@@ -21,7 +21,7 @@
     <div v-else style="height: 200px;position: relative">
       <JNoData/>
     </div>
-    <JLoading :loading="loading">{{$t('dataLoading')}}</JLoading>
+    <JLoading style="z-index: 999" :loading="loading">{{$t('dataLoading')}}</JLoading>
   </div>
 </template>
 
diff --git a/jero-web/src/views/dashboard/components/monthlyReportRegulations.vue b/jero-web/src/views/dashboard/components/monthlyReportRegulations.vue
index 7955c1749..a6caefcff 100644
--- a/jero-web/src/views/dashboard/components/monthlyReportRegulations.vue
+++ b/jero-web/src/views/dashboard/components/monthlyReportRegulations.vue
@@ -17,7 +17,7 @@
     <div v-else style="height: 300px;position: relative">
       <JNoData/>
     </div>
-    <JLoading :loading="loading">{{$t('dataLoading')}}</JLoading>
+    <JLoading style="z-index: 999" :loading="loading">{{$t('dataLoading')}}</JLoading>
   </div>
 </template>
 
diff --git a/jero-web/src/views/dashboard/components/myList.vue b/jero-web/src/views/dashboard/components/myList.vue
index b3e9180d5..7a62e70d5 100644
--- a/jero-web/src/views/dashboard/components/myList.vue
+++ b/jero-web/src/views/dashboard/components/myList.vue
@@ -11,11 +11,11 @@
       <div class="myList-box-content-box" v-for="(item,index) in dataSource" :key="index" @click="prcClick(item)">
         <div class="top">
           <span class="top-text" v-if="item.flowType == 10"
-                :title="item.flowTypeShow+'-'+item.projectName">
-            {{item.flowTypeShow+'-'+item.projectName}}
+                :title="item.projectName+'-'+ item.flowTypeShow">
+            {{item.projectName+'-'+ item.flowTypeShow}}
           </span>
-          <span class="top-text" :title="item.flowTypeShow+'-'+item.serialNumber">
-            {{item.flowTypeShow+'-'+item.serialNumber}}
+          <span class="top-text" :title="item.serialNumber+'-'+item.flowTypeShow">
+            {{item.serialNumber+'-'+item.flowTypeShow}}
           </span>
           <!--          <span class="top-admin" :title="prcTypeName[item.prcType]">{{prcTypeName[item.prcType]}}</span>-->
         </div>
@@ -30,7 +30,7 @@
     <div v-else style="height: 300px;position: relative">
       <JNoData/>
     </div>
-    <JLoading :loading="loading">{{$t('dataLoading')}}</JLoading>
+    <JLoading style="z-index: 999" :loading="loading">{{$t('dataLoading')}}</JLoading>
   </div>
 </template>
 
diff --git a/jero-web/src/views/dashboard/components/myNews.vue b/jero-web/src/views/dashboard/components/myNews.vue
index 3d693062a..fe22a2d10 100644
--- a/jero-web/src/views/dashboard/components/myNews.vue
+++ b/jero-web/src/views/dashboard/components/myNews.vue
@@ -26,7 +26,7 @@
     <div v-else style="height: 300px;position: relative">
       <JNoData/>
     </div>
-    <JLoading :loading="loading">{{$t('dataLoading')}}</JLoading>
+    <JLoading style="z-index: 999" :loading="loading">{{$t('dataLoading')}}</JLoading>
   </div>
 </template>
 
diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue
index d5bd07ddc..0ba7dd070 100644
--- a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue
+++ b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue
@@ -1,12 +1,12 @@
 <template>
-  <div class='mainItem'>
+  <div class="mainItem">
     <div class="split-detail" @click="clearMenu" :style="'width:' + (fullWidth - 200) + 'px'">
       <a-card :bordered="false">
         <div class="split-detail-wrap">
           <div class="split-detail-left">
             <div class="split-detail-left-tree">
               <a-input-search style="margin-bottom: 8px" :placeholder="$t('NodeQuickLookup')" @change="onLeftChange"
-                              @search="onSearch"/>
+                              @search="onSearch" />
               <a-tree
                 v-if="gData.length>0"
                 :selected-keys="selectedKeys"
@@ -25,32 +25,36 @@
                     <span v-if="title.indexOf(searchValue) >= -1 && title.length <= 18" :title="title"
                           class="expand-title">
                       {{ title.substr(0, title.indexOf(searchValue)) }}<span
-                      style="color: #f50">{{ searchValue }}</span>{{ title.substr(title.indexOf(searchValue) + searchValue.length) }}
+                      style="color: #f50">{{ searchValue
+                      }}</span>{{ title.substr(title.indexOf(searchValue) + searchValue.length) }}
                     </span>
                     <span
                       v-else-if="title.indexOf(searchValue) >= -1 && title.length > 18 && title.indexOf(searchValue)>18"
                       :title="title">
-                      {{title && title.length > 18?title.slice(0,17)+'...':title}}
+                      {{ title && title.length > 18 ? title.slice(0, 17) + '...' : title }}
                     </span>
                     <span
                       v-else-if="title.indexOf(searchValue) >= -1 && title.length > 18 && title.indexOf(searchValue)<=18"
                       :title="title">
-                      {{ title.substr(0, title.indexOf(searchValue)) }}<span style="color: #f50">{{ title.indexOf(searchValue)+searchValue.length>18?searchValue.substr(0,18-title.indexOf(searchValue)) : searchValue }}</span>{{ title.indexOf(searchValue)+searchValue.length>18?'...': title.substr(title.indexOf(searchValue) + searchValue.length,18-title.indexOf(searchValue) - searchValue.length)+'...'  }}
+                      {{ title.substr(0, title.indexOf(searchValue)) }}<span
+                      style="color: #f50">{{ title.indexOf(searchValue) + searchValue.length > 18 ? searchValue.substr(0, 18 - title.indexOf(searchValue)) : searchValue
+                      }}</span>{{ title.indexOf(searchValue) + searchValue.length > 18 ? '...' : title.substr(title.indexOf(searchValue) + searchValue.length, 18 - title.indexOf(searchValue) - searchValue.length) + '...'
+                      }}
 
                     </span>
                     <span v-else :title="title">
-                      {{title && title.length > 18?title.slice(0,17)+'...':title}}
+                      {{ title && title.length > 18 ? title.slice(0, 17) + '...' : title }}
                     </span>
                     <template #overlay>
                       <a-menu v-if="$route.query.createBy == userData.username || administrators"
                               @click="({ key: menuKey }) => onContextMenuClick(treeKey, menuKey, record)">
-                        <a-menu-item key="1" @click="orgAdd" v-has="'split:sarFileSplitMenu:add'">{{$t('newNode')}}
+                        <a-menu-item key="1" @click="orgAdd" v-has="'split:sarFileSplitMenu:add'">{{ $t('newNode') }}
                         </a-menu-item>
                         <a-menu-item key="2" @click="orgEdit" v-has="'split:sarFileSplitMenu:update'">
-                          {{$t('modifyNode')}}
+                          {{ $t('modifyNode') }}
                         </a-menu-item>
                         <a-menu-item key="3" @click="orgDelete" v-if="deleteNode"
-                                     v-has="'split:sarFileSplitMenu:delete'">{{$t('deleteNode')}}
+                                     v-has="'split:sarFileSplitMenu:delete'">{{ $t('deleteNode') }}
                         </a-menu-item>
                       </a-menu>
                     </template>
@@ -63,26 +67,26 @@
             <div class="split-detail-right-wraper">
               <div class="split-detail-search-header">
                 <search :flag="'4'" :url="url" :infoId="$route.query.infoId"
-                        :menuId="menuId" @resetSearch="resetSearch" @queryParams="queryParamsValues"/>
+                        :menuId="menuId" @resetSearch="resetSearch" @queryParams="queryParamsValues" />
               </div>
               <div class="table-operator">
                 <div class="operator-text" @click="handleCopyManage"
                      v-if="$route.query.createBy == userData.username || administrators"
                      v-has="'split:sarFileSplitItems:copy'">
-                  <a-icon type="copy"/>
+                  <a-icon type="copy" />
                   {{ $t('copy') }}
                 </div>
                 <div class="operator-text" @click="handleAddManage"
                      v-if="$route.query.createBy == userData.username || administrators"
                      v-has="'split:sarFileSplitItems:add'">
-                  <a-icon type="plus"/>
+                  <a-icon type="plus" />
                   {{ $t('add') }}
                 </div>
                 <div class="operator-text upload-split"
                      v-if="$route.query.createBy == userData.username || administrators"
                      @click="handleImportManage" v-has="'split:sarFileSplitItems:import'">
-                  <a-icon type="import" :rotate="-90" v-if="uploadMenuId===undefined||uploadMenuId===''"/>
-                  {{ (uploadMenuId===''||uploadMenuId===undefined)? $t('import'):'' }}
+                  <a-icon type="import" :rotate="-90" v-if="uploadMenuId===undefined||uploadMenuId===''" />
+                  {{ (uploadMenuId === '' || uploadMenuId === undefined) ? $t('import') : '' }}
                   <upload v-if="menuId" ref="uploadSplit" :infoId="infoId" :menuId="uploadMenuId"
                           @uploadSuccess="uploadSuccess"></upload>
                   <!--                  <ImportFile :url="url"/>-->
@@ -90,31 +94,31 @@
                 </div>
                 <div class="operator-text" @click="handleExportManage"
                      v-has="'split:sarFileSplitItems:export'">
-                  <a-icon type="export" :rotate="-90"/>
+                  <a-icon type="export" :rotate="-90" />
                   {{ $t('export') }}
                 </div>
                 <div class="operator-text" @click="handleDownManage"
                      v-if="$route.query.createBy == userData.username || administrators"
                      v-has="'split:sarFileSplitItems:template'">
-                  <a-icon type="download"/>
+                  <a-icon type="download" />
                   {{ $t('TemplateDownload') }}
                 </div>
                 <div class="operator-text" @click="handleMergeManage"
                      v-if="$route.query.createBy == userData.username || administrators"
                      v-has="'split:sarFileSplitItems:merge'">
-                  <a-icon type="snippets"/>
+                  <a-icon type="snippets" />
                   {{ $t('MergerClause') }}
                 </div>
                 <div class="operator-text" @click="handleManage"
                      v-if="$route.query.createBy == userData.username || administrators"
                      v-has="'split:sarFileSplitItems:set'">
-                  <a-icon type="setting"/>
+                  <a-icon type="setting" />
                   {{ $t('BatchSetting') }}
                 </div>
                 <div class="operator-text" @click="handleBatCancel"
                      v-if="$route.query.createBy == userData.username || administrators"
                      v-has="'split:sarFileSplitItems:delete'">
-                  <a-icon type="delete"/>
+                  <a-icon type="delete" />
                   {{ $t('BatchDelete') }}
                 </div>
               </div>
@@ -143,7 +147,7 @@
             :footer="false"
             @cancel="handleCancel"
           >
-            <p v-html='contentValue'></p>
+            <p v-html="contentValue"></p>
           </a-modal>
           <!--          添加节点-->
           <a-modal
@@ -164,15 +168,17 @@
               :wrapper-col="wrapperCol"
             >
               <a-form-model-item :label="$t('clauseNo')" prop="name">
-                <a-input v-model="form.name" :placeholder="$t('PleaseEnter')+$t('clauseNo')"/>
+                <a-input class="box-input" v-model="form.name" :placeholder="$t('PleaseEnter')+$t('clauseNo')" />
               </a-form-model-item>
               <a-form-model-item :label="$t('clauseName')" prop="itemName">
-                <a-input v-model="form.itemName" :placeholder="$t('PleaseEnter')+$t('clauseName')"/>
+                <a-input class="box-input" v-model="form.itemName" :placeholder="$t('PleaseEnter')+$t('clauseName')" />
               </a-form-model-item>
               <a-form-model-item :label="$t('serialNumber')" prop="displaySeq">
                 <a-input-number v-model="form.displaySeq" :min="1" :max="99999"
-                                :placeholder="$t('PleaseEnter')+$t('serialNumber')" :formatter="limitNumber"
-                                :parser="limitNumber" style="width: 100%"/>
+                                class="box-input"
+                                :placeholder="$t('PleaseEnter')+$t('serialNumber')"
+                                :formatter="limitNumber"
+                                :parser="limitNumber" style="width: 100%" />
                 <!--                <a-input-number v-model="rowCount" :min="1" :placeholder="$t('pleaseEnter')+$t('numberRows')" :formatter="limitNumber" :parser="limitNumber" />-->
               </a-form-model-item>
             </a-form-model>
@@ -207,360 +213,414 @@
 </template>
 
 <script>
-  import { getAction, postAction, deleteAction, putAction, downloadFile } from '@/api/manage'
-  import search from '@/components/SplitSearch/index'
-  import TableData from '@/components/SplitDetailTable/index'
-  // import upload from '@/components/uploadFile/file.vue'
-  import SplitBatForm from '@/components/SplitBatForm/index'
-  import SplitAddForm from './SplitAddForm'
-  import upload from '@/components/SplitImport/index'
-  import axios from 'axios'
-  import { ACCESS_TOKEN } from '@/store/mutation-types'
-  import moment from 'moment'
-  import eventBUs from '@/common/event'
-  import Vue from 'vue'
-  import { mapGetters } from 'vuex'
+import { getAction, postAction, deleteAction, putAction, downloadFile } from '@/api/manage'
+import search from '@/components/SplitSearch/index'
+import TableData from '@/components/SplitDetailTable/index'
+// import upload from '@/components/uploadFile/file.vue'
+import SplitBatForm from '@/components/SplitBatForm/index'
+import SplitAddForm from './SplitAddForm'
+import upload from '@/components/SplitImport/index'
+import axios from 'axios'
+import { ACCESS_TOKEN } from '@/store/mutation-types'
+import moment from 'moment'
+import eventBUs from '@/common/event'
+import Vue from 'vue'
+import { mapGetters } from 'vuex'
 
-  export default {
-    name: 'SplitDetail',
-    components: {
-      search,
-      TableData,
-      SplitBatForm,
-      SplitAddForm,
-      upload
-      // ImportFile
-    },
-    data() {
-      return {
-        labelCol: { span: 6 },
-        userData: {},
-        wrapperCol: { span: 16 },
-        contentVisible: false,  //条款内容弹框显示
-        queryParams: {
-          pageNo: 1,
-          pageSize: 10
-        },
-        total: 0,
-        tableData: [],
-        selectedRowKeys: [],
-        selectedRows: [],
-        expandedKeys: [],
-        searchValue: '',
-        autoExpandParent: true,
-        dataList: [],
-        contentValue: '',
-        gData: [],
-        selecIds: [],
-        loading: false,
-        columns: [],
-        addVisible: false,
-        attId: '',
-        data: [],
-        confirmLoading: false,
-        NodeTreeItem: null,   //右键菜单
-        tmpStyle: '',   //右键菜单位置
-        menuTitle: this.$t('add'),
-        formTitle: '',
-        menuRightVisible: false,
-        form: {},
-        rules: {
-          name: [
-            // { required: true, message: this.$t('PleaseEnter') + this.$t('clauseNo'), trigger: 'blur' },
-            { min: 1, max: 200, message: this.$t('cantExeed') + '200' + this.$t('characters'), trigger: 'blur' }
-          ],
-          itemName: [
-            { required: true, message: this.$t('PleaseEnter') + this.$t('clauseName'), trigger: 'blur' },
-            { min: 1, max: 200, message: this.$t('cantExeed') + '200' + this.$t('characters'), trigger: 'blur' }
-          ],
-          displaySeq: [
-            { required: true, message: this.$t('PleaseEnter') + this.$t('serialNumber'), trigger: 'blur' }
-            // { min: 1, max: 99999, message: this.$t('cantExeed') + '99999' + this.$t('characters'), trigger: 'blur' },
-          ]
-        },
-        infoId: '',
-        menuId: '',
-        itemId: '',
-        itemVal: {},
-        // NodeTreeItemVisible:false,
-        flag: false,  //提交按钮标识
-        isEdit: false,
-        OperationList: [   //操作栏
-          {
-            text: this.$t('edit'),
-            ClickEvent: 'editClick'
-          },   //编辑
-          {
-            text: this.$t('delete'),
-            ClickEvent: 'deleteClick'
-          }  //删除
+export default {
+  name: 'SplitDetail',
+  components: {
+    search,
+    TableData,
+    SplitBatForm,
+    SplitAddForm,
+    upload
+    // ImportFile
+  },
+  data() {
+    return {
+      labelCol: { span: 6 },
+      userData: {},
+      wrapperCol: { span: 16 },
+      contentVisible: false,  //条款内容弹框显示
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10
+      },
+      total: 0,
+      tableData: [],
+      selectedRowKeys: [],
+      selectedRows: [],
+      expandedKeys: [],
+      searchValue: '',
+      autoExpandParent: true,
+      dataList: [],
+      contentValue: '',
+      gData: [],
+      selecIds: [],
+      loading: false,
+      columns: [],
+      addVisible: false,
+      attId: '',
+      data: [],
+      confirmLoading: false,
+      NodeTreeItem: null,   //右键菜单
+      tmpStyle: '',   //右键菜单位置
+      menuTitle: this.$t('add'),
+      formTitle: '',
+      menuRightVisible: false,
+      form: {},
+      rules: {
+        name: [
+          // { required: true, message: this.$t('PleaseEnter') + this.$t('clauseNo'), trigger: 'blur' },
+          { min: 1, max: 200, message: this.$t('cantExeed') + '200' + this.$t('characters'), trigger: 'blur' }
         ],
-        url: {
-          tableHeader: 'split/sarFileSplitItems/getHeader',      //表格头部字段
-          seachList: 'split/sarFileSplitItems/queryCondition',   //搜索字段
-          tableList: 'split/sarFileSplitItems/getSplitItemsByPage',         //表格数据
-          getAddForm: 'split/sarFileSplitItems/getForm',   // 表单的字段
-          addInfo: '/jero-boot/split/sarFileSplitItems/addSplitItems',      //新增
-          updateInfo: '/jero-boot/split/sarFileSplitItems/updateSplitItems',  //编辑
-          getDocumentInfo: 'split/sarFileSplitItems/getSplitItemsById',
-          importZipUrl: '/split/sarFileSplitItems/importSplitItems'//导入
-        },
-        urlBatSet: {
-          getAddForm: 'split/sarFileSplitItems/getBatchSetForm',
-          addInfo: '/jero-boot/split/sarFileSplitItems/batchSet'
-        },
-        batSetVisible: false,  //批量设置弹框显示
-        ids: '',
-        token: Vue.ls.get(ACCESS_TOKEN),
-        // upAccept:'.zip',  //导入文件类型
-        uploadMenuId: '',
-        selectedKeys: [],
-        deleteNode: false,
-        fullWidth: '',
-        parameter: {},
-        widthBrown: '',
-        creenWidth: document.body.clientWidth,
-        brownHeight: document.documentElement.clientHeight,
-        administrators:false,
-      }
-    },
-    watch: {
-      deleteNode() {
-
+        itemName: [
+          { required: true, message: this.$t('PleaseEnter') + this.$t('clauseName'), trigger: 'blur' },
+          { min: 1, max: 200, message: this.$t('cantExeed') + '200' + this.$t('characters'), trigger: 'blur' }
+        ],
+        displaySeq: [
+          { required: true, message: this.$t('PleaseEnter') + this.$t('serialNumber'), trigger: 'blur' }
+          // { min: 1, max: 99999, message: this.$t('cantExeed') + '99999' + this.$t('characters'), trigger: 'blur' },
+        ]
       },
-      screenWidth: {
-        immediate: true,
-        handler(newValue) {
-          // console.log(newValue)
+      infoId: '',
+      menuId: '',
+      itemId: '',
+      itemVal: {},
+      // NodeTreeItemVisible:false,
+      flag: false,  //提交按钮标识
+      isEdit: false,
+      OperationList: [   //操作栏
+        {
+          text: this.$t('edit'),
+          ClickEvent: 'editClick'
+        },   //编辑
+        {
+          text: this.$t('delete'),
+          ClickEvent: 'deleteClick'
+        }  //删除
+      ],
+      url: {
+        tableHeader: 'split/sarFileSplitItems/getHeader',      //表格头部字段
+        seachList: 'split/sarFileSplitItems/queryCondition',   //搜索字段
+        tableList: 'split/sarFileSplitItems/getSplitItemsByPage',         //表格数据
+        getAddForm: 'split/sarFileSplitItems/getForm',   // 表单的字段
+        addInfo: '/jero-boot/split/sarFileSplitItems/addSplitItems',      //新增
+        updateInfo: '/jero-boot/split/sarFileSplitItems/updateSplitItems',  //编辑
+        getDocumentInfo: 'split/sarFileSplitItems/getSplitItemsById',
+        importZipUrl: '/split/sarFileSplitItems/importSplitItems'//导入
+      },
+      urlBatSet: {
+        getAddForm: 'split/sarFileSplitItems/getBatchSetForm',
+        addInfo: '/jero-boot/split/sarFileSplitItems/batchSet'
+      },
+      batSetVisible: false,  //批量设置弹框显示
+      ids: '',
+      token: Vue.ls.get(ACCESS_TOKEN),
+      // upAccept:'.zip',  //导入文件类型
+      uploadMenuId: '',
+      selectedKeys: [],
+      deleteNode: false,
+      fullWidth: '',
+      parameter: {},
+      widthBrown: '',
+      creenWidth: document.body.clientWidth,
+      brownHeight: document.documentElement.clientHeight,
+      administrators: false
+    }
+  },
+  watch: {
+    deleteNode() {
+
+    },
+    screenWidth: {
+      immediate: true,
+      handler(newValue) {
+        // console.log(newValue)
+      }
+    }
+  },
+  computed: {},
+  mounted() {
+    const that = this
+    let client = ''
+    let width = ''
+    // this.widthBrown = window.screenWidth || document.body.clientWidth;
+    // let iframeTop= document.querySelector('.split-detail-left').getBoundingClientRect().top
+    // document.querySelector('.split-detail-left').style.height = this.brownHeight-iframeTop-24 + 'px'
+    // console.log(iframeTop,'iframeTop2222')
+    // document.querySelector('.split-detail-table .ant-table-content').style.width = width - 20 + 'px'
+    // window.addEventListener('resize', () => {
+    //   that.screenWidth = window.screenWidth || document.body.clientWidth;
+    //   client = document.querySelector('.split-detail-table .ant-table-content').getBoundingClientRect()
+    //   // console.log('screenWidth',that.screenWidth)
+    //   width =  that.screenWidth - client.left
+    //   document.querySelector('.split-detail-table .ant-table-content').style.width = width - 20 + 'px'
+    //   iframeTop= document.querySelector('.split-detail-left').getBoundingClientRect().top
+    //   console.log(iframeTop,'iframeTop111')
+    //   document.querySelector('.split-detail-left').style.height = this.brownHeight-iframeTop-24 + 'px'
+    // }, false);
+
+    this.userData = this.userInfo()
+    this.administrators = false
+    if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) {
+      this.userInfo().userRoleList.forEach(res => {
+        if (res.roleCode == 'admin') {
+          this.administrators = true
+        }
+      })
+    }
+    this.infoId = this.$route.query.infoId
+    console.log('info', this.$route.query)
+    this.loadMenuData()
+    // this.loadData()
+    this.generateList(this.gData)
+  },
+  methods: {
+    ...mapGetters(['userInfo']),
+    //显示条款内容弹框
+    showContent(val) {
+      this.contentVisible = true
+      this.contentValue = val
+    },
+    //关闭条款内容弹框
+    handleCancel() {
+      this.contentVisible = false
+    },
+    generateList(data) {
+      for (let i = 0; i < data.length; i++) {
+        const node = data[i]
+        const key = node.key
+        this.dataList.push({ key, title: key })
+        if (node.children) {
+          this.generateList(node.children)
         }
       }
     },
-    computed: {},
-    mounted() {
-      const that = this
-      let client = ''
-      let width = ''
-      // this.widthBrown = window.screenWidth || document.body.clientWidth;
-      // let iframeTop= document.querySelector('.split-detail-left').getBoundingClientRect().top
-      // document.querySelector('.split-detail-left').style.height = this.brownHeight-iframeTop-24 + 'px'
-      // console.log(iframeTop,'iframeTop2222')
-      // document.querySelector('.split-detail-table .ant-table-content').style.width = width - 20 + 'px'
-      // window.addEventListener('resize', () => {
-      //   that.screenWidth = window.screenWidth || document.body.clientWidth;
-      //   client = document.querySelector('.split-detail-table .ant-table-content').getBoundingClientRect()
-      //   // console.log('screenWidth',that.screenWidth)
-      //   width =  that.screenWidth - client.left
-      //   document.querySelector('.split-detail-table .ant-table-content').style.width = width - 20 + 'px'
-      //   iframeTop= document.querySelector('.split-detail-left').getBoundingClientRect().top
-      //   console.log(iframeTop,'iframeTop111')
-      //   document.querySelector('.split-detail-left').style.height = this.brownHeight-iframeTop-24 + 'px'
-      // }, false);
 
-
-      this.userData = this.userInfo()
-      this.administrators = false
-      if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) {
-        this.userInfo().userRoleList.forEach(res => {
-          if (res.roleCode == 'admin') {
-            this.administrators = true
+    getParentKey(key, tree) {
+      let parentKey
+      for (let i = 0; i < tree.length; i++) {
+        const node = tree[i]
+        if (node.children) {
+          if (node.children.some(item => item.key === key)) {
+            parentKey = node.key
+          } else if (this.getParentKey(key, node.children)) {
+            parentKey = this.getParentKey(key, node.children)
           }
+        }
+      }
+      return parentKey
+    },
+    onExpand(expandedKeys) {
+      // console.log('expandedKeys',expandedKeys)
+      this.expandedKeys = expandedKeys
+      this.autoExpandParent = false
+    },
+    onLeftChange(e) {
+      const value = e.target.value
+      const expandedKeys = this.dataList
+        .map(item => {
+          if (item.title.indexOf(value) > -1) {
+            return this.getParentKey(item.key, this.gData)
+          }
+          return null
         })
-      }
-      this.infoId = this.$route.query.infoId
-      console.log('info', this.$route.query)
-      this.loadMenuData()
-      // this.loadData()
-      this.generateList(this.gData)
+        .filter((item, i, self) => item && self.indexOf(item) === i)
+      Object.assign(this, {
+        expandedKeys,
+        searchValue: value,
+        autoExpandParent: true
+      })
+      this.onSearch()
     },
-    methods: {
-      ...mapGetters(['userInfo']),
-      //显示条款内容弹框
-      showContent(val) {
-        this.contentVisible = true
-        this.contentValue = val
-      },
-      //关闭条款内容弹框
-      handleCancel() {
-        this.contentVisible = false
-      },
-      generateList(data) {
-        for (let i = 0; i < data.length; i++) {
-          const node = data[i]
-          const key = node.key
-          this.dataList.push({ key, title: key })
-          if (node.children) {
-            this.generateList(node.children)
-          }
-        }
-      },
-
-      getParentKey(key, tree) {
-        let parentKey
-        for (let i = 0; i < tree.length; i++) {
-          const node = tree[i]
-          if (node.children) {
-            if (node.children.some(item => item.key === key)) {
-              parentKey = node.key
-            } else if (this.getParentKey(key, node.children)) {
-              parentKey = this.getParentKey(key, node.children)
-            }
-          }
-        }
-        return parentKey
-      },
-      onExpand(expandedKeys) {
-        // console.log('expandedKeys',expandedKeys)
-        this.expandedKeys = expandedKeys
-        this.autoExpandParent = false
-      },
-      onLeftChange(e) {
-        const value = e.target.value
-        const expandedKeys = this.dataList
-          .map(item => {
-            if (item.title.indexOf(value) > -1) {
-              return this.getParentKey(item.key, this.gData)
-            }
-            return null
+    //获取左侧目录数据
+    loadMenuData() {
+      let params = {
+        infoId: this.infoId
+      }
+      this.loading = true
+      getAction(`split/sarFileSplitMenu/getSplitMenusByInfoId`, params).then(res => {
+        if (res.success) {
+          this.data = this.toTree(res.result)
+          this.gData = [...this.data]
+          Object.assign(this, {
+            expandedKeys: this.expandedKeys,
+            autoExpandParent: true
           })
-          .filter((item, i, self) => item && self.indexOf(item) === i)
-        Object.assign(this, {
-          expandedKeys,
-          searchValue: value,
-          autoExpandParent: true
-        })
-        this.onSearch()
-      },
-      //获取左侧目录数据
-      loadMenuData() {
-        let params = {
-          infoId: this.infoId
         }
-        this.loading = true
-        getAction(`split/sarFileSplitMenu/getSplitMenusByInfoId`, params).then(res => {
-          if (res.success) {
-            this.data = this.toTree(res.result)
-            this.gData = [...this.data]
-            Object.assign(this, {
-              expandedKeys: this.expandedKeys,
-              autoExpandParent: true
+      }).finally(() => {
+        this.loading = false
+      })
+    },
+    //将数据拼成树形结构
+    toTree(config) {
+      // 删除 所有 children,以防止多次调用
+      config.forEach(function(item) {
+        delete item.children
+      })
+      // 将数据存储为 以 id 为 KEY 的 map 索引数据列
+      let map = {}
+      config.forEach((item) => {
+        if (!item.name) {
+          item.name = ''
+        }
+        item.label = item.name
+        item.key = item.id
+        item.title = item.name + (item.itemName ? ' ' + item.itemName : '')
+        map[item.id] = item
+      })
+      let val = []
+      config.forEach((item) => {
+        // 以当前遍历项，的pid,去map对象中找到索引的id
+        let parent = map[item.pid]
+        // 如果找到索引，那么说明此项不在顶级当中,那么需要把此项添加到，他对应的父级中
+        if (parent) {
+          (parent.children || (parent.children = [])).push(item)
+        } else {
+          //如果没有在map中找到对应的索引ID,那么直接把 当前的item添加到 val结果集中，作为顶级
+          val.push(item)
+        }
+      })
+      return val
+    },
+    //鼠标右键
+    rightClick({ event, node }) {
+
+      this.deleteNode = node._props.dataRef.pid ? true : false
+      // console.log('eee',event,node)
+      // this.NodeTreeItemVisible=true
+      const x =
+        event.currentTarget.offsetLeft + event.currentTarget.clientWidth
+      const y = event.currentTarget.offsetTop
+      this.NodeTreeItem = {
+        pageX: x,
+        pageY: y,
+        id: node._props.dataRef.id,
+        name: node._props.dataRef.name,
+        itemName: node._props.dataRef.itemName,
+        displaySeq: node._props.dataRef.displaySeq,
+        title: node._props.dataRef.title,
+        pid: node._props.dataRef.pid || null
+      }
+      this.nodeItem = JSON.parse(JSON.stringify(this.NodeTreeItem))
+      // this.form.pid=this.NodeTreeItem.id
+      // this.form.id=this.NodeTreeItem.id
+      this.tmpStyle = {
+        position: 'absolute',
+        maxHeight: 40,
+        textAlign: 'center',
+        left: `${x + 10 - 0}px`,
+        top: `${y + 6 - 0}px`,
+        background: `#FFFFFF`,
+        zIndex: `2`
+      }
+      // console.log('NodeTreeItem',this.NodeTreeItem)
+    },
+    // 用于点击空白处隐藏增删改菜单
+    clearMenu() {
+      this.NodeTreeItem = null
+      // this.NodeTreeItemVisible=false
+    },
+    //选择树节点
+    onSelect(selectedKeys) {
+      this.menuId = selectedKeys[0]
+      this.uploadMenuId = selectedKeys[0]
+      this.selectedKeys = selectedKeys
+      let queryParam = {
+        menu_id: this.menuId,
+        info_id: this.infoId
+
+      }
+      this.parameter.info_id = this.infoId
+      this.parameter.menu_id = this.menuId
+      eventBUs.$emit('searchQuery', JSON.parse(JSON.stringify(queryParam)))
+      // eventBUs.$emit('searchReset')
+      console.log('sele', this.menuId, selectedKeys)
+      // console.log('uploadMenuId',this.uploadMenuId)
+    },
+    //树形新增
+    orgAdd() {
+      this.menuTitle = this.$t('add')
+      this.isEdit = false
+      this.form = {}
+      this.menuRightVisible = true
+
+    },
+    //树形修改
+    orgEdit() {
+      this.menuTitle = this.$t('edit')
+      this.isEdit = true
+      this.form.id = this.nodeItem.id
+      this.form.pid = this.nodeItem.pid
+      this.form.name = this.nodeItem.name
+      this.form.itemName = this.nodeItem.itemName
+      this.form.displaySeq = this.nodeItem.displaySeq
+      this.form = { ...this.form }
+      this.menuRightVisible = true
+    },
+    //树形删除
+    orgDelete() {
+      this.$confirm({
+        content: this.$t('deleteNodes'),
+        onOk:
+          async () => {
+            getAction(`split/sarFileSplitMenu/deleteMenu`, { id: this.nodeItem.id }).then(res => {
+              if (res.success) {
+                this.$message.success(this.$t('OperationSuccessful'))
+                this.loadMenuData()
+                let queryParam = {
+                  menu_id: this.menuId,
+                  info_id: this.infoId
+
+                }
+                eventBUs.$emit('searchQuery', JSON.parse(JSON.stringify(queryParam)))
+                // eventBUs.$emit('searchReset')
+              } else {
+                this.$message.warning(this.$t('operationFailed'))
+              }
             })
           }
-        }).finally(() => {
-          this.loading = false
-        })
-      },
-      //将数据拼成树形结构
-      toTree(config) {
-        // 删除 所有 children,以防止多次调用
-        config.forEach(function(item) {
-          delete item.children
-        })
-        // 将数据存储为 以 id 为 KEY 的 map 索引数据列
-        let map = {}
-        config.forEach((item) => {
-          item.label = item.name
-          item.key = item.id
-          item.title = item.name + (item.itemName ? ' ' + item.itemName : '')
-          map[item.id] = item
-        })
-        let val = []
-        config.forEach((item) => {
-          // 以当前遍历项，的pid,去map对象中找到索引的id
-          let parent = map[item.pid]
-          // 如果找到索引，那么说明此项不在顶级当中,那么需要把此项添加到，他对应的父级中
-          if (parent) {
-            (parent.children || (parent.children = [])).push(item)
-          } else {
-            //如果没有在map中找到对应的索引ID,那么直接把 当前的item添加到 val结果集中，作为顶级
-            val.push(item)
-          }
-        })
-        return val
-      },
-      //鼠标右键
-      rightClick({ event, node }) {
+      })
+    },
+    onContextMenuClick(treeKey, menuKey) {
+      // console.log(`treeKey: ${treeKey}, menuKey: ${menuKey}`);
+    },
+    //清空按钮
+    resetSearch() {
+      this.menuId = ''
+      this.uploadMenuId = ''
+      this.selectedKeys = []
+    },
+    handleCancelMenuRight() {
+      this.menuRightVisible = false
+    },
+    //增加条款确定
+    hideModalMenuRight() {
 
-        this.deleteNode = node._props.dataRef.pid ? true : false
-        // console.log('eee',event,node)
-        // this.NodeTreeItemVisible=true
-        const x =
-          event.currentTarget.offsetLeft + event.currentTarget.clientWidth
-        const y = event.currentTarget.offsetTop
-        this.NodeTreeItem = {
-          pageX: x,
-          pageY: y,
-          id: node._props.dataRef.id,
-          name: node._props.dataRef.name,
-          itemName: node._props.dataRef.itemName,
-          displaySeq: node._props.dataRef.displaySeq,
-          title: node._props.dataRef.title,
-          pid: node._props.dataRef.pid || null
+      let expandId = []
+      expandId.push(this.form.pid)
+      if (!this.isEdit) {
+        let params = {
+          infoId: this.infoId,
+          pid: this.nodeItem.id,
+          ...this.form
         }
-        this.nodeItem = JSON.parse(JSON.stringify(this.NodeTreeItem))
-        // this.form.pid=this.NodeTreeItem.id
-        // this.form.id=this.NodeTreeItem.id
-        this.tmpStyle = {
-          position: 'absolute',
-          maxHeight: 40,
-          textAlign: 'center',
-          left: `${x + 10 - 0}px`,
-          top: `${y + 6 - 0}px`,
-          background: `#FFFFFF`,
-          zIndex: `2`
-        }
-        // console.log('NodeTreeItem',this.NodeTreeItem)
-      },
-      // 用于点击空白处隐藏增删改菜单
-      clearMenu() {
-        this.NodeTreeItem = null
-        // this.NodeTreeItemVisible=false
-      },
-      //选择树节点
-      onSelect(selectedKeys) {
-        this.menuId = selectedKeys[0]
-        this.uploadMenuId = selectedKeys[0]
-        this.selectedKeys = selectedKeys
-        let queryParam = {
-          menu_id: this.menuId,
-          info_id: this.infoId
+        this.$refs.ruleForm.validate(valid => {
+          if (valid) {
 
-        }
-        this.parameter.info_id = this.infoId
-        this.parameter.menu_id = this.menuId
-        eventBUs.$emit('searchQuery', JSON.parse(JSON.stringify(queryParam)))
-        // eventBUs.$emit('searchReset')
-        console.log('sele', this.menuId, selectedKeys)
-        // console.log('uploadMenuId',this.uploadMenuId)
-      },
-      //树形新增
-      orgAdd() {
-        this.menuTitle = this.$t('add')
-        this.isEdit = false
-        this.form = {}
-        this.menuRightVisible = true
-
-      },
-      //树形修改
-      orgEdit() {
-        this.menuTitle = this.$t('edit')
-        this.isEdit = true
-        this.form.id = this.nodeItem.id
-        this.form.pid = this.nodeItem.pid
-        this.form.name = this.nodeItem.name
-        this.form.itemName = this.nodeItem.itemName
-        this.form.displaySeq = this.nodeItem.displaySeq
-        this.form = { ...this.form }
-        this.menuRightVisible = true
-      },
-      //树形删除
-      orgDelete() {
-        this.$confirm({
-          content: this.$t('deleteNodes'),
-          onOk:
-            async () => {
-              getAction(`split/sarFileSplitMenu/deleteMenu`, { id: this.nodeItem.id }).then(res => {
+            // console.log('parms',this.params)
+            if (!this.flag) {
+              this.flag = true
+              postAction(`split/sarFileSplitMenu/addMenu`, params).then(res => {
                 if (res.success) {
+                  this.menuRightVisible = false
                   this.$message.success(this.$t('OperationSuccessful'))
+                  // this.onExpand(expandId)
+                  this.form = {}
+                  this.expandedKeys.push(this.nodeItem.id)
+                  // console.log('expandedKeys1111',this.expandedKeys)
                   this.loadMenuData()
                   let queryParam = {
                     menu_id: this.menuId,
@@ -572,418 +632,295 @@
                 } else {
                   this.$message.warning(this.$t('operationFailed'))
                 }
+              }).finally(() => {
+                this.flag = false
+                this.menuRightVisible = false
               })
             }
-        })
-      },
-      onContextMenuClick(treeKey, menuKey) {
-        // console.log(`treeKey: ${treeKey}, menuKey: ${menuKey}`);
-      },
-      //清空按钮
-      resetSearch() {
-        this.menuId = ''
-        this.uploadMenuId = ''
-        this.selectedKeys = []
-      },
-      handleCancelMenuRight() {
-        this.menuRightVisible = false
-      },
-      //增加条款确定
-      hideModalMenuRight() {
-
-        let expandId = []
-        expandId.push(this.form.pid)
-        if (!this.isEdit) {
-          let params = {
-            infoId: this.infoId,
-            pid: this.nodeItem.id,
-            ...this.form
           }
-          this.$refs.ruleForm.validate(valid => {
-            if (valid) {
+        })
+      } else {
+        let params = {
+          info_id: this.infoId,
+          ...this.form
+        }
+        if (!this.flag) {
+          this.flag = true
+          // console.log('parms',params)
+          putAction(`split/sarFileSplitMenu/updateMenu`, params).then(res => {
+            if (res.success) {
+              this.$message.success(this.$t('OperationSuccessful'))
+              this.onExpand(expandId)
+              this.form = {}
+              this.loadMenuData()
+            } else {
+              this.$message.warning(this.$t('operationFailed'))
+            }
+          }).finally(() => {
+            this.flag = false
+            this.menuRightVisible = false
+          })
+        }
+      }
+    },
+    //获取列表数据
+    loadData() {
+      let params = {
+        ...this.queryParams,
+        info_id: this.infoId
+      }
+      this.loading = true
+      postAction(`split/sarFileSplitItems/getSplitItemsByPage`, params).then(res => {
+        if (res.success) {
+          this.tableData = [...res.result.records]
+          this.loading = false
+        }
+      })
+    },
+    //搜索
+    searchQuery() {
 
-              // console.log('parms',this.params)
-              if (!this.flag) {
-                this.flag = true
-                postAction(`split/sarFileSplitMenu/addMenu`, params).then(res => {
-                  if (res.success) {
-                    this.menuRightVisible = false
+    },
+    //清空
+    searchReset() {
+      this.queryParams = {
+        pageNo: 1,
+        pageSize: 10
+      }
+      this.loadData()
+    },
+    //复制按钮
+    handleCopyManage(record) {
+      // console.log('')
+      let ids = []
+      let infoIds = []
+      let menuIds = []
+      this.selectedRows.forEach(item => {
+        ids.push(item.id)
+        infoIds.push(item.info_id)
+        menuIds.push(item.menu_id)
+      })
+      let params = {
+        ids: ids.join(','),
+        infoIds: infoIds.join(','),
+        menuids: menuIds.join(',')
+      }
+      if (menuIds && menuIds.length > 0) {
+        this.$confirm({
+          title: this.$t('ConfirmReplication'),
+          content: '',
+          onOk:
+            async () => {
+              axios({
+                url: '/jero-boot/split/sarFileSplitItems/batchCopyItems',
+                method: 'get',
+                params: params,
+                // transformRequest: [function (data) {
+                //   // Do whatever you want to transform the data
+                //   let ret = ''
+                //   for (let it in data) {
+                //     ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&'
+                //   }
+                //   return ret
+                // }],
+                headers: {
+                  // 'Content-Type': 'application/x-www-form-urlencoded',
+                  'X-Access-Token': this.token
+                }
+              })
+                .then((res) => {
+                  if (res.data.success) {
                     this.$message.success(this.$t('OperationSuccessful'))
-                    // this.onExpand(expandId)
-                    this.form = {}
-                    this.expandedKeys.push(this.nodeItem.id)
-                    // console.log('expandedKeys1111',this.expandedKeys)
+                    this.$emit('selectClear')
+                    this.selectClear()
+                    // this.loadData()
                     this.loadMenuData()
                     let queryParam = {
                       menu_id: this.menuId,
                       info_id: this.infoId
 
                     }
-                    eventBUs.$emit('searchQuery', JSON.parse(JSON.stringify(queryParam)))
+                    eventBUs.$emit('searchGetData', JSON.parse(JSON.stringify(queryParam)))
                     // eventBUs.$emit('searchReset')
                   } else {
                     this.$message.warning(this.$t('operationFailed'))
                   }
-                }).finally(() => {
-                  this.flag = false
-                  this.menuRightVisible = false
                 })
-              }
-            }
-          })
-        } else {
-          let params = {
-            info_id: this.infoId,
-            ...this.form
-          }
-          if (!this.flag) {
-            this.flag = true
-            // console.log('parms',params)
-            putAction(`split/sarFileSplitMenu/updateMenu`, params).then(res => {
-              if (res.success) {
-                this.$message.success(this.$t('OperationSuccessful'))
-                this.onExpand(expandId)
-                this.form = {}
-                this.loadMenuData()
-              } else {
-                this.$message.warning(this.$t('operationFailed'))
-              }
-            }).finally(() => {
-              this.flag = false
-              this.menuRightVisible = false
-            })
-          }
-        }
-      },
-      //获取列表数据
-      loadData() {
-        let params = {
-          ...this.queryParams,
-          info_id: this.infoId
-        }
-        this.loading = true
-        postAction(`split/sarFileSplitItems/getSplitItemsByPage`, params).then(res => {
-          if (res.success) {
-            this.tableData = [...res.result.records]
-            this.loading = false
+            },
+          onCancel() {
           }
         })
-      },
-      //搜索
-      searchQuery() {
-
-      },
-      //清空
-      searchReset() {
-        this.queryParams = {
-          pageNo: 1,
-          pageSize: 10
-        }
-        this.loadData()
-      },
-      //复制按钮
-      handleCopyManage(record) {
-        // console.log('')
-        let ids = []
-        let infoIds = []
-        let menuIds = []
-        this.selectedRows.forEach(item => {
-          ids.push(item.id)
-          infoIds.push(item.info_id)
-          menuIds.push(item.menu_id)
+      } else if (menuIds.length == 0) {
+        this.$message.warning(this.$t('PleaseSelectData'))
+      }
+    },
+    //新增
+    handleAddManage() {
+      // console.log('this.menuId',this.menuId)
+      if (this.menuId) {
+        this.formTitle = this.$t('add')
+        this.itemId = ''
+        this.addVisible = true
+        this.$nextTick(() => {
+          this.$refs.splitForm.add()
         })
-        let params = {
-          ids: ids.join(','),
-          infoIds: infoIds.join(','),
-          menuids: menuIds.join(',')
-        }
-        if (menuIds && menuIds.length > 0) {
-          this.$confirm({
-            title: this.$t('ConfirmReplication'),
-            content: '',
-            onOk:
-              async () => {
-                axios({
-                  url: '/jero-boot/split/sarFileSplitItems/batchCopyItems',
-                  method: 'get',
-                  params: params,
-                  // transformRequest: [function (data) {
-                  //   // Do whatever you want to transform the data
-                  //   let ret = ''
-                  //   for (let it in data) {
-                  //     ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&'
-                  //   }
-                  //   return ret
-                  // }],
-                  headers: {
-                    // 'Content-Type': 'application/x-www-form-urlencoded',
-                    'X-Access-Token': this.token
-                  }
-                })
-                  .then((res) => {
-                    if (res.data.success) {
-                      this.$message.success(this.$t('OperationSuccessful'))
-                      this.$emit('selectClear')
-                      this.selectClear()
-                      // this.loadData()
-                      this.loadMenuData()
-                      let queryParam = {
-                        menu_id: this.menuId,
-                        info_id: this.infoId
+      } else {
+        this.$message.warning(this.$t('selectDirectoryTerms'))
+      }
+    },
+    closeVisible(val) {
+      this.addVisible = val
+    },
+    //导入
+    handleImportManage() {
+      if (!this.menuId) {
+        this.$message.warning(this.$t('selectDirectoryTerms'))
+      }
 
-                      }
-                      eventBUs.$emit('searchGetData', JSON.parse(JSON.stringify(queryParam)))
-                      // eventBUs.$emit('searchReset')
-                    } else {
-                      this.$message.warning(this.$t('operationFailed'))
-                    }
-                  })
-              },
-            onCancel() {
-            }
-          })
-        } else if (menuIds.length == 0) {
-          this.$message.warning(this.$t('PleaseSelectData'))
-        }
-      },
-      //新增
-      handleAddManage() {
-        // console.log('this.menuId',this.menuId)
-        if (this.menuId) {
-          this.formTitle = this.$t('add')
-          this.itemId = ''
-          this.addVisible = true
-          this.$nextTick(() => {
-            this.$refs.splitForm.add()
-          })
-        } else {
-          this.$message.warning(this.$t('selectDirectoryTerms'))
-        }
-      },
-      closeVisible(val) {
-        this.addVisible = val
-      },
-      //导入
-      handleImportManage() {
-        if (!this.menuId) {
-          this.$message.warning(this.$t('selectDirectoryTerms'))
-        }
-
-      },
-      //上传成功
-      uploadSuccess(data, status) {
-        // console.log('data111',data)
-        if (status === 'success') {
-          let queryParam = {
-            menu_id: this.menuId,
-            info_id: this.infoId
-
-          }
-          this.loadMenuData()
-          eventBUs.$emit('searchGetData', JSON.parse(JSON.stringify(queryParam)))
-        }
-        let attIdList = []
-        if (data && data.length > 0) {
-          data.forEach(item => {
-            attIdList.push(item.id || data.name)
-          })
-          this.attId = attIdList.join(',')
-
-
-          // eventBUs.$emit('searchReset')
-        }
-      },
-      queryParamsValues(search) {
-        Object.keys(search).forEach(res => {
-          if (search[res] instanceof Array) {
-            search[res] = search[res].join(',')
-          }
-        })
-        this.parameter = search
-        this.parameter.info_id = this.infoId
-        this.parameter.menu_id = this.menuId
-      },
-      //导出
-      handleExportManage() {
-        if (JSON.stringify(this.parameter) == '{}') {
-          this.parameter.info_id = this.infoId
-          this.parameter.menu_id = this.menuId
-        }
-        // console.log('menuId',this.menuId)
-        let dateName = moment(new Date()).format('YYYY-MM-DD HH-mm-ss')
-        let name = this.$route.query.infoNumber + ' ' + dateName + '.zip'
-        let query = {
-          exportName: this.$route.query.infoNumber + ' ' + dateName,
-          idList: this.selectedRowKeys.join(','),
-          parameter: this.parameter
-        }
-
-        downloadFile('split/sarFileSplitItems/exportSplitInfoZip', name, query, this.selectClear)
-      },
-      selectClear() {
-        this.$refs.splitDetailTabel.selectedRowKeys = []
-        this.selectedRowKeys = []
-        this.selectedRows = []
-        this.selecIds = []
-      },
-      //模板下载
-      handleDownManage() {
-        let name = this.$t('documentSplitTemplate') + '.xlsx'
-        downloadFile('split/sarFileSplitItems/exportTemplate', name, {})
-      },
-      //合并条款
-      handleMergeManage() {
-        if (this.selectedRowKeys && this.selectedRowKeys.length < 2) {
-          this.$message.warning(this.$t('leastTwo'))
-        } else {
-          let ids = this.selectedRowKeys.join(',')
-          this.$confirm({
-            title: this.$t('mergeTerms'),
-            content: '',
-            onOk:
-              async () => {
-                axios({
-                  url: '/jero-boot/split/sarFileSplitItems/batchMergeItems',
-                  method: 'get',
-                  params: {
-                    ids: ids
-                  },
-                  headers: {
-                    'X-Access-Token': this.token
-                  }
-                })
-                  .then((res) => {
-                    if (res.data.success) {
-                      this.$message.success(this.$t('OperationSuccessful'))
-                      this.selectClear()
-                      this.loadMenuData()
-                      let queryParam = {
-                        menu_id: this.menuId,
-                        info_id: this.infoId
-
-                      }
-                      eventBUs.$emit('searchGetData', JSON.parse(JSON.stringify(queryParam)))
-                      // eventBUs.$emit('searchReset')
-                      this.selectedRowKeys = []
-                    } else {
-                      this.$message.warning(this.$t('operationFailed'))
-                    }
-                  }).finally(() => {
-
-                })
-
-              }
-          })
-        }
-      },
-      //批量设置
-      handleManage() {
-        this.ids = this.selectedRowKeys.join(',')
-        if (this.selectedRowKeys && this.selectedRowKeys.length < 1) {
-          this.$message.warning(this.$t('selectLeastOne'))
-        } else {
-          // console.log('idsss',this.ids)
-          this.batSetVisible = true
-        }
-      },
-      //批量设置确定
-      modalOk() {
-        // this.confirmLoading=true
-        this.$refs.fileForm.sumber()
-      },
-      //批量设置取消
-      batSetCancel() {
-        this.batSetVisible = false
-      },
-      //批量设置确定提交
-      addFormClick() {
-        this.batSetVisible = false
-        this.selectClear()
+    },
+    //上传成功
+    uploadSuccess(data, status) {
+      // console.log('data111',data)
+      if (status === 'success') {
         let queryParam = {
           menu_id: this.menuId,
           info_id: this.infoId
 
         }
-        eventBUs.$emit('searchGetData', JSON.parse(JSON.stringify(queryParam)))
-      },
-      //批量删除
-      handleBatCancel() {
-        let params = {
-          ids: this.selecIds.join(',')
-        }
-        if (this.selecIds && this.selecIds.length > 0) {
-          this.$confirm({
-            title: this.$t('ConfirmBatchDeletion'),
-            content: '',
-            onOk:
-              async () => {
-                axios({
-                  url: '/jero-boot/split/sarFileSplitItems/batchDeleteItems',
-                  method: 'post',
-                  data: params,
-                  transformRequest: [function(data) {
-                    // Do whatever you want to transform the data
-                    let ret = ''
-                    for (let it in data) {
-                      ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&'
-                    }
-                    return ret
-                  }],
-                  headers: {
-                    'Content-Type': 'application/x-www-form-urlencoded',
-                    'X-Access-Token': this.token
-                  }
-                })
-                  .then((res) => {
-                    if (res.data.success) {
-                      this.$message.success(this.$t('OperationSuccessful'))
-                      this.loadMenuData()
-                      let queryParam = {
-                        menu_id: this.menuId,
-                        info_id: this.infoId
-
-                      }
-                      eventBUs.$emit('searchGetData', JSON.parse(JSON.stringify(queryParam)))
-                      this.selectClear()
-                      // eventBUs.$emit('searchReset')
-                    } else {
-                      this.$message.warning(res.data.message)
-                    }
-                  })
-                  .catch((error) => {
-                    console.log(error)
-                  })
-
-
-              },
-            onCancel() {
-            }
-          })
-        } else {
-          this.$message.warning(this.$t('selectLeastOne'))
-        }
-      },
-      //编辑
-      editClick(val) {
-        this.formTitle = this.$t('edit')
-        this.itemVal = val
-        this.itemId = val.id
-        this.addVisible = true
-        this.$nextTick(() => {
-          this.$refs.splitForm.edit(val)
-        })
-      },
-      //保存成功
-      sumber() {
         this.loadMenuData()
-      },
-      //删除
-      deleteClick(val) {
-        let params = {
-          ids: val.id
+        eventBUs.$emit('searchGetData', JSON.parse(JSON.stringify(queryParam)))
+      }
+      let attIdList = []
+      if (data && data.length > 0) {
+        data.forEach(item => {
+          attIdList.push(item.id || data.name)
+        })
+        this.attId = attIdList.join(',')
+
+        // eventBUs.$emit('searchReset')
+      }
+    },
+    queryParamsValues(search) {
+      Object.keys(search).forEach(res => {
+        if (search[res] instanceof Array) {
+          search[res] = search[res].join(',')
         }
+      })
+      this.parameter = search
+      this.parameter.info_id = this.infoId
+      this.parameter.menu_id = this.menuId
+    },
+    //导出
+    handleExportManage() {
+      if (JSON.stringify(this.parameter) == '{}') {
+        this.parameter.info_id = this.infoId
+        this.parameter.menu_id = this.menuId
+      }
+      // console.log('menuId',this.menuId)
+      let dateName = moment(new Date()).format('YYYY-MM-DD HH-mm-ss')
+      let name = this.$route.query.infoNumber + ' ' + dateName + '.zip'
+      let query = {
+        exportName: this.$route.query.infoNumber + ' ' + dateName,
+        idList: this.selectedRowKeys.join(','),
+        parameter: this.parameter
+      }
+
+      downloadFile('split/sarFileSplitItems/exportSplitInfoZip', name, query, this.selectClear)
+    },
+    selectClear() {
+      this.$refs.splitDetailTabel.selectedRowKeys = []
+      this.selectedRowKeys = []
+      this.selectedRows = []
+      this.selecIds = []
+    },
+    //模板下载
+    handleDownManage() {
+      let name = this.$t('documentSplitTemplate') + '.xlsx'
+      downloadFile('split/sarFileSplitItems/exportTemplate', name, {})
+    },
+    //合并条款
+    handleMergeManage() {
+      if (this.selectedRowKeys && this.selectedRowKeys.length < 2) {
+        this.$message.warning(this.$t('leastTwo'))
+      } else {
+        let ids = this.selectedRowKeys.join(',')
         this.$confirm({
-          title: this.$t('areYouSure'),
+          title: this.$t('mergeTerms'),
+          content: '',
+          onOk:
+            async () => {
+              axios({
+                url: '/jero-boot/split/sarFileSplitItems/batchMergeItems',
+                method: 'get',
+                params: {
+                  ids: ids
+                },
+                headers: {
+                  'X-Access-Token': this.token
+                }
+              })
+                .then((res) => {
+                  if (res.data.success) {
+                    this.$message.success(this.$t('OperationSuccessful'))
+                    this.selectClear()
+                    this.loadMenuData()
+                    let queryParam = {
+                      menu_id: this.menuId,
+                      info_id: this.infoId
+
+                    }
+                    eventBUs.$emit('searchGetData', JSON.parse(JSON.stringify(queryParam)))
+                    // eventBUs.$emit('searchReset')
+                    this.selectedRowKeys = []
+                  } else {
+                    this.$message.warning(this.$t('operationFailed'))
+                  }
+                }).finally(() => {
+
+              })
+
+            }
+        })
+      }
+    },
+    //批量设置
+    handleManage() {
+      this.ids = this.selectedRowKeys.join(',')
+      if (this.selectedRowKeys && this.selectedRowKeys.length < 1) {
+        this.$message.warning(this.$t('selectLeastOne'))
+      } else {
+        // console.log('idsss',this.ids)
+        this.batSetVisible = true
+      }
+    },
+    //批量设置确定
+    modalOk() {
+      // this.confirmLoading=true
+      this.$refs.fileForm.sumber()
+    },
+    //批量设置取消
+    batSetCancel() {
+      this.batSetVisible = false
+    },
+    //批量设置确定提交
+    addFormClick() {
+      this.batSetVisible = false
+      this.selectClear()
+      let queryParam = {
+        menu_id: this.menuId,
+        info_id: this.infoId
+
+      }
+      eventBUs.$emit('searchGetData', JSON.parse(JSON.stringify(queryParam)))
+    },
+    //批量删除
+    handleBatCancel() {
+      let params = {
+        ids: this.selecIds.join(',')
+      }
+      if (this.selecIds && this.selecIds.length > 0) {
+        this.$confirm({
+          title: this.$t('ConfirmBatchDeletion'),
           content: '',
           onOk:
             async () => {
@@ -1014,337 +951,417 @@
 
                     }
                     eventBUs.$emit('searchGetData', JSON.parse(JSON.stringify(queryParam)))
+                    this.selectClear()
                     // eventBUs.$emit('searchReset')
                   } else {
-                    this.$message.warning(this.$t('operationFailed'))
+                    this.$message.warning(res.data.message)
                   }
                 })
                 .catch((error) => {
                   console.log(error)
                 })
 
-
-              // postAction(`split/sarFileSplitItems/batchDeleteItems`,params).then(res=> {
-              //   if(res.success){
-              //     this.$message.success(this.$t('OperationSuccessful'))
-              //     // if(this.selecIds.length==this.tableData.length&&this.queryParams.pageNo!=1){
-              //     //   this.queryParams.pageNo=this.queryParams.pageNo-1
-              //     // }
-              //     // this.loadData()
-              //     this.loadMenuData()
-              //     eventBUs.$emit('searchReset')
-              //   }else{
-              //     this.$message.warning(this.$t('operationFailed'))
-              //   }
-              // })
             },
           onCancel() {
           }
         })
-      },
-      //选择框
-      onSelectChange(selectedRowKeys, rows) {
-        this.selectedRowKeys = selectedRowKeys
-        this.selectedRows = rows
-        this.selecIds = selectedRowKeys
-        // console.log('rows',this.selectedRows)
-      },
-      //点击页数
-      onChangePage(page, pageSize) {
-        this.queryParams.pageNo = page
-        this.loadData()
-      },
-      //一页显示条数
-      SizeChange(page, pageSize) {
-        this.queryParams.pageSize = pageSize
-        this.queryParams.pageNo = 1
-        this.loadData()
-      },
-
-      onSearch() {
-        let self = this
-        let tree = JSON.parse(JSON.stringify(this.data))
-        this.expandedKeys = []
-        if (this.searchValue.trim() == '') {
-          this.gData = JSON.parse(JSON.stringify(this.data))
-          return
-        }
-        if (tree && tree.length > 0) {
-          tree.forEach((n, i, a) => {
-            self.searchEach(n, this.searchValue)
-          })
-
-          // 没有叶子节点的根节点也要清理掉
-          let length = tree.length
-          for (let i = length - 1; i >= 0; i--) {
-            let e2 = tree[i]
-            if (!this.isHasChildren(e2) && e2.title.indexOf(this.searchValue) <= -1) {
-              tree.splice(i, 1)
-              this.expandedKeys.push(e2.key)
-            }
-          }
-          this.gData = [...tree]
-        }
-      },
-      searchEach(node, value) {
-        let depth = this.getTreeDepth(node)
-        let self = this
-        for (let i = 0; i < depth - 1; i++) {
-          let spliceCounter = 0
-          this.traverseTree(node, n => {
-            if (self.isHasChildren(n)) {
-              let children = n.children
-              let length = children.length
-              for (let j = length - 1; j >= 0; j--) {
-                let e3 = children[j]
-                if (!self.isHasChildren(e3) && e3.title.indexOf(value) <= -1) {
-                  children.splice(j, 1)
-                  spliceCounter++
-                } else {
-                  this.expandedKeys.push(e3.key)
+      } else {
+        this.$message.warning(this.$t('selectLeastOne'))
+      }
+    },
+    //编辑
+    editClick(val) {
+      this.formTitle = this.$t('edit')
+      this.itemVal = val
+      this.itemId = val.id
+      this.addVisible = true
+      this.$nextTick(() => {
+        this.$refs.splitForm.edit(val)
+      })
+    },
+    //保存成功
+    sumber() {
+      this.loadMenuData()
+    },
+    //删除
+    deleteClick(val) {
+      let params = {
+        ids: val.id
+      }
+      this.$confirm({
+        title: this.$t('areYouSure'),
+        content: '',
+        onOk:
+          async () => {
+            axios({
+              url: '/jero-boot/split/sarFileSplitItems/batchDeleteItems',
+              method: 'post',
+              data: params,
+              transformRequest: [function(data) {
+                // Do whatever you want to transform the data
+                let ret = ''
+                for (let it in data) {
+                  ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&'
                 }
+                return ret
+              }],
+              headers: {
+                'Content-Type': 'application/x-www-form-urlencoded',
+                'X-Access-Token': this.token
+              }
+            })
+              .then((res) => {
+                if (res.data.success) {
+                  this.$message.success(this.$t('OperationSuccessful'))
+                  this.loadMenuData()
+                  let queryParam = {
+                    menu_id: this.menuId,
+                    info_id: this.infoId
+
+                  }
+                  eventBUs.$emit('searchGetData', JSON.parse(JSON.stringify(queryParam)))
+                  // eventBUs.$emit('searchReset')
+                } else {
+                  this.$message.warning(this.$t('operationFailed'))
+                }
+              })
+              .catch((error) => {
+                console.log(error)
+              })
+
+            // postAction(`split/sarFileSplitItems/batchDeleteItems`,params).then(res=> {
+            //   if(res.success){
+            //     this.$message.success(this.$t('OperationSuccessful'))
+            //     // if(this.selecIds.length==this.tableData.length&&this.queryParams.pageNo!=1){
+            //     //   this.queryParams.pageNo=this.queryParams.pageNo-1
+            //     // }
+            //     // this.loadData()
+            //     this.loadMenuData()
+            //     eventBUs.$emit('searchReset')
+            //   }else{
+            //     this.$message.warning(this.$t('operationFailed'))
+            //   }
+            // })
+          },
+        onCancel() {
+        }
+      })
+    },
+    //选择框
+    onSelectChange(selectedRowKeys, rows) {
+      this.selectedRowKeys = selectedRowKeys
+      this.selectedRows = rows
+      this.selecIds = selectedRowKeys
+      // console.log('rows',this.selectedRows)
+    },
+    //点击页数
+    onChangePage(page, pageSize) {
+      this.queryParams.pageNo = page
+      this.loadData()
+    },
+    //一页显示条数
+    SizeChange(page, pageSize) {
+      this.queryParams.pageSize = pageSize
+      this.queryParams.pageNo = 1
+      this.loadData()
+    },
+
+    onSearch() {
+      let self = this
+      let tree = JSON.parse(JSON.stringify(this.data))
+      this.expandedKeys = []
+      if (this.searchValue.trim() == '') {
+        this.gData = JSON.parse(JSON.stringify(this.data))
+        return
+      }
+      if (tree && tree.length > 0) {
+        tree.forEach((n, i, a) => {
+          self.searchEach(n, this.searchValue)
+        })
+
+        // 没有叶子节点的根节点也要清理掉
+        let length = tree.length
+        for (let i = length - 1; i >= 0; i--) {
+          let e2 = tree[i]
+          if (!this.isHasChildren(e2) && e2.title.indexOf(this.searchValue) <= -1) {
+            tree.splice(i, 1)
+            this.expandedKeys.push(e2.key)
+          }
+        }
+        this.gData = [...tree]
+      }
+    },
+    searchEach(node, value) {
+      let depth = this.getTreeDepth(node)
+      let self = this
+      for (let i = 0; i < depth - 1; i++) {
+        let spliceCounter = 0
+        this.traverseTree(node, n => {
+          if (self.isHasChildren(n)) {
+            let children = n.children
+            let length = children.length
+            for (let j = length - 1; j >= 0; j--) {
+              let e3 = children[j]
+              if (!self.isHasChildren(e3) && e3.title.indexOf(value) <= -1) {
+                children.splice(j, 1)
+                spliceCounter++
+              } else {
+                this.expandedKeys.push(e3.key)
               }
             }
-          })
-          if (spliceCounter == 0) {
-            break
           }
-        }
-      },
-      // 判断树形结构中的一个节点是否具有孩子节点
-      isHasChildren(node) {
-        let flag = false
-        if (node.children && node.children.length > 0) {
-          flag = true
-        }
-        return flag
-      },
-
-      // 通过传入根节点获得树的深度
-      getTreeDepth(node) {
-        if (undefined == node || null == node) {
-          return 0
-        }
-        let r = 0
-        let currentLevelNodes = [node]
-        while (currentLevelNodes.length > 0) {
-          r++
-          let nextLevelNodes = new Array()
-          for (let i = 0; i < currentLevelNodes.length; i++) {
-            let e = currentLevelNodes[i]
-            if (this.isHasChildren(e)) {
-              nextLevelNodes = nextLevelNodes.concat(e.children)
-            }
-          }
-          currentLevelNodes = nextLevelNodes
-        }
-        return r
-      },
-
-      traverseTree(node, callback) {
-        if (!node) {
-          return
-        }
-        let stack = []
-        stack.push(node)
-        let tmpNode
-        while (stack.length > 0) {
-          tmpNode = stack.pop()
-          callback(tmpNode)
-          if (tmpNode.children && tmpNode.children.length > 0) {
-            for (let i = tmpNode.children.length - 1; i >= 0; i--) {
-              stack.push(tmpNode.children[i])
-            }
-          }
-        }
-      },
-      //正则替换小数点
-      limitNumber(value) {
-        if (typeof value === 'string') {
-          return !isNaN(Number(value)) ? value.replace(/\./g, '') : 0
-        } else if (typeof value === 'number') {
-          return !isNaN(value) ? String(value).replace(/\./g, '') : 0
-        } else {
-          return 0
+        })
+        if (spliceCounter == 0) {
+          break
         }
       }
-
     },
-    beforeDestroy() {
-      window.removeEventListener('resize', {}, false)
+    // 判断树形结构中的一个节点是否具有孩子节点
+    isHasChildren(node) {
+      let flag = false
+      if (node.children && node.children.length > 0) {
+        flag = true
+      }
+      return flag
+    },
+
+    // 通过传入根节点获得树的深度
+    getTreeDepth(node) {
+      if (undefined == node || null == node) {
+        return 0
+      }
+      let r = 0
+      let currentLevelNodes = [node]
+      while (currentLevelNodes.length > 0) {
+        r++
+        let nextLevelNodes = new Array()
+        for (let i = 0; i < currentLevelNodes.length; i++) {
+          let e = currentLevelNodes[i]
+          if (this.isHasChildren(e)) {
+            nextLevelNodes = nextLevelNodes.concat(e.children)
+          }
+        }
+        currentLevelNodes = nextLevelNodes
+      }
+      return r
+    },
+
+    traverseTree(node, callback) {
+      if (!node) {
+        return
+      }
+      let stack = []
+      stack.push(node)
+      let tmpNode
+      while (stack.length > 0) {
+        tmpNode = stack.pop()
+        callback(tmpNode)
+        if (tmpNode.children && tmpNode.children.length > 0) {
+          for (let i = tmpNode.children.length - 1; i >= 0; i--) {
+            stack.push(tmpNode.children[i])
+          }
+        }
+      }
+    },
+    //正则替换小数点
+    limitNumber(value) {
+      if (typeof value === 'string') {
+        return !isNaN(Number(value)) ? value.replace(/\./g, '') : 0
+      } else if (typeof value === 'number') {
+        return !isNaN(value) ? String(value).replace(/\./g, '') : 0
+      } else {
+        return 0
+      }
     }
+
+  },
+  beforeDestroy() {
+    window.removeEventListener('resize', {}, false)
   }
+}
 </script>
 
 <style lang="less" scoped>
-  @import '~@assets/less/common.less';
+@import '~@assets/less/common.less';
 
-  .split-detail {
-    /*height: 100% !important;*/
+.split-detail {
+  /*height: 100% !important;*/
 
-    .split-detail-wrap {
-      /*display: flex;*/
-      /*justify-content: space-between;*/
+  .split-detail-wrap {
+    /*display: flex;*/
+    /*justify-content: space-between;*/
 
-      .split-detail-left {
-        /*height: 100%;*/
-        width: 300px;
-        float: left;
-        padding-right: 20px;
-        /*border-right: 1px solid #E6E7EC;*/
-        overflow-y: auto;
+    .split-detail-left {
+      /*height: 100%;*/
+      width: 300px;
+      float: left;
+      padding-right: 20px;
+      /*border-right: 1px solid #E6E7EC;*/
+      overflow-y: auto;
 
-        .split-detail-left-tree {
+      .split-detail-left-tree {
 
-        }
-
-        .menu-item {
-          padding: 2px 8px;
-          border: 1px solid #000000;
-          border-bottom: none;
-          cursor: pointer;
-        }
-
-        .menu-bottom {
-          border-bottom: 1px solid #000000;
-        }
-
-        .menu-item:hover {
-          background: #00B3BE;
-          color: #ffffff;
-        }
       }
 
-      .split-detail-right {
-        padding-left: 20px;
-        width: calc(100% - 300px);
-        float: right;
-        border-left: 1px solid #E6E7EC;
-        /*flex: 1;*/
+      .menu-item {
+        padding: 2px 8px;
+        border: 1px solid #000000;
+        border-bottom: none;
+        cursor: pointer;
+      }
 
-        .split-detail-search-header {
-          margin-bottom: 20px;
+      .menu-bottom {
+        border-bottom: 1px solid #000000;
+      }
 
-          .table-page-search-submitButtons {
-            display: flex;
-          }
-        }
+      .menu-item:hover {
+        background: #00B3BE;
+        color: #ffffff;
+      }
+    }
 
-        .split-detail-table {
-          .action-edit {
-            margin-right: 20px;
-          }
+    .split-detail-right {
+      padding-left: 20px;
+      width: calc(100% - 300px);
+      float: right;
+      border-left: 1px solid #E6E7EC;
+      /*flex: 1;*/
 
-          .content-show {
-            overflow: hidden;
-            text-overflow: ellipsis;
-            display: -webkit-box;
-            -webkit-line-clamp: 3;
-            -webkit-box-orient: vertical;
-            height: 60px;
-            line-height: 20px;
-            white-space: pre-wrap;
-          }
+      .split-detail-search-header {
+        margin-bottom: 20px;
 
-          .page {
-            text-align: right;
-          }
-        }
-
-        .split-item {
+        .table-page-search-submitButtons {
           display: flex;
         }
       }
 
-      .page {
-        margin-top: 20px;
+      .split-detail-table {
+        .action-edit {
+          margin-right: 20px;
+        }
+
+        .content-show {
+          overflow: hidden;
+          text-overflow: ellipsis;
+          display: -webkit-box;
+          -webkit-line-clamp: 3;
+          -webkit-box-orient: vertical;
+          height: 60px;
+          line-height: 20px;
+          white-space: pre-wrap;
+        }
+
+        .page {
+          text-align: right;
+        }
       }
-    }
-  }
 
-  /deep/ .ant-table-body {
-    overflow: hidden !important;
-  }
-</style>
-
-<style lang="less">
-  .split-item {
-    .ant-form-item-label {
-      min-width: 100px;
-    }
-  }
-
-  .add-menus {
-    .ant-modal-wrap {
-      .ant-modal-footer {
-        text-align: center;
-      }
-    }
-  }
-
-  .split-detail-right-wraper {
-    .table-page-search-submitButtons {
-      .ant-col-md-6 {
+      .split-item {
         display: flex;
       }
     }
 
-    .split-detail-search-header {
-      .ant-col-sm-8 {
-        min-width: 300px;
-      }
-
-      .ant-select-selection--multiple {
-        ul {
-          height: 36px;
-          overflow-y: auto;
-        }
-      }
-    }
-
-    .upload-split {
-      .ant-upload {
-        color: #040B29;
-
-      }
-
-      .anticon-import {
-        display: inline-block;
-        margin-right: 3px !important;
-      }
+    .page {
+      margin-top: 20px;
     }
   }
+}
 
-  .show-setting {
-    .ant-modal {
-      min-width: 700px;
-    }
+/deep/ .ant-table-body {
+  overflow: hidden !important;
+}
+</style>
 
-    .ant-select-dropdown--multiple {
-      max-height: 39vh !important;
-    }
-
-    .ant-modal-body {
-      overflow-y: visible !important;
-    }
+<style lang="less">
+.split-item {
+  .ant-form-item-label {
+    min-width: 100px;
+  }
+}
 
+.add-menus {
+  .ant-modal-wrap {
     .ant-modal-footer {
       text-align: center;
     }
   }
+}
 
-  .split-detail-left {
-
-    .ant-tree-node-content-wrapper-normal {
+.split-detail-right-wraper {
+  .table-page-search-submitButtons {
+    .ant-col-md-6 {
+      display: flex;
+    }
+  }
 
+  .split-detail-search-header {
+    .ant-col-sm-8 {
+      min-width: 300px;
     }
 
-    ant-tree-node-content-wrapper {
-      .expand-title {
-
+    .ant-select-selection--multiple {
+      ul {
+        height: 36px;
+        overflow-y: auto;
       }
     }
+  }
 
+  .upload-split {
+    .ant-upload {
+      color: #040B29;
+
+    }
+
+    .anticon-import {
+      display: inline-block;
+      margin-right: 3px !important;
+    }
+  }
+}
+
+.show-setting {
+  .ant-modal {
+    min-width: 700px;
+  }
+
+  .ant-select-dropdown--multiple {
+    max-height: 39vh !important;
+  }
+
+  .ant-modal-body {
+    overflow-y: visible !important;
+  }
+
+  .ant-modal-footer {
+    text-align: center;
+  }
+}
+
+.split-detail-left {
+
+  .ant-tree-node-content-wrapper-normal {
+
+  }
+
+  ant-tree-node-content-wrapper {
+    .expand-title {
+
+    }
+  }
+
+  .ant-tree-title {
+    span {
+      //display: block;
+      width: auto;
+      overflow: hidden;
+      text-overflow: ellipsis;
+
+    }
+
+  }
+
+  .ant-tree-child-tree {
     .ant-tree-title {
       span {
         //display: block;
@@ -1355,63 +1372,55 @@
       }
 
     }
-
-    .ant-tree-child-tree {
-      .ant-tree-title {
-        span {
-          //display: block;
-          width: auto;
-          overflow: hidden;
-          text-overflow: ellipsis;
-
-        }
-
-      }
-    }
-
   }
 
-  .show-setting .ant-modal-body {
-    max-height: 500px;
-    overflow-y: auto;
+}
+
+.show-setting .ant-modal-body {
+  max-height: 500px;
+  overflow-y: auto;
+}
+
+.split-detail-table {
+  .ant-table-body {
+    overflow: auto !important;
+  }
+}
+
+.item-content-show {
+  .wordImg {
+    width: 40px;
+    height: auto;
+  }
+}
+
+@media screen and (min-width: 600px) and (max-width: 1600px) {
+
+  .operator-text {
+    margin-right: 20px !important;
   }
 
-  .split-detail-table {
-    .ant-table-body {
-      overflow: auto !important;
-    }
-  }
+  /*.title-text {*/
+  /*  min-width: 73px !important;*/
+  /*}*/
+  /*.split-detail-wrap {*/
+  /*  height: 481px !important;*/
+  /*}*/
+  /*.mainItem {*/
+  /*  height: 500px;*/
+  /*}*/
+}
 
-  .item-content-show {
-    .wordImg {
-      width: 40px;
-      height: auto;
-    }
-  }
+@media screen and (min-width: 1600px) and (max-width: 2000px) {
+  /*.split-detail .split-detail-wrap .split-detail-left {*/
+  /*  height: 735px !important;*/
+  /*}*/
+  /*.mainItem {*/
+  /*  height: 800px !important;*/
+  /*}*/
+}
 
-  @media screen and (min-width: 600px) and (max-width: 1600px) {
-
-    .operator-text {
-      margin-right: 20px !important;
-    }
-
-    /*.title-text {*/
-    /*  min-width: 73px !important;*/
-    /*}*/
-    /*.split-detail-wrap {*/
-    /*  height: 481px !important;*/
-    /*}*/
-    /*.mainItem {*/
-    /*  height: 500px;*/
-    /*}*/
-  }
-
-  @media screen and (min-width: 1600px) and (max-width: 2000px) {
-    /*.split-detail .split-detail-wrap .split-detail-left {*/
-    /*  height: 735px !important;*/
-    /*}*/
-    /*.mainItem {*/
-    /*  height: 800px !important;*/
-    /*}*/
-  }
+.box-input {
+  height: 38px;
+}
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/components/ProjectDetails.vue b/jero-web/src/views/projectManagement/components/ProjectDetails.vue
index f4e32f59c..1a5bf7a42 100644
--- a/jero-web/src/views/projectManagement/components/ProjectDetails.vue
+++ b/jero-web/src/views/projectManagement/components/ProjectDetails.vue
@@ -308,7 +308,7 @@
 
     .text-field-content {
       width: 100%;
-      margin-bottom: 8px;
+      margin-bottom: 34px;
 
       .text-field-left {
         width: 124px;
diff --git a/jero-web/src/views/toDoCenter/projectParameterTasks/index.vue b/jero-web/src/views/toDoCenter/projectParameterTasks/index.vue
index 33e86e093..b344f8299 100644
--- a/jero-web/src/views/toDoCenter/projectParameterTasks/index.vue
+++ b/jero-web/src/views/toDoCenter/projectParameterTasks/index.vue
@@ -187,12 +187,15 @@
             let _this = this
             item.type = '1'
             item.userType = _this.flag == undefined ?  valueList[0] : 'dre'
+            this.loading = false
             let newUrl = _this.$router.resolve({
               path: '/ParameterItemCollection',
               query:  item
               // projectName:this.$route.query.projectName
             })
             window.open(newUrl.href, '_blank')
+          }else{
+            this.loading = false
           }
         })
       },
@@ -218,12 +221,15 @@
             let _this = this
             item.type = '1'
             item.userType = _this.flag == undefined ?  valueList[0] : 'sdt'
+            this.loading = false
             let newUrl = _this.$router.resolve({
               path: '/ParameterItemCollection',
               query:  item
               // projectName:this.$route.query.projectName
             })
             window.open(newUrl.href, '_blank')
+          }else{
+            this.loading = false
           }
         })
 
@@ -250,12 +256,15 @@
             let _this = this
             item.type = '1'
             item.userType = _this.flag == undefined ?  valueList[0] : 'homo'
+            this.loading = false
             let newUrl = _this.$router.resolve({
               path: '/ParameterItemCollection',
               query:  item
               // projectName:this.$route.query.projectName
             })
             window.open(newUrl.href, '_blank')
+          }else{
+            this.loading = false
           }
         })
       },