跳转全局公式修改

src/views/manager/projectinfo/tree.vue

@@ -2012,7 +2012,7 @@
       ></FormulaEdit>
     </el-dialog>
     <!-- 全局公式 -->
-    <el-dialog
+    <!-- <el-dialog
       title=""
       :visible.sync="formulaCompVisible1"
       fullscreen
@@ -2034,7 +2034,7 @@
         v-if="formulaCompVisible1"
       >
       </FormulaEditone>
-    </el-dialog>
+    </el-dialog> -->
 
     <!-- 编辑元素 -->
     <el-dialog
@@ -4517,17 +4517,32 @@ clearSearch1() {
     },
 
     //跳转到公式配置页面
-    toFormulaEdit(row, type) {
+    // toFormulaEdit(row, type) {
+    //   this.curEleTable.hasPartFormula = row.hasPartFormula;
+    //   this.formulaCurRow = row;
+    //   this.formulaCurRow.globaltype = type;
+    //   if (type === 10) {
+    //     this.formulaCompVisible1 = true;
+    //     this.formulaCurRow.elementType = false;
+    //     this.istableType = true;
+    //   } else {
+    //     this.formulaCompVisible = true;
+    //   }
+    // },
+      toFormulaEdit(row, type) {
       this.curEleTable.hasPartFormula = row.hasPartFormula;
       this.formulaCurRow = row;
       this.formulaCurRow.globaltype = type;
-      if (type === 10) {
-        this.formulaCompVisible1 = true;
+      // if (type === 10) {
+      //   this.formulaCompVisible1 = true;
+      //   this.formulaCurRow.elementType = false;
+      //   this.istableType = true;
+      // } else {
+      //   this.formulaCompVisible1 = true;
+      // }
+       this.formulaCompVisible = true;
         this.formulaCurRow.elementType = false;
         this.istableType = true;
-      } else {
-        this.formulaCompVisible = true;
-      }
     },
     //关闭公式弹窗
     closeformulaComp() {