From a0d006a8e6734ce1ff08fc5d196266cc2fd27f7d Mon Sep 17 00:00:00 2001
From: husq <931347610@qq.com>
Date: Sun, 08 Oct 2023 17:33:44 +0800
Subject: [PATCH] Merge branch 'demo' of http://s16s652780.51mypc.cn:49896/r/yskj/iot_drone_web into demo
---
src/components/task/use-format-task.ts | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/components/task/use-format-task.ts b/src/components/task/use-format-task.ts
index 486b85c..a3eb7d5 100644
--- a/src/components/task/use-format-task.ts
+++ b/src/components/task/use-format-task.ts
@@ -1,11 +1,11 @@
import { DEFAULT_PLACEHOLDER } from '/@/utils/constants'
-import { Task } from '/@/api/wayline'
+import { Task, waylineJob } from '/@/api/wayline'
import { TaskStatusColor, TaskStatusMap, TaskTypeMap, OutOfControlActionMap, MediaStatusMap, MediaStatusColorMap, MediaStatus } from '/@/types/task'
import { isNil } from 'lodash'
export function useFormatTask () {
- function formatTaskType (task: Task) {
- return TaskTypeMap[task.task_type] || DEFAULT_PLACEHOLDER
+ function formatTaskType (task: waylineJob) {
+ return TaskTypeMap[task.taskType] || DEFAULT_PLACEHOLDER
}
function formatTaskTime (time: string) {
--
Gitblit v1.9.3