Browse Source

区间计算保存指标

xyxie 7 months ago
parent
commit
f73e325985

+ 3 - 3
controllers/data_manage/range_analysis/chart_info.go

@@ -1295,14 +1295,14 @@ func (this *RangeChartChartInfoController) MultipleGraphConfigSaveEdb() {
 		}
 	}
 	// 区间计算图表配置校验
-	var extraConfig string
+	/*var extraConfig string
 	extraConfigByte, err := json.Marshal(req.ExtraConfig)
 	if err != nil {
 		br.Msg = "配置信息错误"
 		br.ErrMsg = "配置信息错误, Err: " + err.Error()
 		return
-	}
-	extraConfig = string(extraConfigByte)
+	}*/
+	extraConfig := req.ExtraConfig
 	// todo 校验配置合法性
 	multipleGraphConfigEdbMappingList, err := data_manage.GetMultipleGraphConfigEdbMappingListByIdAndSource(req.MultipleGraphConfigId, utils.CHART_SOURCE_RANGE_ANALYSIS)
 	if err != nil {

+ 1 - 1
models/data_manage/chart_info_range_analysis.go

@@ -288,7 +288,7 @@ func EditRangeChartInfoAndMapping(req *EditChartInfoReq, edbInfoIdStr, lang stri
 // SaveChartRangeAnalysisEdbReq 指标保存请求
 type SaveChartRangeAnalysisEdbReq struct {
 	EdbInfoList           []*CalculateEdbInfoItem `description:"指标列表"`
-	ExtraConfig           ChartRangeAnalysisExtraConf
+	ExtraConfig           string
 	MultipleGraphConfigId int  `description:"配置id"`
 	IsSaveAs              bool `description:"是否另存为,true的话,就是另存为,不会建立与配置的关系"`
 	EdbInfoType           int  `description:"指标类型"`