diff --git a/src/components/table/index.vue b/src/components/table/index.vue index 8d969a6..84b353e 100644 --- a/src/components/table/index.vue +++ b/src/components/table/index.vue @@ -13,6 +13,7 @@ :sort-config="{ remote: true }" @sort-change="handleSortChange" > + @@ -64,7 +69,7 @@ import DatePicker from '@/components/form/datePicker/index.vue' import { useDebounceFn } from '@vueuse/core' import { queryActivatePage, queryByPagePath } from '@/api/system-boot/csstatisticalset' import RoutingConfig from '@/views/pqs/cockpit/homePage/components/routingConfig.vue' -import { useRouter,useRoute } from 'vue-router' +import { useRouter, useRoute } from 'vue-router' import { useTimeCacheStore } from '@/stores/timeCache' const { push } = useRouter() const datePickerRef = ref() @@ -170,13 +175,16 @@ const zoom = (value: any) => { if (flag.value) { layout.value = [{ ...value, x: 0, y: 0, w: 12, h: 6 }] } else { - layout.value = layoutCopy.value.map((item:any, index: number) => ({ + layout.value = layoutCopy.value.map((item: any, index: number) => ({ ...item, i: item.i || index, // 确保有唯一标识 component: registerComponent(item.path) })) } + console.log("🚀 ~ zoom ~ layout.value:", layout.value) + flag.value = !flag.value + initRowHeight() key.value += 1 } @@ -214,7 +222,7 @@ const fetchLayoutData = async () => { // 窗口大小变化处理 - 使用防抖 const handleResize = useDebounceFn(() => { initRowHeight() - key.value += 1 + // key.value += 1 }, 200) // 修改 @@ -232,15 +240,10 @@ const settings = () => { // 处理 DatePicker 值变化事件 const handleDatePickerChange = (value: any) => { - - // 将值缓存到 timeCache - if (value) { - timeCacheStore.setCache( - route.path, - value.interval, - value.timeValue - ) - } + // 将值缓存到 timeCache + if (value) { + timeCacheStore.setCache(route.path, value.interval, value.timeValue) + } } // 生命周期钩子 diff --git a/src/views/pqs/cockpit/realTimeData/index.vue b/src/views/pqs/cockpit/realTimeData/index.vue index 5f373cc..83f6e7c 100644 --- a/src/views/pqs/cockpit/realTimeData/index.vue +++ b/src/views/pqs/cockpit/realTimeData/index.vue @@ -59,7 +59,7 @@ const tableStore: any = new TableStore({ method: 'POST', showPage: false, - exportName: '主要监测点列表', + column: [ { field: 'index', diff --git a/src/views/pqs/cockpit/setUp/components/popup.vue b/src/views/pqs/cockpit/setUp/components/popup.vue index cf7d1f4..9577fdb 100644 --- a/src/views/pqs/cockpit/setUp/components/popup.vue +++ b/src/views/pqs/cockpit/setUp/components/popup.vue @@ -358,11 +358,11 @@ const onSubmit = () => { formRef.value.validate(async (valid: boolean) => { let url = '' - await html2canvas(document.querySelector('.GridLayout'), { - useCORS: true - }).then(canvas => { - url = canvas.toDataURL('image/png') - }) + // await html2canvas(document.querySelector('.GridLayout'), { + // useCORS: true + // }).then(canvas => { + // url = canvas.toDataURL('image/png') + // }) form.pagePath = form.pagePath || '' if (valid) { diff --git a/types/table.d.ts b/types/table.d.ts index 80874eb..226403e 100644 --- a/types/table.d.ts +++ b/types/table.d.ts @@ -9,6 +9,7 @@ declare global { ref: VxeTableInstance | null data: TableRow[] | any allData: TableRow[] | any + copyData: TableRow[] | any filename: any allFlag: Boolean // 前端分页数据