调整任务中异常数据搜索功能

src/taskManager/taskManager.go

@@ -1132,7 +1132,7 @@ func (t *TaskM) SearchDataInfo() {
 	event, _ := t.GetInteger("event")
 	coll := "spider_warn"
 	if stype == "5" { //下载异常查列表页数据
-		if event == 7100 || event == 7110 || event == 7400 {
+		if event < 7410 && event != 7000 {
 			coll = "spider_highlistdata"
 		} else {
 			coll = "spider_listdata"

src/web/templates/sitelist.html

@@ -331,7 +331,7 @@
      <small>
 <!--			{{if gt (session "auth") 2}}-->
 <!--			<a class="btn btn-default btn-sm" href="/center/spider">新建爬虫</a>-->
-         <a class="btn btn-default btn-sm" id="import" onclick="importSite()">导入</a>
+<!--         <a class="btn btn-default btn-sm" id="import" onclick="importSite()">导入</a>-->
          <a class="btn btn-default btn-sm" id="add" onclick="addSite()">新增</a>
          <a class="btn btn-default btn-sm" onclick="del()">删除</a>
 <!--			{{end}}-->
@@ -395,7 +395,7 @@ $(function(){
               "url": "/js/dataTables.chinese.lang"
           },
 		"columnDefs": [
-		     { "orderable": false, "targets": [0,1,2,4,5,6,7,8,9,10,11,12,13,14,15,16] },
+		     { "orderable": false, "targets": [0,1,2,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18] },
              {"targets":[5], createdCell: function (cell, cellData, rowData, rowIndex, colIndex) {
                 var aInput;
                 $(cell).click(function () {
@@ -624,7 +624,6 @@ $(function(){
     $('#sitelist tbody').on('click', 'td.dt-control', function () {
         var tr = $(this).closest('tr');
         var row = ttable.row(tr);
-
         if (row.child.isShown()) {
             // This row is already open - close it
             row.child.hide();
@@ -637,25 +636,27 @@ $(function(){
     });
 })
 function format_X(d) {
-    if (d.isneedregister == 1){
-        d.isneedregister = "是"
+    var data = Object.assign({},d)
+    data = {...d}
+    if (data.isneedregister == 1){
+        data.isneedregister = "是"
     }else{
-        d.isneedregister = "否"
+        data.isneedregister = "否"
     }
-    if (d.isregistered == 1){
-        d.isregistered = "是"
+    if (data.isregistered == 1){
+        data.isregistered = "是"
     }else{
-        d.isregistered = "否"
+        data.isregistered = "否"
     }
-    if (d.site_status == 1){
-        d.site_status = "正常"
+    if (data.site_status == 1){
+        data.site_status = "正常"
     }else{
-        d.site_status = "异常"
+        data.site_status = "异常"
     }
-    if (d.lasttime != 0){
+    if (data.lasttime != 0){
         var dt = new Date()
-        dt.setTime(parseInt(d.lasttime) * 1000);
-        d.lasttime = dt.format("yyyy-MM-dd");
+        dt.setTime(parseInt(data.lasttime) * 1000);
+        data.lasttime = dt.format("yyyy-MM-dd");
         // d.lasttime = dt.format("yyyy-MM-dd hh:mm:ss");
     }
     return (
@@ -677,51 +678,51 @@ function format_X(d) {
         '</tr>' +
         '<tr>' +
             '<td>' +
-            d.site_status +
+            data.site_status +
             '</td>' +
 
             '<td>' +
-            d.f_area +
+            data.f_area +
             '</td>' +
 
             '<td>' +
-            d.f_city +
+            data.f_city +
             '</td>' +
 
             '<td>' +
-            d.f_district +
+            data.f_district +
             '</td>' +
 
             '<td>' +
-            d.sponsor +
+            data.sponsor +
             '</td>' +
 
             '<td>' +
-            d.site_datanum +
+            data.site_datanum +
             '</td>' +
 
             // '<td>' +
-            // d.period +
+            // data.period +
             // '</td>' +
 
             '<td>' +
-            d.lasttime +
+            data.lasttime +
             '</td>' +
 
             '<td>' +
-            d.isneedregister +
+            data.isneedregister +
             '</td>' +
 
             '<td>' +
-            d.isregistered +
+            data.isregistered +
             '</td>' +
 
             '<td>' +
-            d.account +
+            data.account +
             '</td>' +
 
             '<td>' +
-            d.password +
+            data.password +
             '</td>' +
         '</tr>' +
         '</table>'
@@ -788,22 +789,20 @@ function siteEdit(rowjson){
     //二级类型
     $("#edit-second_type").empty();
     $("#edit-second_type").append("<option value=''>--请选择网站二级类型--</option>");
-    if(row.site_type != ""){
-        for(var k in siteTypesMap){
-            if (row.site_type == k){
-                //一级类型
-                $("#edit-site_type").append("<option selected value='"+k+"'>"+k+"</option>")
-                //二级类型
-                for(i in siteTypesMap[k]){
-                    if ( row.second_type!="" && row.second_type == siteTypesMap[k][i]){
-                        $("#edit-second_type").append("<option selected value='"+siteTypesMap[k][i]+"'>"+siteTypesMap[k][i]+"</option>");
-                    }else{
-                        $("#edit-second_type").append("<option value='"+siteTypesMap[k][i]+"'>"+siteTypesMap[k][i]+"</option>");
-                    }
+    for(var k in siteTypesMap){
+        if (row.site_type == k){
+            //一级类型
+            $("#edit-site_type").append("<option selected value='"+k+"'>"+k+"</option>")
+            //二级类型
+            for(i in siteTypesMap[k]){
+                if ( row.second_type!="" && row.second_type == siteTypesMap[k][i]){
+                    $("#edit-second_type").append("<option selected value='"+siteTypesMap[k][i]+"'>"+siteTypesMap[k][i]+"</option>");
+                }else{
+                    $("#edit-second_type").append("<option value='"+siteTypesMap[k][i]+"'>"+siteTypesMap[k][i]+"</option>");
                 }
-            }else {
-                $("#edit-site_type").append("<option value='"+k+"'>"+k+"</option>")
             }
+        }else {
+            $("#edit-site_type").append("<option value='"+k+"'>"+k+"</option>")
         }
     }
     //需注册