|
@@ -37,23 +37,6 @@ type SectionScatterSeriesItemResp struct {
|
|
|
CoordinatePointData []CoordinatePoint `description:"趋势线的前后坐标点"`
|
|
|
}
|
|
|
|
|
|
-// SectionScatterEdbItemResp 截面散点的返回参数
|
|
|
-type SectionScatterEdbItemResp struct {
|
|
|
- XEdbInfoId int `description:"X轴指标id"`
|
|
|
- XDate string `description:"X轴指标实际日期"`
|
|
|
- XName string `description:"X轴指标名称"`
|
|
|
- XNameEn string `description:"X轴指标英文名称"`
|
|
|
- XValue float64 `description:"X轴实际值"`
|
|
|
- YEdbInfoId int `description:"Y轴指标id"`
|
|
|
- YDate string `description:"Y轴指标实际日期"`
|
|
|
- YName string `description:"Y轴指标名称"`
|
|
|
- YNameEn string `description:"Y轴指标英文名称"`
|
|
|
- YValue float64 `description:"Y轴实际值"`
|
|
|
- IsShow bool `description:"是否展示"`
|
|
|
- Name string `description:"标签名称"`
|
|
|
- NameEn string `description:"英文标签名称"`
|
|
|
-}
|
|
|
-
|
|
|
// CoordinatePoint 坐标点
|
|
|
type CoordinatePoint struct {
|
|
|
X float64
|
|
@@ -338,7 +321,7 @@ func GetChartData(chartInfoId int, config request.ChartConfigReq) (edbList []*mo
|
|
|
|
|
|
dataList = append(dataList, SectionScatterSeriesItemResp{
|
|
|
Name: variety.ChartVarietyName,
|
|
|
- NameEn: "",
|
|
|
+ NameEn: variety.ChartVarietyNameEn,
|
|
|
Color: "",
|
|
|
CoordinatePointData: coordinatePointList,
|
|
|
})
|
|
@@ -346,11 +329,11 @@ func GetChartData(chartInfoId int, config request.ChartConfigReq) (edbList []*mo
|
|
|
|
|
|
dataResp = ChartInfoResp{
|
|
|
XName: xTagInfo.ChartTagName,
|
|
|
- XNameEn: "",
|
|
|
+ XNameEn: xTagInfo.ChartTagNameEn,
|
|
|
XUnitName: "%",
|
|
|
XUnitNameEn: "%",
|
|
|
YName: yTagInfo.ChartTagName,
|
|
|
- YNameEn: "",
|
|
|
+ YNameEn: yTagInfo.ChartTagNameEn,
|
|
|
YUnitName: "%",
|
|
|
YUnitNameEn: "%",
|
|
|
XMinValue: fmt.Sprint(xMinVal),
|