From c7f3fd5215399b37d0511b3bd555150ff1b13507 Mon Sep 17 00:00:00 2001
From: charles <981744753@qq.com>
Date: 星期一, 29 四月 2024 10:39:30 +0800
Subject: [PATCH] fix:回退原先版本
---
src/stores/craftModel.ts | 73 ++++++++++++++++++++++++++++++------
1 files changed, 60 insertions(+), 13 deletions(-)
diff --git a/src/stores/craftModel.ts b/src/stores/craftModel.ts
index 5985e67..fddaddc 100644
--- a/src/stores/craftModel.ts
+++ b/src/stores/craftModel.ts
@@ -1,25 +1,46 @@
-import { onUnmounted, ref, watch } from 'vue'
+import { computed, ref, watch } from 'vue'
import { defineStore } from 'pinia'
import type { CraftModel } from '@/api/craftModel'
import { apiGetCraftModelList } from '@/api'
import { useTasksStore } from '@/stores/tasks'
const watcher = ref()
-
+const page = ref(1)
+const total = ref(0)
export const useCraftModelStore = defineStore('craftModel', () => {
- const craftModelList = ref<CraftModel[]>()
+ const craftModelList = ref<CraftModel[]>([])
const taskStore = useTasksStore()
function getCraftModelList() {
if (taskStore.activeTask?.Procedure.ID) {
- console.log(122)
- apiGetCraftModelList({
- procedureId: taskStore.activeTask?.Procedure.ID,
- page: 1,
- pageSize: 999
- }).then((res) => {
- console.log()
- craftModelList.value = res.data ?? []
- })
+ craftModelList.value = []
+ const procedureModel = taskStore.activeTask?.ProcedureModel
+ const craftObj = [
+ {
+ ID: Number(taskStore.activeTask?.Procedure?.productProcedureID),
+ CreatedAt: taskStore.activeTask?.Procedure?.CreatedAt,
+ UpdatedAt: taskStore.activeTask?.Procedure?.UpdatedAt,
+ DeletedAt: taskStore.activeTask?.Procedure?.DeletedAt,
+ number: procedureModel?.number,
+ product: procedureModel?.product,
+ procedure: procedureModel?.procedure,
+ Params: '',
+ paramsMap: procedureModel?.paramsMap,
+ deviceId: '',
+ isUpdate: false,
+ newParamsMap: '',
+ newNumber: ''
+ }
+ ]
+ craftModelList.value = craftObj ?? []
+
+ // apiGetCraftModelList({
+ // procedureId: taskStore.activeTask?.Procedure.ID,
+ // page: page.value,
+ // pageSize: 6
+ // }).then((res) => {
+ // craftModelList.value = res.data ?? []
+ // total.value = res.total
+ // })
}
}
@@ -27,10 +48,36 @@
watch(
() => taskStore.activeTask,
() => {
+ page.value = 1
getCraftModelList()
}
)
}
- return { craftModelList, getCraftModelList }
+ const loading = ref(false)
+
+ function loadMore() {
+ if (taskStore.activeTask?.Procedure.ID && !loading.value && hasMore.value) {
+ page.value++
+ loading.value = true
+ // apiGetCraftModelList({
+ // procedureId: taskStore.activeTask?.Procedure.ID,
+ // page: page.value,
+ // pageSize: 6
+ // })
+ // .then((res) => {
+ // craftModelList.value = [...craftModelList.value, ...(res.data ?? [])]
+ // total.value = res.total
+ // })
+ // .finally(() => {
+ // loading.value = false
+ // })
+ }
+ }
+
+ const hasMore = computed(() => {
+ return total.value > craftModelList.value.length
+ })
+
+ return { craftModelList, getCraftModelList, hasMore, loading, loadMore }
})
--
Gitblit v1.8.0