节点公式修改

src/views/formula/edit.vue

@@ -1332,8 +1332,12 @@ export default {
       console.log(this.processFormula,'this.processFormula1111111112333');
       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);
+      let obj
+      if(filteredArr.length === 0){
+        obj = formulaArrayToString(this.processFormula,this.resultFormula);
+      }else{
+          obj = formulaArrayToString(filteredArr,this.resultFormula);
+      }
       console.log(this.processFormula,'this.processFormula1111111111');
             console.log(this.resultFormula,'this.resultFormulaa1111111111');
       console.log(obj,'obj1111111111111111111');

src/views/formula/edit1.vue

@@ -1427,7 +1427,14 @@ export default {
       // 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(filteredArr,this.resultFormula);
+      //  let obj = formulaArrayToString(filteredArr,this.resultFormula);
+
+       let obj
+      if(filteredArr.length === 0){
+        obj = formulaArrayToString(this.processFormula,this.resultFormula);
+      }else{
+          obj = formulaArrayToString(filteredArr,this.resultFormula);
+      }
       let deviationRangeText = rangeToString(this.deviationRange.datas,obj.eleMap);
       obj.eleMap.deviationRangeJson = JSON.stringify(this.deviationRange.datas);
       //console.log(obj.eleMap)

src/views/manager/wbsinfo/edit.vue

@@ -1454,6 +1454,7 @@
       fullscreen
       append-to-body
       class="full-dialog"
+       @close="closeformulaComp"
     >
       <FormulaEdit
         :wbsid="id"
@@ -1473,6 +1474,7 @@
       fullscreen
       append-to-body
       class="full-dialog"
+      @close="closeformulaComp1"
     >
       <FormulaEditone
         :wbsid="id"
@@ -1628,7 +1630,7 @@ export default {
 
       importVisible: false,
       tempList: [],
-
+      checkRow:{},    
       curEleTable: {},
       editEleVisible: false,
       editEleList: [],
@@ -2199,6 +2201,8 @@ export default {
     },
 
     handleEditFormula(index, row) {
+      console.log( row, 'row');
+      this.checkRow = row;
       this.curEleTable = row;
       selectFormElements(this.curEleTable.id, { type: 1 }).then((res) => {
         this.editEleListFilter = res.data.data;
@@ -2521,7 +2525,24 @@ export default {
         this.formulaCompVisible = true;
       }
     },
-
+    //关闭公式弹窗
+    closeformulaComp() {
+      console.log(  this.checkRow,'  this.checkRow');
+      
+      console.log("关闭");
+        selectFormElements(  this.checkRow.id, { type: 1 }).then((res) => {
+        this.editEleListFilter = res.data.data;
+        this.editEleListAll = [].concat(this.editEleListFilter);
+      });
+    },
+    //关闭公式弹窗
+    closeformulaComp1() {
+      console.log("关闭");
+      selectFormElements(  this.checkRow.id, { type: 0 }).then((res) => {
+        this.editEleListFilter = res.data.data;
+        this.editEleListAll = [].concat(this.editEleListFilter);
+      });
+    },
     getNodeTypelist() {
       const type = this.wbsType;
       console.log(this.nodeTypelist, "this.nodeTypelist");