From 2453a589a623b2448a8cc940d8dce3da6698c50c Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期一, 05 二月 2024 14:15:49 +0800
Subject: [PATCH] 获取设备列表、切换设备列表、开始生产接口和逻辑修改、结束任务联调、工艺信息联调、切换任务联调
---
src/stores/craftModel.ts | 62 +++++++++++++++++++++----------
1 files changed, 42 insertions(+), 20 deletions(-)
diff --git a/src/stores/craftModel.ts b/src/stores/craftModel.ts
index b550e86..b1e86fc 100644
--- a/src/stores/craftModel.ts
+++ b/src/stores/craftModel.ts
@@ -13,14 +13,35 @@
function getCraftModelList() {
if (taskStore.activeTask?.Procedure.ID) {
craftModelList.value = []
- apiGetCraftModelList({
- procedureId: taskStore.activeTask?.Procedure.ID,
- page: page.value,
- pageSize: 6
- }).then((res) => {
- craftModelList.value = res.data ?? []
- total.value = res.total
- })
+ console.log(taskStore, '8877994455')
+ 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
+ // })
}
}
@@ -40,18 +61,19 @@
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
- })
+ console.log(taskStore, '998877994455')
+ // 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
+ // })
}
}
--
Gitblit v1.8.0