|
@@ -287,7 +287,7 @@
|
|
|
<div v-if="!operationVisible && !showFunDetail && deviationRange.show" class="flex1">
|
|
|
<div class="flex">
|
|
|
<div class=" flex-d-c" style="width:40%">
|
|
|
- <deviation-range ref="deviationrange" :formulainfo="deviationRange" :formulamap="formulaMap" @uncheck="unCheckEleComp" class="flex1"></deviation-range>
|
|
|
+ <deviation-range ref="deviationrange" :formulainfo="deviationRange" :formulamap="formulaMap" @uncheck="unCheckEleComp" class="flex1" @clickTag="handleClickTag"></deviation-range>
|
|
|
<div class="flex1" v-show="deviationRange.showSelectEle" style="margin-top:10px;margin-bottom:30px">
|
|
|
<el-scrollbar style="height: 400px">
|
|
|
<el-tree
|
|
@@ -336,7 +336,7 @@
|
|
|
</el-scrollbar> -->
|
|
|
<el-scrollbar style="height: 520px">
|
|
|
|
|
|
- <tableFormWrite :pkeyId="eleTableIdComp" @element-selected="setDeviationRangeEle" :initTableName="initTableNameDev" :key="4" :container-id="'excel-container-4'" ></tableFormWrite>
|
|
|
+ <tableFormWrite :pkeyId="eleTableIdComp" @element-selected="setDeviationRangeEle" :initTableName="initTableNameDev" :key="4" :container-id="'excel-container-4'" :selectedTableKey="selectedTableKeyDev"></tableFormWrite>
|
|
|
</el-scrollbar>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -627,6 +627,7 @@ export default {
|
|
|
seleList:[],//选择元素弹窗 选中的元素列表
|
|
|
tableKey:'3',
|
|
|
initTableNameDev:'',//初始表名 允许偏差值范围
|
|
|
+ selectedTableKeyDev:'', // 存储
|
|
|
|
|
|
};
|
|
|
},
|
|
@@ -1922,12 +1923,10 @@ console.log(remark,'remark');
|
|
|
|
|
|
//设置动态组件里面的元素
|
|
|
setDeviationRangeEle(item,value){
|
|
|
- console.log(item,'item');
|
|
|
-
|
|
|
- console.log(value,'value');
|
|
|
+
|
|
|
|
|
|
if(value){
|
|
|
- //console.log(this.$refs.dynamiccomponent[index])
|
|
|
+
|
|
|
|
|
|
this.$refs.deviationrange.setELe(item);
|
|
|
}
|
|
@@ -2357,12 +2356,17 @@ replaceSelectedElement(newItem) {
|
|
|
// 更新选中状态和光标位置
|
|
|
this.setActiveElement(currentIndex);
|
|
|
},
|
|
|
- handleShiftPlus(event) {
|
|
|
- event.preventDefault();
|
|
|
- console.log('Shift + + 被按下');
|
|
|
- // this.yourMethod();
|
|
|
+ //偏差值范围选择元素
|
|
|
+ handleClickTag(item){
|
|
|
+
|
|
|
+ // console.log(item,'item');
|
|
|
+
|
|
|
+ const keyParts = item.tableElementKey.split('key');
|
|
|
+ this.selectedTableKeyDev = keyParts.length > 1 ? 'key'+keyParts[1] : null;
|
|
|
+
|
|
|
},
|
|
|
},
|
|
|
+
|
|
|
};
|
|
|
</script>
|
|
|
|