Explorar o código

任务界面修改

zhangjinkun %!s(int64=6) %!d(string=hai) anos
pai
achega
00086a5af2

+ 1 - 1
src/github.com/dlclark/regexp2

@@ -1 +1 @@
-Subproject commit 7632a260cbaf5e7594fc1544a503456ecd0827f1
+Subproject commit 902a5ce7a7812e2ba9f73b9d96c09d5136df39cd

+ 0 - 3
src/jy/extract/extract.go

@@ -56,9 +56,6 @@ func RunExtractTestTask(ext *ExtractTask, startId, num string) bool {
 		//list, _ := ext.TaskInfo.DB.Find(ext.TaskInfo.FromColl, query, nil, Fields, false, -1, -1)
 		list, _ := ext.TaskInfo.DB.Find(ext.TaskInfo.FromColl, query, nil, Fields, false, 0, n)
 		for _, v := range *list {
-			if !ext.IsRun {
-				break
-			}
 			j := PreInfo(v)
 			ext.TaskInfo.ProcessPool <- true
 			go ext.ExtractProcess(j)

+ 3 - 2
src/web/templates/admin/task_list.html

@@ -113,8 +113,9 @@ $(function () {
 					}()},
 					{label:"是否统计",s_label:"i_count",type:"tpl_list_local",must:true,list:[{"s_name":"是","_id":1},{"s_name":"否","_id":0}],default:0},
 					{label:"使用版本",s_label:"s_version",type:"tpl_list_local",must:true,url:"/admin/task/getversion"},
-					//{s_label:"_id",type:"tpl_hidden"}
-					{label:"起始id",s_label:"s_extlastid"}
+					{label:"并发数量",s_label:"i_process",placeholder:"5",must:true},
+					{s_label:"_id",type:"tpl_hidden"},
+					{label:"起始id",s_label:"s_extlastid",must:true}
 				];
 				testtask=[
 					{label:"起始id",s_label:"s_startid",must:true},