diff --git a/components.d.ts b/components.d.ts index ef2a1b7..e5c3631 100644 --- a/components.d.ts +++ b/components.d.ts @@ -20,7 +20,6 @@ declare module 'vue' { NDialogProvider: typeof import('naive-ui')['NDialogProvider'] NDivider: typeof import('naive-ui')['NDivider'] NDropdown: typeof import('naive-ui')['NDropdown'] - NEmpty: typeof import('naive-ui')['NEmpty'] NForm: typeof import('naive-ui')['NForm'] NFormItem: typeof import('naive-ui')['NFormItem'] NGi: typeof import('naive-ui')['NGi'] @@ -39,8 +38,6 @@ declare module 'vue' { 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'] NTooltip: typeof import('naive-ui')['NTooltip'] NUpload: typeof import('naive-ui')['NUpload'] diff --git a/src/config/final.ts b/src/config/final.ts index e338520..17fe255 100644 --- a/src/config/final.ts +++ b/src/config/final.ts @@ -1,5 +1,5 @@ import type { AsideEntity } from './aside' -import { IzProjectVue, IztaskrromVue, PictureDownloadVue, PlanVue, ReportUserVue, TimeVue } from '@/views/home/aside/comp/items' +import { IzProjectVue, IzStatus, IztaskrromVue, PictureDownloadVue, PlanVue, ReportUserVue, TimeVue } from '@/views/home/aside/comp/items' export interface RowData { id: string @@ -104,7 +104,7 @@ export const asideMap: Recordable = { defaultValue: null, isDefaultFilter: false, key: 'izstatus', - component: PlanVue, // todo + component: IzStatus, // todo }, izuptime: { label: '提报时间', diff --git a/src/store/modules/dictonary.ts b/src/store/modules/dictonary.ts index e61e5d8..5759f9d 100644 --- a/src/store/modules/dictonary.ts +++ b/src/store/modules/dictonary.ts @@ -229,7 +229,7 @@ export const useDictionaryStore = defineStore({ async fetchizstatusListt() { const list = await getizstatusList() this.izstatusList = generateOptions2(list, 'codeno', 'name') - return this.backList + return this.izstatusList }, }, }) diff --git a/src/views/final/comp/Action.vue b/src/views/final/comp/Action.vue index daf7e4b..d01da7f 100644 --- a/src/views/final/comp/Action.vue +++ b/src/views/final/comp/Action.vue @@ -17,10 +17,10 @@ const props = defineProps({ }) const actionConfig = { - 3: [{ label: '查看', key: 'view' }, { label: '重置审批', key: 'reset' }], - 4: [{ label: '查看', key: 'view' }, { label: '重置审批', key: 'reset' }], - 2: [{ label: '通过', key: 'approval' }, { label: '不通过', key: 'reject' }, { label: '重置审批', key: 'reset' }], - 5: [{ label: '通过', key: 'approval' }, { label: '不通过', key: 'reject' }, { label: '重置审批', key: 'reset' }], + 3: [{ label: '查看', key: 'view' }], + 4: [{ label: '查看', key: 'view' }], + 2: [{ label: '通过', key: 'approval' }, { label: '不通过', key: 'reject' }], + 5: [{ label: '通过', key: 'approval' }, { label: '不通过', key: 'reject' }], } const actions = computed(() => { diff --git a/src/views/home/aside/comp/items/IzStatus.vue b/src/views/home/aside/comp/items/IzStatus.vue new file mode 100644 index 0000000..ef4c0ea --- /dev/null +++ b/src/views/home/aside/comp/items/IzStatus.vue @@ -0,0 +1,57 @@ + + + + + diff --git a/src/views/home/aside/comp/items/index.ts b/src/views/home/aside/comp/items/index.ts index d79dff6..6ef2592 100644 --- a/src/views/home/aside/comp/items/index.ts +++ b/src/views/home/aside/comp/items/index.ts @@ -19,5 +19,6 @@ import IzCustomtype from './IzCustomtype.vue' import IzProductVue from './IzProduct.vue' import IzProjecttype from './IzProjecttype.vue' import IzVisitcity from './IzVisitcity.vue' +import IzStatus from './IzStatus.vue' -export { IzProjecttype, IzVisitcity, IzCustomlevel, IzCustomtype, IzCustomname, IzfirmVue, IzProductVue, IzvisitproVue, IztaskstatusVue, IztaskrromVue, IzProjectVue, IzShowVue, PictureDownloadVue, PictureUploadVue, PlaceHolderVue, RegionVue, SimilarityVue, ReportUserVue, PlanVue, PictureTypeVue, TimeVue } +export { IzProjecttype, IzStatus, IzVisitcity, IzCustomlevel, IzCustomtype, IzCustomname, IzfirmVue, IzProductVue, IzvisitproVue, IztaskstatusVue, IztaskrromVue, IzProjectVue, IzShowVue, PictureDownloadVue, PictureUploadVue, PlaceHolderVue, RegionVue, SimilarityVue, ReportUserVue, PlanVue, PictureTypeVue, TimeVue } diff --git a/src/views/home/content/Content.vue b/src/views/home/content/Content.vue index d5fdf72..e8eb250 100644 --- a/src/views/home/content/Content.vue +++ b/src/views/home/content/Content.vue @@ -36,6 +36,7 @@ const loading = ref(false) const message = useMessage() const totalCount = ref(0) const sortBy = ref<'asc' | 'desc'>('desc') +const imageRef = ref() let canloadMore = true let filterId = null @@ -297,8 +298,8 @@ function sortHandler() { :src="item.imgUrl" > -->
diff --git a/src/views/task/aside/TaskList.vue b/src/views/task/aside/TaskList.vue index 5276096..1acb0b3 100644 --- a/src/views/task/aside/TaskList.vue +++ b/src/views/task/aside/TaskList.vue @@ -32,7 +32,6 @@ const { isLoading } = useInfiniteScroll( async function loadMore() { if (isLoading.value || el.value == null) return - const more = await fetchList() data.value.push(...more) } diff --git a/src/views/task/modal/BatchModal.vue b/src/views/task/modal/BatchModal.vue index 6ccee30..1cb49fc 100644 --- a/src/views/task/modal/BatchModal.vue +++ b/src/views/task/modal/BatchModal.vue @@ -54,7 +54,7 @@ const loading = ref(false) let _masonry: null | Masonry = null const show = ref(false) const sortBy: PictureSortParam = { - orderbyname: 'asc', + orderbyname: 'desc', orderbyvalue: 'fromuptime', } const batch = ref(false) diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue index 7de6186..e88f089 100644 --- a/src/views/worksheet/content/Content.vue +++ b/src/views/worksheet/content/Content.vue @@ -51,7 +51,7 @@ const taskpagination = reactive({ pageSize: 10, }) const sortBy: PictureSortParam = { - orderbyname: 'asc', + orderbyname: 'desc', orderbyvalue: 'pictureResult', } const workStore = useWorkOrder()