no message

src/front/group.go

@@ -21,7 +21,7 @@ func (f *Front) GroupTaskListByGroup() {
 		start, _ := f.GetInteger("start")
 		limit, _ := f.GetInteger("length")
 		draw, _ := f.GetInteger("draw")
-		status := f.GetString("status")
+		status := f.GetString("s_status")
 		searchStr := f.GetString("search[value]")
 		search := strings.TrimSpace(searchStr)
 		user := f.GetSession("user").(map[string]interface{})

src/front/user.go

@@ -487,7 +487,7 @@ func (f *Front) UserTaskList() {
 		start, _ := f.GetInteger("start")
 		limit, _ := f.GetInteger("length")
 		draw, _ := f.GetInteger("draw")
-		status := f.GetString("status")
+		status := f.GetString("s_status")
 		searchStr := f.GetString("search[value]")
 		search := strings.TrimSpace(searchStr)
 		query := map[string]interface{}{

src/web/templates/project/project_clear.html

@@ -10,7 +10,7 @@
         </h1>
         <ol class="breadcrumb">
             <li><a href="/front/project"><i class="fa fa-dashboard"></i> 项目列表</a></li>
-            <li><a href="#"><i class="fa fa-dashboard"></i> 项目清洗</a></li>
+            <li><a href="#"><i class="fa fa-dashboard"></i> 项目分发</a></li>
         </ol>
     </section>
     <!-- Main content -->

src/web/templates/project/task_detail.html

@@ -9,7 +9,9 @@
             <small></small>
         </h1>
         <ol class="breadcrumb">
-            <li><a href="#"><i class="fa fa-dashboard"></i> 任务列表</a></li>
+            <li><a href="#"><i class="fa fa-dashboard"></i> 项目分发</a></li>
+            <li><a href="#"><i class="fa fa-dashboard"></i> 任务分发</a></li>
+
         </ol>
     </section>
     <!-- Main content -->

src/web/templates/project/task_group_list.html

@@ -19,11 +19,13 @@
                 <div class="box">
                     <div class="box-body">
                         <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>
+                            <label for="statusSelect">状态：
+                                <select class="form-control selectpicker" id="statusSelect">
+                                    <option value="-1">全部</option>
+                                    <option value="未开始">未开始</option>
+                                    <option value="进行中">进行中</option>
+                                    <option value="已完成">已完成</option>
+                                    <option value="已关闭">已关闭</option>
                                 </select></label>
                         </div>
                         <table id="dataTable" class="table table-bordered table-hover">
@@ -65,8 +67,7 @@
             "serverSide": true,
             "ajax": {
                 "url": "/front/group/task/list",
-                "type": "post",
-                "data": {"status": "-1"}
+                "type": "post"
             },
             "language": {
                 "url": "/dist/js/dataTables.chinese.lang"
@@ -124,9 +125,14 @@
             ],
             "initComplete": function () {
                 $("#dataTable_filter").append($('#status-div'))
+            },
+            "fnServerParams": function (e) {
+                e.s_status = $("#statusSelect option:selected").val()
             }
         });
-
+        $('#statusSelect').on('changed.bs.select', function () {
+            ttable.api().ajax.reload();
+        })
     });
 
     function deliverTask(id, status) {

src/web/templates/project/task_list.html

@@ -152,6 +152,7 @@
             },
             "fnServerParams": function (e) {
                 e.s_status = $("#statusSelect option:selected").val()
+
             }
         });
 
@@ -215,7 +216,13 @@
 
     function exportTask() {
 
-        const search = $("[type=search]").val();
+        let search = $("[type=search]").val();
+        let st = $('#starttime').datepicker('getDate')
+        let et = $('#endtime').datepicker('getDate')
+        if (st === null) {
+            
+            return
+        }
         let s = $('#starttime').datepicker('getDate').toLocaleDateString()
         let sc = Date.parse(new Date(s).toString())/1000
         console.log(s, sc)

src/web/templates/project/task_user_list.html

@@ -19,11 +19,13 @@
                 <div class="box">
                     <div class="box-body">
                         <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>
+                            <label for="statusSelect">状态：
+                                <select class="form-control selectpicker" id="statusSelect">
+                                    <option value="-1">全部</option>
+                                    <option value="未开始">未开始</option>
+                                    <option value="进行中">进行中</option>
+                                    <option value="已完成">已完成</option>
+                                    <option value="已关闭">已关闭</option>
                                 </select></label>
                         </div>
                         <table id="dataTable" class="table table-bordered table-hover">
@@ -64,8 +66,7 @@
             "serverSide": true,
             "ajax": {
                 "url": "/front/user/task/list",
-                "type": "post",
-                "data": {"status": "-1"}
+                "type": "post"
             },
             "language": {
                 "url": "/dist/js/dataTables.chinese.lang"
@@ -118,8 +119,14 @@
             ],
             "initComplete": function () {
                 $("#dataTable_filter").append($('#status-div'))
+            },
+            "fnServerParams": function (e) {
+                e.s_status = $("#statusSelect option:selected").val()
             }
         });
+        $('#statusSelect').on('changed.bs.select', function () {
+            ttable.api().ajax.reload();
+        })
     });
 
 </script>