Merge remote-tracking branch 'origin/debug' into debug

services/data/edb_info.go

@@ -2408,25 +2408,29 @@ func formatCalculateFormula(calculateFormula string) (ruleTitle string) {
 		ruleTitle = "=" + calculateFormula
 		return
 	}
-	newCalculateFormula := make([]map[string]string, 0)
+	//newCalculateFormula := make([]map[string]string, 0)
 	sort.Slice(tmpCalculateFormula, func(i, j int) bool {
 		return compareDates(tmpCalculateFormula[i]["d"], tmpCalculateFormula[j]["d"])
 	})
-
+	newCalculateFormulaStr := "<div><div>计算公式：</div>"
 	for i, entry := range tmpCalculateFormula {
 		if formula, ok := entry["f"]; ok {
-			singleFormula := make(map[string]string)
-			singleFormula["公式"] = formula
-			singleFormula["日期"] = determineDateRange(i, len(tmpCalculateFormula), tmpCalculateFormula)
-			newCalculateFormula = append(newCalculateFormula, singleFormula)
-		}
+			dateStr := determineDateRange(i, len(tmpCalculateFormula), tmpCalculateFormula)
+			newCalculateFormulaStr += "<div>" + formula + "，" + dateStr + "</div>"
+			//singleFormula := make(map[string]string)
+			//singleFormula["公式"] = formula
+			//singleFormula["日期"] = determineDateRange(i, len(tmpCalculateFormula), tmpCalculateFormula)
+			//newCalculateFormula = append(newCalculateFormula, singleFormula)
 
+		}
 	}
-	if b, e := json.Marshal(newCalculateFormula); e != nil {
-		ruleTitle = "=" + calculateFormula
-	} else {
-		ruleTitle = "=" + string(b)
-	}
+	newCalculateFormulaStr += "</div>"
+	ruleTitle = newCalculateFormulaStr
+	//if b, e := json.Marshal(newCalculateFormula); e != nil {
+	//	ruleTitle = "=" + calculateFormula
+	//} else {
+	//	ruleTitle = "=" + string(b)
+	//}
 	return
 }