Selaa lähdekoodia

新增重点爬虫列表

mxs 1 vuosi sitten
vanhempi
commit
44b18ebd19

+ 1 - 0
src/taskManager/taskManager.go

@@ -1078,6 +1078,7 @@ func (t *TaskM) CreateRelateTask() {
 	relatecode := t.GetString("relatecode")
 	task, _ := u.MgoEB.FindById("task", taskid, nil)
 	(*task)["s_code"] = relatecode
+	(*task)["i_event"] = 7000
 	//关闭原有关联爬虫任务
 	u.MgoEB.Update("task",
 		map[string]interface{}{

+ 36 - 29
src/web/templates/head.html

@@ -630,21 +630,24 @@
 <!--		  	  <li data="index_sitetask"><a href="/center/sitetask"><i class="glyphicon glyphicon-modal-window"></i> <span>网站任务管理</span></a></li>-->
 <!--		  {{end}}-->
 
-		  <li class="treeview">
-			  <a href="#"><i class="glyphicon glyphicon-tasks"></i> <span>任务管理</span>
-				  <span class="pull-right-container">
-					  <i class="fa fa-angle-left pull-right"></i>
-				  </span>
-			  </a>
-			  <ul class="treeview-menu">
-				  <li><a href="/center/managerTask"><i class="fa fa-circle-o"></i>日常任务</a></li>
-				  {{if eq (session "identity") 1}}
-				  <li><a href="/center/sitetask"><i class="fa fa-circle-o"></i>重点任务</a></li>
-				  {{end}}
-				  <!--				  <li><a href="/center/sitetask"><i class="fa fa-circle-o"></i>角色管理</a></li>-->
-			  </ul>
-		  </li>
-
+<!--		  <li class="treeview">-->
+<!--			  <a href="#"><i class="glyphicon glyphicon-tasks"></i> <span>任务管理</span>-->
+<!--				  <span class="pull-right-container">-->
+<!--					  <i class="fa fa-angle-left pull-right"></i>-->
+<!--				  </span>-->
+<!--			  </a>-->
+<!--			  <ul class="treeview-menu">-->
+<!--				  <li><a href="/center/managerTask"><i class="fa fa-circle-o"></i>日常任务</a></li>-->
+<!--				  {{if eq (session "identity") 1}}-->
+<!--				  <li><a href="/center/sitetask"><i class="fa fa-circle-o"></i>重点任务</a></li>-->
+<!--				  {{end}}-->
+<!--				  &lt;!&ndash;				  <li><a href="/center/sitetask"><i class="fa fa-circle-o"></i>角色管理</a></li>&ndash;&gt;-->
+<!--			  </ul>-->
+<!--		  </li>-->
+		  <li data="index"><a href="/center/managerTask"><i class="glyphicon glyphicon-tasks"></i> <span>日常任务</span></a></li>
+		  {{if eq (session "identity") 1}}
+		  <li data="index"><a href="/center/sitetask"><i class="glyphicon glyphicon-align-justify"></i> <span>重点任务</span></a></li>
+		  {{end}}
 			<li data="index_fbgl"><a href="/center/lualist.html"><i class="glyphicon glyphicon-credit-card"></i> <span>运行监控中心</span></a></li>
 		    <li data="index_pcdr"><a href="/center/importdata"><i class="glyphicon glyphicon-import"></i> <span>爬虫导入</span></a></li>
 		    <li data="index_pcqy"><a href="/center/luamove"><i class="glyphicon glyphicon-move"></i> <span>爬虫迁移管理</span></a></li>
@@ -677,20 +680,24 @@
 <!--			  </ul>-->
 <!--		  </li>-->
 		  <li data="index"><a href="/center"><i class="glyphicon glyphicon-eye-open"></i> <span>脚本列表</span></a></li>
-		  <li class="treeview">
-			  <a href="#"><i class="glyphicon glyphicon-tasks"></i> <span>任务管理</span>
-				  <span class="pull-right-container">
-					  <i class="fa fa-angle-left pull-right"></i>
-				  </span>
-			  </a>
-			  <ul class="treeview-menu">
-				  <li><a href="/center/mytask"><i class="fa fa-circle-o"></i>日常任务</a></li>
-				  {{if eq (session "identity") 1}}
-				  <li><a href="/center/sitetask"><i class="fa fa-circle-o"></i>重点任务</a></li>
-				  {{end}}
-				  <!--				  <li><a href="/center/sitetask"><i class="fa fa-circle-o"></i>角色管理</a></li>-->
-			  </ul>
-		  </li>
+<!--		  <li class="treeview">-->
+<!--			  <a href="#"><i class="glyphicon glyphicon-tasks"></i> <span>任务管理</span>-->
+<!--				  <span class="pull-right-container">-->
+<!--					  <i class="fa fa-angle-left pull-right"></i>-->
+<!--				  </span>-->
+<!--			  </a>-->
+<!--			  <ul class="treeview-menu">-->
+<!--				  <li><a href="/center/mytask"><i class="fa fa-circle-o"></i>日常任务</a></li>-->
+<!--				  {{if eq (session "identity") 1}}-->
+<!--				  <li><a href="/center/sitetask"><i class="fa fa-circle-o"></i>重点任务</a></li>-->
+<!--				  {{end}}-->
+<!--				  &lt;!&ndash;				  <li><a href="/center/sitetask"><i class="fa fa-circle-o"></i>角色管理</a></li>&ndash;&gt;-->
+<!--			  </ul>-->
+<!--		  </li>-->
+		  <li data="index"><a href="/center/mytask"><i class="glyphicon glyphicon-tasks"></i> <span>日常任务</span></a></li>
+		  {{if eq (session "identity") 1}}
+		  <li data="index"><a href="/center/sitetask"><i class="glyphicon glyphicon-align-justify"></i> <span>重点任务</span></a></li>
+		  {{end}}
 		{{end}}
 
 		{{if eq (session "platform") "golua平台"}}

+ 8 - 5
src/web/templates/sitetask.html

@@ -134,13 +134,16 @@
 				}},
 				{"data": "s_source","width":"3%"},
 				{"data": "s_reason"},
-				{"data": "_id","width":"5%",render:function(val,a,row){
+				{"data": "_id","width":"7%",render:function(val,a,row){
 					var div=$("<div><div class=\"btn-group\"></div></div>");
 					{{if eq (session "auth") 1}}
 						var buttonWatch=$('<a type="button" target="_blank" class="btn btn-sm btn-primary">编辑</a>');
 						buttonWatch.attr("onclick","editSiteTask('"+row['s_spidercode']+"','"+row['encode']+"')");
 						div.find(".btn-group").append(buttonWatch);
 					{{else}}
+						var buttonEdit=$('<a type="button" target="_blank" class="btn btn-sm btn-primary">编辑</a>');
+						buttonEdit.attr("href","/center/spider/edit/"+row["encode"]+"__");
+						div.find(".btn-group").append(buttonEdit);
 						var buttonClose=$('<a type="button" class="btn btn-sm btn-danger">关闭</a>');
 						buttonClose.attr("onclick","closeSiteTask('"+row['_id']+"')");
 						div.find(".btn-group").append(buttonClose);
@@ -301,13 +304,13 @@
 
 	function editSiteTask(code,encode) {
 		$.post("/center/sitetask/edit",{"spidercode":code},function(r){
-			console.log(r)
 			if(r && r.taskid != ""){//有常规任务,跳转任务编辑页
+				var taskid = r.taskid;
 				if(r.relatecode != ""){
-					showConfirm("请注意修改关联爬虫:"+relatecode,  function() {
-						$.get("/center/task/createrelatetask?relatecode="+relatecode+"&id="+id,function(r){
+					showConfirm("请注意修改关联爬虫:"+r.relatecode,  function() {
+						$.get("/center/task/createrelatetask?relatecode="+r.relatecode+"&id="+taskid,function(r){
 							if (r&&r.ok){
-								window.location.href="/center/task/edit/"+r.taskid+"__1";
+								window.location.href="/center/task/edit/"+taskid+"__1";
 							}else{
 								showTip("关联爬虫任务创建失败", 1000, function() {});
 							}

+ 5 - 41
src/web/templates/task.html

@@ -1,5 +1,5 @@
 {{include "head.html"}}
-`<div class="modal fade" id="modal-assigntask" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+<div class="modal fade" id="modal-assigntask" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
     <div class="modal-dialog">
         <div class="modal-content">
 			<div class="modal-header">
@@ -93,14 +93,6 @@
   var assigncode = "";
   var assignid = "";
 	$(function(){
-		// window.setInterval(function(){
-		// 	$.post("/center/task/getJumpMark",function(r){
-		// 		if(r){
-		// 			ttabletask.ajax.reload();
-		// 		}
-		// 	})
-		// }, 3000);
-		
 		taskConst = true;
 		setCookie("task","");
 		ttabletask = $('#task').DataTable({
@@ -114,35 +106,7 @@
        		 },
 			"columnDefs": [
 				{ "targets": 0 ,"bVisible": false}, //隐藏列
-				{ "orderable": false, "targets": [0,1,2,3,4,5,6,7,8,13] }, //设置列不可排序
-				//爬虫挂起
-				// {"targets":[15], createdCell: function (cell, cellData, rowData, rowIndex, colIndex) {
-				// 	var aInput;
-				// 	$(cell).click(function () {
-				// 		if( rowData.i_state == "关闭"||rowData.i_pendstate ==1 ){//任务不能由挂起转为非挂起状态;关闭任务不能挂起操作
-				// 			return
-				// 		}
-				// 		$(this).html(createComboxPendState(rowData.s_code,rowData._id));
-				// 		var aInput = $(this).find(":input");
-				// 		aInput.focus().val(cellData);
-				// 	});
-				// 	$(cell).on("click", ":input", function (e) {
-				// 		e.stopPropagation();
-				// 	});
-				// 	$(cell).on("change", ":input", function () {
-				// 		$(this).blur();
-				// 	});
-				// 	$(cell).on("blur", ":input", function () {
-				// 		var text = $(this).find("option:selected").text();
-				// 		if(text == "否"){
-				// 			text = 0
-				// 		}else if(text == "是"){
-				// 			text = 1
-				// 		}
-				// 		ttabletask.cell(cell).data(text);
-				// 		cellData = text;
-				// 	});
-				// }}
+				{ "orderable": false, "targets": [0,1,2,3,4,5,6,7,8,13] } //设置列不可排序
 			],
 			"order": [[12,"desc"]], //默认排序列
 			"lengthChange":false,
@@ -366,13 +330,13 @@
 			})
    		})
 	})
-  function createComboxPendState(code,id){
+    function createComboxPendState(code,id){
 	  return "<select onchange='changeCodePendState(this.value,\""+code+"\",\""+id+"\")' class='form-control input-sm'>"+
 			  "<option value=1>是</option>"+
 			  "<option value=0>否</option>"+
 			  "</select>"
   };
-  function changeCodePendState(pendstate,code,id){
+    function changeCodePendState(pendstate,code,id){
 	  $.ajax({
 		  url:"/center/spider/updatePendState",
 		  type:"post",
@@ -428,7 +392,7 @@
 		$("#modal-assigntask").modal("hide");
 	}
   
-  function comfirm_disables(){
+    function comfirm_disables(){
     if(assigncode== "" || assignid == ""){
       showTip("分发失败", 1000);
       return