|
@@ -202,7 +202,7 @@
|
|
|
</div> -->
|
|
|
<a-tabs class="tabs-box" v-model:activeKey="activeKey" @change="tabChange">
|
|
|
<a-tab-pane key="1" tab="实时监测">
|
|
|
- <GroupMonitorTable v-if="activeKey === '1'" ref="MonitorDataTable" :dataSource="dataSource" :columnsType="`${selectData.deviceType}_monitor`" @selectRow="getSelectRow" :scroll="scroll" :is-action="true">
|
|
|
+ <GroupMonitorTable v-if="activeKey === '1'" ref="MonitorDataTable" :dataSource="dataSource" :columnsType="`${selectData.deviceType}_monitor`" @selectRow="getSelectRow" :scroll="{y: scroll.y - (headElHeight - 56) }" :is-action="true">
|
|
|
<template #action="{ record }">
|
|
|
<a class="table-action-link" @click="deviceEdit($event, 'reportInfo', record)">报表录入</a>
|
|
|
<a class="table-action-link" @click="deviceEdit($event, 'deviceInfo', record)">设备编辑</a>
|
|
@@ -527,7 +527,7 @@
|
|
|
const leftColumns = ref<BasicColumn[]>([])
|
|
|
const devicekide = ref('fanlocal')
|
|
|
const deviceType = ref(selectData.deviceType)
|
|
|
-
|
|
|
+ let headElHeight = ref(0)
|
|
|
|
|
|
watch(deviceType , (type) => {
|
|
|
rightColumns.value = getTableHeaderColumns(type + '_monitor_right') as []
|
|
@@ -554,6 +554,12 @@
|
|
|
selectData = lodash.cloneDeep(initData)
|
|
|
loading.value = false
|
|
|
if(selectData.deviceID)MonitorDataTable.value.setSelectedRowKeys([selectData.deviceID])
|
|
|
+
|
|
|
+ const headEl = document.querySelector(`.zxm-table-thead`);
|
|
|
+ if (headEl) {
|
|
|
+ headElHeight.value = headEl.clientHeight
|
|
|
+ }
|
|
|
+
|
|
|
})
|
|
|
}
|
|
|
|
|
@@ -652,6 +658,12 @@
|
|
|
modalType.value = selectIndex > 0 ? 'fm' : 'fc';
|
|
|
|
|
|
nextTick(() => {
|
|
|
+ debugger
|
|
|
+ const headEl = document.querySelector(`.zxm-table-thead`);
|
|
|
+ if (headEl) {
|
|
|
+ headElHeight.value = headEl.clientHeight
|
|
|
+ }
|
|
|
+
|
|
|
setModelType(modalType.value).then(() => {
|
|
|
// loading.value = false;
|
|
|
});
|
|
@@ -857,12 +869,10 @@
|
|
|
|
|
|
onMounted(() => {
|
|
|
|
|
|
- mountedThree(player1.value).then(() => {
|
|
|
+ mountedThree(player1.value).then(async () => {
|
|
|
+ await getMonitor(true);
|
|
|
nextTick(async() => {
|
|
|
- await getMonitor(true);
|
|
|
-
|
|
|
- addCssText();
|
|
|
- // playSmoke('startSmoke', 'top', frequencyVal.value, 'open');
|
|
|
+ addCssText();
|
|
|
});
|
|
|
});
|
|
|
document.body.addEventListener('mousedown', addPlayVideo, false);
|