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