|
@@ -5,7 +5,6 @@ import (
|
|
|
"eta/eta_api/controllers"
|
|
|
"eta/eta_api/models"
|
|
|
"eta/eta_api/models/data_manage"
|
|
|
- "eta/eta_api/models/data_manage/excel"
|
|
|
"eta/eta_api/models/system"
|
|
|
"eta/eta_api/services/data"
|
|
|
"eta/eta_api/services/data/data_manage_permission"
|
|
@@ -715,24 +714,14 @@ func (this *ChartClassifyController) DeleteChartClassify() {
|
|
|
for _, m := range myCharts {
|
|
|
myIds = append(myIds, m.MyChartId)
|
|
|
}
|
|
|
- if chartInfo.Source == 11 { //删除来自平衡表的图表
|
|
|
- //删除图表及关联指标
|
|
|
- e = excel.DeleteBalanceExcelChartInfoAndData(req.ChartInfoId)
|
|
|
- if e != nil {
|
|
|
- br.Msg = "删除失败"
|
|
|
- br.ErrMsg = "删除失败,Err:" + e.Error()
|
|
|
- return
|
|
|
- }
|
|
|
- } else {
|
|
|
- //删除图表及关联指标
|
|
|
- err = data_manage.DeleteChartInfoAndData(req.ChartInfoId)
|
|
|
- if err != nil {
|
|
|
- br.Msg = "删除失败"
|
|
|
- br.ErrMsg = "删除失败,Err:" + err.Error()
|
|
|
- return
|
|
|
- }
|
|
|
- }
|
|
|
|
|
|
+ //删除图表及关联指标
|
|
|
+ err = data_manage.DeleteChartInfoAndData(req.ChartInfoId)
|
|
|
+ if err != nil {
|
|
|
+ br.Msg = "删除失败"
|
|
|
+ br.ErrMsg = "删除失败,Err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
//删除ES
|
|
|
{
|
|
|
go data.EsDeleteChartInfo(req.ChartInfoId)
|