Merge branch 'master' of http://192.168.3.207:10080/qmx/jy-data-extract

src/jy/admin/task/task.go

@@ -92,7 +92,7 @@ func init() {
 				"$set": data,
 			}, true, false)
 		}
-		c.JSON(200, gin.H{"rep": b, "version": version})
+		c.JSON(200, gin.H{"rep": b, "version": (*version)["s_version"]})
 	})
 	//启动任务
 	Admin.POST("/task/start", func(c *gin.Context) {

src/web/templates/admin/result_list.html

@@ -238,11 +238,14 @@ $(function () {
 			var resultcoll = resultinfo.split("+")[0];
 			var index = 0;
 			$("#resultlog option").each(function(i,n){
-			if($(this).val().indexOf(resultcoll) >= 0){
-				index = i;
-				return
+				if($(this).val().indexOf(resultcoll) >= 0){
+					index = i;
+					return
 				}
 			})
+			if(trackcoll == ""){
+				trackcoll = "全部";
+			}
 			$("#resultlog").find("option:eq("+index+")").attr("selected",true);
 			$("#tracklog").html("<option value=''>"+trackcoll+"</option>")
 		}
@@ -363,7 +366,8 @@ function cleardata(){
 			type:"post",
 			data:{"id":logarr[0],"resultcoll":logarr[1],"trackcoll":logarr[2]},
 			success:function(r){
-				if(r.rep){		
+				if(r.rep){
+					sessionStorage.setItem("trackcoll","");
 					tablereload();
 				}else{
 					showTip("删除失败", 1000, function() {});