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 f53a427..9e6015d 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, @@ -388,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) }, } } @@ -484,7 +486,16 @@ 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 + } + } // 有过滤配置的时候优先使用过滤配置,不要使用左侧参数 // let params = filterId ? { userSearchId: filterId } : asideParmas let params = asideParmas