fix:系统主题返回

controllers/data_manage/chart_theme.go

@@ -348,8 +348,11 @@ func (c *ChartThemeController) Edit() {
 	if req.Config != `` {
 		chartTheme.Config = req.Config
 	}
+	if req.ChartImage != `` {
+		chartTheme.ChartImage = req.ChartImage
+	}
 	chartTheme.ModifyTime = time.Now()
-	err = chartTheme.Update([]string{"ChartThemeName", "Config", "ModifyTime"})
+	err = chartTheme.Update([]string{"ChartThemeName", "Config", "ChartImage", "ModifyTime"})
 	if err != nil {
 		br.Msg = "修改失败"
 		br.ErrMsg = "修改失败，Err:" + err.Error()

models/data_manage/chart_theme/chart_theme.go

@@ -12,6 +12,7 @@ type ChartTheme struct {
 	ChartThemeId     int       `description:"图表主题类型ID" orm:"column(chart_theme_id);pk"`
 	ChartThemeName   string    `description:"图表主题名称"`
 	ChartThemeTypeId int       `description:"图表主题类型ID"`
+	ChartImage       string    `description:"缩略图"`
 	Config           string    `description:"配置"`
 	IsDelete         int       `description:"是否删除，0：未删除；1：已删除"`
 	SysUserId        int       `description:"操作人"`
@@ -106,6 +107,7 @@ type ChartThemeItem struct {
 	ChartThemeName   string `description:"图表主题名称"`
 	ChartThemeTypeId int    `description:"图表主题类型ID"`
 	Config           string `description:"配置"`
+	ChartImage       string `description:"缩略图"`
 	//IsDelete            int       `description:"是否删除，0：未删除；1：已删除"`
 	IsSystemTheme       int       `description:"是否是系统主题，0：不是；1：是"`
 	SysUserId           int       `description:"操作人"`

models/data_manage/chart_theme/request/theme.go

@@ -13,6 +13,7 @@ type EditThemeReq struct {
 	ChartThemeId   int    `description:"主题id"`
 	ChartThemeName string `description:"主题名称"`
 	Config         string `description:"配置的值"`
+	ChartImage     string `description:"缩略图"`
 }
 
 // DeleteThemeReq

services/data/chart_theme.go

@@ -134,8 +134,8 @@ func getThemePreviewEdbDataMapList(chartType int, calendar, startDate, endDate s
 		item.EdbInfoCategoryType = v.EdbInfoCategoryType
 		item.PredictChartColor = v.PredictChartColor
 		item.ClassifyId = v.ClassifyId
-		item.IsAxis = v.IsAxis
-		item.EdbInfoType = v.EdbInfoType
+		item.IsAxis = 1
+		item.EdbInfoType = 1
 		item.LeadValue = v.LeadValue
 		item.LeadUnit = v.LeadUnit
 		item.LeadUnitEn = GetLeadUnitEn(v.LeadUnit)
@@ -144,9 +144,9 @@ func getThemePreviewEdbDataMapList(chartType int, calendar, startDate, endDate s
 		item.ChartStyle = v.ChartStyle
 		item.ChartColor = v.ChartColor
 		item.ChartWidth = v.ChartWidth
-		item.IsOrder = v.IsOrder
+		item.IsOrder = true
 		item.MaxData = v.MaxValue
-		item.MinData = v.MaxValue
+		item.MinData = v.MinValue
 		item.LatestValue = v.LatestValue
 		item.LatestDate = v.LatestDate
 		item.UniqueCode = v.UniqueCode