no message

src/front/user.go

@@ -481,12 +481,12 @@ func (f *Front) UserTaskSave() {
 func (f *Front) UserTaskList() {
 	defer qu.Catch()
 	user := f.GetSession("user").(map[string]interface{})
-	s_personid := qu.ObjToString(user["_id"])
+	s_personid := qu.ObjToString(user["id"])
 	if f.Method() == "POST" {
 		start, _ := f.GetInteger("start")
 		limit, _ := f.GetInteger("length")
 		draw, _ := f.GetInteger("draw")
-		status := f.GetString("s_status")
+		status := f.GetString("status")
 		searchStr := f.GetString("search[value]")
 		search := strings.TrimSpace(searchStr)
 		query := map[string]interface{}{

src/web/templates/project/project_clear.html

@@ -240,7 +240,7 @@
                 {
                     "data": "_id", width: "11%", render: function (val, a, row, pos) {
                         tmp = '<div>' +
-                            '<a class="btn btn-sm btn-primary" href="/front/user/task/list?grouptaskid=' + val + '&s_sourceinfo='+row.s_sourceinfo+'">查看</a>&nbsp;&nbsp;' +
+                            '<a class="btn btn-sm btn-primary" href="/front/group/user/task/list?grouptaskid=' + val + '&s_sourceinfo='+row.s_sourceinfo+'">查看</a>&nbsp;&nbsp;' +
                             '<a class="btn btn-sm btn-warning" onclick="retrieveTask(\''+val+'\',\''+row.s_sourceinfo+'\',\''+row.s_status+'\')">收回</a>&nbsp;&nbsp;' +
                             '<a class="btn btn-sm btn-info">质检</a>&nbsp;&nbsp;' +
                             '<a class="btn btn-sm btn-info" onclick="repulseTask(\''+val+'\',\''+row.s_sourceinfo+'\',\''+row.s_status+'\')">打回</a>&nbsp;&nbsp;' +

src/web/templates/project/task_detail.html

@@ -220,7 +220,7 @@
         });
 
         $.ajax({
-            url: "/front/user/task/list",
+            url: "/front/group/user/task/list",
             type: "POST",
             data: {"grouptaskid": grouptaskid, "s_status": "-1", "s_login": "-1"},
             success: function (r) {

src/web/templates/project/task_group_list.html

@@ -112,7 +112,7 @@
                 {
                     "data": "_id", width: "11%", render: function (val, a, row, pos) {
                         tmp = '<div>' +
-                            '<a class="btn btn-sm btn-primary" href="/front/user/task/list?grouptaskid=' + val + '&s_sourceinfo='+row.s_sourceinfo+'">查看</a>&nbsp;&nbsp;' +
+                            '<a class="btn btn-sm btn-primary" href="/front/group/user/task/list?grouptaskid=' + val + '&s_sourceinfo='+row.s_sourceinfo+'">查看</a>&nbsp;&nbsp;' +
                             // '<a class="btn btn-sm btn-warning">分发</a>&nbsp;&nbsp;' +
                             '<a class="btn btn-sm btn-primary">质检</a>&nbsp;&nbsp;' +
                             '<a class="btn btn-sm btn-primary">质检结果</a>&nbsp;&nbsp;' +

src/web/templates/project/task_user_list.html

@@ -18,26 +18,28 @@
             <div class="col-xs-12">
                 <div class="box">
                     <div class="box-body">
-                        <hr>
-                        <div class="form-horizontal">
-                            <div class="box-body margin">
-                                <table id="dataTable" class="table table-bordered table-hover">
-                                    <thead>
-                                    <tr>
-                                        <th></th>
-                                        <th>用户账号</th>
-                                        <th>项目名称</th>
-                                        <th>数据量</th>
-                                        <th>任务状态</th>
-                                        <th>完成进度</th>
-                                        <th>开始时间</th>
-                                        <th>完成时间</th>
-                                        <th>操作</th>
-                                    </tr>
-                                    </thead>
-                                </table>
-                            </div>
+                        <div id="status-div" class="col-xs-1" style="width: auto;float:right;">
+                            <label for="pushModelSelect">状态：
+                                <select class="form-control selectpicker" id="pushModelSelect">
+                                    <option value=-1>全部</option>
+                                    <option value=0>开启</option>
+                                    <option value=1>关闭</option>
+                                </select></label>
                         </div>
+                        <table id="dataTable" class="table table-bordered table-hover">
+                            <thead>
+                            <tr>
+                                <th>序号</th>
+                                <th>项目名称</th>
+                                <th>数据量</th>
+                                <th>任务状态</th>
+                                <th>完成进度</th>
+                                <th>开始时间</th>
+                                <th>完成时间</th>
+                                <th>操作</th>
+                            </tr>
+                            </thead>
+                        </table>
                     </div>
                     <!-- /.box-body -->
                 </div>
@@ -82,110 +84,42 @@
                 });
             },
             "columns": [
-                {"data": "", width: "1%"},
-                {"data": "s_personname", width: "5%"},
+                {"data": null, width: "1%"},
                 {"data": "s_projectname", width: "4%"},
                 {"data": "i_givenum", width: "4%"},
-                {"data": "", width: "4%"},
-                {"data": "", width: "4%"},
-                {"data": "", width: "4%"},
-                {"data": "", width: "4%"},
+                {"data": "s_status", width: "4%"},
+                {"data": "s_progress", width: "4%"},
+                {"data": "i_starttime", width: "4%", render: function (val) {
+                        if (val === undefined) {
+                            return "未开始"
+                        }else {
+                            var dt = new Date()
+                            dt.setTime(parseInt(val) * 1000);
+                            return dt.format("yyyy-MM-dd hh:mm:ss")
+                        }
+                    }},
+                {"data": "i_completetime", width: "4%", render: function (val) {
+                        if (val === undefined) {
+                            return "未完成"
+                        }else {
+                            var dt = new Date()
+                            dt.setTime(parseInt(val) * 1000);
+                            return dt.format("yyyy-MM-dd hh:mm:ss")
+                        }
+                    }},
                 {
                     "data": "_id", width: "11%", render: function (val, a, row, pos) {
                         tmp = '<div>' +
-                            '<a class="btn btn-sm btn-primary" onclick="editPro(\'' + pos.row + '\')">收回</a>&nbsp;&nbsp;' +
-                            '<a class="btn btn-sm btn-warning" href="/front/project/clear?pid=' + val + '">质检</a>&nbsp;&nbsp;' +
-                            '<a class="btn btn-sm btn-info" onclick="del(\'' + val + '\')">关闭</a>&nbsp;&nbsp;' +
+                            '<a class="btn btn-sm btn-primary" onclick="editPro()">标注</a>&nbsp;&nbsp;' +
                             '</div>';
                         return tmp
                     }
                 }
-            ]
-        });
-
-        $('input[type=radio][name=stype]').change(function () {
-            if (this.value === 'coll') {
-                stype = "coll"
-                $("#import-coll").attr("style", "display:block;")
-                $("#import-excel").attr("style", "display:none;")
-            } else if (this.value === 'excel') {
-                stype = "excel"
-                $("#import-coll").attr("style", "display:none;")
-                $("#import-excel").attr("style", "display:block;")
+            ],
+            "initComplete": function () {
+                $("#dataTable_filter").append($('#status-div'))
             }
         });
     });
 
-
-    function del(id) {
-        showConfirm("确定删除该用户组？", function () {
-            $.ajax({
-                url: "",
-                type: 'POST',
-                data: {"id": id},
-                success: function (r) {
-                    if (r.rep) {
-                        ttable.ajax.reload();
-                    } else {
-                        showTip("状态修改失败");
-                    }
-                }
-            })
-        })
-    }
-
-    function createPro() {
-       $("#modal-create-project").modal('show')
-    }
-
-    function cancelModel() {
-        document.getElementById("model-form-project").reset();
-        $("#modal-create-project").modal('hide')
-        $("#modal-edit-project").modal('hide')
-    }
-
-    function editPro(index) {
-        projectmap = ttable.fnGetData()[index]
-        console.log(projectmap)
-        $('#modal-edit-project').modal('show')
-        $('#company-edit-name').val(projectmap["s_entname"])
-        $('#rule-edit-name').val(projectmap["s_rulename"])
-        $('#dpart-edit-name').val(projectmap["s_departname"])
-    }
-
-    function saveData() {
-        stype = "edit"
-        let tmp = projectmap
-        tmp["s_entname"] = $('#company-edit-name').val()
-        tmp["s_rulename"] = $('#rule-edit-name').val()
-        tmp["s_departname"] = $('#dpart-edit-name').val()
-
-        let fieldArr = $('#markFieldSelect').val();
-        let m = {}
-        if (fieldArr.length > 0) {
-            for (const i in fields) {
-                if (fieldArr.indexOf(fields[i]["s_code"]) > -1) {
-                    m[fields[i]["s_code"]] = fields[i]["s_name"]
-                }
-            }
-        }
-        tmp["v_field"] = m
-        if (tmp !== projectmap) {
-            $.ajax({
-                url: "/front/project/save",
-                type: 'POST',
-                data: projectmap,
-                success: function (r) {
-                    if (r.rep) {
-                        ttable.api().ajax.reload();
-                    } else {
-                        showTip("保存失败");
-                    }
-                }
-            })
-        } else {
-            showTip("未做修改");
-        }
-    }
-
 </script>