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

src/web/templates/project/project_clear.html

@@ -142,10 +142,6 @@
                                     </label>
                                 </div>
                                 <hr>
-                                <div style="margin-left: 15px;">
-                                    <label>分发信息：</label>
-                                    <input type="button" class="btn btn-info btn-sm" onclick="addTaskSelect()" value="新增">
-                                </div>
                                 <div></div>
                                 <div id="TaskDiv">
                                     <div id="itemDiv" class="form-group" style="margin-left: 10px;display: none">
@@ -157,6 +153,7 @@
                                         <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>
@@ -333,10 +330,11 @@
             arr.push(tmp)
         })
         console.log(arr)
+
         $.ajax({
             url: "/front/project/task/save",
             type: 'POST',
-            data: {"s_projectid": projectid, "s_group": JSON.stringify(arr), "s_type": stype},
+            data: {"grouptaskid": projectid, "s_group": JSON.stringify(arr), "s_type": stype},
             success: function (r) {
                 if (r.success) {
                     location.reload()

src/web/templates/project/task_detail.html

@@ -263,11 +263,12 @@
 
     function saveTask(val) {
 
-
+        let arr = []
+        arr.push({"s_userid": "61a47d76c908d368871f5037", "s_login": "ceshi_1", "i_givenum": 100})
         $.ajax({
             url: "/front/user/task/save",
             type: "POST",
-            data: {"grouptaskid": grouptaskid},
+            data: {"grouptaskid": grouptaskid, "usernums": JSON.stringify(arr)},
             success: function (r) {
                 if (r.data.length > 0) {
                     console.log(r.data)