|
@@ -718,11 +718,11 @@ export default {
|
|
|
id:this.$route.query.id
|
|
|
}).then(res=>{
|
|
|
console.log(res);
|
|
|
- this.spinning=false;
|
|
|
+ // this.spinning=false;
|
|
|
if(res.success){
|
|
|
- this.spinning=false;
|
|
|
+ // this.spinning=false;
|
|
|
new Promise((resolve,reject)=>{
|
|
|
- getAction(this.url.fieldList,{
|
|
|
+ getAction(this.url.fieldList,{
|
|
|
mediaType:res.result.mediaType,
|
|
|
pageNo:1,
|
|
|
pageSize:500,
|
|
@@ -740,30 +740,44 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
}).then(data=>{
|
|
|
- res.result.ruleList.map((item,index)=>{
|
|
|
- item.ruleDetail.forEach((ele,ind)=>{
|
|
|
+ if(res.result.ruleList){
|
|
|
+ res.result.ruleList.map((item,index)=>{
|
|
|
+ item.ruleDetail.forEach((ele,ind)=>{
|
|
|
|
|
|
- ele.baseIndex=[ele.ruleDimension,ele.indicatorCode];
|
|
|
- getAction(this.url.ruleCondition,{
|
|
|
- dataType:ele.dataType
|
|
|
- }).then(result=>{
|
|
|
- console.log(result)
|
|
|
- if(result.success){
|
|
|
- ele.conditionList=result.result
|
|
|
- console.log(this.form);
|
|
|
- this.form={};
|
|
|
- this.form=res.result
|
|
|
- }
|
|
|
+ ele.baseIndex=[ele.ruleDimension,ele.indicatorCode];
|
|
|
+ getAction(this.url.ruleCondition,{
|
|
|
+ dataType:ele.dataType
|
|
|
+ }).then(result=>{
|
|
|
+ console.log(result)
|
|
|
+ if(result.success){
|
|
|
+ ele.conditionList=result.result
|
|
|
+ console.log(this.form);
|
|
|
+ this.form={};
|
|
|
+ this.form=res.result
|
|
|
+ }
|
|
|
+ })
|
|
|
})
|
|
|
})
|
|
|
- })
|
|
|
|
|
|
+ this.form=res.result;
|
|
|
+ this.spinning=false
|
|
|
+ }else{
|
|
|
+
|
|
|
+ this.form={
|
|
|
+ ...res.result,
|
|
|
+ ruleList:[]
|
|
|
+ }
|
|
|
+ // this.form.ruleList=[]
|
|
|
+ this.spinning=false
|
|
|
+ }
|
|
|
+
|
|
|
+ // this.form=res.result;
|
|
|
|
|
|
- this.form=res.result;
|
|
|
})
|
|
|
|
|
|
}else{
|
|
|
-
|
|
|
+ this.$message.error(res.message);
|
|
|
+ this.spinning=false;
|
|
|
}
|
|
|
})
|
|
|
}else{
|
|
@@ -771,7 +785,7 @@ export default {
|
|
|
}
|
|
|
|
|
|
},
|
|
|
-
|
|
|
+
|
|
|
mediaTypeChange(e){
|
|
|
console.log(e);
|
|
|
this.getMediaTypeRuleField()
|