11

src/config/index.json

@@ -1,5 +1,6 @@
 {
-  "target": "http://192.168.0.109:8090",
+  "target1": "http://39.108.216.210:8090",
+  "target": "http://192.168.0.102:8090",
   "dev": {
     "port": 1888
   }

src/views/formula/edit1.vue

@@ -48,8 +48,8 @@
             :item="item" @click="obj => equationClick(obj,index,'resultFormula')"
           >
           </formula-item>
- 
-        
+
+
         </span>
         <span>=</span>
         <span   v-for="(item,index) in processFormula"     :key="index">
@@ -718,85 +718,59 @@ export default {
       }
     },
     treeLoadNode(node, resolve){
-       let parentId = 12345678910;
-      if (node.level != 0) {
-        parentId = node.data.id;
-      }
+      let parentId = 12345678910;
+        console.log(node.level, "node.level")
+        if (node.level != 0) {
+          parentId = node.data.id;
+        }
         // 开启 “加载中” 动画
-        if(node.level == 0) this.loading=true
-        //  if(this.globaltype===1&&!this.elementType){
-           if(!this.elementType){
-             tabTypeLazyTreeAll({parentId,current:1,size:1000,hasPartFormula:this.fromcurNode.hasPartFormula}).then(res => {
-                // 请求接口，返回数据
-                let data = res.data.data.records;
-                  this.loading=false
-                 resolve(data);
-                this.$nextTick(() => {
-                  console.log(this.tableType,'tableType1111111111');
-                  
-                  // if(this.tableType){
-                  //  let expandid=Number(this.tableType)-1
-                  // }else{
-                  //    let expandid=Number(this.fromcurNode.parentId)-1
-                  // }
-                  console.log(this.fromcurNode,'this.fromcurNode');
-                  let expandid=this.tableType? Number(this.fromcurNode.tableType)-1:Number(this.fromcurNode.parentId)-1
-                  console.log(expandid,'expandid');
-                   node.childNodes[expandid].expand();
-
-                    let paramsId = this.fromcurNode.initTableId
-                  console.log(paramsId, "paramsId")
-                  let isArray = Array.isArray(this.$refs.tree)
-                  if (isArray) {
-                    // 根据 id 获取节点信息
-                    this.$refs.tree[0].setCurrentKey(paramsId);
-                  } else {
-                    this.$refs.tree.setCurrentKey(paramsId);
-                  }
-
-                  this.getNodeDetail(this.fromcurNode)
-                  this.getNodeDetailComp(this.fromcurNode)
-
-                })
+        if(node.level == 0) this.loading = true
+        if(!this.elementType) {
+         tabTypeLazyTreeAll({parentId,current:1,size:1000,hasPartFormula:this.fromcurNode.hasPartFormula}).then(res => {
+            // 请求接口，返回数据
+            let data = res.data.data.records;
+            this.loading=false
+             resolve(data);
+            this.$nextTick(() => {
+              let expandid = this.tableType ? Number(this.fromcurNode.tableType)-1 : Number(this.fromcurNode.parentId)-1;
+              node.childNodes[expandid].expand();
+              let paramsId = this.fromcurNode.initTableId
+              let isArray = Array.isArray(this.$refs.tree)
+                console.log(isArray, "isArray")
+              if (isArray) {
+                // 根据 id 获取节点信息
+                this.$refs.tree[0].setCurrentKey(paramsId);
+              } else {
+                this.$refs.tree.setCurrentKey(paramsId);
+              }
+              this.getNodeDetail(this.fromcurNode)
+              this.getNodeDetailComp(this.fromcurNode)
             })
-         }
-        //  else if(this.globaltype===1&&this.elementType)
-            else if(this.elementType)
-         {
-          tabTypeLazyTree({parentId,projectId:this.projectid,pcurrent:1,size:1000}).then(res => {
-                // 请求接口，返回数据
-                let data = res.data.data.records;
-                  this.loading=false
-                 resolve(data);
-                this.$nextTick(() => {
-                  console.log(this.fromcurNode,'this.fromcurNode')
-                  let expandid=Number(this.fromcurNode.parentId)-1
-                   node.childNodes[expandid].expand();
-                    let paramsId = this.fromcurNode.id
-                    console.log(this.nodeid,'this.initTableId');
-                    // 根据 id 获取节点信息
-                    // let getNodeById = this.$refs.tree.getNode(paramsId);
-                    // if(getNodeById){
-                    //     // 设置节点选中
-                    //     this.$refs.tree.setCurrentKey(paramsId);
-                    //      this.getNodeDetail(this.fromcurNode)
-                    //         this.getNodeDetailComp(this.fromcurNode)
-                    // }
-                     let isArray = Array.isArray(this.$refs.tree)
-                  if (isArray) {
-                    // 根据 id 获取节点信息
-                    this.$refs.tree[0].setCurrentKey(paramsId);
-                  } else {
-                    this.$refs.tree.setCurrentKey(paramsId);
-                  }
-
-                  this.getNodeDetail(this.fromcurNode)
-                  this.getNodeDetailComp(this.fromcurNode)
-                })
+        })
+     } else if(this.elementType) {
+      tabTypeLazyTree({parentId,projectId:this.projectid,pcurrent:1,size:1000}).then(res => {
+            // 请求接口，返回数据
+            let data = res.data.data.records;
+            this.loading=false
+            resolve(data);
+            this.$nextTick(() => {
+              let expandid=Number(this.fromcurNode.parentId)-1
+               node.childNodes[expandid].expand();
+                let paramsId = this.fromcurNode.id
+                console.log(this.nodeid,'this.initTableId');
+                let isArray = Array.isArray(this.$refs.tree)
+              if (isArray) {
+                // 根据 id 获取节点信息
+                this.$refs.tree[0].setCurrentKey(paramsId);
+              } else {
+                this.$refs.tree.setCurrentKey(paramsId);
+              }
+              this.getNodeDetail(this.fromcurNode)
+              this.getNodeDetailComp(this.fromcurNode)
             })
-         }
+        })
+     }
     },
-
     //搜索树
     treeFilter() {
       console.log('搜索');
@@ -1507,7 +1481,7 @@ export default {
             type: "success",
             message: msg
           });
-        
+
         })
       }else{
         saveFormula({
@@ -1532,10 +1506,10 @@ export default {
             type: "success",
             message: "保存成功"
           });
-       
+
         })
       }
-     
+
     },
 
     //把公式文本还原数组
@@ -1613,7 +1587,7 @@ export default {
         if(data.hasChildren===false||data.isLinkTable===2){
            this.eleListable=true;
            getTableElments(data.initTableId ).then((res)=>{
-             if(res.data.code==200){
+             if(res.data.code == 200){
                 this.eleList=res.data.data;
                  this.eleTableList =res.data.data;
                 this.eleListable=false;
@@ -1710,7 +1684,7 @@ export default {
                 this.eleTableListComp =res.data.data;
                 console.log( this.eleTableListComp,' this.eleTableListComp');
                 this.eleTableIdComp = this.eleTableListComp[0].id;
-              
+
                }
 
              }