|
@@ -32,7 +32,7 @@
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
- <div class="data-fill-list-item-content">
|
|
|
|
|
|
+ <div class="data-fill-list-item-content" :style="`height: calc(100vh - ${drawType ? '555px' : '386px'} - ${menuBarShow ? 50 : 0}px);`">
|
|
<div class="data-fill-table-form-box">
|
|
<div class="data-fill-table-form-box">
|
|
<div class="hc-excel-table-form-view" :id="`table-form-${item?.pkeyId}`" />
|
|
<div class="hc-excel-table-form-view" :id="`table-form-${item?.pkeyId}`" />
|
|
<div class="hc-no-table-form" v-if="item?.isTableForm === false">
|
|
<div class="hc-no-table-form" v-if="item?.isTableForm === false">
|
|
@@ -425,6 +425,8 @@ const drawType = ref(props.drawType)
|
|
const wbsTempId = ref(props.wbsTempId);
|
|
const wbsTempId = ref(props.wbsTempId);
|
|
const tenantId = ref(props.tenantId);
|
|
const tenantId = ref(props.tenantId);
|
|
const wbsType = ref(props.wbsType);
|
|
const wbsType = ref(props.wbsType);
|
|
|
|
+const menuBarShow = ref(useAppState.menuBarShow)
|
|
|
|
+
|
|
//全局变量
|
|
//全局变量
|
|
const projectId = ref(useAppState.getProjectId);
|
|
const projectId = ref(useAppState.getProjectId);
|
|
const componentDetail=ref({
|
|
const componentDetail=ref({
|
|
@@ -447,12 +449,14 @@ watch(() => [
|
|
props.primaryKeyId,
|
|
props.primaryKeyId,
|
|
props.contractId,
|
|
props.contractId,
|
|
props.projectInfo,
|
|
props.projectInfo,
|
|
-], ([datas, classifyVal, primaryKeyId, cid, pInfo]) => {
|
|
|
|
|
|
+ useAppState.menuBarShow,
|
|
|
|
+], ([datas, classifyVal, primaryKeyId, cid, pInfo, menuBar]) => {
|
|
listDatas.value = datas
|
|
listDatas.value = datas
|
|
classify.value = classifyVal
|
|
classify.value = classifyVal
|
|
isPrimaryKeyId.value = primaryKeyId
|
|
isPrimaryKeyId.value = primaryKeyId
|
|
contractId.value = cid
|
|
contractId.value = cid
|
|
projectInfo.value = pInfo
|
|
projectInfo.value = pInfo
|
|
|
|
+ menuBarShow.value = menuBar
|
|
setFormDataNum(datas)
|
|
setFormDataNum(datas)
|
|
})
|
|
})
|
|
|
|
|
|
@@ -1702,15 +1706,17 @@ const emit = defineEmits(['renew','offsetTop'])
|
|
const getOffsetTop = (key = '') => {
|
|
const getOffsetTop = (key = '') => {
|
|
if (key) {
|
|
if (key) {
|
|
const dom = document.getElementById(key[key.length-1])
|
|
const dom = document.getElementById(key[key.length-1])
|
|
- if(!drawType.value){
|
|
|
|
- if(dom?.offsetTop>=583&&ActiveKey.value.length>1){
|
|
|
|
- emit('offsetTop', dom?.offsetTop-583)
|
|
|
|
|
|
+ if(!drawType.value) {
|
|
|
|
+ if(dom?.offsetTop >= 583 && ActiveKey.value.length > 1){
|
|
|
|
+ const barWidth = menuBarShow.value ? 36 : 0;
|
|
|
|
+ emit('offsetTop', dom?.offsetTop - 583 + barWidth)
|
|
}else{
|
|
}else{
|
|
emit('offsetTop', dom?.offsetTop)
|
|
emit('offsetTop', dom?.offsetTop)
|
|
}
|
|
}
|
|
}else {
|
|
}else {
|
|
- if(dom.offsetTop>=424&&ActiveKey.value.length>1){
|
|
|
|
- emit('offsetTop', dom?.offsetTop-424)
|
|
|
|
|
|
+ if(dom.offsetTop >= 424 && ActiveKey.value.length > 1){
|
|
|
|
+ const barWidth = menuBarShow.value ? 18 : 0;
|
|
|
|
+ emit('offsetTop', dom?.offsetTop - 424 - barWidth)
|
|
}else{
|
|
}else{
|
|
emit('offsetTop', dom?.offsetTop)
|
|
emit('offsetTop', dom?.offsetTop)
|
|
}
|
|
}
|