指标搜索修改

controllers/data_manage/edb_info.go

@@ -4384,7 +4384,7 @@ func (this *EdbInfoController) AllEdbInfoByEs() {
 		keyWordArr = append(keyWordArr, newKeyWord...)
 
 		// 普通的搜索
-		total, edbInfoList, err = elastic.SearchEdbInfoData(utils.DATA_INDEX_NAME, keyWord, startSize, pageSize, filterSource, source, -1, ``, noPermissionEdbInfoIdList)
+		total, edbInfoList, err = elastic.SearchEdbInfoData(utils.DATA_INDEX_NAME, keyWord, startSize, pageSize, filterSource, source, -1, frequency, noPermissionEdbInfoIdList)
 	} else {
 		var condition string
 		var pars []interface{}

controllers/data_manage/excel/mixed_table.go

@@ -363,8 +363,8 @@ func (c *ExcelInfoController) GetMixDateCalculate() {
 	// 计算
 	val, errMsg, err := excel2.DateCalculateFormula(valMap, strings.ToUpper(req.Formula))
 	if err != nil {
-		br.Msg = "日期计算失败"
-		br.ErrMsg = errMsg
+		br.Msg = errMsg
+		br.ErrMsg = err.Error()
 		return
 	}