ソースを参照

add:增加时间序列默认尺寸

zqbao 3 ヶ月 前
コミット
1e3ff1cca4

+ 27 - 1
controllers/data_manage/excel/excel_info.go

@@ -1941,6 +1941,11 @@ func (c *ExcelInfoController) GetOtherEdbData() {
 			dataList[i], dataList[j] = dataList[j], dataList[i]
 		}
 	}
+	// 设置数据默认高度和宽度
+	for i := range dataList {
+		dataList[i].Width = 140
+		dataList[i].Height = 35
+	}
 
 	sourceNameList, sourceNameEnList, err := excel2.GetEdbSourceByEdbInfoIdList([]int{req.EdbInfoId})
 	if err != nil {
@@ -2046,6 +2051,11 @@ func (c *ExcelInfoController) GetBatchEdbData() {
 				br.Msg = "指标数据异常,请检查"
 				return
 			}
+			// 设置数据默认高度和宽度
+			for i := range dataList {
+				dataList[i].Width = 140
+				dataList[i].Height = 35
+			}
 			tableList = append(tableList, &response.TableDataItem{
 				EdbInfoId:     v,
 				Data:          dataList,
@@ -2074,7 +2084,11 @@ func (c *ExcelInfoController) GetBatchEdbData() {
 					dataList[i], dataList[j] = dataList[j], dataList[i]
 				}
 			}
-
+			// 设置数据默认高度和宽度
+			for i := range dataList {
+				dataList[i].Width = 140
+				dataList[i].Height = 35
+			}
 			sourceNameList, sourceNameEnList, err := excel2.GetEdbSourceByEdbInfoIdList([]int{v})
 			if err != nil {
 				br.Msg = "自定义表格数据获取失败"
@@ -2347,6 +2361,12 @@ func (c *ExcelInfoController) GetHistoryDateData() {
 			Data:      firstDataList,
 		})
 
+		// 设置数据默认高度和宽度
+		for i := range firstDataList {
+			firstDataList[i].Width = 140
+			firstDataList[i].Height = 35
+		}
+
 		for _, v := range firstDataList {
 			dateStrList = append(dateStrList, v.DataTime)
 		}
@@ -2370,6 +2390,12 @@ func (c *ExcelInfoController) GetHistoryDateData() {
 				br.ErrMsg = fmt.Sprint("获取失败,Err:", err.Error())
 				return
 			}
+
+			// 设置数据默认高度和宽度
+			for i := range dataList {
+				dataList[i].Width = 140
+				dataList[i].Height = 35
+			}
 			result = append(result, response.TableDataItem{
 				EdbInfoId: v,
 				Decimal:   req.Decimal[k],

+ 2 - 0
models/data_manage/excel/request/excel_info.go

@@ -183,6 +183,8 @@ type ManualDataReq struct {
 	ShowValue           string            `description:"展示值"`
 	Value               string            `description:"实际值(计算公式)"`
 	Decimal             int               `description:"小数位数"`
+	Width               int               `description:"单元格宽度"`
+	Height              int               `description:"单元格高度"`
 	RelationEdbInfoList []RelationEdbInfo `description:"关联指标(计算公式中关联的指标,用于计算的时候去匹配)"`
 }