Преглед изворни кода

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

maxiaoshan пре 3 година
родитељ
комит
5bc81065d8

+ 1 - 1
src/front/user.go

@@ -458,7 +458,7 @@ func (f *Front) UserTaskList() {
 		f.T["isNotGiveNum"] = isNotGiveNum
 		f.T["isTagNum"] = isTagNum
 		f.T["isNotTagNum"] = isNotTagNum
-		_ = f.Render("project/task_user_list.html", &f.T)
+		_ = f.Render("project/task_detail.html", &f.T)
 	}
 }
 

+ 2 - 2
src/web/templates/project/project_clear.html

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

+ 15 - 1
src/web/templates/project/project_list.html

@@ -302,7 +302,7 @@
                     "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/task/list?pid=' + val + '">清洗</a>&nbsp;&nbsp;' +
+                            '<a class="btn btn-sm btn-warning" onclick="clearPro(\''+ val +'\')">清洗</a>&nbsp;&nbsp;' +
                             '<a class="btn btn-sm btn-info" onclick="del(\'' + val + '\')">判重</a>&nbsp;&nbsp;' +
                             '<a class="btn btn-sm btn-default" href="">完成</a>&nbsp;&nbsp;<br>' +
                             '<div style="margin-top: 5px">' +
@@ -479,4 +479,18 @@
         }
     }
 
+    function clearPro(val) {
+        $.ajax({
+            url: "/front/project/qualityAssessment",
+            type: 'POST',
+            data: {"pid": val},
+            success: function (r) {
+                if (r.success) {
+                    window.location.href="/front/project/task/list?pid=" + val
+                } else {
+                    showTip(r.msg);
+                }
+            }
+        })
+    }
 </script>

+ 0 - 0
src/web/templates/project/task_list.html → src/web/templates/project/task_detail.html