Merge branch 'edbAdd-information-carry'

src/views/dataEntry_manage/databaseComponents/addTargetDiaBase.vue

@@ -189,7 +189,7 @@
 
 <script>
 import { dataBaseInterface,dataInterence } from '@/api/api.js'
-import { fromArr, fromCode ,frequencyArr,windCommonIndexCodeArr,THSCommonIndexStockCodeArr,THSCommonIndexFuturesCodeArr} from './util';
+import { frequencyArr,windCommonIndexCodeArr,THSCommonIndexStockCodeArr,THSCommonIndexFuturesCodeArr} from './util';
 export default {
 	name: '',
 	props: {
@@ -235,14 +235,14 @@ export default {
 			search_txt: '',//搜素关键词 M001625518 M0001427
 			fromType: 'wind',
 			fromDatabase:'0',
-			fromArr,
+			fromArr:[],
 			indexCodeSelected:[],
 			databaseType:[
 				{value:'0',label:'经济数据库'},
 				{value:'1',label:'日期序列'}
 			],
 			wsdAddStep:1,
-			fromCode,
+			fromCode:[],
 			tableColums: [
 				{
 					label: '指标ID',
@@ -374,23 +374,26 @@ export default {
 					if (res.Ret === 200) {
 						this.haveResult = false;
 						//隆众指标和手工指标、交易所等将名称 频度 单位带到下一步
-						let opther_params = ['9', '10', '11', '15', '16', '17', '18', '19', '20', '21', '26','38','41','57','60','71'].includes(this.fromCode.get(this.fromType)) ? {
-							edb_name: res.Data.SearchItem.EdbName,
-							unit: res.Data.SearchItem.Unit,
-							frequency: res.Data.SearchItem.Frequency,
-						} : {}
-						let jy_params = Number(this.fromCode.get(this.fromType))>1000?{
-							edb_name:res.Data.SearchItem.EdbName,
-							unit:res.Data.SearchItem.Unit,
-							frequency:frequencyArr.includes(res.Data.SearchItem.Frequency)?res.Data.SearchItem.Frequency:''
-						}:{}
+						console.log(this.fromCode.get(this.fromType),'this.fromCode.get(this.fromType)');
+						// let opther_params = ['9', '10', '11', '15', '16', '17', '18', '19', '20', '21', '26','38','41','57','60','71'].includes(this.fromCode.get(this.fromType)) ? 
+						let opther_params={
+							edb_name: res.Data.SearchItem.EdbName || '',
+							unit: res.Data.SearchItem.Unit || '',
+							frequency: frequencyArr.includes(res.Data.SearchItem.Frequency)?res.Data.SearchItem.Frequency:'',
+						} 
+						// : {}
+						// let jy_params = Number(this.fromCode.get(this.fromType))>1000?{
+						// 	edb_name:res.Data.SearchItem.EdbName,
+						// 	unit:res.Data.SearchItem.Unit,
+						// 	frequency:frequencyArr.includes(res.Data.SearchItem.Frequency)?res.Data.SearchItem.Frequency:''
+						// }:{}
 						this.add_params = {
 							EdbCode: res.Data.SearchItem.EdbCode,
 							EndDate: res.Data.SearchItem.EndDate,
 							StartDate: res.Data.SearchItem.StartDate,
 							Source: Number(this.fromCode.get(this.fromType)),
 							...opther_params,
-							...jy_params
+							// ...jy_params
 						}
 						this.status = res.Data.Status;
 						let classify_arr = res.Data.ClassifyList || [];

src/views/dataEntry_manage/databaseComponents/util.js

@@ -155,11 +155,12 @@ export const computedBatchTypes = [
 
 //频度
 export const frequencyArr = ['日度','周度','旬度','月度','季度','年度']
-//添加基础指标来源
+//添加基础指标来源 已改为从接口获取 datamanage/edb_source/list
 export const fromArr = ['wind','同花顺','彭博','彭博财务','路透','手工指标','隆众指标','SMM','Mysteel','郑商所',
 '大商所','上期所','中金所','上期能源','欧洲天然气','中国煤炭市场网','谷歌出行指数','EIA STEO报告','UN','卓创数据（红桃3）',
 '百川盈孚','国家统计局','富宝数据'];
 
+// 已改为从接口获取 datamanage/edb_source/list
 export const fromCode = new Map([
 	['同花顺','1'],
 	['wind','2'],