Browse Source

formula bug

yangyj 1 year ago
parent
commit
d638197fc8

+ 3 - 3
src/views/formula/edit.vue

@@ -39,7 +39,7 @@
       </div>
     </div>
     <div class="box-dashed">
-      <div class="mg-b-20">函数公式</div>
+      <div class="mg-b-20">函数公式..</div>
       <div class="edit-text">
         <span>
           <formula-item
@@ -1443,7 +1443,7 @@ export default {
         this.eleList = this.paramDataList;
         this.eleList1 = this.paramDataList;
       }else{
-        selectFormElements(tableId,{nodeId:this.nodeid,type:1}).then((res)=>{
+        selectFormElements(tableId,{nodeId:this.nodeid,type:0}).then((res)=>{
           this.eleList = res.data.data;
           this.eleList1 = res.data.data;
         })
@@ -1529,7 +1529,7 @@ export default {
         this.eleListComp = this.paramDataList;
         this.eleListComp1 = this.paramDataList;
       }else{
-        selectFormElements(tableId,{type:1}).then((res)=>{
+        selectFormElements(tableId,{type:0}).then((res)=>{
           this.eleListComp = res.data.data;
            this.eleListComp1 = res.data.data;
         })

+ 1 - 1
src/views/formula/edit1.vue

@@ -39,7 +39,7 @@
       </div>
     </div>
     <div class="box-dashed">
-      <div class="mg-b-20">函数公式2</div>
+      <div class="mg-b-20">函数公式.</div>
       <div class="edit-text">
         <span>
           <formula-item

+ 1 - 1
src/views/formula/editnew.vue

@@ -39,7 +39,7 @@
       </div>
     </div>
     <div class="box-dashed">
-      <div class="mg-b-20">函数公式11111</div>
+      <div class="mg-b-20">函数公式-</div>
       <div class="edit-text">
         <span>
           <formula-item

+ 0 - 1
src/views/manager/projectinfo/tree.vue

@@ -2529,7 +2529,6 @@ export default {
       //     projectid:this.projectid
       //   }
       // });
-
       this.formulaCurRow = row;
       this.formulaCurRow.globaltype = type;
       if(type===10){

+ 2 - 2
vue.config.js

@@ -27,12 +27,12 @@ module.exports = {
             '/api': {
                 //本地服务接口地址
                 // target: 'http://192.168.3.64',
-                // target: 'http://localhost:8090',
+                target: 'http://localhost:8090',
                 // target: 'http://192.168.1.179:8090',
                 // target: 'http://192.168.31.96',
                 // target: 'http://192.168.0.155:1888', //刘依程
                 //远程演示服务地址,可用于直接启动项目
-                target: 'http://47.110.251.215:8090',
+                // target: 'http://47.110.251.215:8090',
 
                 ws: true,
                 pathRewrite: {