|
@@ -547,6 +547,7 @@ export default {
|
|
|
actiFunIndex:0,//元素下挂载的计算式的索引
|
|
|
chooseEleVisible:false,//选择元素弹窗
|
|
|
argumenObj:{},
|
|
|
+ checkGsId:'',//选中的元素表id
|
|
|
|
|
|
symbolReg:/(\+|-|\*|\/)(.+)/,
|
|
|
operatorReg : /^\+|-|\*|%/,//加减乘除
|
|
@@ -1109,6 +1110,8 @@ export default {
|
|
|
|
|
|
//点选等式中的元素
|
|
|
equationClick({selected,item},index,arrName){
|
|
|
+ this.checkGsId=item.id
|
|
|
+
|
|
|
if(selected){
|
|
|
this.resultFormula.forEach((ele)=>{
|
|
|
ele.selected = false;
|
|
@@ -1327,8 +1330,10 @@ export default {
|
|
|
saveFormula(){
|
|
|
console.log('保存',this.pid);
|
|
|
console.log(this.processFormula,'this.processFormula1111111112333');
|
|
|
-
|
|
|
- let obj = formulaArrayToString(this.processFormula,this.resultFormula);
|
|
|
+ let arr=JSON.parse(JSON.stringify(this.processFormula));
|
|
|
+ let filteredArr = arr.filter(item => item.id ===this.checkGsId);
|
|
|
+ // let obj = formulaArrayToString(this.processFormula,this.resultFormula);
|
|
|
+ let obj= formulaArrayToString(filteredArr,this.resultFormula);
|
|
|
console.log(this.processFormula,'this.processFormula1111111111');
|
|
|
console.log(this.resultFormula,'this.resultFormulaa1111111111');
|
|
|
console.log(obj,'obj1111111111111111111');
|