角色添加

VisualInspection/js/role/addrole.js

@@ -0,0 +1,61 @@
+ var roletemp=null;
+function loadRoleData(role) {
+    $("#role_name").val("");
+    $("#role_des").val("");
+
+    if(role!=null && edittype=="edit"){
+         $("#role_name").val(role.name);
+        $("#role_des").val(role.des);
+        roletemp = role;
+       
+    }
+
+    $("#role_add_btn").on("click", function () {
+        addrole();
+    })
+
+
+}
+
+
+function addrole() {
+
+    var role_name = $("#role_name").val();
+    var role_des = $("#role_des").val();
+
+    var data = {
+        "name": role_name,
+        "des": role_des
+    }
+
+    if (edittype == "add") {
+
+        RoleAdd(data, function (susd) {
+            layer.msg('添加成功！', {
+                time: 2000, //20s后自动关闭
+            }, function () {
+                $('#addRoleModal').modal('hide')
+                getrole(pagesize, 1);
+            });
+        }, function (error) {
+
+        });
+
+    }
+
+    if(edittype=="edit"){
+
+        data.id = roletemp.id;
+        RoleUpdate(data,function(params){
+            layer.msg('修改成功！', {
+                    time: 2000, //20s后自动关闭
+                }, function () {
+                    getrole(pagesize, pageNo);
+                });
+        },function(error){
+
+        });
+    }
+
+
+}

VisualInspection/js/role/permision.js

@@ -120,7 +120,6 @@ $(document).ready(function () {
 
                 })
         }
-
     });
 
 });

VisualInspection/js/role/role.js

@@ -24,6 +24,9 @@ var cols = [{
     colClass: 'text-center'
 }];
 var pageNo = null;
+var edittype = "add";
+var pagesize = 30;
+var RoleMap = new HashMap()
 $(document).ready(function () {
 
     $("#main_content_title").html("角色管理")
@@ -37,7 +40,31 @@ $(document).ready(function () {
         }
     });
 
-    var pagesize = 15;
+
+    $('.datatable').on('click', 'button', function () {
+        if (this.name == "user_edit") {
+
+            edittype = "edit"
+            loadRoleData(RoleMap.get(parseInt(this.id)));
+
+            $('#addRoleModal').modal('show');
+        }
+        if (this.name == "user_delete") {
+
+            RoleDelete(this.id, function (data) {
+                layer.msg('角色删除成功！', {
+                    time: 2000, //20s后自动关闭
+                }, function () {
+                    getrole(pagesize, 1);
+                });
+            },
+                function (error) {
+
+                })
+        }
+    });
+
+
     if (pageNo == null || pageNo == "") {
         getrole(pagesize, 1);
     } else {
@@ -46,10 +73,11 @@ $(document).ready(function () {
 
 
 
-   $("#add_role_btn").on("click",function(){
-
-       $('#addRoleModal').modal('show');
-   })
+    $("#add_role_btn").on("click", function () {
+        edittype = "add";
+        loadRoleData(null);
+        $('#addRoleModal').modal('show');
+    })
 
 });
 
@@ -68,8 +96,10 @@ function getrole(size, page) {
                 userdata["checked"] = false;
                 userdata["data"] = [i + 1, role.des, role.usercount, '<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(userdata);
+                RoleMap.set(role.id,role);
             }
         }
+       
 
         // 使用data参数更新数据：
         $('.datatable').datatable('load', {

VisualInspection/js/util/const.js

@@ -39,6 +39,10 @@ var PERMISION_ROLE_DELETE = "/permission/deleteRolePermission"
 var ROLE_GET_ALL = "/role/get/all/"
 var ROLE_GET_ALL_DATA = "/role/get/alldata/"
 var ROLE_GET_BY_PERMISION = "/role/getRoleByPermision/"
+var ROLE_ADD = "/role/addRole"
+var ROLE_EDIT = "/role/updateRole/"
+var ROLE_DELETE = "/role/deleteRole/"
+
 
 
 

VisualInspection/js/util/service.js

@@ -368,6 +368,53 @@ function RoleGetALLNoData(success, fail) {
     });
 }
 
+function RoleAdd(data,success, fail) {
+    var url = base_server_url + 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 RoleUpdate(data,success, fail) {
+    var url = base_server_url + ROLE_EDIT+data.id;
+    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 RoleDelete(roleid,success, fail) {
+    var url = base_server_url + ROLE_DELETE +roleid;
+    ajaxDelete(url, "", function(response) {
+        var data = response;
+        if (data.result_code == 0) {
+            success(data.result_data)
+        } else {
+            fail(data.result_desc);
+        }
+    }, function(error) {
+        fail("网络错误");
+    });
+}
+
+
+
+
+
+
 function RoleGetByPermision(permisionid,success, fail) {
     var url = base_server_url + ROLE_GET_BY_PERMISION+permisionid;
     ajaxGet(url, "", function(response) {

VisualInspection/view/role/addrole.html

@@ -11,17 +11,17 @@
 <div class="container-fluid ">
     <form class="form-horizontal">
        
-
         <div class="form-group">
-            <label for="exampleInputPassword4" class="col-sm-2">角色：</label>
+            <label for="exampleInputAccount4" class="col-sm-2">名称：</label>
             <div class="col-md-6 col-sm-10">
-                <div id="role_select">角色</div>
+                <input type="text" id="role_name" class="form-control" id="code_flag" placeholder="ROLE_ADMIN">
             </div>
         </div>
+
          <div class="form-group">
-            <label for="exampleInputAccount4" class="col-sm-2">权限：</label>
+            <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-删除 ">
+                <input type="text" id="role_des" class="form-control" id="code_flag" placeholder="超级管理员">
             </div>
         </div>
     </form>

VisualInspection/view/role/role.html

@@ -4,17 +4,8 @@
 <script type="text/javascript" src="/js/role/role.js?__inline"></script>
 <div class="container-fluid " style="padding-left:0;padding-right:0">
     <div class="row" style="padding-left:10px;padding-right:10px">
-        <div class="col-md-6">
-            <div class="row">
-                <div class="col-md-2">
-                    <p style="line-height:32px;text-align: right;">关键词</p>
-                </div>
-                <div class="col-md-6"><input type="text" class="form-control" placeholder="关键词"></div>
-                <div class="col-md-2"><button class="btn btn-primary" type="button">查询</button></div>
-            </div>
-
-        </div>
-        <div class="col-md-6">
+ 
+        <div class="col-md-12">
 
             <button class="btn btn-primary" id="add_role_btn" style="float:right" type="button">添加角色</button>
 
@@ -36,6 +27,7 @@
                 <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>

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

@@ -54,8 +54,7 @@
     </update>
 
     <delete id="delete" parameterType="java.lang.Integer" >
-        update sys_role
-         set status=-1
+        delete from sys_role
         WHERE
         id =#{id}
     </delete>