|
@@ -1514,10 +1514,13 @@ func fillAreaGraphData(extraConfigStr string, edbDataList []*data_manage.ChartEd
|
|
|
}
|
|
|
if tmpConfig.IsHeap == 1 {
|
|
|
standardIndexMap := make(map[string]*data_manage.EdbDataList)
|
|
|
+ var standardIndexStartDate, standardIndexEndDate string
|
|
|
for _, v := range edbDataList {
|
|
|
// 判断是否为基准指标
|
|
|
if v.EdbInfoId == tmpConfig.StandardEdbInfoId {
|
|
|
if dataList, ok := v.DataList.([]*data_manage.EdbDataList); ok {
|
|
|
+ standardIndexStartDate = dataList[0].DataTime
|
|
|
+ standardIndexEndDate = dataList[len(dataList)-1].DataTime
|
|
|
for _, dataObject := range dataList {
|
|
|
standardIndexMap[dataObject.DataTime] = dataObject
|
|
|
}
|
|
@@ -1534,6 +1537,15 @@ func fillAreaGraphData(extraConfigStr string, edbDataList []*data_manage.ChartEd
|
|
|
// 前值填充
|
|
|
//fillWithPrevious()
|
|
|
// 按自然日补充,再根据基准指标取对应数据
|
|
|
+ for _, v := range edbDataList {
|
|
|
+ if v.EdbInfoId != tmpConfig.StandardEdbInfoId {
|
|
|
+ if dataList, ok := v.DataList.([]*data_manage.EdbDataList); ok {
|
|
|
+ for i := 0; i < len(dataList); i++ {
|
|
|
+
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
case 3:
|
|
|
// 后值填充
|