Browse Source

no message

Jianghan 3 years ago
parent
commit
2751a4f3e9

+ 1 - 0
src/front/front.go

@@ -24,6 +24,7 @@ type Front struct {
 	logout             xweb.Mapper `xweb:"/front/logout"`            //注销
 	updatePwd          xweb.Mapper `xweb:"/front/updatepwd"`         //更新密码
 	userGroup          xweb.Mapper `xweb:"/front/group"`             //查所有用户组
+	userAll            xweb.Mapper `xweb:"/front/user"`              //查询用户列表
 	userGroupNew       xweb.Mapper `xweb:"/front/group/new"`         //用户组新建
 	userGroupState     xweb.Mapper `xweb:"/front/group/state"`       //用户组状态
 	userGroupStateBulk xweb.Mapper `xweb:"/front/group/bulks_setup"` //批量修改用户组状态

+ 29 - 0
src/front/user.go

@@ -291,6 +291,35 @@ func (f *Front) UserState() {
 	}
 }
 
+func (f *Front) UserAll() {
+	defer qu.Catch()
+	if f.Method() == "POST" {
+		start, _ := f.GetInteger("start")
+		limit, _ := f.GetInteger("length")
+		draw, _ := f.GetInteger("draw")
+		searchStr := f.GetString("search[value]")
+		search := strings.TrimSpace(searchStr)
+		query := map[string]interface{}{
+			"b_delete": false,
+		}
+		if search != "" {
+			query["$or"] = []interface{}{
+				bson.M{"s_login": bson.M{"$regex": search}},
+			}
+		}
+		data, _ := Mgo.Find("s_user", query, `{"i_createtime":-1}`, nil, false, start, limit)
+		count := Mgo.Count("s_user", query)
+		f.ServeJson(map[string]interface{}{
+			"draw":            draw,
+			"data":            data,
+			"recordsFiltered": count,
+			"recordsTotal":    count,
+		})
+	} else {
+		_ = f.Render("user/user_list.html")
+	}
+}
+
 func (f *Front) UserDel() {
 	defer qu.Catch()
 	if f.Method() == "POST" {

+ 1 - 1
src/web/templates/project/project_clear.html

@@ -359,7 +359,7 @@
             $.ajax({
                 url: "/front/project/task/retrieve",
                 type: 'POST',
-                data: {"s_groupid": groupid, "s_sourceinfo": sourceinfo, "taskid": id},
+                data: {"s_groupid": groupid, "s_sourceinfo": sourceinfo, "taskid": id, "s_status": status},
                 success: function (r) {
                     if (r.success) {
                         ttable.api().ajax.reload()

+ 4 - 4
src/web/templates/user/user_list.html

@@ -9,7 +9,7 @@
             <small></small>
         </h1>
         <ol class="breadcrumb">
-            <li><a href="/front/group"><i class="fa fa-dashboard"></i> 用户组管理</a></li>
+            <li><a href="#"><i class="fa fa-dashboard"></i> 用户列表</a></li>
         </ol>
     </section>
     <!-- Main content -->
@@ -110,7 +110,7 @@
 </div>
 
 <script>
-    menuActive("group");
+    menuActive("/front/user");
     let gid = {{ .T.gid }}
     let selectIndex = [];               //选中的编号
     let keyTableChecked = false;        //关键词表格数据是否有选中
@@ -120,13 +120,13 @@
         ttable = $('#dataTable').dataTable({
             "paging": true,
             "lengthChange": false,
-            "searching": false,
+            "searching": true,
             "ordering": false,
             "info": true,
             "autoWidth": false,
             "serverSide": true,
             "ajax": {
-                "url": "/front/group/user",
+                "url": "/front/user",
                 "type": "post",
                 "data": {"gid": gid}
             },