diff --git a/OpenAuth.Mvc/BllScripts/roleManager.js b/OpenAuth.Mvc/BllScripts/roleManager.js index 3c6891a5..56fc0847 100644 --- a/OpenAuth.Mvc/BllScripts/roleManager.js +++ b/OpenAuth.Mvc/BllScripts/roleManager.js @@ -2,7 +2,7 @@ //grid列表模块 function MainGrid() { var url = '/RoleManager/Load?orgId='; - var selectedId = 0; //ztree选中的模块 + var selectedId = 0; //orgtree选中的模块 this.maingrid = $('#maingrid').datagrid({ showToolbar: false, filterThead: false, @@ -57,7 +57,7 @@ MainGrid.prototype = new Grid(); var list = new MainGrid(); //左边分类导航树 -var ztree = function () { +var orgtree = function () { var url = '/OrgManager/LoadOrg'; var setting = { view: { selectedMulti: false }, @@ -76,7 +76,7 @@ var ztree = function () { callback: { onClick: zTreeOnClick } }; $.getJSON(url, function (json) { - $.fn.zTree.init($("#tree"), setting, json).expandAll(true); + $.fn.zTree.init($("#orgtree"), setting, json).expandAll(true); }); function zTreeOnClick(event, treeId, treeNode) { list.reload(treeNode.Id); @@ -85,7 +85,7 @@ var ztree = function () { return { reload: function () { $.getJSON(url, function (json) { - $.fn.zTree.init($("#tree"), setting, json).expandAll(true); + $.fn.zTree.init($("#orgtree"), setting, json).expandAll(true); }); } } @@ -197,7 +197,7 @@ var editDlg = function () { return; } list.reload(); - ztree.reload(); + orgtree.reload(); } }); }); @@ -213,7 +213,7 @@ function del() { $.getJSON('/RoleManager/Delete?Id=' + selected.Id, function (data) { if (data.statusCode == "200") { list.reload(); - ztree.reload(); + orgtree.reload(); } else { $(this).alertmsg('warn', data.message); diff --git a/OpenAuth.Mvc/BllScripts/usermanager.js b/OpenAuth.Mvc/BllScripts/usermanager.js index 3984741c..38f8f065 100644 --- a/OpenAuth.Mvc/BllScripts/usermanager.js +++ b/OpenAuth.Mvc/BllScripts/usermanager.js @@ -65,7 +65,7 @@ MainGrid.prototype = new Grid(); var list = new MainGrid(); //左边分类导航树 -var ztree = function () { +var maintree = function () { var url = '/OrgManager/LoadOrg'; var setting = { view: { selectedMulti: false }, @@ -81,19 +81,20 @@ var ztree = function () { rootPId: 'null' } }, - callback: { onClick: zTreeOnClick } + callback: { + onClick: function(event, treeId, treeNode) { + list.reload(treeNode.Id); + } + } }; $.getJSON(url, function (json) { - $.fn.zTree.init($("#tree"), setting, json).expandAll(true); + $.fn.zTree.init($("#orgtree"), setting, json).expandAll(true); }); - function zTreeOnClick(event, treeId, treeNode) { - list.reload(treeNode.Id); - } return { reload: function () { $.getJSON(url, function (json) { - $.fn.zTree.init($("#tree"), setting, json).expandAll(true); + $.fn.zTree.init($("#orgtree"), setting, json).expandAll(true); }); } } @@ -207,6 +208,7 @@ var editDlg = function () { return; } list.reload(); + maintree.reload(); } }); }); @@ -222,7 +224,7 @@ function del() { $.getJSON('/UserManager/Delete?Id=' + selected.Id, function (data) { if (data.statusCode == "200") { list.reload(); - ztree.reload(); + maintree.reload(); } else { $(this).alertmsg('warn', data.message); @@ -254,7 +256,7 @@ function openUserModuleAccess(obj) { if (selected == null) return; $(obj).dialog({ - id: 'accessUserOrg', + id: 'accessUserModule', url: '/ModuleManager/Assign', title: '为用户分配可见部门', width: 620, @@ -307,7 +309,7 @@ function openUserReourceAccess(obj) { if (selected == null) return; $(obj).dialog({ - id: 'accessUserRole', + id: 'accessUserResource', url: '/ResourceManager/AssignRes', title: '为用户分配资源', width: 600, diff --git a/OpenAuth.Mvc/Views/RoleManager/Index.cshtml b/OpenAuth.Mvc/Views/RoleManager/Index.cshtml index c162ce21..d0450e3a 100644 --- a/OpenAuth.Mvc/Views/RoleManager/Index.cshtml +++ b/OpenAuth.Mvc/Views/RoleManager/Index.cshtml @@ -6,7 +6,7 @@
-
    +
      diff --git a/OpenAuth.Mvc/Views/UserManager/Index.cshtml b/OpenAuth.Mvc/Views/UserManager/Index.cshtml index b8d7aaad..aceb36d6 100644 --- a/OpenAuth.Mvc/Views/UserManager/Index.cshtml +++ b/OpenAuth.Mvc/Views/UserManager/Index.cshtml @@ -5,7 +5,7 @@
      -
        +