Merge branch 'master' of http://47.110.251.215:3000/web/saber

src/views/formula/edit.vue

@@ -96,7 +96,7 @@
           <el-col :span="16" class="h-100p flex flex-d-c ov-hidden">
             <el-select v-model="eleTableId" @change="getTableEle" placeholder="请选择元素表" style="width:300px">
               <el-option v-if="paramDataList.length" label="选择节点参数" value="选择节点参数"></el-option>
-              <el-option  v-for="item in eleTableList" :key="item.id" :label="item.tableName" :value="item.id"></el-option>
+              <el-option  v-for="item in eleTableList" :key="item.id" :label="item.tableName" :value="item.initTableId"></el-option>
             </el-select>
             <div class="mg-t-10 no-mb-col flex1 ov-hidden">
               <el-scrollbar style="height: 100%">
@@ -207,7 +207,7 @@
                 <div v-show="item.showSelectEle"  style="width:60%">
                   <el-select v-model="eleTableIdComp" @change="getTableEleComp" placeholder="请选择元素表" style="width:100%">
                     <el-option v-if="paramDataList.length" label="选择节点参数" value="选择节点参数"></el-option>
-                    <el-option  v-for="item in eleTableListComp" :key="item.id" :label="item.tableName" :value="item.id"></el-option>
+                    <el-option  v-for="item in eleTableListComp" :key="item.id" :label="item.tableName" :value="item.initTableId"></el-option>
                   </el-select>
                   <div class="mg-t-10 mg-b-10 no-mb-col" style="width:100%">
                     <el-scrollbar style="height:520px;">
@@ -264,9 +264,9 @@
             </el-card>
           </el-col>
           <el-col :span="16">
-            <el-select v-model="eleTableId" @change="getTableEle" placeholder="请选择元素表">
+            <el-select v-model="eleTableId" @change="getTableEle1" placeholder="请选择元素表">
               <el-option v-if="paramDataList.length" label="选择节点参数" value="选择节点参数"></el-option>
-              <el-option  v-for="item in eleTableList" :key="item.id" :label="item.tableName" :value="item.id"></el-option>
+              <el-option  v-for="item in eleTableList" :key="item.id" :label="item.tableName" :value="item.initTableId"></el-option>
             </el-select>
             <div class="mg-t-10 mg-b-10 no-mb-col">
               <el-scrollbar style="height: 460px">
@@ -946,7 +946,7 @@ export default {
             }
           }
 
-          
+
           this.$set(this.argumenObj.arguments,this.argumenObj.index,obj);
           this.chooseEleVisible = false;
           break;
@@ -1047,7 +1047,7 @@ export default {
           }
         }
       }
-      
+
       //console.log(obj)
       //console.log(text);
       if(this.formulaid){
@@ -1123,9 +1123,13 @@ export default {
         wbsPrivateGetNodeTabAndParam(data.id, this.pid, this.wbsid).then((res) => {
           if(res.data.data.tabData.length){
             this.eleTableList = res.data.data.tabData;
-
-            this.eleTableId = this.eleTableList[0].id;
-            this.getTableEle(this.eleTableId);
+            // 获取点击节点的第一张表
+            let tabId= this.eleTableList[0].initTableId;
+            this.getTableEle(tabId);
+            setTimeout(() => {
+              // 启动这个指令的DOM结构点击事件
+              this.eleTableId = tabId;
+            },1000); // 默认1秒
           }else{
             this.eleTableList = [];
             this.eleTableId = '';
@@ -1142,9 +1146,12 @@ export default {
         getNodeTabAndParam(data.id).then((res)=>{
           if(res.data.data.tabData.length){
             this.eleTableList = res.data.data.tabData;
-
-            this.eleTableId = this.eleTableList[0].id;
-            this.getTableEle(this.eleTableId);
+            let tabId= this.eleTableList[0].initTableId;
+            this.getTableEle(tabId);
+            setTimeout(() => {
+              // 启动这个指令的DOM结构点击事件
+              this.eleTableId = tabId;
+            },1000); // 默认1秒
           }else{
             this.eleTableList = [];
             this.eleTableId = '';
@@ -1191,14 +1198,14 @@ export default {
           if(res.data.data.tabData.length){
             this.eleTableListComp = res.data.data.tabData;
 
-            this.eleTableIdComp = this.eleTableListComp[0].id;
+            this.eleTableIdComp = this.eleTableListComp[0].initTableId;
             this.getTableEleComp(this.eleTableIdComp);
           }else{
             this.eleTableListComp = [];
             this.eleTableIdComp = '';
             this.eleListComp = [];
           }
-          
+
           if(res.data.data.paramData.length){
             this.paramDataList = res.data.data.paramData;
           }else{
@@ -1210,7 +1217,7 @@ export default {
           if(res.data.data.tabData.length){
             this.eleTableListComp = res.data.data.tabData;
 
-            this.eleTableIdComp = this.eleTableListComp[0].id;
+            this.eleTableIdComp = this.eleTableListComp[0].initTableId;
             this.getTableEleComp(this.eleTableIdComp);
           }else{
             this.eleTableListComp = [];

src/views/manager/wbsinfo/edit.vue

@@ -509,7 +509,7 @@
       :visible.sync="sortTag"
       width="50%"
       append-to-body
-      
+
     >
       <ManualSorting
         v-if="sortTag2"
@@ -2165,7 +2165,7 @@ export default {
 
     handleEdit (index, row) {
       this.curEleTable = row;
-      selectFormElements(this.curEleTable.id).then((res) => {
+      selectFormElements(this.curEleTable.initTableId).then((res) => {
         res.data.data.forEach((element) => {
           this.eleReg.exec(element.eAllowDeviation);
           //console.log(RegExp.$1)
@@ -2205,7 +2205,7 @@ export default {
 
     handleEditFormula (index, row) {
       this.curEleTable = row;
-      selectFormElements(this.curEleTable.id).then((res) => {
+      selectFormElements(this.curEleTable.initTableId).then((res) => {
 
         this.editEleListFilter = res.data.data;
         this.editEleListAll = [].concat(this.editEleListFilter);