|
@@ -307,23 +307,23 @@
|
|
|
</div>
|
|
|
<div v-show="deviationRange.showSelectEle" style="width:60%">
|
|
|
<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!==null&&item.pkeyId!==-1)"></el-option>
|
|
|
+ <el-select v-model="eleTableIdComp" @change="getTableEleComp" placeholder="请选择元素表" style="width:45%" clearable size="small">
|
|
|
+
|
|
|
+ <el-option v-for="item in eleTableListComp" :key="item.id" :label="item.tableName":value="item.pkeyId"></el-option>
|
|
|
</el-select>
|
|
|
<!-- 搜索元素下拉框 -->
|
|
|
- <el-select v-model="input3" filterable clearable placeholder="搜索元素字段" @change="getInput1" style="width:45%">
|
|
|
+ <!-- <el-select v-model="input3" filterable clearable placeholder="搜索元素字段999" @change="getInput1" style="width:45%" size="small">
|
|
|
<el-option
|
|
|
v-for="item in eleListComp1"
|
|
|
:key="item.id"
|
|
|
:label="item.eName"
|
|
|
:value="item.eName">
|
|
|
</el-option>
|
|
|
- </el-select>
|
|
|
+ </el-select> -->
|
|
|
</div>
|
|
|
|
|
|
<div class="mg-t-10 mg-b-10 no-mb-col" style="width:100%">
|
|
|
- <el-scrollbar style="height:520px;">
|
|
|
+ <!-- <el-scrollbar style="height:520px;">
|
|
|
<el-row>
|
|
|
<el-col :span="6" v-for="item in eleListComp" :key="item.id">
|
|
|
<div class="ele-box">
|
|
@@ -333,7 +333,11 @@
|
|
|
</div>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
- </el-scrollbar>
|
|
|
+ </el-scrollbar> -->
|
|
|
+ <el-scrollbar style="height: 520px">
|
|
|
+
|
|
|
+ <tableFormWrite :pkeyId="eleTableIdComp" @element-selected="setDeviationRangeEle" :initTableName="initTableNameDev" :key="4" :container-id="'excel-container-4'" ></tableFormWrite>
|
|
|
+ </el-scrollbar>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -621,7 +625,8 @@ export default {
|
|
|
selectedTableKeyComp:'', // 存储选中的表格元素key 组件
|
|
|
initTableNameList:'',//初始表名 选择元素弹窗
|
|
|
seleList:[],//选择元素弹窗 选中的元素列表
|
|
|
- tableKey:'3'
|
|
|
+ tableKey:'3',
|
|
|
+ initTableNameDev:'',//初始表名 允许偏差值范围
|
|
|
|
|
|
};
|
|
|
},
|
|
@@ -1916,9 +1921,14 @@ console.log(remark,'remark');
|
|
|
},
|
|
|
|
|
|
//设置动态组件里面的元素
|
|
|
- setDeviationRangeEle(value,item){
|
|
|
+ setDeviationRangeEle(item,value){
|
|
|
+ console.log(item,'item');
|
|
|
+
|
|
|
+ console.log(value,'value');
|
|
|
+
|
|
|
if(value){
|
|
|
//console.log(this.$refs.dynamiccomponent[index])
|
|
|
+
|
|
|
this.$refs.deviationrange.setELe(item);
|
|
|
}
|
|
|
},
|
|
@@ -2115,6 +2125,7 @@ console.log(remark,'remark');
|
|
|
this.eleTableListComp.forEach((item)=>{
|
|
|
if(item.pkeyId===tableId){
|
|
|
this.initTableNameComp=item.initTableName
|
|
|
+ this.initTableNameDev=item.initTableName
|
|
|
}
|
|
|
|
|
|
})
|