Jelajahi Sumber

fix:相关性图表需在图上显示计算窗口配置项,拼接在指标名称后面,保存时图表名称也拼接;

Roc 1 tahun lalu
induk
melakukan
5beb171878

+ 1 - 0
controllers/data_manage/chart_classify.go

@@ -295,6 +295,7 @@ func handleNoPermissionChart(allNodes []*data_manage.ChartClassifyItems, noPermi
 	return
 }
 
+// ChartClassifyItems
 // @Title 获取所有图表分类接口-不包含图表
 // @Description 获取所有图表分类接口-不包含图表
 // @Success 200 {object} data_manage.ChartClassifyListResp

+ 3 - 1
controllers/data_manage/multiple_graph_config.go

@@ -295,6 +295,8 @@ func (this *ChartInfoController) MultipleGraphPreview() {
 		correlationConf := req.Correlation
 		// 配置了数据才有返回
 		if correlationConf.LeadValue > 0 {
+			tmpChartInfo := *chartInfo
+
 			moveUnitDays, ok := utils.FrequencyDaysMap[correlationConf.CalculateUnit]
 			if !ok {
 				br.Msg = "错误的分析周期"
@@ -310,7 +312,7 @@ func (this *ChartInfoController) MultipleGraphPreview() {
 				return
 			}
 
-			tmpChartInfo := *chartInfo
+			tmpChartInfo.ChartName += fmt.Sprint(`(`, correlationConf.CalculateValue, correlationConf.CalculateUnit, `)`)
 			tmpChartInfo.Source = utils.CHART_SOURCE_CORRELATION
 			resp.CorrelationData = response.CorrelationResp{
 				ChartInfo:   tmpChartInfo,

+ 1 - 1
services/data/chart_classify.go

@@ -31,7 +31,7 @@ func ChartClassifyItemsMakeTree(sysUser *system.Admin, allNode []*data_manage.Ch
 			childButton := GetChartClassifyOpButton(sysUser, child.SysUserId)
 			childButton.AddButton = false //不管有没有权限,图表都是没有添加按钮的
 			child.Button = childButton
-			node.Children = append(node.Children, child)
+			//node.Children = append(node.Children, child)
 		}
 		node.Children = append(node.Children, childs[0:]...) //添加子节点
 		for _, v := range childs {                           //查询子节点的子节点,并添加到子节点