From 2bbabab4b2def616cdea1d2c6d70047f85bf45b6 Mon Sep 17 00:00:00 2001
From: bobi <bobi1234@foxmail.com>
Date: Mon, 26 Aug 2019 01:03:20 +0800
Subject: [PATCH] fixed:permission.html

---
 lib/layui/lay/okmodules/okMock.js  |  2 +-
 lib/layui/lay/okmodules/okUtils.js | 10 +++--
 pages/member/permission.html       | 71 +++++++++++++++++-------------
 3 files changed, 49 insertions(+), 34 deletions(-)

diff --git a/lib/layui/lay/okmodules/okMock.js b/lib/layui/lay/okmodules/okMock.js
index 6b04c17..cbfcbd3 100644
--- a/lib/layui/lay/okmodules/okMock.js
+++ b/lib/layui/lay/okmodules/okMock.js
@@ -20,7 +20,7 @@ layui.define([], function(exprots) {
             },
             permission: {
                 tree: "https://www.easy-mock.com/mock/5d5d0dd46cfcbd1b8627bf1d/ok-admin-v2.0/permission/tree",
-                list: "https://www.easy-mock.com/mock/5d5d0dd46cfcbd1b8627bf1d/ok-admin-v2.0/permission/tree",
+                list: "https://www.easy-mock.com/mock/5d5d0dd46cfcbd1b8627bf1d/ok-admin-v2.0/permission/list",
                 list2: "https://www.easy-mock.com/mock/5d5d0dd46cfcbd1b8627bf1d/ok-admin-v2.0/permission/list2"
             },
             article: {
diff --git a/lib/layui/lay/okmodules/okUtils.js b/lib/layui/lay/okmodules/okUtils.js
index 0781b0b..0737e18 100644
--- a/lib/layui/lay/okmodules/okUtils.js
+++ b/lib/layui/lay/okmodules/okUtils.js
@@ -37,7 +37,7 @@ layui.define(["layer"], function (exprots) {
          * @param param
          * @returns {*|*|*}
          */
-        ajax: function (url, type, param) {
+        ajax: function (url, type, param, load) {
             var deferred = $.Deferred();
             var loadIndex;
             $.ajax({
@@ -46,7 +46,9 @@ layui.define(["layer"], function (exprots) {
                 data: param || {},
                 dataType: "json",
                 beforeSend: function () {
-                    loadIndex = layer.load(0, {shade: false});
+                    if (load) {
+						loadIndex = layer.load(0, {shade: false});
+					}
                 },
                 success: function (data) {
                     if (data.status == 1000) {
@@ -59,7 +61,9 @@ layui.define(["layer"], function (exprots) {
                     }
                 },
                 complete: function () {
-                    layer.close(loadIndex);
+					if (load) {
+						layer.close(loadIndex);
+					}
                 },
                 error: function () {
                     layer.close(loadIndex);
diff --git a/pages/member/permission.html b/pages/member/permission.html
index 639c890..92dceb7 100644
--- a/pages/member/permission.html
+++ b/pages/member/permission.html
@@ -32,10 +32,10 @@
     </div>-->
     <div class="layui-row">
         <div class="layui-col-md3">
-            <div id="test12" class="demo-tree-more"></div>
+            <div id="permissionTree"></div>
         </div>
         <div class="layui-col-md9">
-            <table class="layui-hide" id="tableId" lay-filter="tableFilter"></table>
+            <table class="layui-hide" id="permissionTable" lay-filter="tableFilter"></table>
         </div>
     </div>
 </div>
@@ -52,10 +52,10 @@
         laydate.render({elem: '#startTime', type: "datetime"});
         laydate.render({elem: '#endTime', type: "datetime"});
 
-        function initTree() {
+        function initPermissionTree() {
             okUtils.ajax(okMock.api.permission.tree, "get", null).done(function (response) {
                 tree.render({
-                    elem: '#test12',
+                    elem: '#permissionTree',
                     data: response.data,
                     showCheckbox: true,
                     id: 'demoId1',
@@ -65,41 +65,52 @@
                         layer.msg('状态：'+ obj.state + '<br>节点数据：' + JSON.stringify(data));
                     }
                 });
+				
+				initPermissionTable();
             }).fail(function (error) {
                 console.log(error)
             });
-
-            table.render({
-                elem: '#tableId',
-                url: okMock.api.user.list,
-                limit: 20,
-                page: true,
-                size: "sm",
-                cols: [[
-                    {field: "id", title: "ID", width: 80, sort: true},
-                    {field: "username", title: "账号", width: 100},
-                    {field: "password", title: "密码", width: 100},
-                    {field: "reallyName", title: "姓名", width: 100},
-                    {field: "nickname", title: "昵称", width: 100},
-                    {field: "role", title: "角色", width: 100, templet: "#roleTpl"},
-                    {field: "status", title: "状态", width: 100, templet: "#statusTpl"},
-                    {field: "email", title: "邮箱", width: 200},
-                    {field: "createTime", title: "创建时间", width: 150},
-                    {field: "logins", title: "登陆次数", width: 100},
-                    {title: "操作", width: 100, templet: "#operationTpl", align: "center", fixed: "right"}
-                ]],
-                done: function (res, curr, count) {
-                    console.info(res, curr, count);
-                }
-            });
         }
-        initTree();
+		
+		function initPermissionTable() {
+			table.render({
+			    elem: '#permissionTable',
+			    url: okMock.api.permission.list,
+			    limit: 20,
+			    page: true,
+			    size: "sm",
+			    cols: [[
+			        {field: "id", title: "ID", width: 80, sort: true},
+			        {field: "name", title: "权限名称", width: 100},
+			        {field: "menuName", title: "权限标识", width: 100},
+			        {field: "menu", title: "权限路径", width: 100},
+					{field: "parentId", title: "父菜单", width: 100},
+			        {field: "type", title: "类型", width: 100, templet: "#typeTpl"},
+			        {field: "createTime", title: "创建时间", width: 150},
+					{field: "updateTime", title: "创建时间", width: 150},
+			        {title: "操作", width: 100, templet: "#operationTpl", align: "center", fixed: "right"}
+			    ]],
+			    done: function (res, curr, count) {
+			        console.info(res, curr, count);
+			    }
+			});
+		}
+		
+        initPermissionTree();
     });
 </script>
-<!--模板-->
+<!--行工具栏模板-->
 <script type="text/html" id="operationTpl">
     <a href="javascript:" title="编辑" lay-event="edit"><i class="layui-icon">&#xe642;</i></a>
     <a href="javascript:" title="删除" lay-event="del"><i class="layui-icon">&#xe640;</i></a>
 </script>
+
+<script type="text/html" id="typeTpl">
+    {{#  if(d.type == 0){ }}
+        <span class="layui-btn layui-btn-normal layui-btn-xs">菜单</span>
+    {{#  } else if(d.type == 1) { }}
+        <span class="layui-btn layui-btn-warm layui-btn-xs">按钮</span>
+    {{#  } }}
+</script>
 </body>
 </html>