From 8c84c7277018b259f5b99f26cbfd14603bc4e4c0 Mon Sep 17 00:00:00 2001 From: haoxuan <haoxuan> Date: 星期三, 01 十一月 2023 19:39:53 +0800 Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/bulletin-board-style1 into dev --- src/api/task.ts | 24 +++++++++++++++++++++--- 1 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src/api/task.ts b/src/api/task.ts index a939691..521f229 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 { @@ -48,7 +49,7 @@ workHours: string inputMaterials: string outputMaterials: string - workers: Workers[] + workers: Worker[] allProcedureNames: string[] channel: number } @@ -62,7 +63,7 @@ CanStarted: boolean } -export interface Workers { +export interface Worker { workerId: string workerName: string phoneNum: string @@ -78,7 +79,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