运行监控中心修改

src/front/spider.go

@@ -1498,36 +1498,42 @@ func (f *Front) LuaList() {
 		search := strings.TrimSpace(searchStr)
 		platform := f.GetString("platform")
 		query := map[string]interface{}{}
-
-		q1 := map[string]interface{}{}
-		q1["$or"] = []interface{}{
-			map[string]interface{}{"code": map[string]interface{}{"$regex": search}},
-			map[string]interface{}{"createuser": map[string]interface{}{"$regex": search}},
-			map[string]interface{}{"param_common.1": map[string]interface{}{"$regex": search}},
+		queryArr := []interface{}{}
+		//搜索条件
+		if search != "" {
+			q1 := map[string]interface{}{}
+			q1["$or"] = []interface{}{
+				map[string]interface{}{"code": map[string]interface{}{"$regex": search}},
+				map[string]interface{}{"createuser": map[string]interface{}{"$regex": search}},
+				map[string]interface{}{"param_common.1": map[string]interface{}{"$regex": search}},
+			}
+			queryArr = append(queryArr, q1)
 		}
+		//爬虫状态
 		q2 := map[string]interface{}{}
 		if state > -1 {
 			q2 = map[string]interface{}{"state": state}
 		} else {
-			q2["$or"] = []interface{}{
-				map[string]interface{}{"state": Sp_state_3},
-				map[string]interface{}{"state": Sp_state_5},
-				map[string]interface{}{"state": Sp_state_6},
+			q2 = map[string]interface{}{
+				"state": map[string]interface{}{
+					"$in": []int{Sp_state_3, Sp_state_5, Sp_state_6},
+				},
 			}
 		}
+		queryArr = append(queryArr, q2)
+		//爬虫节点
 		q3 := map[string]interface{}{}
 		if event > -1 {
 			q3 = map[string]interface{}{"event": event}
+			queryArr = append(queryArr, q3)
 		}
+		//爬虫平台
 		q4 := map[string]interface{}{}
 		if platform != "-1" {
 			q4 = map[string]interface{}{"platform": platform}
+			queryArr = append(queryArr, q4)
 		}
-		if search != "" {
-			query["$and"] = []interface{}{q1, q2, q3, q4}
-		} else {
-			query["$and"] = []interface{}{q2, q3, q4}
-		}
+		query["$and"] = queryArr
 		sort := `{"%s":%d}`
 		orderIndex := f.GetString("order[0][column]")
 		orderName := f.GetString(fmt.Sprintf("columns[%s][data]", orderIndex))
@@ -1537,11 +1543,11 @@ func (f *Front) LuaList() {
 		}
 		sort = fmt.Sprintf(sort, orderName, orderType)
 		page := start / 10
-		qu.Debug("query:", query)
 		//luas, _ := u.MgoE.Find("luaconfig", query, sort, list_fields, false, start, limit)
 		//count := u.MgoE.Count("luaconfig", query)
 		luas, _ := u.MgoEB.Find("luaconfig", query, sort, list_fields, false, start, limit)
 		count := u.MgoEB.Count("luaconfig", query)
+		qu.Debug("query:", query, start, limit, count, len(*luas))
 		for k, v := range *luas {
 			v["num"] = k + 1 + page*10
 			l_uploadtime := qu.Int64All(v["l_uploadtime"])

src/web/templates/lualist.html

@@ -27,11 +27,7 @@
                         <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>
@@ -52,7 +48,7 @@
                     "url": "/js/dataTables.chinese.lang"
                 },
                 "columnDefs": [
-                    { "orderable": false, "targets": [0,1,2,3,4,6,7,8,9,10,11,12] },
+                    { "orderable": false, "targets": [0,1,2,3,4,6,7,8,9] },
                 ],
                 "order": [[5,"desc"]],
                 "processing":true,
@@ -135,13 +131,6 @@
                             }
                             return "<a href='javascript:void(0)' title='审核时间："+val+",核对时间："+row.l_checktime+"'>"+sval+"</a>"
                         }},
-                    { "data": "modifytime",render:function(val,a,row){
-                            sval=val;
-                            if(sval.length>11){
-                                sval=sval.substr(11,sval.length);
-                            }
-                            return "<a href='javascript:void(0)' title='"+val+","+row.lstate+"'>"+sval+"</a>"
-                        }},
                     { "data": "event",render:function(val,a,row){
                             if(val) {
                                 return "<a href='javascript:void(0)' onclick='changeEvent(\""+row.code+"\")' title='点击修改节点'>"+val+"</a>"
@@ -149,9 +138,6 @@
                                 return "<a href='javascript:void(0)' onclick='changeEvent(\""+row.code+"\")' title='点击修改节点'>-</a>"
                             }
                         }},
-                    { "data": "yesterday"},
-                    { "data": "terday"},
-                    { "data": "lastdowncount"},
                     { "data": "state",render:function(val,a,row){
                             var state=row.state;
                             if(state==0){