任务列表更新

src/web/templates/task.html

@@ -230,12 +230,15 @@
 					buttonTag.attr("onclick","tagTask('"+row['s_code']+"','"+row['i_state']+"','"+row['_id']+"','"+row['s_type']+"')");
 					div.find(".btn-group").append(buttonWatch);
 				    div.find(".btn-group").append(buttonClose);
+
+					var buttonAssign=$('<a type="button" class="btn btn-sm btn-warning">分发</a>');
+					buttonAssign.attr("onclick","assignTask('"+row['s_code']+"','"+row['i_state']+"','"+row['_id']+"')");
 					if(row['i_state'] == "0"){
-						var buttonAssign=$('<a type="button" class="btn btn-sm btn-warning">分发</a>');
-						buttonAssign.attr("onclick","assignTask('"+row['s_code']+"','"+row['i_state']+"','"+row['_id']+"')");
 						div.find(".btn-group").append(buttonAssign);
 						div.find(".btn-group").append(buttonTag);
-				 	}
+				 	}else if (row['i_state'] == "1"){
+						div.find(".btn-group").append(buttonTag);
+					}
 					return div.html();
 				}}
 			],
@@ -480,22 +483,22 @@
 
 	//标记任务
 	function tagTask(code,state,id,stype){
-		if(state != 0){
+		if(state != 0 && state != 1){
 			alert("该任务不能被标记！")
 			return
 		}
-	  showConfirm("确定标记任务?",function(){
-		  $.post("/center/spider/tagcode",{"id":id,"code":code,"stype":stype},function(r){
-			  if(r == "y"){
-				  showTip("标记成功", 1000);
-				  $('#com-alert').on('hidden.bs.modal', function () {
-					  ttabletask.ajax.reload();
-				  })
-			  }else{
-				  showTip("标记失败", 1000);
-			  }
-		  })
-	  })
+		showConfirm("确定标记任务?",function(){
+			$.post("/center/spider/tagcode",{"id":id,"code":code,"stype":stype},function(r){
+				if(r == "y"){
+					showTip("标记成功", 1000);
+					$('#com-alert').on('hidden.bs.modal', function () {
+						ttabletask.ajax.reload();
+					})
+				}else{
+					showTip("标记失败", 1000);
+				}
+			})
+		})
 	}
 
 	//批量分发