From 200834ea8ef0ea38b68194b6cc45bdb7d2876d56 Mon Sep 17 00:00:00 2001 From: xxssyyyyssxx Date: Thu, 18 Nov 2021 19:25:06 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=BC=B9=E7=AA=97=E9=80=89=E6=8B=A9-?= =?UTF-8?q?=E6=A0=91=E5=BD=A2ztree?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/palmte/work/bean/ZtreeNode.java | 61 ++++++++++++++ .../controller/backend/ProjectController.java | 23 ++++++ .../static/assets/js/project_common.js | 20 ++++- .../templates/admin/project_list.ftl | 81 +++++++++++++++++++ .../templates/common/common_pager.ftl | 2 +- 5 files changed, 185 insertions(+), 2 deletions(-) create mode 100644 src/main/java/cn/palmte/work/bean/ZtreeNode.java diff --git a/src/main/java/cn/palmte/work/bean/ZtreeNode.java b/src/main/java/cn/palmte/work/bean/ZtreeNode.java new file mode 100644 index 0000000..51cc067 --- /dev/null +++ b/src/main/java/cn/palmte/work/bean/ZtreeNode.java @@ -0,0 +1,61 @@ +package cn.palmte.work.bean; + +/** + * { id:2, pId:0, name:"随意勾选 2", checked:true, open:true}, + * @author xiongshiyan at 2021/11/18 , contact me with email yanshixiong@126.com or phone 15208384257 + */ +public class ZtreeNode { + private String id; + private String pId; + private String name; + private boolean checked; + private boolean open = true; + + public ZtreeNode(String id, String pId, String name, boolean checked, boolean open) { + this.id = id; + this.pId = pId; + this.name = name; + this.checked = checked; + this.open = open; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getpId() { + return pId; + } + + public void setpId(String pId) { + this.pId = pId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public boolean isChecked() { + return checked; + } + + public void setChecked(boolean checked) { + this.checked = checked; + } + + public boolean isOpen() { + return open; + } + + public void setOpen(boolean open) { + this.open = open; + } +} diff --git a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java index bbf3348..1eb61b2 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java @@ -456,6 +456,29 @@ public class ProjectController extends BaseController { actProcInsService.createProcInsPng(response, relationList.get(0).getProcessInsId()); } + + + @RequestMapping("/roleUsers") + @ResponseBody + public ResponseMsg roleUsers(@RequestParam int projectId) { + /*{ id:1, pId:0, name:"随意勾选 1", open:true}, + { id:11, pId:1, name:"随意勾选 1-1", open:true}, + { id:12, pId:1, name:"随意勾选 1-2", open:true}, + { id:2, pId:0, name:"随意勾选 2", checked:true, open:true}, + { id:21, pId:2, name:"随意勾选 2-1"}, + { id:22, pId:2, name:"随意勾选 2-2", open:true}, + { id:23, pId:2, name:"随意勾选 2-3"}*/ + List ztreeNodes = new ArrayList<>(); + ztreeNodes.add(new ZtreeNode("1","0","随意勾选 1",false,true)); + ztreeNodes.add(new ZtreeNode("11","1","随意勾选 1-1",false,true)); + ztreeNodes.add(new ZtreeNode("12","1","随意勾选 1-2",false,true)); + ztreeNodes.add(new ZtreeNode("2","0","随意勾选 2",false,true)); + ztreeNodes.add(new ZtreeNode("21","2","随意勾选 2-1",false,true)); + ztreeNodes.add(new ZtreeNode("22","2","随意勾选 2-2",false,true)); + ztreeNodes.add(new ZtreeNode("23","2","随意勾选 2-3",false,true)); + return ResponseMsg.buildSuccessData(ztreeNodes); + } + @InitBinder public void initBinder(WebDataBinder webDataBinder) { webDataBinder.addCustomFormatter(new DateFormatter("yyyy-MM-dd")); diff --git a/src/main/resources/static/assets/js/project_common.js b/src/main/resources/static/assets/js/project_common.js index a8572f9..e6bb101 100644 --- a/src/main/resources/static/assets/js/project_common.js +++ b/src/main/resources/static/assets/js/project_common.js @@ -76,7 +76,25 @@ function postAjax(url, data, callback) { async: false, success: function (d) { console.log(d); - callback(data, d); + if(callback) { + callback(data, d); + } + } + }); +} +function getAjax(url, params, callback) { + $.ajax({ + url: url, + data: params, + type: "get", + dataType: "json", + /*contentType:"application/json",*/ + async: false, + success: function (d) { + console.log(d); + if(callback) { + callback(params, d); + } } }); } diff --git a/src/main/resources/templates/admin/project_list.ftl b/src/main/resources/templates/admin/project_list.ftl index 51c8c44..70565b2 100644 --- a/src/main/resources/templates/admin/project_list.ftl +++ b/src/main/resources/templates/admin/project_list.ftl @@ -1,7 +1,20 @@ <#assign base=request.contextPath /> <#import "../common/defaultLayout.ftl" as defaultLayout> + <@defaultLayout.layout> + +
@@ -199,6 +212,10 @@
+ <#--<@shiro.hasPermission name="PROJECT_EDIT">--> <#--概算状态 并且概算审批状态为草稿和不通过--> <#if list.status==1 && (list.approveStatusEstimate==0 || list.approveStatusEstimate==3)> @@ -304,12 +321,33 @@
+ + + +
+
+
请选择项目可见性
+
+ 请勾选能够看到该项目的人员或角色 +
    +
    +
    + 取消 + 提交 +
    +
    +
    +
    + + + + diff --git a/src/main/resources/templates/common/common_pager.ftl b/src/main/resources/templates/common/common_pager.ftl index 112fe86..58da72b 100644 --- a/src/main/resources/templates/common/common_pager.ftl +++ b/src/main/resources/templates/common/common_pager.ftl @@ -3,7 +3,7 @@
      - +<#---->