gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop

Browse Source
This commit is contained in:
dongxiaoyan
2018-12-15 11:57:25 +08:00
parent 0ebc269b22 23a560563a
commit df49e05d1d
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java
View File

@@ -29,6 +29,7 @@ import com.nis.util.Constants;
import com.nis.util.DictUtils; import com.nis.util.DictUtils;
import com.nis.util.StringUtils; import com.nis.util.StringUtils;
import com.nis.web.controller.BaseController; import com.nis.web.controller.BaseController;
import com.nis.web.security.UserUtils;
@Controller @Controller
@RequestMapping(value = "${adminPath}/specific/specificServiceCfg") @RequestMapping(value = "${adminPath}/specific/specificServiceCfg")
@@ -462,7 +463,9 @@ public class SpecificServiceCfgController extends BaseController {
map.put("name",cfg.getSpecServiceName()); map.put("name",cfg.getSpecServiceName());
map.put("serviceType",cfg.getCfgType()); map.put("serviceType",cfg.getCfgType());
map.put("businessType",cfg.getBusinessType()); map.put("businessType",cfg.getBusinessType());
map.put("serviceCode",cfg.getSpecServiceCode());
map.put("groupId",cfg.getGroupId()); map.put("groupId",cfg.getGroupId());
map.put("addFlag",UserUtils.getUser().getId());
return map; return map;
}catch (Exception e) { }catch (Exception e) {
e.printStackTrace(); e.printStackTrace();

13
src/main/webapp/WEB-INF/views/sys/tagTreeselect.jsp
View File

@@ -283,8 +283,11 @@
success:function(data){ success:function(data){
treeNode.id=data.id; treeNode.id=data.id;
treeNode.groupId=data.groupId; treeNode.groupId=data.groupId;
treeNode.specServiceCode=data.specServiceCode; treeNode.serviceCode=data.serviceCode;
treeNode.serviceType=data.serviceType;
treeNode.user=data.addFlag; treeNode.user=data.addFlag;
treeNode.pId=data.pId;
treeNode.name=data.name;
var zTree = $.fn.zTree.getZTreeObj("tree"); var zTree = $.fn.zTree.getZTreeObj("tree");
zTree.updateNode(treeNode); zTree.updateNode(treeNode);
closeTip(); closeTip();
@@ -376,8 +379,7 @@
var id="manual"+new Date().getTime(); var id="manual"+new Date().getTime();
var zTree = $.fn.zTree.getZTreeObj("tree"); //addSelectedNode var zTree = $.fn.zTree.getZTreeObj("tree"); //addSelectedNode
zTree.addNodes(treeNode, {id:id, pId:treeNode.id,parentTId:treeNode.tId, name:"<spring:message code='new' /> <spring:message code='${title}' />", zTree.addNodes(treeNode, {id:id, pId:treeNode.id,parentTId:treeNode.tId, name:"<spring:message code='new' /> <spring:message code='${title}' />",
businessType:treeNode.id.replace("businessType",""),user:"${userId}",serviceType:treeNode.serviceType,groupId:"", businessType:treeNode.id.replace("businessType",""),user:"${userId}",serviceType:treeNode.serviceType,groupId:"",serviceCode:""});
serviceCode:""});
var node = zTree.getNodeByParam("id", id,treeNode); var node = zTree.getNodeByParam("id", id,treeNode);
if(node){ if(node){
zTree.updateNode(node); zTree.updateNode(node);
@@ -411,9 +413,10 @@
editBtn.bind("click", function(){ editBtn.bind("click", function(){
var zTree = $.fn.zTree.getZTreeObj("tree"); var zTree = $.fn.zTree.getZTreeObj("tree");
//替代beforeEditName //替代beforeEditName
if(confirm("<spring:message code='edit' />" + treeNode.name + "?")){ /* if(confirm("<spring:message code='edit' />" + treeNode.name + "?")){
zTree.editName(treeNode); zTree.editName(treeNode);
} } */
zTree.editName(treeNode);
return; return;
}); });
} }