no message

src/front/user.go

@@ -80,7 +80,7 @@ func (f *Front) Login() {
 	}
 }
 
-// 获取图片验证码
+// Code 获取图片验证码
 func (f *Front) Code() {
 	id := captcha.NewLen(4)
 	//r := &http.Request{}
@@ -127,7 +127,6 @@ func (f *Front) UserGroup() {
 				bson.M{"s_name": bson.M{"$regex": search}},
 			}
 		}
-
 		data, _ := Mgo.Find("s_group", query, `{"i_createtime":-1}`, nil, false, start, limit)
 		count := Mgo.Count("s_group", query)
 		f.ServeJson(map[string]interface{}{

src/web/templates/project/project_clear.html

@@ -41,7 +41,8 @@
                                         <input type="text" class="form-control" style="width: 80px" readonly value="{{.T.allIsTagDataNum}}"></label>
                                     </div>
                                     <div class="col-xs-3 form-group">
-                                        <label class="form-inline">操作：
+                                        <label class="form-inline">&nbsp;操作：
+                                            <input type="button" class="btn btn-danger" onclick="" value="标注">
                                             <input type="button" class="btn btn-info" onclick="dispatchTask('all')" value="分发">
                                             <input type="button" class="btn btn-primary" value="质检">
                                             <input type="button" class="btn btn-success" value="质检结果">
@@ -50,7 +51,7 @@
                                 </div>
                                 <div class="form-group" style="margin-left: 10px">
                                     <div class="col-xs-6" style="width: auto">
-                                        <label class="form-inline">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;达标：
+                                        <label class="form-inline">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;达标：
                                             <input type="text" class="form-control" style="width: 80px" readonly value="{{.T.okAllDataNum}}"></label>
                                         <label class="form-inline" style="margin-left: 20px">已分发：
                                             <input type="text" class="form-control" style="width: 80px" readonly value="{{.T.okIsGiveDataNum}}"></label>
@@ -61,6 +62,7 @@
                                     </div>
                                     <div class="col-xs-3 form-group">
                                         <label class="form-inline">操作：
+                                            <input type="button" class="btn btn-danger" onclick="" value="标注">
                                             <input type="button" class="btn btn-info" onclick="dispatchTask('notag')" value="分发">
                                             <input type="button" class="btn btn-primary" value="质检">
                                             <input type="button" class="btn btn-success" value="质检结果">
@@ -80,6 +82,7 @@
                                     </div>
                                     <div class="col-xs-3 form-group">
                                         <label class="form-inline">操作：
+                                            <input type="button" class="btn btn-danger" onclick="" value="标注">
                                             <input type="button" class="btn btn-info" onclick="dispatchTask('tag')" value="分发">
                                             <input type="button" class="btn btn-primary" value="质检">
                                             <input type="button" class="btn btn-success" value="质检结果">
@@ -89,7 +92,13 @@
 
                             </div>
                         </div>
-
+                        <div id="status-div" class="col-xs-9">
+                            <select class="form-control selectpicker" id="pushModelSelect">
+                                <option value=-1>全部</option>
+                                <option value=0>开启</option>
+                                <option value=1>关闭</option>
+                            </select>
+                        </div>
                         <hr>
                         <div class="form-horizontal">
                             <div class="box-body margin">
@@ -218,13 +227,13 @@
                         }else if (row['i_starttime'] && row['i_completetime'] === undefined) {
                             let dt = new Date()
                             dt.setTime(parseInt(row['i_starttime']) * 1000);
-                            str = dt.format("yyyy-MM-dd") + " - 未结束"
+                            str = dt.format("yyyy-MM-dd hh:mm:ss") + " - 未结束"
                         }else {
                             let dt = new Date()
                             let ds = new Date()
                             dt.setTime(parseInt(row['i_starttime']) * 1000);
                             ds.setTime(parseInt(row["i_completetime"]) * 1000)
-                            str = dt.format("yyyy-MM-dd") + " - " + ds.format("yyyy-MM-dd")
+                            str = dt.format("yyyy-MM-dd hh:mm:ss") + " - " + ds.format("yyyy-MM-dd hh:mm:ss")
                         }
                         return str
                     }
@@ -241,7 +250,10 @@
                         return tmp
                     }
                 }
