From 171a5597caa5887da782db59ca4ab643b163b84d Mon Sep 17 00:00:00 2001
From: husq <931347610@qq.com>
Date: Sat, 28 Oct 2023 20:52:52 +0800
Subject: [PATCH] 实施航线逻辑修改、页面修改
---
src/components/GMap.vue | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/components/GMap.vue b/src/components/GMap.vue
index 595dc27..d0f79ca 100644
--- a/src/components/GMap.vue
+++ b/src/components/GMap.vue
@@ -177,12 +177,18 @@
<div class="flex-align-center flex-justify-center" style="display: flex;">
<div v-if="osdVisible.latest_wayline_job" class="flex-column flex-align-center flex-justify-center">
<div class="task_wrapper">
- <div class="task_content">
+ <div class="task_content task_content_way" v-if="deviceInfo.device && deviceInfo.device?.mode_code === 5">
+ <div class="task_status">
+ <ContainerOutlined />
+ <span>执行任务中</span>
+ </div>
+ </div>
+ <div class="task_content" v-else>
<div class="task_status">
<ContainerOutlined />
<span>待执行</span>
</div>
- <div class="task_info">{{convertTimestampToDate(osdVisible.latest_wayline_job.begin_time)}}</div>
+ <div class="task_info">{{osdVisible.latest_wayline_job.is_later ? '今天': '明天'}}{{convertTimestampToDate(osdVisible.latest_wayline_job.begin_time, 'hh:mm')}}</div>
</div>
<div class="task_title">{{osdVisible.latest_wayline_job.name}}</div>
</div>
@@ -764,7 +770,7 @@
BorderOutlined, LineOutlined, ControlOutlined, TrademarkOutlined, ArrowDownOutlined,
ThunderboltOutlined, SignalFilled, GlobalOutlined, HistoryOutlined, CloudUploadOutlined, RocketOutlined,
FieldTimeOutlined, CloudOutlined, CloudFilled, FolderOpenOutlined, RobotFilled, ArrowUpOutlined, CarryOutOutlined,
- DesktopOutlined, CloseOutlined
+ DesktopOutlined, CloseOutlined, ContainerOutlined
} from '@ant-design/icons-vue'
import { EDeviceTypeName } from '../types'
import DockControlPanel from './g-map/DockControlPanel.vue'
@@ -778,6 +784,7 @@
BorderOutlined,
LineOutlined,
CloseOutlined,
+ ContainerOutlined,
ControlOutlined,
TrademarkOutlined,
ThunderboltOutlined,
@@ -1598,9 +1605,13 @@
align-items: center;
font-size: 12px;
.task_content {
- background-color: #19be6b;
+ background-color: #41bbfa;
padding: 2px 4px;
}
+
+ .task_content_way {
+ background-color: #19be6b;
+ }
.task_title {
margin-left: 5px;
font-size: 14px;
--
Gitblit v1.9.3