公式配置

src/views/formula/edit.vue

@@ -39,7 +39,7 @@
       </div>
     </div>
     <div class="box-dashed">
-      <div class="mg-b-20">函数公式1</div>
+      <div class="mg-b-20">函数公式</div>
       <div class="edit-text">
         <span>
           <formula-item
@@ -1313,7 +1313,7 @@ export default {
 
     //把公式文本还原数组
     async formulaStringToArray(){
-      let detail = (await formulaDetail({elementId:this.eleid,scope:this.globaltype,nodeId:this.nodeid})).data.data;
+      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){
         this.formulaid = detail.id;

src/views/formula/edit1.vue

@@ -1509,7 +1509,7 @@ export default {
 
     //把公式文本还原数组
     async formulaStringToArray(){
-      let detail = (await formulaDetail({elementId:this.eleid,scope:this.globaltype,nodeId:this.nodeid})).data.data;
+      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){
         this.formulaid = detail.id;

src/views/manager/projectinfo/tree.vue

@@ -2503,7 +2503,7 @@ export default {
 
       this.formulaCurRow = row;
       this.formulaCurRow.globaltype = type;
-      if(type===1){
+      if(type===10){
           this.formulaCompVisible1 = true;
            this.formulaCurRow.elementType = false;
             this.istableType=true;