Merge branch 'dev2.0' of http://192.168.3.207:8080/data_processing/data_validation into dev2.0

src/front/user.go

@@ -315,7 +315,7 @@ func (f *Front) UserModify() {
 
 func (f *Front) GroupList() {
 	qu.Catch()
-	query := map[string]interface{}{"b_delete": false, "i_state": false}
+	query := map[string]interface{}{"b_delete": false, "i_state": true}
 	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 {
@@ -331,8 +331,8 @@ func (f *Front) UserList() {
 	if f.Method() == "POST" {
 		user := f.GetSession("user").(map[string]interface{})
 		gid := qu.ObjToString(user["s_groupid"])
-		query := map[string]interface{}{"s_groupid": gid, "b_delete": false, "i_state": false}
-		field := map[string]interface{}{"s_name": 1, "s_personname": 1}
+		query := map[string]interface{}{"s_groupid": gid, "b_delete": false, "i_state": true, "i_role": "3"}
+		field := map[string]interface{}{"s_login": 1, "s_groupid": 1}
 		info, b := Mgo.Find("s_user", query, nil, field, false, -1, -1)
 		if b && len(*info) > 0 {
 			f.ServeJson(map[string]interface{}{

src/web/templates/project/project_clear.html

@@ -332,6 +332,7 @@
             }
             arr.push(tmp)
         })
+        console.log(arr)
         $.ajax({
             url: "/front/project/task/save",
             type: 'POST',

src/web/templates/project/project_list.html

@@ -45,7 +45,6 @@
                                 <th>售后人员</th>
                                 <th>数据量</th>
                                 <th>项目状态</th>
-                                <th>完成进度</th>
                                 <th>项目时间</th>
                                 <th>操作</th>
                             </tr>
@@ -278,7 +277,6 @@
                 {"data": "s_personname", width: "4%", "defaultContent": ""},
                 {"data": "i_importnum", width: "4%"},
                 {"data": "s_status", width: "4%"},
-                {"data": null, width: "4%"},
                 {
                     "data": "_id", width: "4%", render: function (val, a, row) {
                         let str = ""
@@ -480,10 +478,10 @@
             $.ajax({
                 url: "/front/project/qualityAssessment",
                 type: 'POST',
-                data: {"pid": tmp._id},
+                data: {"pid": tmp["_id"]},
                 success: function (r) {
                     if (r.success) {
-                        window.location.href="/front/project/task/list?pid=" + val
+                        window.location.href="/front/project/task/list?pid=" + tmp["_id"]
                     } else {
                         showTip(r.msg);
                     }

src/web/templates/project/task_detail.html

@@ -94,27 +94,39 @@
                             <div class="modal-body modal-task">
                                 <div class="form-group margin-bottom" style="margin-left: 15px">
                                     <label class="control-label form-inline h4">待分发数据总量(条)：
-                                        <span id="modal-num">0</span>
+                                        <span id="modal-num">{{.T.isNotGiveNum}}</span>
                                     </label>
                                 </div>
                                 <hr>
-                                <div style="margin-left: 15px;">
-                                    <label>分发信息：</label>
-                                    <input type="button" class="btn btn-info btn-sm" onclick="addTaskSelect()" value="新增">
+                                <div class="form-group" style="margin-left: 15px">
+                                    <label class="radio-inline">
+                                        <input type="radio" name="stype" value="man" checked>手动分发
+                                    </label>
+                                    <label class="radio-inline">
+                                        <input type="radio" name="stype" value="auto">自动分发
+                                    </label>
                                 </div>
-                                <div></div>
-                                <div id="TaskDiv">
-                                    <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" required></label>
-                                    </div>
-                                    <div class="form-group clone-template" 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" required></label>
+                                <div id="task-man">
+                                    <div id="TaskDiv">
+                                        <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" required></label>
+                                        </div>
+                                        <div class="form-group clone-template" 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" required></label>
+                                            <input type="button" class="btn btn-info btn-sm" onclick="addTaskSelect()" value="新增">
+                                        </div>
                                     </div>
                                 </div>
+                                <div id="task-auto" style="display: none">
+                                    <label class="control-label form-inline" style="margin-left: 20px">用户数量：
+                                        <input type="number" class="form-control by-use" required></label>
+                                    <label class="control-label form-inline" style="margin-left: 20px">数据量(条)：
+                                        <input type="number" class="form-control by-use" required></label>
+                                </div>
                             </div>
                         </form>
                     </div>
@@ -134,6 +146,7 @@
 
     let grouptaskid = {{ .T.grouptaskid }}
     let userList = []
+    let stype = ""
 
     $(function () {
         ttable = $('#dataTable').dataTable({
@@ -182,7 +195,7 @@
         });
 
         $.ajax({
-            url: "/front/project/task/list",
+            url: "/front/user/task/list",
             type: "POST",
             data: {"grouptaskid": grouptaskid},
             success: function (r) {
@@ -199,28 +212,53 @@
             data: {},
             success: function (r) {
                 if (r.rep) {
-                    console.log(userList)
                     userList = r.data
+                    console.log(userList)
                 }
             }
         })
+        $('input[type=radio][name=stype]').change(function () {
+            if (this.value === 'man') {
+                stype = "man"
+                $("#task-man").attr("style", "display:block;")
+                $("#task-auto").attr("style", "display:none;")
+            } else if (this.value === 'auto') {
+                stype = "auto"
+                $("#task-man").attr("style", "display:none;")
+                $("#task-auto").attr("style", "display:block;")
+            }
+        });
     });
 
     function cancelModel() {
-        document.getElementById("model-form-project").reset();
+        $('#TaskDiv .form-group .clone-template').remove()
         $("#modal-create-task").modal('hide')
+        document.getElementById("modal-form-task").reset();
     }
 
     function dispatchTask(val) {
         $('#modal-create-task').modal('show')
-        for (var i in groupList) {
+        for (var i in userList) {
             var opt = document.createElement('option');
-            opt.innerText = groupList[i]["s_name"];
-            opt.value = groupList[i]["_id"];
+            opt.innerText = userList[i]["s_login"];
+            opt.value = userList[i]["_id"];
             $('#group-select')[0].appendChild(opt)
         }
         $("#group-select").selectpicker("refresh");
+    }
 
+    function addTaskSelect() {
+        let tNode = $('#itemDiv').clone().addClass('clone-template').show()
+        let st = $(tNode).find('select')
+        $(st).addClass('selectpicker')
+        for (var i in userList) {
+            var opt = document.createElement('option');
+            opt.innerText = userList[i]["s_login"];
+            opt.value = userList[i]["_id"];
+            $(st)[0].appendChild(opt)
+        }
+        $(st).selectpicker("refresh");
+        $('#TaskDiv').append($(tNode))
     }
 
     function saveTask(val) {