添加用户

VisualInspection/js/lib/imageupload/js/imgUp.js

@@ -41,7 +41,7 @@ $(function() {
 
                 });
                 $img0.attr("src", "/js/lib/imageupload/img/a7.png").appendTo($section);
-                var $img = $("<img class='up-img up-opcity'>");
+                var $img = $("<img class='up-img up-opcity' id='user_pic'>");
                 $img.attr("src", imgArr[i]);
                 $img.appendTo($section);
                 var $p = $("<p class='img-name-p'>");

VisualInspection/js/user/addUser.js

@@ -25,8 +25,51 @@ function loadUserData(nodedata) {
         selectvalue: pnode.length > 0 ? pnode[0].id : null
     });
 
+    $("#user_add_btn").on("click", function() {
+        addUser();
+    })
 
+}
 
+function addUser() {
+
+    var username = $("#user_name").val();
+    var userworkno = $("#user_workno").val();
+    var userpassword = $("#user_password").val();
+    var userconfirmpassword = $("#user_confirm_password").val();
+    var userpic = $("#user_pic").val();
+    // var userroleselect = $("#user_role_select").val();
+    var usermobile = $("#user_mobile").val();
+    var useridno = $("#user_idno").val();
+    var useremail = $("#user_email").val();
+    var userbirth = $("#user_birth").val();
+    var userposition = $("#user_position").val();
+    var usertruename = $("#user_true_name").val();
+
+    var parm = {
+        "username": username,
+        "password": userpassword,
+        "phone": usermobile,
+        "workno": userworkno,
+        "idno": useridno,
+        "email": useremail,
+        "pic": userpic,
+        "birth": userbirth,
+        "organid": dept_selectinput.value,
+        "positionid": 1,
+        "truename": usertruename
+    }
+
+    UserAdd(parm, function(data) {
+        layer.msg('添加成功！', {
+            time: 2000, //20s后自动关闭
+        }, function() {
+            $('#addUserModal').modal('hide')
+            updateUser(dept_selectinput.value)
+        });
+    }, function(error) {
+
+    });
 
 
 }

VisualInspection/js/user/userManager.js

@@ -136,51 +136,7 @@
      }
 
      function zTreeOnClick(event, treeId, treeNode) {
-
-         var userData = {
-             "organid": treeNode.id
-         }
-
-         UserGetList(userData, function(data) {
-                 console.log(data)
-                     //跟新table
-                 var rowdata = [];
-                 if (data != null && data.length > 0) {
-                     for (var i = 0; i < data.length; i++) {
-                         var user = data[i];
-
-                         var attr = "";
-                         if (user.authorities.length > 0) {
-                             for (var j = 0; j < user.authorities.length; j++) {
-                                 var at = user.authorities[j];
-                                 if (attr.length > 0) {
-                                     attr += "," + at.authority;
-                                     continue;
-                                 }
-                                 attr += at.authority;
-                             }
-                         }
-
-
-                         var userdata = {};
-                         userdata["checked"] = false;
-                         userdata["data"] = [i + 1, user.id, user.username, user.workno == null ? -1 : user.workno, user.mobile, attr, '<a href="#" data-toggle="modal" data-target="#myModal"><i class="icon icon-edit"></i> 修改</a><a href="#"><i class="icon icon-remove-circle"></i> 删除</a>'];
-                         rowdata.push(userdata);
-                     }
-                 }
-
-
-
-                 // 使用data参数更新数据：
-                 $('.datatable').datatable('load', {
-                     cols: cols,
-                     rows: rowdata
-                 });
-
-             },
-             function(error) {
-
-             });
+         updateUser(treeNode.id)
      };
 
 
@@ -262,4 +218,47 @@
      } else {
          return [];
      }
+ }
+
+ function updateUser(organid) {
+     var userData = {
+         "organid": organid
+     }
+
+     UserGetList(userData, function(data) {
+             console.log(data)
+                 //跟新table
+             var rowdata = [];
+             if (data != null && data.length > 0) {
+                 for (var i = 0; i < data.length; i++) {
+                     var user = data[i];
+
+                     var attr = "";
+                     if (user.authorities.length > 0) {
+                         for (var j = 0; j < user.authorities.length; j++) {
+                             var at = user.authorities[j];
+                             if (attr.length > 0) {
+                                 attr += "," + at.authority;
+                                 continue;
+                             }
+                             attr += at.authority;
+                         }
+                     }
+
+                     var userdata = {};
+                     userdata["checked"] = false;
+                     userdata["data"] = [i + 1, user.id, user.username, user.workno == null ? -1 : user.workno, user.mobile, attr, '<a href="#" data-toggle="modal" data-target="#myModal"><i class="icon icon-edit"></i> 修改</a><a href="#"><i class="icon icon-remove-circle"></i> 删除</a>'];
+                     rowdata.push(userdata);
+                 }
+             }
+             // 使用data参数更新数据：
+             $('.datatable').datatable('load', {
+                 cols: cols,
+                 rows: rowdata
+             });
+
+         },
+         function(error) {
+
+         });
  }

VisualInspection/js/util/const.js

@@ -2,6 +2,7 @@
 var USER_LOGIN = "/user/auth/login"
 var USER_LOGOUT = "/user/logout"
 var USER_GET_LIST = "/user/getUserList"
+var USER_ADD = "/user/addUser"
 
 
 var UI_USER_LOGIN = "view/user/login"

VisualInspection/js/util/service.js

@@ -29,6 +29,20 @@ function UserGetList(data, success, fail) {
     });
 }
 
