ziwen hai 1 ano
pai
achega
606b0fefda
Modificáronse 2 ficheiros con 48 adicións e 33 borrados
  1. 1 1
      models/data_manage/chart_info.go
  2. 47 32
      services/data/chart_info.go

+ 1 - 1
models/data_manage/chart_info.go

@@ -1791,7 +1791,7 @@ func EditChartInfoExtraConfig(chartId int, extraConfig string) (err error) {
 			`
 	sql += `WHERE chart_info_id = ?`
 
-	pars = append(pars, extraConfig)
+	pars = append(pars, chartId)
 	_, err = o.Raw(sql, pars).Exec()
 	if err != nil {
 		fmt.Println("UPDATE  chart_info Err:", err.Error())

+ 47 - 32
services/data/chart_info.go

@@ -535,40 +535,9 @@ func GetChartEdbData(chartInfoId, chartType int, calendar, startDate, endDate st
 			err = errors.New(errMsg)
 			return
 		}
-
-		// 截面散点图点击详情时自动更新系列名
-		if len(tmpExtraConfig.SeriesList) > 0 {
-			// 默认名字的时候才自动更新
-			if tmpExtraConfig.SeriesList[0].IsNameDefault {
-				firstXEdbInfoId := tmpExtraConfig.SeriesList[0].EdbInfoList[0].XEdbInfoId
-				needUpdate := false
-				for _, v := range edbList {
-					if v.EdbInfoId == firstXEdbInfoId {
-						tmpExtraConfig.SeriesList[0].Name = v.LatestDate
-						needUpdate = true
-					}
-				}
-				if needUpdate {
-					err = data_manage.EditChartInfoExtraConfig(chartInfoId, extraConfigStr)
-					if err != nil {
-						errMsg = "截面散点系列更新异常"
-						err = errors.New(errMsg)
-						return
-					}
-				}
-			}
-		}
-
+		
 		extraConfig = tmpExtraConfig
 
-		extraConfigByte, e := json.Marshal(tmpExtraConfig)
-		if e != nil {
-			errMsg = "截面散点系列更新异常"
-			err = errors.New(errMsg)
-			return
-		}
-		extraConfigStr = string(extraConfigByte)
-
 	default:
 		xEdbIdValue = make([]int, 0)
 		yDataList = make([]data_manage.YData, 0)
@@ -605,6 +574,52 @@ func GetChartEdbData(chartInfoId, chartType int, calendar, startDate, endDate st
 		sectionScatterConf := extraConfig.(data_manage.SectionScatterReq)
 		xEdbIdValue, dataResp, err = GetSectionScatterChartData(mappingList, edbDataListMap, sectionScatterConf)
 
+		var tmpExtraConfig data_manage.SectionScatterReq
+		if extraConfigStr == `` {
+			errMsg = "截面散点图未配置"
+			err = errors.New(errMsg)
+			return
+		}
+		err = json.Unmarshal([]byte(extraConfigStr), &tmpExtraConfig)
+		if err != nil {
+			errMsg = "截面散点配置异常"
+			err = errors.New(errMsg)
+			return
+		}
+
+		// 截面散点图点击详情时自动更新系列名
+		if len(tmpExtraConfig.SeriesList) > 0 {
+			// 默认名字的时候才自动更新
+			if tmpExtraConfig.SeriesList[0].IsNameDefault {
+				firstXEdbInfoId := tmpExtraConfig.SeriesList[0].EdbInfoList[0].XEdbInfoId
+				needUpdate := false
+				for _, v := range edbList {
+					if v.EdbInfoId == firstXEdbInfoId {
+						tmpExtraConfig.SeriesList[0].Name = v.LatestDate
+						needUpdate = true
+					}
+				}
+				if needUpdate {
+					err = data_manage.EditChartInfoExtraConfig(chartInfoId, extraConfigStr)
+					if err != nil {
+						errMsg = "截面散点系列更新异常"
+						err = errors.New(errMsg)
+						return
+					}
+				}
+			}
+		}
+
+		extraConfig = tmpExtraConfig
+
+		extraConfigByte, e := json.Marshal(tmpExtraConfig)
+		if e != nil {
+			errMsg = "截面散点系列更新异常"
+			err = errors.New(errMsg)
+			return
+		}
+		extraConfigStr = string(extraConfigByte)
+
 		// 这个数据没有必要返回给前端
 		for _, v := range edbList {
 			v.DataList = nil