|
@@ -1515,7 +1515,7 @@ export default {
|
|
|
async formulaStringToArray(){
|
|
|
let detail = (await formulaDetail({elementId:this.eleid,scope:this.globaltype,nodeId:this.nodeid,projectId:this.curProjiect.id||this.pid})).data.data;
|
|
|
console.log(detail);
|
|
|
- if(detail.id){
|
|
|
+ if(detail&&detail.id){
|
|
|
this.formulaid = detail.id;
|
|
|
//let formula = formulaStringToArray('FC.sum(FC.repeat(E[测试测试_222]))+FC.ifelse(3<E[测试测试_333]&&E[测试测试_333]<10,E[测试测试_222]+E[测试测试_333],E[测试测试_333])',detail.map,this.formulaMap);
|
|
|
let formula = formulaStringToArray(detail.formula,detail.map,this.formulaMap);
|
|
@@ -1532,7 +1532,7 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if(detail.scale > -1){
|
|
|
+ if(detail&&detail.scale > -1){
|
|
|
this.isRetain = true;
|
|
|
this.retainNum = detail.scale;
|
|
|
}
|
|
@@ -1672,7 +1672,7 @@ export default {
|
|
|
this.eleTableListComp =res.data.data;
|
|
|
console.log( this.eleTableListComp,' this.eleTableListComp');
|
|
|
this.eleTableIdComp = this.eleTableListComp[0].id;
|
|
|
- ;
|
|
|
+
|
|
|
}
|
|
|
|
|
|
}
|