Browse Source

fix:自定义分析

Roc 1 year ago
parent
commit
671953a37f
2 changed files with 6 additions and 4 deletions
  1. 2 1
      models/edb_data_base.go
  2. 4 3
      services/excel/lucky_sheet.go

+ 2 - 1
models/edb_data_base.go

@@ -148,7 +148,8 @@ func GetEdbDataTableName(source int) (tableName string) {
 		tableName = "edb_data_calculate_zsxy" // 指数修匀->72
 	case utils.DATA_SOURCE_PREDICT_CALCULATE_ZSXY:
 		tableName = "edb_data_predict_calculate_zsxy" // 预测指数修匀->73
-		tableName = "edb_data_calculate_zdyfx"        // 自定义分析->74
+	case utils.DATA_SOURCE_CALCULATE_ZDYFX:
+		tableName = "edb_data_calculate_zdyfx" // 自定义分析->74
 	case utils.DATA_SOURCE_CALCULATE_RJZ: //日均值->75
 		tableName = "edb_data_calculate_rjz"
 	default:

+ 4 - 3
services/excel/lucky_sheet.go

@@ -106,9 +106,10 @@ type LuckySheetData struct {
 	ChWidth  int64                `json:"ch_width" description:"工作表区域的宽度"`
 	Config   LuckySheetDataConfig `json:"config" description:""`
 	//Index             int                  `json:"index" description:"工作表索引"`
-	RhHeight          float64     `json:"rh_height" description:"工作表区域的高度"`
-	ScrollLeft        float64     `json:"scrollLeft" description:"左右滚动条位置"`
-	ScrollTop         float64     `json:"scrollTop" description:"上下滚动条位置"`
+	RhHeight   float64 `json:"rh_height" description:"工作表区域的高度"`
+	ScrollLeft float64 `json:"scrollLeft" description:"左右滚动条位置"`
+	ScrollTop  float64 `json:"scrol
+lTop" description:"上下滚动条位置"`
 	Status            interface{} `json:"status" description:"激活状态"`
 	VisibleDataColumn []int64     `json:"visibledatacolumn" description:"所有列的位置信息,递增的列位置数据,初始化无需设置"`
 	VisibleDataRow    []int64     `json:"visibledatarow" description:"所有行的位置信息,递增的行位置数据,初始化无需设置"`