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

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 v != nil && 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})
+
 }

src/jy/extract/extract.go

@@ -48,6 +48,7 @@ func StartExtractTestTask(taskId, startId, num, resultcoll, trackcoll string) bo
 		ext.InitDFA()
 	}
 	//质量审核
+	ext.InitAuditFields()
 	ext.InitAuditRule()
 	ext.InitAuditClass()
 	ext.InitAuditRecogField()
@@ -101,6 +102,7 @@ func StartExtractTaskId(taskId string) bool {
 		ext.InitDFA()
 	}
 	//质量审核
+	ext.InitAuditFields()
 	ext.InitAuditRule()
 	ext.InitAuditClass()
 	ext.InitAuditRecogField()
@@ -845,23 +847,6 @@ func AnalysisSaveResult(j *ju.Job, e *ExtractTask) {
 
 func (e *ExtractTask) QualityAudit(resulttmp map[string]interface{}) {
 	//获取审核字段
-	//log.Println("需要审核的字段-----", AuditFields)
-	if len(e.AuditFields) == 0 {
-		v, _ := db.Mgo.FindOne("version", `{"isuse":true,"delete":false}`) //查找当前使用版本
-		if len(*v) > 0 {                                                   //查找当前使用版本中属性配置需要审核的字段
-			vid := qu.BsonIdToSId((*v)["_id"])
-			query := map[string]interface{}{
-				"isaudit": true,
-				"delete":  false,
-				"vid":     vid,
-			}
-			data, _ := db.Mgo.Find("versioninfo", query, `{"_id":-1}`, `{"s_field":1}`, false, -1, -1)
-			for _, d := range *data {
-				field := qu.ObjToString(d["s_field"])
-				e.AuditFields = append(e.AuditFields, field)
-			}
-		}
-	}
 	for _, field := range e.AuditFields {
 		//1.分包
 		if resulttmp["package"] != nil {

src/jy/extract/extractInit.go

@@ -748,3 +748,23 @@ func (e *ExtractTask) InitAuditRule() {
 		e.CidRuleMap[classid] = ruleList
 	}
 }
+
+//
+func (e *ExtractTask) InitAuditFields() {
+	if len(e.AuditFields) == 0 {
+		v, _ := db.Mgo.FindOne("version", `{"isuse":true,"delete":false}`) //查找当前使用版本
+		if v != nil && len(*v) > 0 {                                       //查找当前使用版本中属性配置需要审核的字段
+			vid := qu.BsonIdToSId((*v)["_id"])
+			query := map[string]interface{}{
+				"isaudit": true,
+				"delete":  false,
+				"vid":     vid,
+			}
+			data, _ := db.Mgo.Find("versioninfo", query, `{"_id":-1}`, `{"s_field":1}`, false, -1, -1)
+			for _, d := range *data {
+				field := qu.ObjToString(d["s_field"])
+				e.AuditFields = append(e.AuditFields, field)
+			}
+		}
+	}
+}

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){

src/web/templates/admin/track.html

@@ -147,7 +147,7 @@
 		if(flag2){
 			var boxhtml = '<div class="resultshowstyle">'
 							+'<div class="box box-primary">'
-								+'<div class="codestyle">Code : '+key+sourcehtml+typehtml
+								+'<div class="codestyle">Code:'+key+sourcehtml+typehtml
 								+'</div>'
 								+'<table class="table first">'
 									+'<thead>'