|
|
@@ -645,13 +645,25 @@ func (c *ChartInfoController) Relation() {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- tagList, err := cross_varietyModels.GetTagListByIdList([]int{config.TagX, config.TagY})
|
|
|
+ tmpTagList, err := cross_varietyModels.GetTagListByIdList([]int{config.TagX, config.TagY})
|
|
|
if err != nil {
|
|
|
br.Msg = "获取标签信息失败"
|
|
|
br.ErrMsg = "获取标签信息失败，Err:" + err.Error()
|
|
|
return
|
|
|
}
|
|
|
|
|
|
+ var xTag, yTag *cross_varietyModels.ChartTag
|
|
|
+ for _, v := range tmpTagList {
|
|
|
+ if v.ChartTagId == config.TagX {
|
|
|
+ xTag = v
|
|
|
+ } else {
|
|
|
+ yTag = v
|
|
|
+ }
|
|
|
+ }
|
|
|
+ tagList := []*cross_varietyModels.ChartTag{
|
|
|
+ xTag, yTag,
|
|
|
+ }
|
|
|
+
|
|
|
// 获取品种列表
|
|
|
varietyList, err := cross_varietyModels.GetVarietyListByIdList(config.VarietyList)
|
|
|
if err != nil {
|
|
|
@@ -1139,13 +1151,13 @@ func (c *ChartInfoController) EnInfoEdit() {
|
|
|
br.IsAddLog = true
|
|
|
}
|
|
|
|
|
|
-// DeleteChartClassify
|
|
|
+// DeleteChart
|
|
|
// @Title 删除跨品种分析分类/图表
|
|
|
// @Description 删除跨品种分析分类/图表接口
|
|
|
// @Param request body data_manage.DeleteChartClassifyReq true "type json string"
|
|
|
// @Success 200 Ret=200 删除成功
|
|
|
// @router /chart_info/delete [post]
|
|
|
-func (c *ChartInfoController) DeleteChartClassify() {
|
|
|
+func (c *ChartInfoController) DeleteChart() {
|
|
|
br := new(models.BaseResponse).Init()
|
|
|
defer func() {
|
|
|
c.Data["json"] = br
|