-            ]
+            ],
+            "initComplete": function () {
+                $("#dataTable_filter").append($('#status-div'))
+            }
         });
 
         $.ajax({

src/web/templates/project/project_list.html

@@ -27,8 +27,9 @@
                                 </div>
                             </div>
                         </div>
-                        <div class="col-xs-12">
-                            <select class="selectpicker" id="pushModelSelect">
+
+                        <div id="status-div" class="col-xs-9">
+                            <select class="form-control selectpicker" id="pushModelSelect">
                                 <option value=-1>全部</option>
                                 <option value=0>开启</option>
                                 <option value=1>关闭</option>
@@ -274,24 +275,24 @@
                 {"data": "s_departname", width: "4%"},
                 {"data": "s_rulename", width: "4%"},
                 {"data": "s_name", width: "4%"},
-                {"data": "s_personname", width: "4%", "defaultContent": ""},
-                {"data": "i_importnum", width: "4%"},
+                {"data": "s_personname", width: "3%", "defaultContent": ""},
+                {"data": "i_importnum", width: "2%"},
                 {"data": "s_status", width: "4%"},
                 {
-                    "data": "_id", width: "4%", render: function (val, a, row) {
+                    "data": "_id", width: "5%", render: function (val, a, row) {
                         let str = ""
                         if (row['i_starttime'] === undefined) {
                             str = "未开始"
                         }else if (row['i_starttime'] && row['i_completetime'] === undefined) {
                             let dt = new Date()
                             dt.setTime(parseInt(row['i_starttime']) * 1000);
-                            str = dt.format("yyyy-MM-dd") + " - 未结束"
+                            str = dt.format("yyyy-MM-dd hh:mm:ss") + " - 未结束"
                         }else {
                             let dt = new Date()
                             let ds = new Date()
                             dt.setTime(parseInt(row['i_starttime']) * 1000);
                             ds.setTime(parseInt(row["i_completetime"]) * 1000)
-                            str = dt.format("yyyy-MM-dd") + " - " + ds.format("yyyy-MM-dd")
+                            str = dt.format("yyyy-MM-dd hh:mm:ss") + " - " + ds.format("yyyy-MM-dd hh:mm:ss")
                         }
                         return str
                     }
@@ -301,19 +302,21 @@
                         tmp = '<div>' +
                             '<a class="btn btn-sm btn-primary" onclick="editPro(\'' + pos.row + '\')">编辑</a>&nbsp;&nbsp;' +
                             '<a class="btn btn-sm btn-warning" onclick="clearPro(\''+ pos.row +'\')">清洗</a>&nbsp;&nbsp;' +
-                            '<a class="btn btn-sm btn-info" onclick="del(\'' + val + '\')">判重</a>&nbsp;&nbsp;' +
+                            '<a class="btn btn-sm btn-info" onclick="">质检</a>&nbsp;&nbsp;' +
                             '<a class="btn btn-sm btn-default" href="">完成</a>&nbsp;&nbsp;<br>' +
                             '<div style="margin-top: 5px">' +
                             '<a class="btn btn-sm btn-primary" href="">上传</a>&nbsp;&nbsp;' +
                             '<a class="btn btn-sm btn-primary" href="">下载</a>&nbsp;&nbsp;' +
-                            '<a class="btn btn-sm btn-primary" href="">扣费</a>&nbsp;&nbsp;' +
-                            '<a class="btn btn-sm btn-danger" href="">删除</a>&nbsp;&nbsp;' +
+                            '<a class="btn btn-sm btn-primary" href="">质检结果</a>&nbsp;&nbsp;' +
                             '</div></div>';
                         return tmp
                     }
                 }
-            ]
-        });
+            ],
+            "initComplete": function () {
+                $("#dataTable_filter").append($('#status-div'))
+            }
+        })
 
         $('input[type=radio][name=stype]').change(function () {
             if (this.value === 'coll') {

src/web/templates/project/task_detail.html

@@ -47,6 +47,13 @@
                             </div>
                         </div>
                         <hr>
+                        <div id="status-div" class="col-xs-9">
+                            <select class="form-control selectpicker" id="pushModelSelect">
+                                <option value=-1>全部</option>
+                                <option value=0>开启</option>
+                                <option value=1>关闭</option>
+                            </select>
+                        </div>
                         <div class="form-horizontal">
                             <div class="box-body margin">
                                 <h3><i class="glyphicon glyphicon-tasks" style="margin-right: 6px"></i>数据清洗任务列表
@@ -145,6 +152,7 @@
     menuActive("task/list");
 
     let grouptaskid = {{ .T.grouptaskid }}
+    let isNotGiveNum = {{ .T.isNotGiveNum }}
     let userList = []
     let stype = "man"
 
@@ -202,12 +210,15 @@
                         tmp = '<div>' +
                             '<a class="btn btn-sm btn-primary" onclick="retrieveTask(\''+val+'\',\''+row.s_sourceinfo+'\',\''+row.s_status+'\')">收回</a>&nbsp;&nbsp;' +
                             '<a class="btn btn-sm btn-warning">质检</a>&nbsp;&nbsp;' +
-                            '<a class="btn btn-sm btn-info" onclick="">关闭</a>&nbsp;&nbsp;' +
+                            '<a class="btn btn-sm btn-info" onclick="closeTask(\'' + val + '\',\'' + row.s_status + '\')">关闭</a>&nbsp;&nbsp;' +
                             '</div>';
                         return tmp
                     }
                 }
-            ]
+            ],
+            "initComplete": function () {
+                $("#dataTable_filter").append($('#status-div'))
+            }
         });
 
         $.ajax({
@@ -251,7 +262,11 @@
         document.getElementById("modal-form-task").reset();
     }
 
-    function dispatchTask(val) {
+    function dispatchTask() {
+        if (isNotGiveNum === 0) {
+            showTip("没有可分发的数据")
+            return
+        }
         $('#modal-create-task').modal('show')
         let text = document.getElementById("modal-user-num");
         text.setAttribute("max", userList.length.toString())
@@ -380,4 +395,20 @@
             showTip("操作不允许")
         }
     }
+    function closeTask(val, status) {
+        showConfirm("确认要关闭当前任务吗？", function () {
+            $.ajax({
+                url: "",
+                type: 'POST',
+                data: {"s_status": status, "id": val},
+                success: function (r) {
+                    if (r.success) {
+                        ttable.api().ajax.reload()
+                    } else {
+                        showTip(r.msg);
+                    }
+                }
+            })
+        })
+    }
 </script>

src/web/templates/user/user_group.html

@@ -21,25 +21,6 @@
 
                         <div class="form-horizontal">
                             <div class="box-body">
-                                <div class="form-group">
-                                    <label class="col-sm-1 control-label">用户组名称</label>
-                                    <div class="col-sm-2">
-                                        <input type="text" class="form-control" id="customername" placeholder="公司名称" required>
-                                    </div>
-                                    <label class="col-sm-1 control-label">状态</label>
-                                    <div class="col-sm-2">
-                                        <select class="form-control selectpicker" id="pushModelSelect">
-                                            <option value=-1>全部</option>
-                                            <option value=0>开启</option>
-                                            <option value=1>关闭</option>
-                                        </select>
-                                    </div>
-                                    <div class="col-sm-2">
-                                        <a class="btn btn-sm btn-success margin-r-5" onclick="">查询</a>
-                                        <a class="btn btn-sm btn-default" onclick="">取消</a>
-                                    </div>
-                                </div>
-
                                 <div class="form-group" style="margin-left: 20px">
                                     <a class="btn btn-sm btn-success margin" href="/front/group/new"><i class="fa fa-fw fa-plus fa-lg"></i>新建用户组</a>
                                     <a class="btn btn-sm btn-default margin" onclick="bulkSetup(true)">批量开启</a>
@@ -47,7 +28,13 @@
                                 </div>
                             </div>
                         </div>
-
+                        <div id="status-div" class="col-xs-9">
+                            <select class="form-control selectpicker" id="pushModelSelect">
+                                <option value=-1>全部</option>
+                                <option value=0>开启</option>
+                                <option value=1>关闭</option>
+                            </select>
+                        </div>
                         <table id="dataTable" class="table table-bordered table-hover">
                             <thead>
                             <tr>
@@ -81,7 +68,7 @@
         ttable = $('#dataTable').dataTable({
             "paging": true,
             "lengthChange": false,
-            "searching": false,
+            "searching": true,
             "ordering": false,
             "info": true,
             "autoWidth": false,
@@ -89,7 +76,7 @@
             "ajax": {
                 "url": "/front/group",
                 "type": "post",
-                "data": {"ids": ""}
+                "data": {}
             },
             "language": {
                 "url": "/dist/js/dataTables.chinese.lang"
@@ -108,7 +95,7 @@
                 // });
             },
             "columns": [
-                {"data": "", width: "1%", render: function() {
+                    {"data": "", width: "1%", render: function() {
                         return `<input type="checkbox" name="ckb-keyid" onclick="singleSelect(this)" style="text-align: center">`
                     }},
                 {"data": "s_name", width: "15%"},
@@ -140,8 +127,12 @@
                           '</div>';
                       return tmp
                 }}
-            ]
+            ],
+            "initComplete": function () {
+                $("#dataTable_filter").append($('#status-div'))
+            }
         });
+
     });
 
     function setupState(id, v) {