Merge branch 'dev2.0' of http://192.168.3.207:8080/data_processing/data_validation into dev2.0

src/front/front.go

@@ -23,15 +23,18 @@ type Front struct {
 	*xweb.Action
 	index xweb.Mapper `xweb:"/front/index"` //index页面
 	//user
-	login          xweb.Mapper `xweb:"/"`                       //登录页面
-	code           xweb.Mapper `xweb:"/code"`                   //获取图片验证码
-	logout         xweb.Mapper `xweb:"/front/logout"`           //注销
-	updatePwd      xweb.Mapper `xweb:"/front/updatepwd"`        //更新密码
-	userGroup      xweb.Mapper `xweb:"/front/group"`            //查所有用户组
-	userGroupNew   xweb.Mapper `xweb:"/front/group/new"`        //用户组新建
-	userGroupState xweb.Mapper `xweb:"/front/group/state"`      //用户组状态
-	userManage     xweb.Mapper `xweb:"/front/group/user"`       //用户管理
-	userState      xweb.Mapper `xweb:"/front/group/user/state"` //用户状态
+	login          xweb.Mapper `xweb:"/"`                        //登录页面
+	code           xweb.Mapper `xweb:"/code"`                    //获取图片验证码
+	logout         xweb.Mapper `xweb:"/front/logout"`            //注销
+	updatePwd      xweb.Mapper `xweb:"/front/updatepwd"`         //更新密码
+	userGroup      xweb.Mapper `xweb:"/front/group"`             //查所有用户组
+	userGroupNew   xweb.Mapper `xweb:"/front/group/new"`         //用户组新建
+	userGroupState xweb.Mapper `xweb:"/front/group/state"`       //用户组状态
+	userGroupDel   xweb.Mapper `xweb:"/front/group/del"`         //用户组删除
+	userManage     xweb.Mapper `xweb:"/front/group/user"`        //用户管理
+	userState      xweb.Mapper `xweb:"/front/group/user/state"`  //用户状态
+	userDel        xweb.Mapper `xweb:"/front/group/user/del"`    //用户删除
+	userModify     xweb.Mapper `xweb:"/front/group/user/modify"` // 修改用户信息
 
 	//menu
 	menu           xweb.Mapper `xweb:"/front/menu"`            //查一级菜单
@@ -109,7 +112,9 @@ func (f *Front) UserGroup() {
 		draw, _ := f.GetInteger("draw")
 		searchStr := f.GetString("search[value]")
 		search := strings.TrimSpace(searchStr)
-		query := make(map[string]interface{})
+		query := map[string]interface{}{
+			"b_delete": false,
+		}
 		if search != "" {
 			query["$or"] = []interface{}{
 				bson.M{"s_name": bson.M{"$regex": search}},
@@ -138,6 +143,7 @@ func (f *Front) UserGroupNew() {
 		currenttime := time.Now().Unix()
 		group["i_createtime"] = currenttime
 		group["i_updatetime"] = currenttime
+		group["b_delete"] = false
 		gid := Mgo.Save("s_group", group) // 保存用户组
 		if gid != "" {
 			// 1、用户组管理员账号
@@ -151,6 +157,7 @@ func (f *Front) UserGroupNew() {
 			m1["i_createtime"] = currenttime
 			m1["i_updatetime"] = currenttime
 			m1["i_state"] = true
+			m1["b_delete"] = false
 			Mgo.Save("s_user", m1)
 			// 2、质检员账号
 			for i := 0; i < qu.IntAll(user["u1_size"]); i++ {
@@ -164,6 +171,7 @@ func (f *Front) UserGroupNew() {
 				m["i_createtime"] = currenttime
 				m["i_updatetime"] = currenttime
 				m["i_state"] = true
+				m["b_delete"] = false
 				Mgo.Save("s_user", m)
 			}
 			// 3、普通用户账号
@@ -178,6 +186,7 @@ func (f *Front) UserGroupNew() {
 				m["i_createtime"] = currenttime
 				m["i_updatetime"] = currenttime
 				m["i_state"] = true
+				m["b_delete"] = false
 				Mgo.Save("s_user", m)
 			}
 			f.ServeJson(map[string]interface{}{
@@ -206,13 +215,25 @@ func (f *Front) UserGroupState() {
 	}
 }
 
+func (f *Front) UserGroupDel() {
+	defer qu.Catch()
+	if f.Method() == "POST" {
+		data := GetPostForm(f.Request)
+		qu.Debug(data)
+		b := Mgo.UpdateById("s_group", qu.ObjToString(data["id"]), map[string]interface{}{"$set": map[string]interface{}{"b_delete": true}})
+		f.ServeJson(map[string]interface{}{
+			"rep": b,
+		})
+	}
+}
+
 func (f *Front) UserManage() {
 	defer qu.Catch()
 	if f.Method() == "POST" {
 		data := GetPostForm(f.Request)
 		gid := qu.ObjToString(data["gid"])
 		draw, _ := f.GetInteger("draw")
-		query := map[string]interface{}{"s_groupid": gid}
+		query := map[string]interface{}{"s_groupid": gid, "b_delete": false}
 		info, b := Mgo.Find("s_user", query, nil, nil, false, -1, -1)
 		count := Mgo.Count("s_user", query)
 		if b && len(*info) > 0 {
@@ -244,3 +265,25 @@ func (f *Front) UserState() {
 		})
 	}
 }
+
+func (f *Front) UserDel() {
+	defer qu.Catch()
+	if f.Method() == "POST" {
+		data := GetPostForm(f.Request)
+		b := Mgo.UpdateById("s_user", qu.ObjToString(data["id"]), map[string]interface{}{"$set": map[string]interface{}{"b_delete": true}})
+		f.ServeJson(map[string]interface{}{
+			"rep": b,
+		})
+	}
+}
+
+func (f *Front) UserModify() {
+	defer qu.Catch()
+	if f.Method() == "POST" {
+		data := GetPostForm(f.Request)
+		b := Mgo.UpdateById("s_user", qu.ObjToString(data["id"]), map[string]interface{}{"$set": map[string]interface{}{"s_name": data["s_name"], "s_phone": data["s_phone"]}})
+		f.ServeJson(map[string]interface{}{
+			"rep": b,
+		})
+	}
+}

src/front/user.go

@@ -49,11 +49,12 @@ func (f *Front) Login() {
 			"s_name":     username,
 			"s_password": passwordEn,
 		}
-		user, _ := Mgo.FindOne("user", query)
+		user, _ := Mgo.FindOne("s_user", query)
 		checked := false
 		if user != nil && len(*user) > 0 {
 			checked = true
 			f.SetSession("user", map[string]interface{}{
+				//"s_groupid": (*user)["s_groupid"],
 				"s_name":  (*user)["s_name"],
 				"i_role":  (*user)["i_role"],
 				"s_pwd":   password,

src/web/templates/com/header.html

@@ -61,31 +61,31 @@
 		    </div>
 		    <div class="modal-body">
 		     	<div class="form-group">
-				    <label for="code" class="col-sm-2 control-label">账号:</label>
+				    <label class="col-sm-2 control-label">账号:</label>
 				    <div class="col-sm-10">
-						<input id="t_email" type="email" value={{(session "user").email}} class="form-control" disabled>
+						<input id="t_email" type="email" value={{(session "user").s_login}} class="form-control" disabled>
 				    </div>
 				</div>
 				<div class="form-group">
-				    <label for="code" class="col-sm-2 control-label">密码:</label>
+				    <label class="col-sm-2 control-label">密码:</label>
 				    <div class="col-sm-10">
-						<input id="t_pwd" type="password" value={{(session "user").pwd}} class="form-control" placeholder="请输入密码">
+						<input id="t_pwd" type="password" value={{(session "user").s_password}} class="form-control" placeholder="请输入密码">
 				    </div>
 				</div>
 				<div class="form-group">
-				    <label for="site" class="col-sm-2 control-label">姓名:</label>
+				    <label class="col-sm-2 control-label">姓名:</label>
 				    <div class="col-sm-10">
-						<input id="t_name" type="text" value={{(session "user").name}} class="form-control" disabled>
+						<input id="t_name" type="text" value={{(session "user").s_name}} class="form-control" disabled>
 				    </div>
 				</div>
 				<div class="form-group">
-				    <label for="modify" class="col-sm-2 control-label">角色:</label>
+				    <label class="col-sm-2 control-label">角色:</label>
 				    <div class="col-sm-10">
 				     	<select id="t_role" class="form-control" disabled>
 							<option value={{(session "user").role}}>
 							<script>
 								role={{(session "user").role}};
-								if(role=="2"){
+								if(role===2){
 									document.write("开发员")
 								}else if(role=="1"){
 									document.write("管理员")

src/web/templates/user/user_group.html

@@ -157,8 +157,21 @@
         })
     }
 
-    function del() {
-
+    function del(id) {
+        showConfirm("确定删除该用户组？", function() {
+            $.ajax({
+                url: "/front/group/del",
+                type: 'POST',
+                data: {"id": id},
+                success: function (r) {
+                    if (r.rep) {
+                        ttable.ajax.reload();
+                    } else {
+                        showTip("状态修改失败");
+                    }
+                }
+            })
+        })
     }
 
     //表格全选

src/web/templates/user/user_group_create.html

@@ -231,7 +231,7 @@
             data: {"group": JSON.stringify(group), "user": JSON.stringify(user)},
             success: function (r) {
                 if (r.rep) {
-                    window.location.href="/front/user"
+                    window.location.href="/front/group"
                 } else {
                     showTip("保存失败");
                 }

src/web/templates/user/user_list.html

@@ -52,6 +52,63 @@
     </section>
 </div>
 {{include "com/footer.html"}}
+
+<div class="modal fade" id="modal-modify-user" tabindex="-1" role="dialog" aria-hidden="true">
+    <div class="modal-dialog" style="width: 30%">
+        <div class="modal-content">
+            <div class="modal-header">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                    <div class="edit-info">
+                        <span class="glyphicon glyphicon-alert" aria-hidden="true"></span>
+                        <span class="h4">修改用户信息</span>
+                    </div>
+                    <div class="edit-form">
+                        <hr>
+                        <form class="form-horizontal">
+                            <div class="form-group margin-bottom">
+                                <input type="text" class="form-control" id="user-id" placeholder="用户账号" style="display: none">
+                                <label class="col-sm-3 control-label">用户账号</label>
+                                <div class="col-sm-8">
+                                    <input type="text" class="form-control" id="user-login" placeholder="用户账号" readonly="readonly">
+                                </div>
+                            </div>
+                            <div class="form-group margin-bottom">
+                                <label class="col-sm-3 control-label">用户名称</label>
+                                <div class="col-sm-8">
+                                    <input type="text" class="form-control" id="user-name" placeholder="用户名称">
+                                </div>
+                            </div>
+                            <div class="form-group margin-bottom">
+                                <label class="col-sm-3 control-label">联系方式</label>
+                                <div class="col-sm-8">
+                                    <input type="text" class="form-control" id="user-contract" placeholder="电话/邮箱">
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <label class="col-sm-3 control-label">登陆密码</label>
+                                <div class="col-sm-5">
+                                    <input type="password" id="user-pwd" readonly="readonly" class="form-control">
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <label class="col-sm-3 control-label">服务时间</label>
+                                <div class="col-sm-8">
+                                    <input type="text" id="stratDate" class="col-sm-2 form-control" readonly="readonly" placeholder="开始日期 - 结束日期">
+                                </div>
+                            </div>
+                        </form>
+                    </div>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <input type="button" onclick="modifySave()" class="btn btn-primary saveBtn" value="保存">
+                <input type="button" onclick="cancelModel()" class="btn btn-default" value="取消">
+            </div>
+        </div>
+    </div><!-- /.modal -->
+</div>
+
 <script>
     menuActive("group");
     let gid = {{ .T.gid }}
@@ -60,7 +117,7 @@
     let keyTableAllChecked = true;      //表单数据是否被全选中
 
     $(function () {
-        ttable = $('#dataTable').DataTable({
+        ttable = $('#dataTable').dataTable({
             "paging": true,
             "lengthChange": false,
             "searching": false,
@@ -95,7 +152,7 @@
                     }},
                 {"data": "s_login", width: "9%"},
                 {"data": "s_name", width: "9%"},
-                {"data": "i_power", width:"9%", render: function (val) {
+                {"data": "i_role", width:"9%", render: function (val) {
                         if (val === "1") {
                             return "管理员"
                         }else if (val === "2") {
@@ -125,7 +182,7 @@
                     }},
                 {"data": "_id", width:"11%",render: function (val, a, row, pos) {
                         tmp = '<div>' +
-                            '<a class="btn btn-sm btn-primary" href="/front/group/user?id='+val+'">设置</a>&nbsp;&nbsp;'+
+                            '<a class="btn btn-sm btn-primary" onclick="modifyInfo(\''+pos.row+'\')">设置</a>&nbsp;&nbsp;'+
                             '<a class="btn btn-sm btn-danger" onclick="del(\''+val+'\')">删除</a>'+
                             '</div>';
                         return tmp
@@ -152,10 +209,6 @@
         })
     }
 
-    function del() {
-
-    }
-
     //表格全选
     function allSelect(obj) {
         if ($(obj).is(':checked')) {
@@ -196,4 +249,57 @@
         }
     }
 
+    function modifyInfo(v) {
+        let tmp = ttable.fnGetData()[v]
+        $("#user-id").val(tmp["_id"])
+        $("#user-login").val(tmp["s_login"])
+        $("#user-pwd").val(tmp["s_password"])
+        $("#user-name").val(tmp["s_name"])
+        $("#user-contract").val(tmp["s_phone"])
+        $('#modal-modify-user').modal("show")
+
+    }
+
+    function modifySave() {
+        let id = $("#user-id").val()
+        console.log(id)
+        let name = $("#user-name").val()
+        let phone = $("#user-contract").val()
+        if (name !== "" || phone !== "") {
+            $.ajax({
+                url: "/front/group/user/modify",
+                type: 'POST',
+                data: {"id": id, "s_name": name, "s_phone": phone},
+                success: function (r) {
+                    if (r.rep) {
+                        $('#modal-modify-user').modal('hide')
+                    } else {
+                        showTip("保存失败");
+                    }
+                }
+            })
+        }
+    }
+
+    function del(id) {
+        showConfirm("确定删除该用户组？", function() {
+            $.ajax({
+                url: "front/group/user/del",
+                type: 'POST',
+                data: {"id": id},
+                success: function (r) {
+                    if (r.rep) {
+                        ttable.ajax.reload();
+                    } else {
+                        showTip("状态修改失败");
+                    }
+                }
+            })
+        })
+    }
+
+    function cancelModel() {
+        $('#modal-modify-user').modal('hide')
+    }
+
 </script>