From 01483c626fbba66e1c2bbb68f70de7ab3961881a Mon Sep 17 00:00:00 2001 From: sy2084 Date: Wed, 31 Jul 2024 18:38:04 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8A=A5=E8=A1=A8=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/y-chart.vue | 4 +--- src/components/common/y-table.vue | 13 ++++++++++++- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/components/common/y-chart.vue b/src/components/common/y-chart.vue index d0c51ef..044b479 100644 --- a/src/components/common/y-chart.vue +++ b/src/components/common/y-chart.vue @@ -52,9 +52,7 @@ const emit = defineEmits(["toFilt"]); const chartType = ref("line"); const dateType = ref("day"); -const filterData = ref({ - -}); +const filterData = ref({}); const rangePicker = computed(() => { switch(dateType.value) { diff --git a/src/components/common/y-table.vue b/src/components/common/y-table.vue index d64a24c..bc2468a 100644 --- a/src/components/common/y-table.vue +++ b/src/components/common/y-table.vue @@ -29,7 +29,7 @@ /> - +
@@ -57,6 +58,7 @@ import { reactive, ref } from "vue"; import { useDebounceFn } from "@vueuse/core"; import _ from "lodash"; +import { CloudDownloadOutlined } from "@ant-design/icons-vue"; const YCODE_BASEURL = import.meta.env.VITE_YCODE_BASEURL @@ -99,6 +101,14 @@ const pageState = reactive({ perPage: 20, }); +// watch(() => props.previewId, () => { +// props.filterConfig.forEach(item => { +// if (item.type === 'time') { +// filterData.value[item.name] = [dayjs().startOf('month'), dayjs().endOf('month')]; +// } +// }) +// }, { immediate: true }) + const getFilter = () => { const cloneFilter = _.cloneDeep(props.filterConfig); const filter = cloneFilter @@ -141,6 +151,7 @@ const pageChange = () => {