From 33bdc00cdee41fa0e8d315f4bb2c3fc13ed0df10 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期四, 02 十一月 2023 19:30:50 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/bulletin-board-style1 into wn
---
src/api/task.ts | 36 +++++++++++++++++++++++++++++++-----
1 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/src/api/task.ts b/src/api/task.ts
index a939691..125883a 100644
--- a/src/api/task.ts
+++ b/src/api/task.ts
@@ -16,6 +16,7 @@
startTime: number
endTime: number
Status: number
+ finishNumber: number
}
export interface Procedure {
@@ -46,9 +47,9 @@
startTime: number
endTime: number
workHours: string
- inputMaterials: string
- outputMaterials: string
- workers: Workers[]
+ inputMaterials: inputMaterial[]
+ outputMaterials: inputMaterial[]
+ workers: Worker[]
allProcedureNames: string[]
channel: number
}
@@ -61,8 +62,16 @@
CurrentProcedureIndex: number
CanStarted: boolean
}
+export interface inputMaterial {
+ materialId: string
+ materialName: string
+ amount: number
+ unit: string
+ background: string
+ date: string
+}
-export interface Workers {
+export interface Worker {
workerId: string
workerName: string
phoneNum: string
@@ -78,7 +87,24 @@
export interface TasksResponse {
Tasks: Task[]
TaskCount: number
- workers: Workers[]
+ workers: Worker[]
Prompt: Prompt
ChannelAmount: number
}
+
+export interface TasksGroupByChannel {
+ [channel: number]: TasksResponse
+}
+
+/**
+ * 宸ヨ壓鍙傛暟
+ */
+export interface CraftParam {
+ Key: string
+ Value: string
+}
+
+export interface CraftParamsResponse {
+ Number: string
+ Params: CraftParam[]
+}
--
Gitblit v1.8.0