|
|
@@ -5,7 +5,7 @@
|
|
|
<div class="flex">
|
|
|
<div class="retain-box">
|
|
|
<el-checkbox v-model="isRetain"></el-checkbox>
|
|
|
- <span>保留1</span>
|
|
|
+ <span>保留</span>
|
|
|
<el-input-number
|
|
|
v-model="retainNum"
|
|
|
:step="1"
|
|
|
@@ -205,7 +205,7 @@
|
|
|
<div class=" flex-d-c" style="width:40%">
|
|
|
<component ref="dynamiccomponent" v-bind:is="componentMap[item.name]" :formulainfo="item" :curele="equationSelectEle" :formulamap="formulaMap" @uncheck="unCheckEleComp" class="flex1"></component>
|
|
|
<div class="flex1" v-show="item.showSelectEle" style="margin-top:10px;margin-bottom:30px">
|
|
|
- <el-scrollbar style="height: 400px">
|
|
|
+ <el-scrollbar style="height: 520px">
|
|
|
<el-tree
|
|
|
|
|
|
class="filter-tree"
|
|
|
@@ -225,9 +225,9 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<div v-show="item.showSelectEle" style="width:60%">
|
|
|
- <el-select v-model="eleTableIdComp" @change="getTableEleComp" placeholder="请选择元素表" style="width:100%">
|
|
|
+ <el-select v-model="eleTableIdComp" @change="getTableEleComp" placeholder="请选择元素字段" style="width:100%">
|
|
|
<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.initTableId"></el-option>
|
|
|
+ <el-option v-for="item in eleTableListComp" :key="item.id" :label="item.eName" :value="item.id"></el-option>
|
|
|
</el-select>
|
|
|
<div class="mg-t-10 mg-b-10 no-mb-col" style="width:100%">
|
|
|
<el-scrollbar style="height:520px;">
|
|
|
@@ -255,7 +255,7 @@
|
|
|
<div class=" flex-d-c" style="width:40%">
|
|
|
<deviation-range ref="deviationrange" :formulainfo="deviationRange" :formulamap="formulaMap" @uncheck="unCheckEleComp" class="flex1"></deviation-range>
|
|
|
<div class="flex1" v-show="deviationRange.showSelectEle" style="margin-top:10px;margin-bottom:30px">
|
|
|
- <el-scrollbar style="height: 400px">
|
|
|
+ <el-scrollbar style="height: 520px">
|
|
|
<el-tree
|
|
|
class="filter-tree"
|
|
|
:data="treeData"
|
duy