+function UserAdd(data, success, fail) {
+    var url = base_server_url + USER_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 MenuGetAll(success, fail) {
     var url = base_server_url + MENU_GET_ALL

VisualInspection/view/user/addUser.html

@@ -14,32 +14,39 @@
         <div class="form-group" style="margin-bottom:0">
             <div class="col-md-8">
                 <div class="form-group">
-                    <label for="exampleInputAccount4" class="col-sm-3">姓名：</label>
+                    <label for="exampleInputAccount4" class="col-sm-3">账号：</label>
                     <div class="col-md-9 col-sm-9">
-                        <input type="text" id="user_dept_name" class="form-control" id="code_flag" placeholder="名称">
+                        <input type="text" id="user_name" class="form-control" placeholder="账号">
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label for="exampleInputAccount4" class="col-sm-3">真实姓名：</label>
+                    <div class="col-md-9 col-sm-9">
+                        <input type="text" id="user_true_name" class="form-control" placeholder="真实姓名">
                     </div>
                 </div>
                 <div class="form-group">
                     <label for="exampleInputAccount4" class="col-sm-3">工号：</label>
                     <div class="col-md-9 col-sm-9">
-                        <input type="text" id="user_dept_name" class="form-control" id="code_flag" placeholder="名称">
+                        <input type="text" id="user_workno" class="form-control" placeholder="工号">
                     </div>
                 </div>
 
                 <div class="form-group">
                     <label for="exampleInputAccount4" class="col-sm-3">密码：</label>
                     <div class="col-md-9 col-sm-9">
-                        <input type="text" id="user_dept_name" class="form-control" id="code_flag" placeholder="名称">
+                        <input type="text" id="user_password" class="form-control" placeholder="密码">
                     </div>
                 </div>
                 <div class="form-group">
                     <label for="exampleInputAccount4" class="col-sm-3">确定密码：</label>
                     <div class="col-md-9 col-sm-9">
-                        <input type="text" id="user_dept_name" class="form-control" id="code_flag" placeholder="名称">
+                        <input type="text" id="user_confirm_password" class="form-control" placeholder="确认密码">
                     </div>
                 </div>
 
 
+
             </div>
             <div class="col-md-4">
                 <div class="row hide" id="user_img_pre">
@@ -61,13 +68,18 @@
 
 
 
-
+        <div class="form-group">
+            <label for="exampleInputAccount4" class="col-sm-2">生日：</label>
+            <div class="col-md-10 col-sm-10">
+                <input type="text" id="user_birth" class="form-control" placeholder="生日">
+            </div>
+        </div>
 
 
         <div class="form-group">
             <label for="exampleInputPassword4" class="col-sm-2">用户角色：</label>
             <div class="col-md-10 col-sm-10">
-                <input type="text" id="user_dept_name" class="form-control" id="code_flag" placeholder="名称">
+                <input type="text" id="user_role_select" class="form-control" placeholder="请选择角色">
 
             </div>
         </div>
@@ -81,19 +93,25 @@
         <div class="form-group">
             <label for="exampleInputAccount4" class="col-sm-2">手机：</label>
             <div class="col-md-10 col-sm-10">
-                <input type="text" id="user_dept_name" class="form-control" id="code_flag" placeholder="名称">
+                <input type="text" id="user_mobile" class="form-control" placeholder="手机号">
+            </div>
+        </div>
+        <div class="form-group">
+            <label for="exampleInputAccount4" class="col-sm-2">职位：</label>
+            <div class="col-md-10 col-sm-10">
+                <input type="text" id="user_position" class="form-control" placeholder="职位">
             </div>
         </div>
         <div class="form-group">
             <label for="exampleInputAccount4" class="col-sm-2">身份证：</label>
             <div class="col-md-10 col-sm-10">
-                <input type="text" id="user_dept_name" class="form-control" id="code_flag" placeholder="名称">
+                <input type="text" id="user_idno" class="form-control" placeholder="身份证">
             </div>
         </div>
         <div class="form-group">
             <label for="exampleInputAccount4" class="col-sm-2">邮箱：</label>
             <div class="col-md-10 col-sm-10">
-                <input type="text" id="user_dept_name" class="form-control" id="code_flag" placeholder="名称">
+                <input type="text" id="user_email" class="form-control" placeholder="邮箱">
             </div>
         </div>
 

VisualInspection/view/user/userManager.html

@@ -67,7 +67,7 @@
                 <link rel="import" href="/view/user/addUser.html?__inline">
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-primary">保存</button>
+                <button type="button" id="user_add_btn" class="btn btn-primary">保存</button>
             </div>
         </div>
     </div>

VisualInspection_server/src/main/java/com/xintong/visualinspection/bean/User.java

@@ -72,6 +72,8 @@ public class User implements UserDetails {
 	private String idno;
 	
 	private String token;
+	private String email;
+	private String pic;
 
 	@JsonIgnore
 	private List<Role> roles;

VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/cluster/UserInfoMapper.xml

@@ -31,9 +31,9 @@
     <insert id="insert" parameterType="com.xintong.visualinspection.bean.User" >
         INSERT INTO
         t_sys_users
-        (username,password,TRUENAME,ORGANID,BIRTH,AGE,MOBILE,POSITIONID,SEX,WORKNO,IDNO)
+        (username,password,TRUENAME,ORGANID,BIRTH,MOBILE,POSITIONID,WORKNO,IDNO,EMAIL,PIC)
         VALUES
-        (#{username},#{password},#{truename},#{organid},#{birth},#{age},#{mobile},#{positionid},#{sex},#{workno},#{idno})
+        (#{username},#{password},#{truename},#{organid},#{birth},#{phone},#{positionid},#{workno},#{idno},#{email},#{pic})
     </insert>
 
     <update id="update" parameterType="com.xintong.visualinspection.bean.User" >