|
@@ -103,7 +103,7 @@
|
|
|
<div class="flex" style="justify-content: space-between;width:100%">
|
|
|
<el-select v-model="eleTableId" @change="getTableEle" placeholder="请选择元素表" style="width:45%">
|
|
|
<el-option v-if="paramDataList.length" label="选择节点参数2" value="选择节点参数"></el-option>
|
|
|
- <el-option v-for="item in eleTableList" :key="item.id" :label="item.tableName" :value="item.pkeyId!==-1?item.pkeyId:item.id"></el-option>
|
|
|
+ <el-option v-for="item in eleTableList" :key="item.id" :label="item.tableName" :value="(item.pkeyId!==null&&item.pkeyId!==-1)?item.pkeyId:item.id"></el-option>
|
|
|
</el-select>
|
|
|
<!-- 搜索元素下拉框 -->
|
|
|
<el-select v-model="input3" filterable clearable placeholder="搜索元素字段1" @change="getInput" style="width:45%">
|
|
@@ -228,7 +228,7 @@
|
|
|
<div class="flex" style="justify-content: space-between;width:100%">
|
|
|
<el-select v-model="eleTableIdComp" @change="getTableEleComp" placeholder="请选择元素表" style="width:45%">
|
|
|
<el-option v-if="paramDataList.length" label="选择节点参数1" value="选择节点参数"></el-option>
|
|
|
- <el-option v-for="item in eleTableListComp" :key="item.id" :label="item.tableName" :value="item.pkeyId!==-1?item.pkeyId:item.id"></el-option>
|
|
|
+ <el-option v-for="item in eleTableListComp" :key="item.id" :label="item.tableName" :value="(item.pkeyId!==null&&item.pkeyId!==-1)"></el-option>
|
|
|
</el-select>
|
|
|
<!-- 搜索元素下拉框 -->
|
|
|
<el-select v-model="input3" filterable placeholder="搜索元素字段2" @change="getInput1" style="width:45%">
|
|
@@ -287,7 +287,7 @@
|
|
|
<div class="flex" style="justify-content: space-between;width:100%">
|
|
|
<el-select v-model="eleTableIdComp" @change="getTableEleComp" placeholder="请选择元素表" style="width:45%">
|
|
|
<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.pkeyId!==-1?item.pkeyId:item.id"></el-option>
|
|
|
+ <el-option v-for="item in eleTableListComp" :key="item.id" :label="item.tableName" :value="(item.pkeyId!==null&&item.pkeyId!==-1)"></el-option>
|
|
|
</el-select>
|
|
|
<!-- 搜索元素下拉框 -->
|
|
|
<el-select v-model="input3" filterable clearable placeholder="搜索元素字段3" @change="getInput1" style="width:45%">
|
|
@@ -357,7 +357,7 @@
|
|
|
<el-select v-model="eleTableId" @change="getTableEle" placeholder="请选择元素表">
|
|
|
<el-option v-if="paramDataList.length" label="选择节点参数3" value="选择节点参数"></el-option>
|
|
|
<template v-if="pid">
|
|
|
- <el-option v-for="item in eleTableList" :key="item.id" :label="item.tableName" :value="item.pkeyId!==-1?item.pkeyId:item.id"></el-option>
|
|
|
+ <el-option v-for="item in eleTableList" :key="item.id" :label="item.tableName" :value="(item.pkeyId!==null&&item.pkeyId!==-1)"></el-option>
|
|
|
</template>
|
|
|
<template v-else>
|
|
|
<el-option v-for="item in eleTableList" :key="item.id" :label="item.tableName" :value="item.id"></el-option>
|
|
@@ -1537,7 +1537,7 @@ export default {
|
|
|
},
|
|
|
|
|
|
getTableEle(tableId){
|
|
|
- console.log("getTableEle");
|
|
|
+ console.log("getTableEle",tableId);
|
|
|
this.input3=''
|
|
|
if(tableId === '选择节点参数'){
|
|
|
this.eleList = this.paramDataList;
|