no message

src/front/project.go

@@ -231,7 +231,7 @@ func (f *Front) ProjectTaskList() {
 	projectid := f.GetString("pid") //项目id
 	qu.Debug("Project Id：", projectid)
 	if f.Method() == "POST" {
-		status := f.GetString("s_status") //任务状态
+		//status := f.GetString("s_status") //任务状态
 		searchStr := f.GetString("search[value]")
 		search := strings.TrimSpace(searchStr)
 		start, _ := f.GetInteger("start")
@@ -241,9 +241,9 @@ func (f *Front) ProjectTaskList() {
 			"s_projectid": projectid,
 			"s_stype":     "group",
 		}
-		if status != "-1" {
-			query["s_status"] = status
-		}
+		//if status != "-1" {
+		//	query["s_status"] = status
+		//}
 		if search != "" {
 			query["$or"] = []interface{}{
 				map[string]interface{}{"s_groupname": map[string]interface{}{"$regex": search}},
@@ -294,6 +294,7 @@ func (f *Front) ProjectTaskList() {
 		qu.Debug("达标量：", okAllDataNum, "达标已分发量：", okIsGiveDataNum, "达标待分发量：", okNotGiveDataNum, "达标已标注量：", okIsTagDataNum)
 		qu.Debug(" 未达标量：", IsNoOkAllDataNum, " 未达标已分发量：", IsNoOkIsGiveDataNum, " 未达标待分发量：", IsNotOkNotGiveDataNum, " 未达标已标注量：", IsNotOkIsTagDataNum)
 		f.T["s_projectid"] = projectid
+		f.T["s_sourceinfo"] = sourceinfo
 		f.T["allDataNum"] = allDataNum
 		f.T["okAllDataNum"] = okAllDataNum
 		f.T["okIsGiveDataNum"] = okIsGiveDataNum
@@ -328,6 +329,7 @@ func (f *Front) ProjectTaskSave() {
 	sourceinfo := f.GetString("s_sourceinfo")                                                   //源数据表
 	sourcetaskinfo := "f_sourcetaskinfo_" + strings.ReplaceAll(sourceinfo, "f_sourceinfo_", "") //任务日志表
 	group := f.GetString("s_group")
+	qu.Debug(group)
 	stype := f.GetString("s_type")
 	if err := json.Unmarshal([]byte(group), &groupArr); err != nil {
 		qu.Debug("GroupInfo Unmarshal Failed：", err)

src/front/user.go

@@ -316,7 +316,7 @@ func (f *Front) UserModify() {
 func (f *Front) GroupList() {
 	qu.Catch()
 	query := map[string]interface{}{"b_delete": false, "i_state": false}
-	field := map[string]interface{}{"s_name": 1}
+	field := map[string]interface{}{"s_name": 1, "s_personname": 1}
 	info, b := Mgo.Find("s_group", query, nil, field, false, -1, -1)
 	if b && len(*info) > 0 {
 		f.ServeJson(map[string]interface{}{

src/web/templates/project/project_clear.html

@@ -40,9 +40,9 @@
                                         <label class="form-inline" style="margin-left: 20px">已标注：
                                         <input type="text" class="form-control" style="width: 80px" readonly value="{{.T.allIsTagDataNum}}"></label>
                                     </div>
-                                    <div class="col-xs-6 form-group">
+                                    <div class="col-xs-3 form-group">
                                         <label class="form-inline">操作：
-                                            <input type="button" class="btn btn-info" onclick="dispatchTak('0')" value="分发">
+                                            <input type="button" class="btn btn-info" onclick="dispatchTak('all')" value="分发">
                                             <input type="button" class="btn btn-primary" value="质检">
                                             <input type="button" class="btn btn-success" value="质检结果">
                                         </label>
@@ -59,9 +59,9 @@
                                         <label class="form-inline" style="margin-left: 20px">已标注：
                                             <input type="text" class="form-control" style="width: 80px" readonly value="{{.T.okIsTagDataNum}}"></label>
                                     </div>
-                                    <div class="col-xs-6 form-group">
+                                    <div class="col-xs-3 form-group">
                                         <label class="form-inline">操作：
-                                            <input type="button" class="btn btn-info" onclick="dispatchTak('1')" value="分发">
+                                            <input type="button" class="btn btn-info" onclick="dispatchTak('notag')" value="分发">
                                             <input type="button" class="btn btn-primary" value="质检">
                                             <input type="button" class="btn btn-success" value="质检结果">
                                         </label>
@@ -78,9 +78,9 @@
                                         <label class="form-inline" style="margin-left: 20px">已标注：
                                             <input type="text" class="form-control" style="width: 80px" readonly value="{{.T.IsNotOkIsTagDataNum}}"></label>
                                     </div>
-                                    <div class="col-xs-6 form-group">
+                                    <div class="col-xs-3 form-group">
                                         <label class="form-inline">操作：
-                                            <input type="button" class="btn btn-info" onclick="dispatchTak('2')" value="分发">
+                                            <input type="button" class="btn btn-info" onclick="dispatchTak('tag')" value="分发">
                                             <input type="button" class="btn btn-primary" value="质检">
                                             <input type="button" class="btn btn-success" value="质检结果">
                                         </label>
@@ -151,12 +151,12 @@
                                     <div id="itemDiv" class="form-group" style="margin-left: 10px;display: none">
                                         <select id="group-select-clone"></select>
                                         <label class="control-label form-inline" style="margin-left: 20px">数据量(条)：
-                                            <input type="number" class="form-control"></label>
+                                            <input type="number" class="form-control" required></label>
                                     </div>
-                                    <div class="form-group" style="margin-left: 10px;">
+                                    <div class="form-group itemDiv" style="margin-left: 10px;">
                                         <select class="selectpicker" id="group-select"></select>
                                         <label class="control-label form-inline" style="margin-left: 20px">数据量(条)：
-                                            <input type="number" class="form-control by-use"></label>
+                                            <input type="number" class="form-control by-use" required></label>
                                     </div>
                                 </div>
                             </div>
@@ -172,72 +172,14 @@
     </div><!-- /.modal -->
 </div>
 
-
-<div class="modal fade" id="modal-edit-project" 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" enctype="multipart/form-data">
-                            <div class="box-body">
-                                <div class="form-group">
-                                    <label class="col-sm-3 control-label">公司名称</label>
-                                    <div class="col-sm-5">
-                                        <input type="text" class="form-control" id="company-edit-name" readonly>
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <label class="col-sm-3 control-label">部门名称</label>
-                                    <div class="col-sm-5">
-                                        <input type="text" class="form-control" id="dpart-edit-name">
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <label class="col-sm-3 control-label">规则名称</label>
-                                    <div class="col-sm-5">
-                                        <input type="text" class="form-control" id="rule-edit-name">
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <label class="col-sm-3 control-label">售后人员</label>
-                                    <div class="col-sm-6">
-                                        <input type="text" class="form-control" id="edit-person">
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <label class="col-sm-3 control-label">选择标注字段</label>
-                                    <div class="col-sm-6">
-                                        <select class="form-control selectpicker" multiple
-                                                id="markFieldSelect"></select>
-                                    </div>
-                                </div>
-                            </div>
-                        </form>
-                    </div>
-                </div>
-            </div>
-            <div class="modal-footer">
-                <input type="button" onclick="saveData()" class="btn btn-primary saveBtn" value="保存">
-                <input type="button" onclick="cancelModel()" class="btn btn-default" value="取消">
-            </div>
-        </div>
-    </div><!-- /.modal -->
-</div>
-
-
 {{include "com/footer.html"}}
 <script>
     menuActive("project");
 
     let projectid = {{ .T.s_projectid }}
     let groupList = []
+    let tableData = []
+    let stype = ""                                  // 分发类型：所有数据:all 达标数据：notag 未达标：tag
 
     $(function () {
         ttable = $('#dataTable').dataTable({
@@ -247,12 +189,6 @@
             "ordering": false,
             "info": true,
             "autoWidth": false,
-            "serverSide": true,
-            // "ajax": {
-            //     "url": "/front/project/task/list",
-            //     "type": "post",
-            //     "data": {"status": "-1"}
-            // },
             "language": {
                 "url": "/dist/js/dataTables.chinese.lang"
             },
@@ -295,9 +231,12 @@
         $.ajax({
             url: "/front/project/task/list",
             type: "POST",
-            data: {"pid`": projectid},
+            data: {"pid": projectid},
             success: function (r) {
-                console.log(r)
+                if (r.data.length > 0) {
+                    ttable.fnClearTable();
+                    ttable.fnAddData(r.data);
+                }
             }
         })
         $.ajax({
@@ -321,7 +260,7 @@
                 data: {"id": id},
                 success: function (r) {
                     if (r.rep) {
-                        ttable.ajax.reload();
+
                     } else {
                         showTip("状态修改失败");
                     }
@@ -330,22 +269,8 @@
         })
     }
 
-    function saveData() {
-        $.ajax({
-            url: "",
-            type: 'POST',
-            data: projectmap,
-            success: function (r) {
-                if (r.rep) {
-                    ttable.api().ajax.reload();
-                } else {
-                    showTip("保存失败");
-                }
-            }
-        })
-    }
-
     function dispatchTak(val) {
+        stype = val
         $('#modal-create-task').modal('show')
         for (var i in groupList) {
             var opt = document.createElement('option');
@@ -378,6 +303,7 @@
     }
 
     function saveTask() {
+        console.log(stype)
         $('#TaskDiv select').each(function () {
             let ms = $(this).find("option:checked").val()
             console.log(ms)
@@ -387,6 +313,22 @@
             let ms = $(this).val()
             console.log(ms)
         })
+
+        let arr = []
+        arr.push({"s_groupid": "61a47d76c908d368871f5033", "s_groupname": "ceshi", "s_personname": "111", "i_givenum": 100})
+        console.log(JSON.stringify(arr))
+        $.ajax({
+            url: "/front/project/task/save",
+            type: 'POST',
+            data: {"s_projectid": projectid, "s_group": JSON.stringify(arr), "s_type": stype},
+            success: function (r) {
+                if (r.success) {
+                    location.reload()
+                } else {
+                    showTip(r.msg);
+                }
+            }
+        })
     }
 
 </script>