From d9e2702936f03b25b5d24222349cf10cb2c34bd0 Mon Sep 17 00:00:00 2001 From: raofuzi <2641346316@qq.com> Date: Sun, 14 Apr 2024 13:58:25 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E5=8A=A0?= =?UTF-8?q?=E8=BD=BDbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components.d.ts | 8 ++++++++ src/views/final/content/Content.vue | 15 ++++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/components.d.ts b/components.d.ts index e7a9d76..11049e1 100644 --- a/components.d.ts +++ b/components.d.ts @@ -12,13 +12,21 @@ declare module 'vue' { DataHeader: typeof import('./src/components/DataHeader/index.vue')['default'] NAvatar: typeof import('naive-ui')['NAvatar'] NButton: typeof import('naive-ui')['NButton'] + NCard: typeof import('naive-ui')['NCard'] NCheckbox: typeof import('naive-ui')['NCheckbox'] + NCollapse: typeof import('naive-ui')['NCollapse'] + NCollapseItem: typeof import('naive-ui')['NCollapseItem'] NConfigProvider: typeof import('naive-ui')['NConfigProvider'] + NDatePicker: typeof import('naive-ui')['NDatePicker'] NDialogProvider: typeof import('naive-ui')['NDialogProvider'] NDivider: typeof import('naive-ui')['NDivider'] NDropdown: typeof import('naive-ui')['NDropdown'] NForm: typeof import('naive-ui')['NForm'] NFormItem: typeof import('naive-ui')['NFormItem'] + NGi: typeof import('naive-ui')['NGi'] + NGrid: typeof import('naive-ui')['NGrid'] + NGridItem: typeof import('naive-ui')['NGridItem'] + NImage: typeof import('naive-ui')['NImage'] NInput: typeof import('naive-ui')['NInput'] NMessageProvider: typeof import('naive-ui')['NMessageProvider'] NModal: typeof import('naive-ui')['NModal'] diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue index f53a427..ee42c55 100644 --- a/src/views/final/content/Content.vue +++ b/src/views/final/content/Content.vue @@ -16,6 +16,8 @@ import { } from 'vue' import { rowPropKeys } from 'naive-ui/es/legacy-grid/src/Row' import { useRoute, useRouter } from 'vue-router' +import dayjs from 'dayjs' +import { cloneDeep } from 'lodash-es' import { CustomTabelModal, ImportExcelModal, @@ -484,7 +486,18 @@ const finalStore = useFinal() async function query(page: number, pageSize: number, filterId?: any, taskName?: string) { console.log('query', taskName) - const asideParmas = unref(finalStore.getAsideValue) + const asideParmas = cloneDeep(unref(finalStore.getAsideValue)) + if (asideParmas.izyear) { + asideParmas.izuptime = cloneDeep(asideParmas.izyear) + if (typeof asideParmas.izuptime == 'object') { + asideParmas.izuptime[0] = dayjs(asideParmas.izuptime[0]).format('YYYY/MM/DD') + asideParmas.izuptime[1] = dayjs(asideParmas.izuptime[1]).format('YYYY/MM/DD') + asideParmas.izuptime = asideParmas.izuptime.join('-') + delete asideParmas.izyear + } + console.log('typeof asideParmas[\'izuptime\']', typeof asideParmas.izuptime) + // delete asideParmas['izyear']; + } // 有过滤配置的时候优先使用过滤配置，不要使用左侧参数 // let params = filterId ? { userSearchId: filterId } : asideParmas let params = asideParmas -- 2.39.3 From 1166daa7b6f7625718d6d172cccf6dd618b76da3 Mon Sep 17 00:00:00 2001 From: raofuzi <2641346316@qq.com> Date: Sun, 14 Apr 2024 14:14:44 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E5=8A=A0?= =?UTF-8?q?=E8=BD=BDbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components.d.ts | 9 --------- src/views/final/content/Content.vue | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/components.d.ts b/components.d.ts index 6458938..bf396cc 100644 --- a/components.d.ts +++ b/components.d.ts @@ -11,7 +11,6 @@ declare module 'vue' { BasicModal: typeof import('./src/components/Modal/BasicModal.vue')['default'] DataHeader: typeof import('./src/components/DataHeader/index.vue')['default'] NAvatar: typeof import('naive-ui')['NAvatar'] - NBackTop: typeof import('naive-ui')['NBackTop'] NButton: typeof import('naive-ui')['NButton'] NCard: typeof import('naive-ui')['NCard'] NCheckbox: typeof import('naive-ui')['NCheckbox'] @@ -22,8 +21,6 @@ declare module 'vue' { NDialogProvider: typeof import('naive-ui')['NDialogProvider'] NDivider: typeof import('naive-ui')['NDivider'] NDropdown: typeof import('naive-ui')['NDropdown'] - NEllipsis: typeof import('naive-ui')['NEllipsis'] - NEmpty: typeof import('naive-ui')['NEmpty'] NForm: typeof import('naive-ui')['NForm'] NFormItem: typeof import('naive-ui')['NFormItem'] NGi: typeof import('naive-ui')['NGi'] @@ -35,21 +32,15 @@ declare module 'vue' { NModal: typeof import('naive-ui')['NModal'] NNotificationProvider: typeof import('naive-ui')['NNotificationProvider'] NotPassed: typeof import('./src/components/NotPassed.vue')['default'] - NPopconfirm: typeof import('naive-ui')['NPopconfirm'] NPopover: typeof import('naive-ui')['NPopover'] NPopselect: typeof import('naive-ui')['NPopselect'] - NProgress: typeof import('naive-ui')['NProgress'] NScrollbar: typeof import('naive-ui')['NScrollbar'] NSelect: typeof import('naive-ui')['NSelect'] NSlider: typeof import('naive-ui')['NSlider'] NSpace: typeof import('naive-ui')['NSpace'] NSpin: typeof import('naive-ui')['NSpin'] NSwitch: typeof import('naive-ui')['NSwitch'] - NTabPane: typeof import('naive-ui')['NTabPane'] - NTabs: typeof import('naive-ui')['NTabs'] NTag: typeof import('naive-ui')['NTag'] - NTimeline: typeof import('naive-ui')['NTimeline'] - NTimelineItem: typeof import('naive-ui')['NTimelineItem'] NTooltip: typeof import('naive-ui')['NTooltip'] NUpload: typeof import('naive-ui')['NUpload'] NUploadDragger: typeof import('naive-ui')['NUploadDragger'] diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue index ee42c55..b2b7950 100644 --- a/src/views/final/content/Content.vue +++ b/src/views/final/content/Content.vue @@ -390,7 +390,7 @@ async function formatColumns() { return h(SvgIcon, { name: 'sort-3' }) }, render(row: any) { - return formatToDateHMS(row.createdate || 0) + return formatToDateHMS(row.fromuptime || 0) }, } } -- 2.39.3 From f1b3364018889f0cc2b2e92c8fe551f9a6f38023 Mon Sep 17 00:00:00 2001 From: raofuzi <2641346316@qq.com> Date: Sun, 14 Apr 2024 14:23:03 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E5=8A=A0?= =?UTF-8?q?=E8=BD=BDbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/final/content/Content.vue | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue index b2b7950..9e6015d 100644 --- a/src/views/final/content/Content.vue +++ b/src/views/final/content/Content.vue @@ -495,8 +495,6 @@ async function query(page: number, pageSize: number, filterId?: any, taskName?: asideParmas.izuptime = asideParmas.izuptime.join('-') delete asideParmas.izyear } - console.log('typeof asideParmas[\'izuptime\']', typeof asideParmas.izuptime) - // delete asideParmas['izyear']; } // 有过滤配置的时候优先使用过滤配置，不要使用左侧参数 // let params = filterId ? { userSearchId: filterId } : asideParmas -- 2.39.3