From 6fa082e98b9bcdf8691ca8d651adf958571246b1 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 25 Sep 2023 14:03:51 +0800
Subject: [PATCH] 局部国际化
---
src/components/task/TaskPanel.vue | 334 ++++++++++++++++++++++++++++---------------------------
1 files changed, 172 insertions(+), 162 deletions(-)
diff --git a/src/components/task/TaskPanel.vue b/src/components/task/TaskPanel.vue
index 598c3c2..457b2a5 100644
--- a/src/components/task/TaskPanel.vue
+++ b/src/components/task/TaskPanel.vue
@@ -1,136 +1,147 @@
<template>
<!-- <div class="header">计划库</div>-->
<!--搜索栏-->
- <div class="search-panel-wrapper">
- <div class="search-part">
- <a-range-picker :size="searchPanelOptions.size" :format="searchPanelOptions.dateFormat" :valueFormat="searchPanelOptions.valueFormat" v-model:value="timeRangeArr.data" @change="dateChange" style="width: 300px" />
+ <a-config-provider :locale="zhCN">
+
+ <div class="search-panel-wrapper">
+ <div class="search-part">
+ <a-range-picker :size="searchPanelOptions.size" :format="searchPanelOptions.dateFormat"
+ :valueFormat="searchPanelOptions.valueFormat" v-model:value="timeRangeArr.data"
+ @change="dateChange" style="width: 300px"/>
+ </div>
+
+ <div class="search-part">
+ <a-select :size="searchPanelOptions.size" @change="selectChange" ref="select"
+ v-model:value="searchQuery.taskType" style="width: 300px">
+ <a-select-option value="">所有类型</a-select-option>
+ <a-select-option :value="item.value" v-for="(item) in TaskTypeOptions" :key="item.value">{{ item.label }}
+ </a-select-option>
+ </a-select>
+ </div>
+
+ <div class="search-part">
+ <a-select v-model:value="statusArr" allowClear @change="selectMultipleChange" :options="TaskStatusOptions"
+ :maxTagCount="searchPanelOptions.maxTagCount" mode="multiple"
+ :size="searchPanelOptions.size" placeholder="全部状态" style="width: 300px">
+ </a-select>
+ </div>
+
+ <div class="search-part">
+ <a-input-search :size="searchPanelOptions.size" v-model:value="searchQuery.name" @change="inputChange"
+ placeholder="按航线或计划名搜索" style="width: 300px"/>
+ </div>
</div>
- <div class="search-part">
- <a-select :size="searchPanelOptions.size" @change="selectChange" ref="select" v-model:value="searchQuery.taskType" style="width: 300px">
- <a-select-option value="">所有类型</a-select-option>
- <a-select-option :value="item.value" v-for="(item) in TaskTypeOptions" :key="item.value">{{ item.label }}
- </a-select-option>
- </a-select>
- </div>
-
- <div class="search-part">
- <a-select v-model:value="statusArr" allowClear @change="selectMultipleChange" :options="TaskStatusOptions" :maxTagCount="searchPanelOptions.maxTagCount" mode="multiple"
- :size="searchPanelOptions.size" placeholder="全部状态" style="width: 300px">
- </a-select>
- </div>
-
- <div class="search-part">
- <a-input-search :size="searchPanelOptions.size" v-model:value="searchQuery.name" @change="inputChange" placeholder="按航线或计划名搜索" style="width: 300px"/>
- </div>
-
- </div>
-
- <!--表格-->
- <div class="plan-panel-wrapper">
- <a-table :loading="tableLoading" class="plan-table" :columns="columns" :data-source="plansData.data" row-key="job_id"
- :pagination="paginationProp" :scroll="{ x: '100%', y: 600 }" @change="refreshData">
- <!-- 执行时间 -->
- <template #duration="{ record }">
- <div class="flex-row" style="white-space: pre-wrap">
+ <!--表格-->
+ <div class="plan-panel-wrapper">
+ <a-table :loading="tableLoading" class="plan-table" :columns="columns" :data-source="plansData.data"
+ row-key="job_id"
+ :pagination="paginationProp" :scroll="{ x: '100%', y: 600 }" @change="refreshData">
+ <!-- 执行时间 -->
+ <template #duration="{ record }">
+ <div class="flex-row" style="white-space: pre-wrap">
+ <div>
+ <div>{{ formatTaskTime(record.begin_time) }}</div>
+ <div>{{ formatTaskTime(record.end_time) }}</div>
+ </div>
+ <div class="ml10">
+ <div>{{ formatTaskTime(record.execute_time) }}</div>
+ <div>{{ formatTaskTime(record.completed_time) }}</div>
+ </div>
+ </div>
+ </template>
+ <!-- 状态 -->
+ <template #status="{ record }">
<div>
- <div>{{ formatTaskTime(record.begin_time) }}</div>
- <div>{{ formatTaskTime(record.end_time) }}</div>
+ <div class="flex-display flex-align-center">
+ <span class="circle-icon" :style="{backgroundColor: formatTaskStatus(record).color}"></span>
+ {{ formatTaskStatus(record).text }}
+ <a-tooltip v-if="!!record.code" placement="bottom" arrow-point-at-center>
+ <template #title>
+ <div>{{ getCodeMessage(record.code) }}</div>
+ </template>
+ <exclamation-circle-outlined class="ml5" :style="{color: commonColor.WARN, fontSize: '16px' }"/>
+ </a-tooltip>
+ </div>
+ <div v-if="record.status === TaskStatus.Carrying">
+ <a-progress :percent="record.progress || 0"/>
+ </div>
</div>
- <div class="ml10">
- <div>{{ formatTaskTime(record.execute_time) }}</div>
- <div>{{ formatTaskTime(record.completed_time) }}</div>
+ </template>
+ <!-- 任务类型 -->
+ <template #taskType="{ record }">
+ <div>{{ formatTaskType(record) }}</div>
+ </template>
+ <!-- 失控动作 -->
+ <template #lostAction="{ record }">
+ <div>{{ formatLostAction(record) }}</div>
+ </template>
+ <!-- 媒体上传状态 -->
+ <template #media_upload="{ record }">
+ <div>
+ <div class="flex-display flex-align-center">
+ <span class="circle-icon" :style="{backgroundColor: formatMediaTaskStatus(record).color}"></span>
+ {{ formatMediaTaskStatus(record).text }}
+ </div>
+ <div class="pl15">
+ {{ formatMediaTaskStatus(record).number }}
+ <a-tooltip v-if="formatMediaTaskStatus(record).status === MediaStatus.ToUpload" placement="bottom"
+ arrow-point-at-center>
+ <template #title>
+ <div>Upload now</div>
+ </template>
+ <UploadOutlined class="ml5" :style="{color: commonColor.BLUE, fontSize: '16px' }"
+ @click="onUploadMediaFileNow(record.job_id)"/>
+ </a-tooltip>
+ </div>
</div>
- </div>
- </template>
- <!-- 状态 -->
- <template #status="{ record }">
- <div>
- <div class="flex-display flex-align-center">
- <span class="circle-icon" :style="{backgroundColor: formatTaskStatus(record).color}"></span>
- {{ formatTaskStatus(record).text }}
- <a-tooltip v-if="!!record.code" placement="bottom" arrow-point-at-center>
- <template #title>
- <div>{{ getCodeMessage(record.code) }}</div>
- </template>
- <exclamation-circle-outlined class="ml5" :style="{color: commonColor.WARN, fontSize: '16px' }"/>
- </a-tooltip>
+ </template>
+ <!-- 操作 -->
+ <template #action="{ record }">
+ <div class="action-area">
+ <a-popconfirm
+ v-if="record.status === TaskStatus.Wait"
+ title="你确定要删除该计划吗?"
+ ok-text="确定"
+ cancel-text="取消"
+ @confirm="onDeleteTask(record.job_id)"
+ >
+ <a-button type="primary" size="small">删除</a-button>
+ </a-popconfirm>
+ <a-popconfirm
+ v-if="record.status === TaskStatus.Carrying"
+ title="你确定要暂停该任务吗?"
+ ok-text="确定"
+ cancel-text="取消"
+ @confirm="onSuspendTask(record.job_id)"
+ >
+ <a-button type="primary" size="small">暂停</a-button>
+ </a-popconfirm>
+ <a-popconfirm
+ v-if="record.status === TaskStatus.Paused"
+ title="你确定要重新开始吗?"
+ ok-text="确定"
+ cancel-text="取消"
+ @confirm="onResumeTask(record.job_id)"
+ >
+ <a-button type="primary" size="small">重新开始</a-button>
+ </a-popconfirm>
</div>
- <div v-if="record.status === TaskStatus.Carrying">
- <a-progress :percent="record.progress || 0"/>
- </div>
- </div>
- </template>
- <!-- 任务类型 -->
- <template #taskType="{ record }">
- <div>{{ formatTaskType(record) }}</div>
- </template>
- <!-- 失控动作 -->
- <template #lostAction="{ record }">
- <div>{{ formatLostAction(record) }}</div>
- </template>
- <!-- 媒体上传状态 -->
- <template #media_upload="{ record }">
- <div>
- <div class="flex-display flex-align-center">
- <span class="circle-icon" :style="{backgroundColor: formatMediaTaskStatus(record).color}"></span>
- {{ formatMediaTaskStatus(record).text }}
- </div>
- <div class="pl15">
- {{ formatMediaTaskStatus(record).number }}
- <a-tooltip v-if="formatMediaTaskStatus(record).status === MediaStatus.ToUpload" placement="bottom"
- arrow-point-at-center>
- <template #title>
- <div>Upload now</div>
- </template>
- <UploadOutlined class="ml5" :style="{color: commonColor.BLUE, fontSize: '16px' }"
- @click="onUploadMediaFileNow(record.job_id)"/>
- </a-tooltip>
- </div>
- </div>
- </template>
- <!-- 操作 -->
- <template #action="{ record }">
- <div class="action-area">
- <a-popconfirm
- v-if="record.status === TaskStatus.Wait"
- title="你确定要删除该计划吗?"
- ok-text="确定"
- cancel-text="取消"
- @confirm="onDeleteTask(record.job_id)"
- >
- <a-button type="primary" size="small">删除</a-button>
- </a-popconfirm>
- <a-popconfirm
- v-if="record.status === TaskStatus.Carrying"
- title="你确定要暂停该任务吗?"
- ok-text="确定"
- cancel-text="取消"
- @confirm="onSuspendTask(record.job_id)"
- >
- <a-button type="primary" size="small">暂停</a-button>
- </a-popconfirm>
- <a-popconfirm
- v-if="record.status === TaskStatus.Paused"
- title="你确定要重新开始吗?"
- ok-text="确定"
- cancel-text="取消"
- @confirm="onResumeTask(record.job_id)"
- >
- <a-button type="primary" size="small">重新开始</a-button>
- </a-popconfirm>
- </div>
- </template>
- </a-table>
- </div>
+ </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 {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 'moment/dist/locale/zh-cn'
import {
deleteTask,
updateTaskStatus,
@@ -140,9 +151,9 @@
uploadMediaFileNow,
TaskQueryParam
} 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,
@@ -154,23 +165,22 @@
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'
const store = useMyStore()
const workspaceId = localStorage.getItem(ELocalStorageKey.WorkspaceId)!
const dockSns = computed(() => store.state.common.dockSns)
-
// 监听设备选择
watch(
- () => dockSns.value,
- (newVal) => {
- searchQuery.dockSn = newVal
- getPlans()
- }
+ () => dockSns.value,
+ (newVal) => {
+ searchQuery.dockSn = newVal
+ getPlans()
+ }
)
// 搜索栏配置项
@@ -210,13 +220,13 @@
title: '计划|实际时间',
dataIndex: 'duration',
width: 200,
- slots: { customRender: 'duration' },
+ slots: {customRender: 'duration'},
},
{
title: '执行状态',
key: 'status',
width: 150,
- slots: { customRender: 'status' }
+ slots: {customRender: 'status'}
},
{
title: '计划名称',
@@ -238,12 +248,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']
@@ -252,13 +262,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) {
@@ -274,8 +284,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
}
@@ -290,8 +300,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) {
@@ -302,7 +312,7 @@
}
}
-function getCodeMessage (code: number) {
+function getCodeMessage(code: number) {
return getErrorMessage(code) + `（code: ${code}）`
}
@@ -316,26 +326,26 @@
getPlans()
})
-function dateChange (value:any) {
+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() {
console.log('计划查询请求参数', searchQuery)
tableLoading.value = true
getWaylineJobs(workspaceId, body, searchQuery).then(res => {
@@ -353,15 +363,15 @@
})
}
-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) {
@@ -371,8 +381,8 @@
}
// 挂起任务
-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
})
@@ -383,8 +393,8 @@
}
// 解除挂起任务
-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
})
@@ -395,8 +405,8 @@
}
// 立即上传媒体
-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')
getPlans()
@@ -453,7 +463,7 @@
display: flex;
align-items: center;
- .search-part{
+ .search-part {
margin-right: 10px;
}
--
Gitblit v1.9.3