|
@@ -95,8 +95,11 @@
|
|
|
<div class="dialog-content">
|
|
|
<!-- 选择指标 or 预测指标 -->
|
|
|
<div class="table-radio-wrap">
|
|
|
- <el-radio v-model="edbType" label="1">ETA指标</el-radio>
|
|
|
- <el-radio v-model="edbType" label="2">预测指标</el-radio>
|
|
|
+ <el-radio-group v-model="factorData.edbType" @input="changeEdbType">
|
|
|
+ <el-radio label="1">ETA指标</el-radio>
|
|
|
+ <el-radio label="2">预测指标</el-radio>
|
|
|
+ </el-radio-group>
|
|
|
+
|
|
|
</div>
|
|
|
<!-- 表格筛选项 -->
|
|
|
<div class="table-select-box">
|
|
@@ -247,7 +250,8 @@ export default {
|
|
|
"selectList":[
|
|
|
{"EdbInfoId":104758,"EdbName":"7894567","EdbNameEn":"aaaa"},
|
|
|
{"EdbInfoId":104845,"EdbName":"生成指标","EdbNameEn":"生成指标"}
|
|
|
- ]
|
|
|
+ ],
|
|
|
+ "edbType":'1'
|
|
|
},
|
|
|
{
|
|
|
"name":"美国10年通胀预期同比",
|
|
@@ -255,7 +259,8 @@ export default {
|
|
|
"selectList":[
|
|
|
{"EdbInfoId":104176,"EdbName":"美国10年通胀预期同比","EdbNameEn":"美国10年通胀预期同比"},
|
|
|
{"EdbInfoId":104177,"EdbName":"天津螺纹价格同比","EdbNameEn":"天津螺纹价格同比"}
|
|
|
- ]
|
|
|
+ ],
|
|
|
+ "edbType":'2'
|
|
|
}
|
|
|
], //mock用,之后替换成infoForm中表示因子系列的字段
|
|
|
isAddFactorDialogShow:false,
|
|
@@ -263,6 +268,7 @@ export default {
|
|
|
name:'',//因子系列名称
|
|
|
formulaList:[],//因子系列计算公式
|
|
|
selectList:[],//因子系列选择的指标
|
|
|
+ edbType:'1',//选择的指标类型:1指标2预测指标
|
|
|
},
|
|
|
tableData:[],
|
|
|
tableSelectParams:{
|
|
@@ -288,17 +294,26 @@ export default {
|
|
|
},
|
|
|
methods:{
|
|
|
openAddDialog(data){
|
|
|
- const {name='',formulaList=[],selectList=[]} = data
|
|
|
+ const {name='',formulaList=[],selectList=[],edbType='1'} = data
|
|
|
this.factorData = {
|
|
|
- name,formulaList,selectList
|
|
|
+ name,formulaList,selectList,edbType
|
|
|
}
|
|
|
this.getClassifyOpt()
|
|
|
this.getSysUserOpt()
|
|
|
//清空筛选项
|
|
|
this.initSelectOpt()
|
|
|
this.tableData = []
|
|
|
+ console.log('open')
|
|
|
this.isAddFactorDialogShow = true
|
|
|
},
|
|
|
+ changeEdbType(){
|
|
|
+ if(this.isAddFactorDialogShow){
|
|
|
+ console.log('change')
|
|
|
+ //若切换指标类型,清空选项
|
|
|
+ this.factorData.selectList = []
|
|
|
+ this.getClassifyOpt()
|
|
|
+ }
|
|
|
+ },
|
|
|
initSelectOpt(){
|
|
|
this.tableSelectParams = {
|
|
|
classify:'',
|