fix

controllers/data_manage/cross_variety/classify.go

@@ -83,6 +83,10 @@ func (c *ClassifyController) List() {
 	// 移除没有图表的分类
 	allNodes := make([]*data_manage.ChartClassifyItems, 0)
 	for _, v := range rootList {
+		if v.SysUserId == c.SysUser.AdminId || c.SysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_ADMIN {
+			v.Button.OpButton = true
+		}
+
 		rootChildMap[v.ParentId] = append(rootChildMap[v.ParentId], v)
 		if existItems, ok := chartInfoMap[v.ChartClassifyId]; ok {
 			v.Children = existItems
@@ -140,17 +144,17 @@ func (c *ClassifyController) EditChartClassify() {
 
 	source := utils.CHART_SOURCE_CROSS_HEDGING
 	if item.ChartClassifyName != req.ChartClassifyName {
-		count, err := data_manage.GetChartClassifyCount(req.ChartClassifyName, item.ParentId, source)
-		if err != nil {
-			br.Msg = "判断名称是否已存在失败"
-			br.ErrMsg = "判断名称是否已存在失败，Err:" + err.Error()
-			return
-		}
-		if count > 0 {
-			br.Msg = "分类名称已存在，请重新输入"
-			br.IsSendEmail = false
-			return
-		}
+		//count, err := data_manage.GetChartClassifyCount(req.ChartClassifyName, item.ParentId, source)
+		//if err != nil {
+		//	br.Msg = "判断名称是否已存在失败"
+		//	br.ErrMsg = "判断名称是否已存在失败，Err:" + err.Error()
+		//	return
+		//}
+		//if count > 0 {
+		//	br.Msg = "分类名称已存在，请重新输入"
+		//	br.IsSendEmail = false
+		//	return
+		//}
 
 		err = data_manage.EditChartClassify(req.ChartClassifyId, source, req.ChartClassifyName)
 		if err != nil {

models/data_manage/cross_variety/chart_tag.go

@@ -11,6 +11,7 @@ import (
 type ChartTag struct {
 	ChartTagId      int       `orm:"column(chart_tag_id);pk"`
 	ChartTagName    string    `description:"标签名称"`
+	ChartTagNameEn  string    `description:"标签名称（英文）"`
 	SysUserId       int       `description:"创建人id"`
 	SysUserRealName string    `description:"创建人姓名"`
 	ModifyTime      time.Time `description:"修改时间"`
@@ -119,11 +120,12 @@ func GetTagListByIdList(idList []int) (items []*ChartTag, err error) {
 	return
 }
 
-// ChartTag
+// ChartTagItem
 // @Description: chart_tag 图表标签表
 type ChartTagItem struct {
 	ChartTagId      int       `orm:"column(chart_tag_id);pk"`
 	ChartTagName    string    `description:"标签名称"`
+	ChartTagNameEn  string    `description:"标签名称（英文）"`
 	SysUserId       int       `description:"创建人id"`
 	VarietyTotal    int       `description:"配置关联品种的数量"`
 	SysUserRealName string    `description:"创建人姓名"`

models/data_manage/cross_variety/chart_tag_variety.go

@@ -221,3 +221,19 @@ func SaveVarietyEdb(chartTagId int, list []request.VarietyEdbReq, sysUserId int,
 	}
 	return
 }
+
+// GetCountByEdbInfoId
+// @Description: 根据指标id获取其关联的品种数量
+// @author: Roc
+// @datetime 2023-11-28 19:43:42
+// @param edbInfoId int
+// @return total int
+// @return err error
+func GetCountByEdbInfoId(edbInfoId int) (total int, err error) {
+	o := orm.NewOrmUsingDB("data")
+	sql := `SELECT count(1) total FROM chart_tag_variety a 
+         join edb_info b on a.edb_info_id=b.edb_info_id WHERE edb_info_id = ?`
+	err = o.Raw(sql, edbInfoId).QueryRow(&total)
+
+	return
+}

models/data_manage/cross_variety/chart_variety.go

@@ -9,12 +9,13 @@ import (
 // ChartVariety
 // @Description: chart_variety 图表品种表
 type ChartVariety struct {
-	ChartVarietyId   int       `orm:"column(chart_variety_id);pk"`
-	ChartVarietyName string    `description:"品种名称"`
-	SysUserId        int       `description:"创建人id"`
-	SysUserRealName  string    `description:"创建人姓名"`
-	ModifyTime       time.Time `description:"修改时间"`
-	CreateTime       time.Time `description:"创建时间"`
+	ChartVarietyId     int       `orm:"column(chart_variety_id);pk"`
+	ChartVarietyName   string    `description:"品种名称"`
+	ChartVarietyNameEn string    `description:"品种名称（英文）"`
+	SysUserId          int       `description:"创建人id"`
+	SysUserRealName    string    `description:"创建人姓名"`
+	ModifyTime         time.Time `description:"修改时间"`
+	CreateTime         time.Time `description:"创建时间"`
 }
 
 // GetVarietyById

services/data/cross_variety/chart.go

@@ -350,11 +350,11 @@ func GetChartData(chartInfoId int, config request.ChartConfigReq) (edbList []*da
 
 	dataResp = ChartInfoResp{
 		XName:       xTagInfo.ChartTagName,
-		XNameEn:     "",
+		XNameEn:     xTagInfo.ChartTagNameEn,
 		XUnitName:   "%",
 		XUnitNameEn: "%",
 		YName:       yTagInfo.ChartTagName,
-		YNameEn:     "",
+		YNameEn:     yTagInfo.ChartTagNameEn,
 		YUnitName:   "%",
 		YUnitNameEn: "%",
 		XMinValue:   fmt.Sprint(xMinVal),

services/data/edb_classify.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"eta/eta_api/models"
 	"eta/eta_api/models/data_manage"
+	"eta/eta_api/models/data_manage/cross_variety"
 	"eta/eta_api/models/data_manage/excel"
 	"eta/eta_api/models/system"
 	"eta/eta_api/services/alarm_msg"
@@ -573,7 +574,7 @@ func Delete(classifyId, edbInfoId int, sysUser *system.Admin, requestBody, reque
 			calculateCount, tmpErr := excel.GetNoCustomAnalysisExcelEdbMappingCount(edbInfoId)
 			if tmpErr != nil && tmpErr.Error() != utils.ErrNoRow() {
 				errMsg = "删除失败"
-				err = errors.New("当前指标已添加到表格，GetNoCustomAnalysisExcelEdbMappingCount Err:" + tmpErr.Error())
+				err = errors.New("判断指标是否用作表格引用，GetNoCustomAnalysisExcelEdbMappingCount Err:" + tmpErr.Error())
 				return
 			}
 			if calculateCount > 0 {
@@ -582,6 +583,20 @@ func Delete(classifyId, edbInfoId int, sysUser *system.Admin, requestBody, reque
 			}
 		}
 
+		// 判断指标是否用作跨品种图表使用
+		{
+			calculateCount, tmpErr := cross_variety.GetCountByEdbInfoId(edbInfoId)
+			if tmpErr != nil && tmpErr.Error() != utils.ErrNoRow() {
+				errMsg = "删除失败"
+				err = errors.New("判断指标是否用作跨品种图表使用，GetCountByEdbInfoId Err:" + tmpErr.Error())
+				return
+			}
+			if calculateCount > 0 {
+				errMsg = "当前指标已添加到跨品种分析，不可删除"
+				return
+			}
+		}
+
 		//真实删除
 		tmpErr = data_manage.DeleteEdbInfoAndData(edbInfo.EdbInfoId, edbInfo.Source)
 		if tmpErr != nil {