用户管理

VisualInspection/js/user/userManager.js

@@ -5,33 +5,55 @@ $(document).ready(function() {
     $('#dashboard').dashboard({ draggable: true });
 
 
-    DeptGetAll(function(data) {
-        console.log(data)
-    }, function(error) {
 
-    });
+
+
+
 
     var zTreeObj;
     // zTree 的参数配置，深入使用请参考 API 文档（setting 配置详解）
-    var setting = {};
-    // zTree 的数据属性，深入使用请参考 API 文档（zTreeNode 节点数据详解）
-    var zNodes = [{
-            name: "test1",
-            open: true,
-            children: [
-                { name: "test1_1" }, { name: "test1_2" }, { name: "test1_2" }, { name: "test1_2" }, { name: "test1_2" }, { name: "test1_2" }, { name: "test1_2" }, { name: "test1_2" }, { name: "test1_2" }, { name: "test1_2" }, { name: "test1_2" }, { name: "test1_2" }, { name: "test1_2" }, { name: "test1_2" }
-            ]
+    var setting = {
+        data: {
+            simpleData: {
+                enable: true,
+                idKey: "id",
+                pIdKey: "pId",
+                rootPId: null
+            }
         },
-        {
-            name: "test2",
-            open: true,
-            children: [
-                { name: "test2_1" }, { name: "test2_2" }, { name: "test1_2" }, { name: "test1_2" }, { name: "test1_2" }, { name: "test1_2" }, { name: "test1_2" }, { name: "test1_2" }, { name: "test1_2" }, { name: "test1_2" }, { name: "test1_2" }, { name: "test1_2" }, { name: "test1_2" }, { name: "test1_2" }, { name: "test1_2" }
-            ]
+        view: { //表示tree的显示状态
+            selectMulti: false //表示禁止多选
+        },
+        check: { //表示tree的节点在点击时的相关设置
+            enable: false, //是否显示radio/checkbox
+            chkStyle: "checkbox", //值为checkbox或者radio表示
+            checkboxType: { p: "", s: "" }, //表示父子节点的联动效果
+            radioType: "level" //设置tree的分组
         }
-    ];
+    };
+    // zTree 的数据属性，深入使用请参考 API 文档（zTreeNode 节点数据详解）
+    var zNodes = [];
     zTreeObj = $.fn.zTree.init($("#department_tree"), setting, zNodes);
 
+    var zdata = [];
+    DeptGetAll(function(data) {
+        for (var i = 0; i < data.length; i++) {
+            var m = data[i];
+            var zdataItem = {};
+            zdataItem["id"] = m.id;
+            zdataItem["pId"] = null;
+            zdataItem["name"] = m.organname;
+            zdataItem["children"] = addobj(m);
+            zdata.push(zdataItem);
+        }
+        // zTreeObj.updateNode(zdata);
+        $.fn.zTree.init($("#department_tree"), setting, zdata)
+            //zTreeObj.refresh();
+        console.log(zdata)
+    }, function(error) {
+
+    });
+
 
 
     $('.datatable').datatable({
@@ -104,4 +126,25 @@ $(document).ready(function() {
 
 
 
-});
+});
+
+
+function addobj(data) {
+    var zdata = [];
+    if (typeof(data.childs) != "undefinde" && data.childs != null &&
+        data.childs.length > 0) {
+        for (var i = 0; i < data.childs.length; i++) {
+            var m = data.childs[i];
+            var zdataItem = {};
+            zdataItem["id"] = m.id;
+            zdataItem["pId"] = data.id;
+            zdataItem["icon"] = "";
+            zdataItem["name"] = m.organname;
+            zdataItem["children"] = addobj(m);
+            zdata.push(zdataItem);
+        }
+        return zdata;
+    } else {
+        return [];
+    }
+}

VisualInspection_server/src/main/resources/application.properties

@@ -2,14 +2,14 @@ server.port=8089
 spring.thymeleaf.cache=false
 
 
-master.datasource.url = jdbc:mysql://git.topm.win:9001/visualinspection?useUnicode=true&characterEncoding=utf-8
+master.datasource.url = jdbc:mysql://192.168.57.38:3306/visualinspection?useUnicode=true&characterEncoding=utf-8
 master.datasource.username = root
 master.datasource.password = root
 master.datasource.driver-class-name = com.mysql.jdbc.Driver
 master.mapper-locations=classpath:com/xintong/visualinspection/mapper/master/*.xml
 
 ## \u7528\u6237\u6570\u636e\u6e90\u914d\u7f6e
-cluster.datasource.url=jdbc:mysql://git.topm.win:9001/yanhai?useUnicode=true&characterEncoding=utf8
+cluster.datasource.url=jdbc:mysql://192.168.57.38:3306/yanhai?useUnicode=true&characterEncoding=utf8
 cluster.datasource.username=root
 cluster.datasource.password=root
 cluster.datasource.driver-class-name = com.mysql.jdbc.Driver
@@ -50,7 +50,7 @@ spring.datasource.useGlobalDataSourceStat=true
 # Redis\u6570\u636e\u5e93\u7d22\u5f15\uff08\u9ed8\u8ba4\u4e3a0\uff09
 spring.redis.database=0  
 # Redis\u670d\u52a1\u5668\u5730\u5740
-spring.redis.host=git.topm.win
+spring.redis.host=192.168.57.38
 # Redis\u670d\u52a1\u5668\u8fde\u63a5\u7aef\u53e3
 spring.redis.port=6379  
 # Redis\u670d\u52a1\u5668\u8fde\u63a5\u5bc6\u7801\uff08\u9ed8\u8ba4\u4e3a\u7a7a\uff09
@@ -83,7 +83,7 @@ spring.devtools.restart.enabled=true
 # JWT
 jwt.header=token
 jwt.secret=mySecret
-jwt.expiration=604800
+jwt.expiration=60480000
 jwt.tokenHead=XinTong