|
@@ -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],
|