maxiaoshan 4 лет назад
Родитель
Сommit
edb5d86a78
3 измененных файлов с 51 добавлено и 24 удалено
  1. 6 0
      src/front/front.go
  2. 1 1
      src/front/spider.go
  3. 44 23
      src/web/templates/index.html

+ 6 - 0
src/front/front.go

@@ -371,6 +371,7 @@ func (f *Front) LoadIndex() {
 		search := strings.TrimSpace(searchStr)
 		state, _ := f.GetInteger("state")
 		urgency, _ := f.GetInteger("urgency") //节点
+		platform := f.GetString("platform")
 		query := bson.M{}
 		if event > -1 {
 			query["event"] = event
@@ -378,6 +379,9 @@ func (f *Front) LoadIndex() {
 		if urgency > -1 {
 			query["urgency"] = urgency
 		}
+		if platform != "-1" {
+			query["platform"] = platform
+		}
 		if auth == role_examine { //审核员
 			if state > -1 {
 				query["state"] = state
@@ -589,6 +593,7 @@ func (f *Front) Importfile() {
 						} else {
 							o["urgency"] = 0
 						}
+						o["platform"] = cells[9].Value
 						//						table := cells[6].Value
 						//						o["table"] = table
 						//						o["transfercode"] = qu.IntAll(Transfercode[table])
@@ -707,6 +712,7 @@ func pf(o map[string]interface{}) (bool, string) {
 	}
 	param["historyevent"] = qu.IntAll(o["historyevent"])
 	param["spiderhistorymaxpage"] = 1
+	param["platform"] = o["platform"]
 	//qu.Debug("param---", param)
 	issave := spider.SaveSpider(o["code"].(string), param)
 	return issave, one["s_name"].(string)

+ 1 - 1
src/front/spider.go

@@ -1142,7 +1142,7 @@ func IsHasUpState(auth, state int) bool {
 	return rep
 }
 
-var list_fields = `{"_id":1,"code":1,"createuser":1,"modifyuser":1,"modifytime":1,"l_uploadtime":1,"l_checktime":1,"state":1,"param_common":1,"event":1,"urgency":1}`
+var list_fields = `{"_id":1,"code":1,"createuser":1,"modifyuser":1,"modifytime":1,"l_uploadtime":1,"l_checktime":1,"state":1,"param_common":1,"event":1,"urgency":1,"platform":1}`
 
 //脚本管理,结合爬虫运行信息
 func (f *Front) LuaList() {

+ 44 - 23
src/web/templates/index.html

@@ -102,11 +102,12 @@
           				<th>网站名称</th>
           				<th>栏目名称</th>
           				<th>爬虫代码</th>
-                  <th>紧急度</th>
+                  		<th>紧急度</th>
           				<th>节点</th>
           				<th>作者</th>
           				<th>最后修改时间</th>
           				<th>状态</th>
+						<th>平台</th>
                   <th class="hidden-xs">操作</th>
                 </tr>
                 </thead>
@@ -124,8 +125,8 @@ $(function(){
               "url": "/js/dataTables.chinese.lang"
           },
 		"columnDefs": [
-		    { "orderable": false, "targets": [0,10] },
-        {"targets":[6], createdCell: function (cell, cellData, rowData, rowIndex, colIndex) {
+		    { "orderable": false, "targets": [0,10,11] },
+			{"targets":[6], createdCell: function (cell, cellData, rowData, rowIndex, colIndex) {
           {{if gt (session "auth") 2}}
           var aInput;
           $(cell).click(function () {
@@ -146,7 +147,7 @@ $(function(){
           });
           {{end}}
         }},
-        {"targets":[9], createdCell: function (cell, cellData, rowData, rowIndex, colIndex) {
+        	{"targets":[9], createdCell: function (cell, cellData, rowData, rowIndex, colIndex) {
           {{if gt (session "auth") 2}}
           var aInput;
           $(cell).click(function () {
@@ -199,7 +200,7 @@ $(function(){
 			{ "data": "_id",render:function(val,a,row){
 				return "<input type='checkbox' value='"+val+"' name='"+row.param_common[1]+"_"+row.param_common[2]+"' code='"+row.param_common[0]+"'/>"
 			}},
-      { "data": "_id",render:function(val,a,row){
+      		{ "data": "_id",render:function(val,a,row){
 				return row.num
 			}},
 			{ "data": "param_common","width":"200px",render:function(val,a,row){
@@ -222,13 +223,13 @@ $(function(){
 				return val
 			}},
 			{ "data": "code"},
-      { "data": "urgency",render:function(val){
-        if(val==1){
-          return "紧急"
-        }else{
-          return "普通"
-        }
-      }},
+			{ "data": "urgency",render:function(val){
+				if(val==1){
+				  return "紧急"
+				}else{
+				  return "普通"
+				}
+			}},
 			{ "data": "event","width":"50px"},
 			{ "data": "createuser"},
 			{ "data": "modifytime"},
@@ -259,6 +260,7 @@ $(function(){
 				}
 				return val
 			}},
+			{ "data": "platform"},
 			{ "data": "param_common","width":"95px",render:function(val,a,row){
 				var div=$("<div><div class=\"btn-group\"></div></div>")
 				var currentuser="{{session "username"}}";
@@ -319,15 +321,16 @@ $(function(){
 		"fnServerParams": function (e) {  
 			var state=$("#type_state").val()
 			var taskEvent = $("#task_event").val();
-      var urgency = $("#luaurgency").val();
-      //紧急度
-      if(urgency){
+			var urgency = $("#luaurgency").val();
+			var platform = $("#platform").val();
+			//紧急度
+			if(urgency){
 				e.urgency=urgency
 			}else{
 				e.urgency="-1"
 			}
-      //状态
-      if(state){
+		    //状态
+		    if(state){
 				e.state=state
 			}else{
 				e.state="-1"
@@ -338,7 +341,13 @@ $(function(){
 			}else{
 				e.taskEvent="-1";
 			}
-    }
+			//平台
+			if(platform){
+				e.platform=platform
+			}else{
+				e.platform="-1"
+			}
+		}
 	});
 	common.setActive("index");
 	ttable.on('init.dt', function () {
@@ -346,8 +355,8 @@ $(function(){
 		if(search){
 			$("[type=search]").val(search);
 		}
-    
-    var urgency="<div class='form-group'><label for='name'>紧急程度:</label>"+
+    	// 紧急度
+    	var urgency="<div class='form-group'><label for='name'>紧急程度:</label>"+
 			"<select id='luaurgency' onchange='checkclick(this.value)' class='form-control input-sm'>"+
 			"<option value='-1'>全部</option>"+
       "<option value='0'>普通</option>"+
@@ -355,7 +364,7 @@ $(function(){
 			"</select></div>"
 		$("#spider_filter").prepend("&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;");
 		$("#spider_filter").prepend(urgency);
-    
+    	//爬虫状态
 		var opt="<option value='-1'>全部</option>";
 		var opt1="<option value='0'>待完成</option>";	
 		var opt2="<option value='1'>待审核</option>"+
@@ -381,7 +390,7 @@ $(function(){
 			"</select></div>"
 		$("#spider_filter").prepend("&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;");
 		$("#spider_filter").prepend(select);
-		
+		//节点
 		var spiderEvent="<option value='-1'>全部</option>"
 		var events={{.T.events}}
 		for(k in events){
@@ -393,7 +402,19 @@ $(function(){
 			"</select></div>"
 		$("#spider_filter").prepend("&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;");
 		$("#spider_filter").prepend(selectEvent);
-    $("#spider_wrapper .col-sm-6").css({width:"100%"})//样式
+		//平台
+		var platform="<div class='form-group'><label for='name'>平台:</label>"+
+			"<select id='platform' onchange='checkclick(this.value)' class='form-control input-sm'>"+
+			"<option value='-1'>全部</option>"+
+			"<option value='golua平台'>golua平台</option>"+
+			"<option value='python'>python</option>"+
+				"<option value='通用爬虫'>通用爬虫</option>"+
+				"<option value='chrome插件'>chrome插件</option>"+
+			"</select></div>"
+		$("#spider_filter").prepend("&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;");
+		$("#spider_filter").prepend(platform);
+
+    	$("#spider_wrapper .col-sm-6").css({width:"100%"})//样式
 	});
 })