VisualInspection/js/config.js

@@ -2,5 +2,5 @@
 // var base_server_url = "http://10.112.0.236:8089/";
 var base_image_server_url = "http://10.112.0.236:8088/";
 
-var base_ui_url = "http://localhost:8080/";
-var base_server_url = "http://localhost:8089/";
+var base_ui_url = "http://192.168.68.126:8080/";
+var base_server_url = "http://192.168.68.126:8089/";

VisualInspection/js/lib/treeSelect.js

@@ -51,15 +51,7 @@ var TreeSelect = (function() {
             //input.val(self.text);
             return false;
         });
-  
-       
-
         input.click(function() {
-             if(typeof(options.enable)!="undefined" && options.enable!=null){
-                 if(!options.enable){
-                     return;
-                 }
-            }
             if (!self.isOpen()) {
                 self.open();
             } else {

VisualInspection/js/main.js

@@ -2,6 +2,8 @@ var MENU;
 //计算左面的
 $(document).ready(function () {
 
+    console.log($.zui.store.enable)
+
     setletftime();
 
     $('#treeMenu').on('click', 'a', function () {

VisualInspection/js/menu/menu.js

@@ -94,7 +94,7 @@ function getMenu() {
          }
      };
 
-     get_common_service('menu/get/all?judge=10',null,function(data) {
+     get_common_service('menu/get/all',null,function(data) {
          zdata = [];
          for (var i = 0; i < data.length; i++) {
              var m = data[i];

VisualInspection/js/role/addpermision.js

@@ -1,158 +0,0 @@
-var permission_selectinput;
-var resource_selectinput;
-var permisiontemp;
-function loadPermisionData(nodedata) {
-    var pnode = nodedata;
-    resetform()
-
-    if (edittype == "add") {
-        $("#dept_name").val("")
-    }
-    if (edittype == "edit") {
-        permisiontemp = PermisionMap.get(nodedata[0].id);
-        setPermison();
-    }
-
-    permission_selectinput = new TreeSelect({
-        element: '#permision_select',
-        data: zdata,
-        valueKey: "id",
-        placeholder: "选择父权限",
-        selectvalue: pnode.length > 0 ? pnode[0].id : null
-    });
-
-
-
-    //获取菜单data
-    getmumdata();
-
-    $("#resourcetype").change(function () {
-
-        if (this.value == "1") {
-            //菜单
-            getmumdata();
-        }
-        if (this.value == "2") {
-            //按钮
-            getbuttonData()
-        }
-
-    });
-
-
-
-    $("#permision_add_btn").on("click", function () {
-        addpermision();
-    })
-
-}
-
-function setPermison(){
-
-    $("#permission_name").val(permisiontemp.name);
-    $("#permission_des").val(permisiontemp.description);
-    $("#resourcetype").val(permisiontemp.type);
-}
-
-
-function addpermision(){
-
-    var per_name = $("#permission_name").val();
-    var per_des = $("#permission_des").val();
-
-    var per_pid = permission_selectinput.value;
-    var resource_type = $("#resourcetype").val();
-    var resource_id = resource_selectinput.value;
-    var data = {
-        "name":per_name,
-        "description":per_des,
-        "type":resource_type,
-        "pid":per_pid,
-        "resourceid":resource_id,
-        "status":1
-    }
-
-     PermisionAdd(data,function(sus_data){
-        layer.msg('添加成功！', {
-            time: 2000, //20s后自动关闭
-        }, function () {
-            $('#addModal').modal('hide')
-           getPermission();
-        });
-     },function(error){
-
-     });
-
-    
-
-}
-
-
-function getbuttonData() {
-    resource_selectinput = new TreeSelect({
-        element: '#resource_select',
-        data: [],
-        valueKey: "id",
-        placeholder: "选择资源",
-        selectvalue: null
-    });
-}
-
-function getmumdata() {
-    var mumdata = [];
-
-    get_common_service('menu/get/all?judge=10', null, function (data) {
-        mumdata = [];
-        for (var i = 0; i < data.length; i++) {
-            var m = data[i];
-            var zdataItem = {};
-            zdataItem["id"] = m.id;
-            zdataItem["value"] = m.id;
-            zdataItem["pId"] = null;
-            zdataItem["name"] = m.menuname;
-            zdataItem["children"] = addobj(m);
-            mumdata.push(zdataItem);
-        }
-        resource_selectinput = new TreeSelect({
-            element: '#resource_select',
-            data: mumdata,
-            valueKey: "id",
-            placeholder: "选择资源",
-            selectvalue: permisiontemp==null?null:permisiontemp.resourceid
-        });
-
-    }, function (error) {
-
-    });
-
-
-    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["value"] = m.id;
-                zdataItem["pId"] = data.id;
-                zdataItem["icon"] = "";
-                zdataItem["name"] = m.menuname;
-                zdataItem["children"] = addobj(m);
-                zdata.push(zdataItem);
-            }
-            return zdata;
-        } else {
-            return [];
-        }
-    }
-
-}
-
-
-function resetform() {
-
-    $("#permission_name").val("");
-    $("#permission_des").val("");
-      $("#resourcetype").val(1);
-}

VisualInspection/js/role/addrolepermision.js

@@ -1,93 +0,0 @@
-var role_selectinput;
-var permision_id;
-var roletemp = null;
-function loadPermisionRoleData(nodedata, roleid) {
-    var pnode = nodedata;
-    permision_id = pnode[0].id
-    $("#permission_mod").val("");
-    if (roleid != 0) {
-        roletemp = RoleMap.get(parseInt(roleid));
-        $("#permission_mod").val(roletemp.mod);
-    }
-
-    getRole();
-
-
-    $("#role_add_btn").on("click", function () {
-
-        addroleper();
-    })
-}
-
-
-
-function getRole() {
-
-    RoleGetALLNoData(function (data) {
-
-        roles = [];
-        for (var i = 0; i < data.length; i++) {
-            var m = data[i];
-            var zdataItem = {};
-            zdataItem["id"] = m.id;
-            zdataItem["name"] = m.des;
-            roles.push(zdataItem);
-        }
-        var enabbleedit = true;
-        if (edittype == "edit") {
-            enabbleedit = false;
-        }
-
-
-        role_selectinput = new TreeSelect({
-            element: '#role_select',
-            data: roles,
-            valueKey: "id",
-            placeholder: "选择角色",
-            enable: enabbleedit,
-            selectvalue: roletemp == null ? null : roletemp.id
-        });
-    }, function (error) {
-
-    });
-
-
-
-}
-
-function addroleper() {
-    var permision_id1 = permision_id;
-    var role_id = role_selectinput.value;
-    var mod = $("#permission_mod").val();
-    var data = {
-        "role_id": role_id,
-        "permission_id": permision_id1,
-        "permission_type": mod
-    }
-    if (edittype == "edit") {
-        PermisionRoleEDIT(data, function (data) {
-            layer.msg('更新成功！', {
-                time: 2000, //20s后自动关闭
-            }, function () {
-                $('#addRoleModal').modal('hide')
-                updateRole(permision_id);
-            });
-        }, function (error) {
-
-        })
-
-    } else {
-        PermisionRoleAdd(data, function (data) {
-            layer.msg('添加成功！', {
-                time: 2000, //20s后自动关闭
-            }, function () {
-                $('#addRoleModal').modal('hide')
-                updateRole(permision_id);
-            });
-        }, function (error) {
-
-        })
-    }
-
-
-}

VisualInspection/js/role/permision.js

@@ -1,261 +1,228 @@
 var RoleMap = new HashMap()
-var PermisionMap = new HashMap()
-var edittype = "add"
-var zdata = [];
 var cols = [{
-    width: 10,
-    text: '序号',
-    type: 'number',
-    flex: true,
-    colClass: 'text-center'
-}, {
-    width: 30,
-    text: '角色',
-    type: 'string',
-    flex: true,
-    colClass: 'text-center'
-}, {
-    width: 30,
-    text: '操作权限',
-    type: 'string',
-    flex: true,
-    sort: 'down',
-    colClass: 'text-center'
-}, {
-    width: 140,
-    text: '操作',
-    type: 'string',
-    flex: true,
-    colClass: 'text-center'
-}];
+     width: 10,
+     text: '序号',
+     type: 'number',
+     flex: true,
+     colClass: 'text-center'
+ }, {
+     width: 30,
+     text: '角色',
+     type: 'string',
+     flex: true,
+     colClass: 'text-center'
+ }, {
+     width: 30,
+     text: '操作权限',
+     type: 'string',
+     flex: true,
+     sort: 'down',
+     colClass: 'text-center'
+ },{
+     width: 140,
+     text: '操作',
+     type: 'string',
+     flex: true,
+     colClass: 'text-center'
+ }];
 $(document).ready(function () {
+
     $("#main_content_title").html("权限管理")
-    $('#dashboard').dashboard({ draggable: true });
-    var zTreeObj;
-    var zNodes = [];
-    dept_tree = $.fn.zTree.init($("#permision_tree"), {}, zNodes);
-    getPermission()
-    $("#permision_add").on("click", function () {
-        var nodedata = dept_tree.getSelectedNodes();
-        edittype = "add"
-        loadPermisionData(nodedata)
-        $('#addModal').modal('show')
-    })
-    $("#permision_edit").on("click", function () {
-        //获取选中的节点
-        var nodedata = dept_tree.getSelectedNodes();
-        if (nodedata.length < 1) {
-            layer.msg('请先选择权限！', {
-                time: 2000, //20s后自动关闭
-            });
-            return;
-        }
-        edittype = "edit"
-        loadPermisionData(nodedata)
-        $('#addModal').modal('show');
-    });
-    $("#permision_delete").on("click", function () {
-        //获取选中的节点
-        var nodedata = dept_tree.getSelectedNodes();
-        if (nodedata.length < 1) {
-            layer.msg('请先选择权限！', {
-                time: 2000, //20s后自动关闭
-            });
-            return;
-        }
-        PermisionDelete(nodedata[0].id, function (data) {
-            layer.msg('删除成功！', {
-                time: 2000, //20s后自动关闭
-            });
-            dept_tree.removeNode(nodedata[0]);
-        }, function (error) {
-
-        });
-    });
-    $("#role_add").on("click", function () {
-        var nodedata = dept_tree.getSelectedNodes();
-        edittype = "add"
-        if (nodedata.length < 1) {
-            layer.msg('请先选择权限！', {
-                time: 2000, //20s后自动关闭
-            });
-            return;
-        }
-        loadPermisionRoleData(nodedata,0)
-        $('#addRoleModal').modal('show');
-    });
-
-    $('.datatable').datatable({
-        checkable: false,
-        sortable: false,
-        data: {
-            cols: cols,
-            rows: []
-        }
-    });
-
-    $('.datatable').on('click', 'button', function () {
-        if (this.name == "user_edit") {
-             var nodedata = dept_tree.getSelectedNodes();
-            edittype = "edit"
-            var user = nodedata
-            loadPermisionRoleData(user,this.id)
-            $('#addRoleModal').modal('show')
-        }
-        if (this.name == "user_delete") {
-            var nodedata = dept_tree.getSelectedNodes();
-            var data = {
-                "role_id":this.id,
-                "permission_id":nodedata[0].id
-            }
-            PermisionRoleDELETE(data, function (data) {
-                layer.msg('角色删除成功！', {
-                    time: 2000, //20s后自动关闭
-                }, function () {
-                    var nodedata = dept_tree.getSelectedNodes();
-                    updateRole(nodedata[0].id)
-                });
-            },
-                function (error) {
-
-                })
-        }
-
-    });
+
+
+
+    
+     $('#dashboard').dashboard({ draggable: true });
+     var zTreeObj;
+     var zNodes = [];
+     dept_tree = $.fn.zTree.init($("#permision_tree"), {}, zNodes);
+
+     getPermission()
+
+
+
+
+
+     $("#permision_add").on("click", function() {
+         var nodedata = dept_tree.getSelectedNodes();
+         edittype = "add"
+         //loadData(nodedata)
+         $('#addModal').modal('show')
+     })
+
+     $("#permision_edit").on("click", function() {
+         //获取选中的节点
+         var nodedata = dept_tree.getSelectedNodes();
+         if (nodedata.length < 1) {
+             layer.msg('请先权限！', {
+                 time: 2000, //20s后自动关闭
+             });
+             return;
+         }
+         edittype = "edit"
+         loadData(nodedata)
+         $('#addModal').modal('show');
+     });
+
+     $("#permision_delete").on("click", function() {
+         //获取选中的节点
+         var nodedata = dept_tree.getSelectedNodes();
+         if (nodedata.length < 1) {
+             layer.msg('请先选择部门！', {
+                 time: 2000, //20s后自动关闭
+             });
+             return;
+         }
+         PermisionDelete(nodedata[0].id, function(data) {
+             layer.msg('删除成功！', {
+                 time: 2000, //20s后自动关闭
+             });
+             dept_tree.removeNode(nodedata[0]);
+         }, function(error) {
+
+         });
+     });
+
+
+
+
+     $('.datatable').datatable({
+         checkable: false,
+         sortable: false,
+         data: {
+             cols: cols,
+             rows: []
+         }
+     });
 
 });
 
 
 
 function getPermission() {
-    function zTreeOnRename(event, treeId, treeNode, isCancel) {
-        alert(treeNode.tId + ", " + treeNode.name);
-    }
-
-    //  function zTreeBeforeDrop(treeId, treeNodes, targetNode, moveType) {
-    //      return !(targetNode == null || (moveType != "inner" && !targetNode.parentTId));
-    //  };
-
-    function zTreeOnRemove(event, treeId, treeNode) {
-        alert(treeNode.tId + ", " + treeNode.name);
-    }
-
-    function zTreeOnClick(event, treeId, treeNode) {
-        updateRole(treeNode.id)
-    };
-
-
-    var setting = {
-        data: {
-            simpleData: {
-                enable: true,
-                idKey: "id",
-                pIdKey: "pId",
-                rootPId: null
-            }
-        },
-        view: { //表示tree的显示状态
-            selectMulti: false //表示禁止多选
-        },
-        check: { //表示tree的节点在点击时的相关设置
-            enable: false, //是否显示radio/checkbox
-            chkStyle: "checkbox", //值为checkbox或者radio表示
-            checkboxType: { p: "", s: "" }, //表示父子节点的联动效果
-            radioType: "level" //设置tree的分组
-        },
-        callback: {
-            onRename: zTreeOnRename,
-            //  beforeDrop: zTreeBeforeDrop,
-            onRemove: zTreeOnRemove,
-            onClick: zTreeOnClick
-        },
-        edit: {
-            enable: true,
-            drag: {
-                autoExpandTrigger: true,
-                isMove: true,
-                prev: false,
-                next: true,
-                inner: true,
-                autoOpenTime: 0
-            },
-            showRenameBtn: false,
-            showRemoveBtn: false
-        }
-    };
-
-    PermisionGetAll(function (data) {
-        zdata = [];
-        for (var i = 0; i < data.length; i++) {
-            var m = data[i];
-            var zdataItem = {};
-            zdataItem["id"] = m.id;
-            zdataItem["value"] = m.id;
-            zdataItem["pId"] = null;
-            zdataItem["name"] = m.name;
-            zdataItem["open"] = true;
-            zdataItem["children"] = addobj(m);
-            zdata.push(zdataItem);
-
-            PermisionMap.set(m.id, m);
-        }
-        dept_tree = $.fn.zTree.init($("#permision_tree"), setting, zdata)
-    }, function (error) {
-
-    });
-}
-
-
-
-function addobj(data) {
-    var zdata = [];
-    if (typeof (data.childs) != "undefined" && 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["value"] = m.id;
-            zdataItem["pId"] = data.id;
-            zdataItem["icon"] = "";
-            zdataItem["open"] = true;
-            zdataItem["name"] = m.name;
-            zdataItem["children"] = addobj(m);
-            zdata.push(zdataItem);
-
-            PermisionMap.set(m.id, m);
-        }
-        return zdata;
-    } else {
-        return [];
-    }
-}
+     function zTreeOnRename(event, treeId, treeNode, isCancel) {
+         alert(treeNode.tId + ", " + treeNode.name);
+     }
+
+     //  function zTreeBeforeDrop(treeId, treeNodes, targetNode, moveType) {
+     //      return !(targetNode == null || (moveType != "inner" && !targetNode.parentTId));
+     //  };
+
+     function zTreeOnRemove(event, treeId, treeNode) {
+         alert(treeNode.tId + ", " + treeNode.name);
+     }
+
+     function zTreeOnClick(event, treeId, treeNode) {
+         updateRole(treeNode.id)
+     };
+
+
+     var setting = {
+         data: {
+             simpleData: {
+                 enable: true,
+                 idKey: "id",
+                 pIdKey: "pId",
+                 rootPId: null
+             }
+         },
+         view: { //表示tree的显示状态
+             selectMulti: false //表示禁止多选
+         },
+         check: { //表示tree的节点在点击时的相关设置
+             enable: false, //是否显示radio/checkbox
+             chkStyle: "checkbox", //值为checkbox或者radio表示
+             checkboxType: { p: "", s: "" }, //表示父子节点的联动效果
+             radioType: "level" //设置tree的分组
+         },
+         callback: {
+             onRename: zTreeOnRename,
+             //  beforeDrop: zTreeBeforeDrop,
+             onRemove: zTreeOnRemove,
+             onClick: zTreeOnClick
+         },
+         edit: {
+             enable: true,
+             drag: {
+                 autoExpandTrigger: true,
+                 isMove: true,
+                 prev: false,
+                 next: true,
+                 inner: true,
+                 autoOpenTime: 0
+             },
+             showRenameBtn: false,
+             showRemoveBtn: false
+         }
+     };
+
+     PermisionGetAll(function(data) {
+         zdata = [];
+         for (var i = 0; i < data.length; i++) {
+             var m = data[i];
+             var zdataItem = {};
+             zdataItem["id"] = m.id;
+             zdataItem["value"] = m.id;
+             zdataItem["pId"] = null;
+             zdataItem["name"] = m.name;
+             zdataItem["open"] = true;
+             zdataItem["children"] = addobj(m);
+             zdata.push(zdataItem);
+         }
+         dept_tree = $.fn.zTree.init($("#permision_tree"), setting, zdata)
+     }, function(error) {
+
+     });
+ }
+
+
+
+ function addobj(data) {
+     var zdata = [];
+     if (typeof(data.childs) != "undefined" && 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["value"] = m.id;
+             zdataItem["pId"] = data.id;
+             zdataItem["icon"] = "";
+             zdataItem["open"] = true;
+             zdataItem["name"] = m.name;
+             zdataItem["children"] = addobj(m);
+             zdata.push(zdataItem);
+         }
+         return zdata;
+     } else {
+         return [];
+     }
+ }
 function updateRole(permisionid) {
 
-    RoleGetByPermision(permisionid, function (data) {
-        //跟新table
-        var rowdata = [];
-        if (data != null && data.length > 0) {
-            for (var i = 0; i < data.length; i++) {
-                var role = data[i];
-
-                RoleMap.set(role.id, role)
-                var roledata = {};
-                roledata["checked"] = false;
-                roledata["data"] = [i + 1, role.des, role.mod, '<button class="btn btn-primary" name="user_edit" id=' + role.id + '><i class="icon icon-edit"></i>修改</button>  <button class="btn btn-primary" name="user_delete" id=' + role.id + ' ><i class="icon icon-remove-circle"></i>删除</button>'];
-                rowdata.push(roledata);
-
-                RoleMap.set(role.id,role);
-            }
-        }
-        // 使用data参数更新数据：
-        $('.datatable').datatable('load', {
-            cols: cols,
-            rows: rowdata
-        });
-
-    },
-        function (error) {
-
-        });
-}
+     RoleGetByPermision(permisionid, function(data) {
+             //跟新table
+             console.log(data)
+             var rowdata = [];
+             if (data != null && data.length > 0) {
+                 for (var i = 0; i < data.length; i++) {
+                     var role = data[i];
+                  
+                     RoleMap.set(role.id, role)
+                     var roledata = {};
+                     roledata["checked"] = false;
+                     roledata["data"] = [i + 1, role.des, role.mod, '<button class="btn btn-primary" name="user_edit" id=' + role.id + '><i class="icon icon-edit"></i>修改</button>  <button class="btn btn-primary" name="user_delete" id=' + role.id + ' ><i class="icon icon-remove-circle"></i>删除</button>'];
+                     rowdata.push(roledata);
+                 }
+             }
+             // 使用data参数更新数据：
+             $('.datatable').datatable('load', {
+                 cols: cols,
+                 rows: rowdata
+             });
+
+         },
+         function(error) {
+
+         });
+ }

VisualInspection/js/role/role.js

@@ -45,18 +45,13 @@ $(document).ready(function () {
     }
 
 
-
-   $("#add_role_btn").on("click",function(){
-
-       $('#addRoleModal').modal('show');
-   })
-
 });
 
 
 function getrole(size, page) {
     RoleGetALL(page, size, function (data) {
 
+console.log(data)
         totalPage = data.pages;
         totalRecords = data.total;
         setpage(data.currentPage);

VisualInspection/js/util/const.js

@@ -26,12 +26,6 @@ var PERMISION_GET_ALL = "/permission/get/all"
 var PERMISION_DELETE = "/permission/deletePermission/"
 var PERMISION_UPDATE = "/permission/updatePermission/"
 var PERMISION_ADD = "/permission/addPermission"
-var PERMISION_ROLE_ADD = "/permission/addRolePermission"
-var PERMISION_ROLE_EDIT = "/permission/updateRolePermission"
-var PERMISION_ROLE_DELETE = "/permission/deleteRolePermission"
-
-
-
 
 
 

VisualInspection/js/util/service.js

@@ -117,54 +117,9 @@ function PermisionGetAll(success, fail) {
     });
 }
 
-function PermisionRoleAdd(data,success, fail) {
-    var url = base_server_url + PERMISION_ROLE_ADD
-    ajaxPost(url, data, function(response) {
-        var data = response;
-        if (data.result_code == 0) {
-            success(data.result_data)
-        } else {
-            fail(data.result_desc);
-        }
-    }, function(error) {
-        fail("网络错误");
-    });
-}
-
-function PermisionRoleEDIT(data,success, fail) {
-    var url = base_server_url + PERMISION_ROLE_EDIT
-    ajaxPut(url, data, function(response) {
-        var data = response;
-        if (data.result_code == 0) {
-            success(data.result_data)
-        } else {
-            fail(data.result_desc);
-        }
-    }, function(error) {
-        fail("网络错误");
-    });
-}
-
-
-function PermisionRoleDELETE(data,success, fail) {
-    var url = base_server_url + PERMISION_ROLE_DELETE
-    ajaxDelete(url, data, function(response) {
-        var data = response;
-        if (data.result_code == 0) {
-            success(data.result_data)
-        } else {
-            fail(data.result_desc);
-        }
-    }, function(error) {
-        fail("网络错误");
-    });
-}
-
-
-
 
 function PermisionAdd(data,success, fail) {
-    var url = base_server_url + PERMISION_ADD
+    var url = base_server_url + PermisionAdd
     ajaxPost(url, data, function(response) {
         var data = response;
         if (data.result_code == 0) {
@@ -191,8 +146,8 @@ function PermisionEdit(data,success, fail) {
     });
 }
 
-function PermisionDelete(id,success, fail) {
-    var url = base_server_url + PERMISION_DELETE+id;
+function PermisionDelete(success, fail) {
+    var url = base_server_url + PermisionDelete
     ajaxDelete(url, "", function(response) {
         var data = response;
         if (data.result_code == 0) {

VisualInspection/js/util/video.js

@@ -22,7 +22,7 @@ function queryVideoList(){
         s1 = $.checkTask.end_time.replace(/-/g,"/");
         var endTime = new Date(s1).getTime()/1000;
         // alert(curVideo);
-        var str = 929+'|'+startTime+'|'+endTime;
+        var str = 120+'|'+startTime+'|'+endTime;
         callFunc("findvideolist",str);
     }else{
 

VisualInspection/view/role/addpermision.html

@@ -24,18 +24,18 @@
             </div>
         </div>
 
-        <div class="form-group">
+          <div class="form-group">
             <label for="exampleInputPassword4" class="col-sm-2">父权限：</label>
             <div class="col-md-6 col-sm-10">
-                <div id="permision_select">父权限</div>
+                <div id="permission_select">父权限</div>
             </div>
         </div>
-        <div class="form-group">
+           <div class="form-group">
             <label for="exampleInputPassword4" class="col-sm-2">资源类型：</label>
             <div class="col-md-6 col-sm-10">
-                <select class="form-control" id="resourcetype">
-                    <option value="1">菜单</option>
+                 <select class="form-control" id="resourcetype">
                     <option value="2">按钮</option>
+                    <option value="1">菜单</option>
                  </select>
             </div>
         </div>
@@ -52,7 +52,7 @@
 
         <div class="form-group">
             <div class="col-sm-offset-2 col-sm-10">
-                <button type="button" id="permision_add_btn" class="btn btn-default" >添加</button>
+                <button type="button" id="dept_add_btn" class="btn btn-default" onclick="addDept()">添加</button>
             </div>
         </div>
     </form>

VisualInspection/view/role/addrole.html

@@ -1,28 +0,0 @@
-<!--<script type="text/javascript" src="/node_modules/zui/dist/lib/chosen/chosen.min.js?__inline">
-</script>
-<link rel="stylesheet" type="text/css" href="/node_modules/zui/dist/lib/chosen/chosen.min.css">
-<script type="text/javascript" src="/node_modules/zui/dist/lib/chosenicons/zui.chosenicons.min.js?__inline">
-</script>
-<link rel="stylesheet" type="text/css" href="/node_modules/zui/dist/lib/chosenicons/zui.chosenicons.min.css">-->
-<script type="text/javascript" src="/js/role/addrole.js?__inline"></script>
-<link rel="stylesheet" type="text/css" href="/css/role/addrole.css?__inline">
-
-
-<div class="container-fluid ">
-    <form class="form-horizontal">
-       
-
-        <div class="form-group">
-            <label for="exampleInputPassword4" class="col-sm-2">角色：</label>
-            <div class="col-md-6 col-sm-10">
-                <div id="role_select">角色</div>
-            </div>
-        </div>
-         <div class="form-group">
-            <label for="exampleInputAccount4" class="col-sm-2">权限：</label>
-            <div class="col-md-6 col-sm-10">
-                <input type="text" id="permission_mod" class="form-control" id="code_flag" placeholder="1-读写 2-读 3-删除 ">
-            </div>
-        </div>
-    </form>
-</div>

VisualInspection/view/role/addrolepermision.html

@@ -1,28 +0,0 @@
-<!--<script type="text/javascript" src="/node_modules/zui/dist/lib/chosen/chosen.min.js?__inline">
-</script>
-<link rel="stylesheet" type="text/css" href="/node_modules/zui/dist/lib/chosen/chosen.min.css">
-<script type="text/javascript" src="/node_modules/zui/dist/lib/chosenicons/zui.chosenicons.min.js?__inline">
-</script>
-<link rel="stylesheet" type="text/css" href="/node_modules/zui/dist/lib/chosenicons/zui.chosenicons.min.css">-->
-<script type="text/javascript" src="/js/role/addrolepermision.js?__inline"></script>
-<link rel="stylesheet" type="text/css" href="/css/role/addrolepermision.css?__inline">
-
-
-<div class="container-fluid ">
-    <form class="form-horizontal">
-       
-
-        <div class="form-group">
-            <label for="exampleInputPassword4" class="col-sm-2">角色：</label>
-            <div class="col-md-6 col-sm-10">
-                <div id="role_select">角色</div>
-            </div>
-        </div>
-         <div class="form-group">
-            <label for="exampleInputAccount4" class="col-sm-2">权限：</label>
-            <div class="col-md-6 col-sm-10">
-                <input type="text" id="permission_mod" class="form-control" id="code_flag" placeholder="1-读写 2-读 3-删除 ">
-            </div>
-        </div>
-    </form>
-</div>

VisualInspection/view/role/permision.html

@@ -1,11 +1,6 @@
 <link rel="stylesheet" type="text/css" href="/css/role/permision.css?__inline">
 <script type="text/javascript" src="/node_modules/zui/dist/lib/dashboard/zui.dashboard.min.js?__inline"></script>
 <link rel="stylesheet" type="text/css" href="/node_modules/zui/dist/lib/dashboard/zui.dashboard.min.css">
-
-
-<script type="text/javascript" src="/js/lib/combotree/icontains.js?__inline"></script>
-<script type="text/javascript" src="/js/lib/combotree/comboTreePlugin.js?__inline"></script>
-
 <script type="text/javascript" src="/js/role/permision.js?__inline"></script>
 <div class="container-fluid ">
     <div id="dashboard" class="dashboard dashboard-draggable" data-height="500">
@@ -72,7 +67,7 @@
                 <link rel="import" href="/view/role/addrolepermision.html?__inline">
             </div>
             <div class="modal-footer">
-                <button type="button" id="role_add_btn" class="btn btn-primary">保存</button>
+                <button type="button" id="user_add_btn" class="btn btn-primary">保存</button>
             </div>
         </div>
     </div>

VisualInspection/view/role/role.html

@@ -16,7 +16,7 @@
         </div>
         <div class="col-md-6">
 
-            <button class="btn btn-primary" id="add_role_btn" style="float:right" type="button">添加角色</button>
+            <button class="btn btn-primary" style="float:right" type="button">添加角色</button>
 
         </div>
     </div>
@@ -27,21 +27,4 @@
          <div id='kkpager'></div>
      </div>
 
-</div>
-
-<div class="modal fade" id="addRoleModal">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span><span class="sr-only">关闭</span></button>
-                <h4 class="modal-title">添加角色</h4>
-            </div>
-            <div class="modal-body">
-                <link rel="import" href="/view/role/addrole.html?__inline">
-            </div>
-            <div class="modal-footer">
-                <button type="button" id="role_add_btn" class="btn btn-primary">保存</button>
-            </div>
-        </div>
-    </div>
 </div>

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/MenuController.java

@@ -13,7 +13,6 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.github.pagehelper.PageHelper;
@@ -100,10 +99,10 @@ public class MenuController extends BaseController {
      */
 
     @RequestMapping(value = "/get/all",method=RequestMethod.GET,produces="application/json;charset=UTF-8")
-    public String getAllMenu(HttpServletRequest request,@RequestParam(required=false) Integer judge){
+    public String getAllMenu(HttpServletRequest request){
         try{
         	User u = getCurrentUser(request);
-        	List<Menu> menus= menuService.getMenus(new Menu(),u,judge);
+        	List<Menu> menus= menuService.getMenus(new Menu(),u);
         	return returnResult(0, "获取成功", menus);
         }catch(Exception e){
         	throw new BusinessException(20001);
@@ -131,7 +130,7 @@ public class MenuController extends BaseController {
         	Menu menu = new Menu();
         	menu.setId(menuid);
         	
-        	List<Menu> menus = menuService.getMenus(menu,u,0);
+        	List<Menu> menus = menuService.getMenus(menu,u);
         	if(menus==null||menus.size()<1 ) throw  new BusinessException(20001);
         	return returnResult(0, "获取成功", menus.get(0));
         }catch(Exception e){

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/PermissionController.java

@@ -19,7 +19,6 @@ import com.xintong.system.err.BusinessException;
 import com.xintong.system.securityTools.RedisCacheUtil;
 import com.xintong.visualinspection.bean.Permission;
 import com.xintong.visualinspection.bean.User;
-import com.xintong.visualinspection.pojo.RolePermision;
 import com.xintong.visualinspection.service.AuthService;
 import com.xintong.visualinspection.service.PermissionService;
 import com.xintong.visualinspection.service.UserService;
@@ -52,23 +51,6 @@ public class PermissionController extends BaseController {
     	return returnResult(0, "添加成功", null);
     }
     
-    @RequestMapping(value = "/addRolePermission",method=RequestMethod.POST,produces="application/json;charset=UTF-8")
-    public String addPermission(@RequestBody RolePermision rolePermision) throws Exception{
-    	permissionService.addrolepermision(rolePermision);
-    	return returnResult(0, "添加成功", null);
-    }
-    
-    @RequestMapping(value = "/deleteRolePermission",method=RequestMethod.DELETE,produces="application/json;charset=UTF-8")
-    public String deletePermission(@RequestBody RolePermision rolePermision) throws Exception{
-    	permissionService.deleterolepermision(rolePermision);
-    	return returnResult(0, "刪除成功", null);
-    }
-    @RequestMapping(value = "/updateRolePermission",method=RequestMethod.PUT,produces="application/json;charset=UTF-8")
-    public String updateRolePermission(@RequestBody RolePermision rolePermision) throws Exception{
-    	permissionService.updaterolepermision(rolePermision);
-    	return returnResult(0, "更新成功", null);
-    }
-    
     /**
      * 修改权限
      * @return

VisualInspection_server/src/main/java/com/xintong/visualinspection/dao/master/PermissionDao.java

@@ -5,7 +5,6 @@ import java.util.List;
 import org.apache.ibatis.annotations.Mapper;
 
 import com.xintong.visualinspection.bean.Permission;
-import com.xintong.visualinspection.pojo.RolePermision;
 
 /**
  * 文件名：PermissionDao
@@ -21,11 +20,4 @@ public interface PermissionDao {
     public List<Permission> findByAdminUserId(int userId);
     public List<Permission> getByRoleId(int roleId);
     
-    public void addrolepermision(RolePermision rolePermision);
-    
-    public void deleterolepermision(RolePermision rolePermision);
-    public void updaterolepermision(RolePermision rolePermision);
-    
-    
-    
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/master/PermissionDaoMapper.xml

@@ -37,9 +37,9 @@
      <insert id="insert" parameterType="com.xintong.visualinspection.dao.master.PermissionDao" >
         INSERT INTO
         sys_permission
-        (name,description,pid,type,resourceid,status)
+        (name,descritpion,pid,type,resourceid,status)
         VALUES
-        (#{name},#{description},#{pid},#{type},#{resourceid},#{status})
+        (#{name},#{descritpion},#{pid},#{type},#{resourceid},#{status})
     </insert>
     
     
@@ -58,7 +58,8 @@
     </update>
     
      <delete id="delete" parameterType="java.lang.Integer" >
-        delete from sys_permission
+        update sys_permission
+         set status=-1
         WHERE
         id =#{id}
     </delete>
@@ -77,27 +78,4 @@
         SELECT p.* from sys_permission p  where id in (select permission_id from sys_permission_role where role_id=#{roleId});
     </select>
     
-    
-    
-     <insert id="addrolepermision" parameterType="com.xintong.visualinspection.pojo.RolePermision" >
-        INSERT INTO
-        sys_permission_role
-        (role_id,permission_id,permission_type)
-        VALUES
-        (#{role_id},#{permission_id},#{permission_type})
-      </insert>
-      
-       <delete id="deleterolepermision" parameterType="com.xintong.visualinspection.pojo.RolePermision" >
-        delete from
-        sys_permission_role
-        where role_id=#{role_id} and permission_id=#{permission_id}
-      </delete>
-    
-    
-       <update id="updaterolepermision" parameterType="com.xintong.visualinspection.pojo.RolePermision" >
-        update  
-        sys_permission_role
-        set permission_type = #{permission_type} 
-        where role_id=#{role_id} and permission_id=#{permission_id}
-      </update>
 </mapper>

VisualInspection_server/src/main/java/com/xintong/visualinspection/pojo/RolePermision.java

@@ -1,13 +0,0 @@
-package com.xintong.visualinspection.pojo;
-
-import lombok.Data;
-
-@Data
-public class RolePermision {
-	
-	private Integer id;
-	private Integer role_id;
-	private Integer permission_id;
-	private Integer permission_type;
-
-}

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/MenuService.java

@@ -10,7 +10,7 @@ import com.xintong.visualinspection.bean.User;
  * 版本信息：日期：2017/3/30 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
  */
 public interface MenuService {
-    public List<Menu> getMenus(Menu menu,User user,Integer judge);
+    public List<Menu> getMenus(Menu menu,User user);
     public List<Menu> getMenuByParent(Menu menu);
     public void insert(Menu menu);
     public void update(Menu menu);

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/PermissionService.java

@@ -3,7 +3,6 @@ package com.xintong.visualinspection.service;
 import java.util.List;
 
 import com.xintong.visualinspection.bean.Permission;
-import com.xintong.visualinspection.pojo.RolePermision;
 
 /**
  * 文件名：UserService 版本信息：日期：2017/3/30 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
@@ -16,12 +15,6 @@ public interface PermissionService {
 	public void update(Permission permission);
 
 	public void delete(Integer id);
-
+	
 	public List<Permission> getByRoleId(int roleId);
-
-	public void addrolepermision(RolePermision rolePermision);
-
-	public void deleterolepermision(RolePermision rolePermision);
-
-	public void updaterolepermision(RolePermision rolePermision);
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/MenuServiceImpl.java

@@ -35,13 +35,10 @@ public class MenuServiceImpl extends BaseService implements MenuService {
 	private PermissionDao permissionDao;
 
 	@Override
-	public List<Menu> getMenus(Menu menu,User user,Integer judge) {
+	public List<Menu> getMenus(Menu menu,User user) {
 		
 		List<Menu> menus = 	menuDao.getMenu(menu);
-		if(judge==null || judge.intValue()==0){
-			menus=getMenusByPermison(menus,user);
-		}
-		
+		menus=getMenusByPermison(menus,user);
 		
 		List<Menu> mlist = 	new ArrayList<>();
 		
@@ -64,7 +61,7 @@ public class MenuServiceImpl extends BaseService implements MenuService {
 		//找出子
 		for (Integer mid : map.keySet()) {
 			for (Menu m2 : menus) {
-				if(m2.getId().intValue()==mid.intValue()){
+				if(m2.getId()==mid){
 					m2.setChilds(map.get(mid));
 					if(m2.getParentId()==null){
 						mlist.add(m2);

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/PermissionServiceImpl.java

@@ -13,7 +13,6 @@ import com.xintong.visualinspection.bean.Organ;
 import com.xintong.visualinspection.bean.Permission;
 import com.xintong.visualinspection.dao.master.PermissionDao;
 import com.xintong.visualinspection.dao.master.RoleDao;
-import com.xintong.visualinspection.pojo.RolePermision;
 import com.xintong.visualinspection.service.BaseService;
 import com.xintong.visualinspection.service.PermissionService;
 
@@ -84,20 +83,5 @@ public class PermissionServiceImpl extends BaseService implements PermissionServ
 		return permissionDao.getByRoleId(roleId);
 	}
 
-	@Override
-	public void addrolepermision(RolePermision rolePermision) {
-		permissionDao.addrolepermision(rolePermision);
-	}
-
-	@Override
-	public void deleterolepermision(RolePermision rolePermision) {
-		permissionDao.deleterolepermision(rolePermision);
-	}
-
-	@Override
-	public void updaterolepermision(RolePermision rolePermision) {
-		permissionDao.updaterolepermision(rolePermision);
-	}
-
   
 }