Merge branch 'ETA_1.9.4' into debug

controllers/data_manage/chart_info.go

@@ -1435,18 +1435,7 @@ func (this *ChartInfoController) PreviewChartInfoDetail() {
 			return
 		}
 		for i := range markerLines {
-			if markerLines[i].MarkLineType == 1 {
-				// 跟随图表
-				if edbList[0].IsAxis == 1 {
-					value, err := data.MarkerLineCalculate(markerLines[i], edbList[0].DataList, chartInfo)
-					if err != nil {
-						br.Msg = "标识线配置异常"
-						br.ErrMsg = "标识线配置异常" + err.Error()
-						return
-					}
-					markerLines[i].Value = value
-				}
-			} else {
+			if markerLines[i].EdbType == 1 {
 				// 指标计算
 				edbInfo, err := data_manage.GetEdbInfoById(markerLines[i].EdbInfoId)
 				if err != nil {
@@ -1467,6 +1456,18 @@ func (this *ChartInfoController) PreviewChartInfoDetail() {
 					return
 				}
 				markerLines[i].Value = value
+
+			} else {
+				// 跟随图表
+				if edbList[0].IsAxis == 1 {
+					value, err := data.MarkerLineCalculate(markerLines[i], edbList[0].DataList, chartInfo)
+					if err != nil {
+						br.Msg = "标识线配置异常"
+						br.ErrMsg = "标识线配置异常" + err.Error()
+						return
+					}
+					markerLines[i].Value = value
+				}
 			}
 		}