unknown пре 6 година
родитељ
комит
a07e158f3e
2 измењених фајлова са 20 додато и 15 уклоњено
  1. 18 13
      src/jy/admin/resulttrack.go
  2. 2 2
      src/web/templates/admin/result_list.html

+ 18 - 13
src/jy/admin/resulttrack.go

@@ -94,19 +94,24 @@ func ClearColl(c *gin.Context) {
 func GetVersionInfo(c *gin.Context) {
 	version, _ := c.GetPostForm("version")
 	v, _ := Mgo.FindOne("version", `{"version":"`+version+`"}`)
-	vid := (*v)["_id"].(bson.ObjectId).Hex()
-	query := map[string]interface{}{
-		"vid":    vid,
-		"isuse":  true,
-		"delete": false,
-	}
-	versioninfo, _ := Mgo.Find("versioninfo", query, nil, `{"s_field":1}`, false, -1, -1)
-	if len(*versioninfo) > 0 {
-		for _, val := range *versioninfo {
-			s_field := val["s_field"].(string)
-			f, _ := Mgo.FindOne("fields", `{"s_field":"`+s_field+`"}`)
-			val["s_name"] = (*f)["s_name"]
+	if len(*v) > 0 {
+		vid := (*v)["_id"].(bson.ObjectId).Hex()
+		query := map[string]interface{}{
+			"vid":    vid,
+			"isuse":  true,
+			"delete": false,
+		}
+		versioninfo, _ := Mgo.Find("versioninfo", query, nil, `{"s_field":1}`, false, -1, -1)
+		if len(*versioninfo) > 0 {
+			for _, val := range *versioninfo {
+				s_field := val["s_field"].(string)
+				f, _ := Mgo.FindOne("fields", `{"s_field":"`+s_field+`"}`)
+				val["s_name"] = (*f)["s_name"]
+			}
 		}
+		c.JSON(200, gin.H{"versioninfo": versioninfo})
+	} else {
+		c.JSON(200, gin.H{"versioninfo": map[string]interface{}{}})
 	}
-	c.JSON(200, gin.H{"versioninfo": versioninfo})
+
 }

+ 2 - 2
src/web/templates/admin/result_list.html

@@ -297,11 +297,11 @@ function trackShow(_id){
 				var resultcoll = resultinfo.split("+")[0];
 				window.open("/admin/resulttrack/trackData/?trackId="+trackId+"&field="+field+"&trackcoll="+trackcoll+"&resultcoll="+resultcoll);
 			});
+			$("#modal-info-resulttrack").modal("show");
 		}else{
-			alert("无详细信息!");
+			showTip("无详细信息!",1000);
 		}
 	},'json')
-	$("#modal-info-resulttrack").modal("show");
 }
 
 function checkclick(log){