..

controllers/data_manage/range_analysis/chart_info.go

@@ -93,6 +93,7 @@ func (this *RangeChartChartInfoController) Preview() {
 		return
 	}
 	chartInfo.ChartThemeId = chartTheme.ChartThemeId
+	chartInfo.ChartThemeStyle = chartTheme.Config
 	// 获取图表x轴y轴
 	edbList, xEdbIdValue, dataResp, e := rangeServ.GetChartDataByEdbInfoList(0, req.DateType, req.StartYear, req.StartDate, req.EndDate, edbInfoMappingList, &req.ExtraConfig)
 	if e != nil {

models/data_manage/factor_edb_series_calculate_data_qjjs.go

@@ -37,8 +37,8 @@ type FactorEdbSeriesCalculateDataQjjsCols struct {
 	DataTimestamp     string
 }
 
-func (m *FactorEdbSeriesCalculateDataQjjs) Cols() FactorEdbSeriesCalculateDataCols {
-	return FactorEdbSeriesCalculateDataCols{
+func (m *FactorEdbSeriesCalculateDataQjjs) Cols() FactorEdbSeriesCalculateDataQjjsCols {
+	return FactorEdbSeriesCalculateDataQjjsCols{
 		PrimaryId:         "factor_edb_series_calculate_data_id",
 		FactorEdbSeriesId: "factor_edb_series_id",
 		EdbInfoId:         "edb_info_id",