From 54849757852f6ab40eb17afbd03d1d839b60a38d Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 13 Nov 2023 17:09:15 +0800
Subject: [PATCH] 重复定时和连续执行
---
src/components/task/TaskPanel.vue | 173 ++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 116 insertions(+), 57 deletions(-)
diff --git a/src/components/task/TaskPanel.vue b/src/components/task/TaskPanel.vue
index 457b2a5..2309581 100644
--- a/src/components/task/TaskPanel.vue
+++ b/src/components/task/TaskPanel.vue
@@ -1,7 +1,6 @@
<template>
<!-- <div class="header">计划库</div>-->
<!--搜索栏-->
- <a-config-provider :locale="zhCN">
<div class="search-panel-wrapper">
<div class="search-part">
@@ -34,7 +33,7 @@
<!--表格-->
<div class="plan-panel-wrapper">
- <a-table :loading="tableLoading" class="plan-table" :columns="columns" :data-source="plansData.data"
+ <a-table :loading="tableLoading" class="plan-table" :columns="columns" :data-source="plansData.data" @expand="expand" :indentSize="200"
row-key="job_id"
:pagination="paginationProp" :scroll="{ x: '100%', y: 600 }" @change="refreshData">
<!-- 执行时间 -->
@@ -130,17 +129,15 @@
</template>
</a-table>
</div>
- </a-config-provider>
</template>
<script setup lang="ts">
-import {reactive, ref} from '@vue/reactivity'
-import {message} from 'ant-design-vue'
-import {TableState} from 'ant-design-vue/lib/table/interface'
-import {computed, onMounted} from 'vue'
-import {IPage} from '/@/api/http/type'
-import zhCN from 'ant-design-vue/es/locale/zh_CN'
+import { reactive, ref } from '@vue/reactivity'
+import { message } from 'ant-design-vue'
+import { TableState } from 'ant-design-vue/lib/table/interface'
+import { computed, onMounted } from 'vue'
+import { IPage } from '/@/api/http/type'
import 'moment/dist/locale/zh-cn'
import {
deleteTask,
@@ -149,11 +146,11 @@
getWaylineJobs,
Task,
uploadMediaFileNow,
- TaskQueryParam
+ TaskQueryParam, getWaylineChildrenJobs
} from '/@/api/wayline'
-import {useMyStore} from '/@/store'
-import {ELocalStorageKey} from '/@/types/enums'
-import {useFormatTask} from './use-format-task'
+import { useMyStore } from '/@/store'
+import { ELocalStorageKey } from '/@/types/enums'
+import { useFormatTask } from './use-format-task'
import {
TaskTypeOptions,
TaskStatus,
@@ -165,10 +162,11 @@
MediaStatusProgressInfo,
TaskMediaHighestPriorityProgressInfo
} from '/@/types/task'
-import {useTaskWsEvent} from './use-task-ws-event'
-import {getErrorMessage} from '/@/utils/error-code/index'
-import {commonColor} from '/@/utils/color'
-import {ExclamationCircleOutlined, UploadOutlined} from '@ant-design/icons-vue'
+import { useTaskWsEvent } from './use-task-ws-event'
+import { getErrorMessage } from '/@/utils/error-code/index'
+import { commonColor } from '/@/utils/color'
+import { ExclamationCircleOutlined, UploadOutlined } from '@ant-design/icons-vue'
+import { timestampToTime } from '/@/utils/time'
const store = useMyStore()
const workspaceId = localStorage.getItem(ELocalStorageKey.WorkspaceId)!
@@ -176,11 +174,11 @@
const dockSns = computed(() => store.state.common.dockSns)
// 监听设备选择
watch(
- () => dockSns.value,
- (newVal) => {
- searchQuery.dockSn = newVal
- getPlans()
- }
+ () => dockSns.value,
+ (newVal) => {
+ searchQuery.dockSn = newVal
+ getPlans()
+ }
)
// 搜索栏配置项
@@ -196,9 +194,17 @@
const searchQuery = reactive<TaskQueryParam>({
taskType: ''
})
+
+function getSearchTime (n:number) {
+ const nowStamp = new Date().getTime()
+ const timestamp = nowStamp + (n * 60 * 60 * 1000 * 24)
+ const time = timestampToTime(timestamp)
+ return time
+}
+
const statusArr = reactive([])
const timeRangeArr = reactive({
- data: [] as string[]
+ data: [getSearchTime(-3), getSearchTime(3)] as string[]
})
const body: IPage = {
@@ -219,19 +225,20 @@
{
title: '计划|实际时间',
dataIndex: 'duration',
- width: 200,
- slots: {customRender: 'duration'},
+ width: 240,
+ slots: { customRender: 'duration' },
},
{
title: '执行状态',
key: 'status',
- width: 150,
- slots: {customRender: 'status'}
+ width: 80,
+ slots: { customRender: 'status' }
},
{
title: '计划名称',
dataIndex: 'job_name',
- width: 100,
+ ellipsis: true,
+ width: 170,
},
{
title: '设备名称',
@@ -248,12 +255,12 @@
title: '航线飞行中失联',
dataIndex: 'out_of_control_action',
width: 140,
- slots: {customRender: 'lostAction'},
+ slots: { customRender: 'lostAction' },
},
{
title: '操作',
width: 120,
- slots: {customRender: 'action'}
+ slots: { customRender: 'action' }
}
]
type Pagination = TableState['pagination']
@@ -262,13 +269,13 @@
data: [] as Task[]
})
-const {formatTaskType, formatTaskTime, formatLostAction, formatTaskStatus, formatMediaTaskStatus} = useFormatTask()
+const { formatTaskType, formatTaskTime, formatLostAction, formatTaskStatus, formatMediaTaskStatus } = useFormatTask()
// 设备任务执行进度更新
-function onTaskProgressWs(data: TaskProgressInfo) {
- const {bid, output} = data
+function onTaskProgressWs (data: TaskProgressInfo) {
+ const { bid, output } = data
if (output) {
- const {status, progress} = output || {}
+ const { status, progress } = output || {}
const taskItem = plansData.data.find(task => task.job_id === bid)
if (!taskItem) return
if (status) {
@@ -284,8 +291,8 @@
}
// 媒体上传进度更新
-function onTaskMediaProgressWs(data: MediaStatusProgressInfo) {
- const {media_count: mediaCount, uploaded_count: uploadedCount, job_id: jobId} = data
+function onTaskMediaProgressWs (data: MediaStatusProgressInfo) {
+ const { media_count: mediaCount, uploaded_count: uploadedCount, job_id: jobId } = data
if (isNaN(mediaCount) || isNaN(uploadedCount) || !jobId) {
return
}
@@ -300,8 +307,8 @@
taskItem.uploaded_count = uploadedCount
}
-function onoTaskMediaHighestPriorityWS(data: TaskMediaHighestPriorityProgressInfo) {
- const {pre_job_id: preJobId, job_id: jobId} = data
+function onoTaskMediaHighestPriorityWS (data: TaskMediaHighestPriorityProgressInfo) {
+ const { pre_job_id: preJobId, job_id: jobId } = data
const preTaskItem = plansData.data.find(task => task.job_id === preJobId)
const taskItem = plansData.data.find(task => task.job_id === jobId)
if (preTaskItem) {
@@ -312,7 +319,7 @@
}
}
-function getCodeMessage(code: number) {
+function getCodeMessage (code: number) {
return getErrorMessage(code) + `（code: ${code}）`
}
@@ -326,32 +333,63 @@
getPlans()
})
-function dateChange(value: any) {
+function expand (expand:any, record:any) {
+ if (!expand) {
+ return
+ }
+ tableLoading.value = true
+ const params = {
+ parentId: record.job_id
+ }
+
+ getWaylineChildrenJobs(workspaceId, params).then(res => {
+ const data = res.data
+ plansData.data.forEach(item => {
+ if (item.job_id === record.job_id) {
+ item.children = data
+ }
+ })
+
+ tableLoading.value = false
+ })
+}
+
+function dateChange (value: any) {
searchQuery.startTime = value[0]
searchQuery.endTime = value[1]
getPlans()
}
-function inputChange(searchValue: string) {
+function inputChange (searchValue: string) {
getPlans()
}
-function selectChange(value: any) {
+function selectChange (value: any) {
getPlans()
}
-function selectMultipleChange(value: any) {
+function selectMultipleChange (value: any) {
searchQuery.status = value.join(',')
getPlans()
}
-function getPlans() {
+function getPlans () {
+ searchQuery.startTime = timeRangeArr.data[0]
+ searchQuery.endTime = timeRangeArr.data[1]
+
console.log('计划查询请求参数', searchQuery)
tableLoading.value = true
getWaylineJobs(workspaceId, body, searchQuery).then(res => {
if (res.code !== 0) {
return
}
+
+ res.data.list.forEach(e => {
+ if (e.has_children === '1') {
+ e.children = []
+ }
+ })
+
plansData.data = res.data.list
paginationProp.total = res.data.pagination.total
paginationProp.current = res.data.pagination.page
@@ -363,52 +401,52 @@
})
}
-function refreshData(page: Pagination) {
+function refreshData (page: Pagination) {
body.page = page?.current!
body.page_size = page?.pageSize!
getPlans()
}
// 删除任务
-async function onDeleteTask(jobId: string) {
- const {code} = await deleteTask(workspaceId, {
+async function onDeleteTask (jobId: string) {
+ const { code } = await deleteTask(workspaceId, {
job_id: jobId
})
if (code === 0) {
- message.success('Deleted successfully')
+ message.success('删除成功')
getPlans()
}
}
// 挂起任务
-async function onSuspendTask(jobId: string) {
- const {code} = await updateTaskStatus(workspaceId, {
+async function onSuspendTask (jobId: string) {
+ const { code } = await updateTaskStatus(workspaceId, {
job_id: jobId,
status: UpdateTaskStatus.Suspend
})
if (code === 0) {
- message.success('Suspended successfully')
+ message.success('暂停成功')
getPlans()
}
}
// 解除挂起任务
-async function onResumeTask(jobId: string) {
- const {code} = await updateTaskStatus(workspaceId, {
+async function onResumeTask (jobId: string) {
+ const { code } = await updateTaskStatus(workspaceId, {
job_id: jobId,
status: UpdateTaskStatus.Resume
})
if (code === 0) {
- message.success('Resumed successfully')
+ message.success('恢复成功')
getPlans()
}
}
// 立即上传媒体
-async function onUploadMediaFileNow(jobId: string) {
- const {code} = await uploadMediaFileNow(workspaceId, jobId)
+async function onUploadMediaFileNow (jobId: string) {
+ const { code } = await uploadMediaFileNow(workspaceId, jobId)
if (code === 0) {
- message.success('Upload Media File successfully')
+ message.success('上传媒体文件成功')
getPlans()
}
}
@@ -422,6 +460,24 @@
.plan-table {
background: #fff;
margin-top: 10px;
+
+ :deep(.ant-table-tbody) {
+
+ tr.ant-table-row-level-0 {
+ td:first-child {
+ display: flex;
+ align-items: center;
+ }
+ }
+
+ tr.ant-table-row-level-1 {
+ td:first-child {
+ padding-left: 60px;
+ }
+ }
+
+
+ }
}
.action-area {
@@ -468,4 +524,7 @@
}
}
+
+
+
</style>
--
Gitblit v1.9.3