no message

src/front/mark.go

@@ -87,7 +87,7 @@ func (f *Front) JyMarkList() {
 		} else if !fieldScreen && notag {
 			query["i_ckdata"] = 0
 		}
-		qu.Debug("query:", query)
+		qu.Debug("query:", query, sourceInfo)
 		list, _ := util.Mgo.Find(sourceInfo, query, map[string]interface{}{"_id": 1}, nil, false, start, limit)
 		count := util.Mgo.Count(sourceInfo, query)
 		//checkedNum, allNum := GetCheckedAndAllDataInfo(query, coll) //已标和总数信息

src/web/templates/project/check_task_list.html

@@ -111,7 +111,7 @@
                 {
                     "data": "_id", width: "11%", render: function (val, a, row, pos) {
                         tmp = '<div>' +
-                            '<a class="btn btn-sm btn-primary" href="/front/user/check/data?pid='+row.s_projectid+'&tid=' + val + '&s_sourceinfo='+row.s_sourceinfo+'">质检</a>&nbsp;&nbsp;' +
+                            '<a class="btn btn-sm btn-primary" onclick="checkMethod(\'' + val + '\',\''+row.s_projectid+'\',\''+row.s_sourceinfo+'\',\'' + row.s_status + '\')">质检</a>&nbsp;&nbsp;' +
                             '</div>';
                         return tmp
                     }
@@ -129,4 +129,11 @@
         })
     });
 
+    function checkMethod(tid, pid, sourceinfo, status) {
+        if (status !== "已关闭") {
+            window.location.href = "/front/user/check/data?pid="+pid+"&tid="+tid+"&s_sourceinfo="+sourceinfo
+        }else {
+            showTip("操作不允许")
+        }
+    }
 </script>

src/web/templates/project/project_clear.html

@@ -399,8 +399,9 @@
                     data: { "s_sourceinfo": sourceinfo, "taskid": id, "s_status": status,"i_givenum" :givenum},
                     success: function (r) {
                         if (r.success) {
-                            showTip(r.msg);
-                            location.reload()
+                            showTip(r.msg, 2000, function () {
+                                location.reload()
+                            });
                         } else {
                             showTip(r.msg);
                         }

src/web/templates/project/remark_jy_list.html

@@ -50,9 +50,9 @@
                             </label>
                             <label for="statusSelect" class="form-inline">状态：
                                 <select class="form-control selectpicker" id="statusSelect">
-                                    <option value=-1>全部</option>
-                                    <option value=0>未标注</option>
-                                    <option value=1>已标注</option>
+                                    <option value="-1">全部</option>
+                                    <option value="false" selected>未标注</option>
+                                    <option value="true">已标注</option>
                                 </select></label>
                         </div>
                         <table id="dataTable" class="table table-bordered table-hover">
@@ -145,6 +145,7 @@
                         e.maxval = $('#maxInput').val()
                     }
                 }
+                e.b_istag = $("#statusSelect option:selected").val()
             }
         });
 
@@ -188,6 +189,9 @@
                 $('#fieldStatus2').hide()
             }
         })
+        $('#statusSelect').on('changed.bs.select', function () {
+            ttable.api().ajax.reload();
+        })
     });
 
     function searchBtn() {

src/web/templates/project/task_list.html

@@ -195,7 +195,9 @@
                 data: {"s_status": status, "taskid": id, "s_sourceinfo": sourceinfo},
                 success: function (r) {
                     if (r.success) {
-                        ttable.api().ajax.reload()
+                        showTip(r.msg, 2000, function () {
+                            ttable.api().ajax.reload()
+                        })
                     } else {
                         showTip(r.msg);
                     }