From ca633dd51ce23edd51ce0e5de8f90e29e5273f9b Mon Sep 17 00:00:00 2001
From: GuLiMmo <2820890765@qq.com>
Date: Thu, 25 Jan 2024 15:52:33 +0800
Subject: [PATCH] chore：控制面板修改
---
src/components/GMap.vue | 1 +
src/pages/page-web/projects/tsa.vue | 24 ++++++++++++++++--------
2 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/src/components/GMap.vue b/src/components/GMap.vue
index 450193d..a739128 100644
--- a/src/components/GMap.vue
+++ b/src/components/GMap.vue
@@ -1162,6 +1162,7 @@
deviceInfo.device = data.deviceInfo[osdVisible.value.sn]
}
}
+
if (data.currentType === EDeviceTypeName.Dock && data.dockInfo[data.currentSn]) {
if (osdVisible.value.visible && osdVisible.value.is_dock && osdVisible.value.gateway_sn !== '') {
deviceInfo.dock = data.dockInfo[osdVisible.value.gateway_sn]
diff --git a/src/pages/page-web/projects/tsa.vue b/src/pages/page-web/projects/tsa.vue
index a45a5cb..346dd25 100644
--- a/src/pages/page-web/projects/tsa.vue
+++ b/src/pages/page-web/projects/tsa.vue
@@ -16,10 +16,10 @@
<a-empty style="color: #fff;" :image="simpleImage" description="暂无数据" :image-style="{ height: '60px' }" />
</div>
<div v-else class="fz12" style="color: white;">
- <div v-for="dock in onlineDocks.data" :key="dock.sn"
- style="background: #3c3c3c; margin-bottom: 10px;">
+ <div v-for="dock in onlineDocks.data" :key="dock.sn" style="background: #3c3c3c; margin-bottom: 10px;">
<div class="task_wrapper" v-if="dock.latest_wayline_job">
- <div class="task_content task_content_way" v-if="deviceInfo[dock.sn] && deviceInfo[dock.sn].mode_code === 5">
+ <div class="task_content task_content_way"
+ v-if="deviceInfo[dock.sn] && deviceInfo[dock.sn].mode_code === 5">
<div class="task_status">
<ContainerOutlined />
<span>执行任务中</span>
@@ -30,9 +30,10 @@
<ContainerOutlined />
<span>待执行</span>
</div>
- <div class="task_info">{{dock.latest_wayline_job.is_later ? '今天': '明天'}}{{convertTimestampToDate(dock.latest_wayline_job.begin_time, 'hh:mm')}}</div>
+ <div class="task_info">{{ dock.latest_wayline_job.is_later ? '今天' :
+ '明天' }}{{ convertTimestampToDate(dock.latest_wayline_job.begin_time, 'hh:mm') }}</div>
</div>
- <div class="task_title">{{dock.latest_wayline_job.name}}</div>
+ <div class="task_title">{{ dock.latest_wayline_job.name }}</div>
</div>
<div style="border-radius: 2px; height: 90px; width: 100%;"
class="flex-row flex-justify-between flex-align-center">
@@ -122,7 +123,7 @@
:style="deviceInfo[dock.sn] && deviceInfo[dock.sn].mode_code !== EModeCode.Disconnected || dockInfo[dock.gateway.sn].basic_osd?.drone_in_dock === 1 ? 'color: #00ee8b' : 'color: red;'">
{{
deviceInfo[dock.sn] ? EModeText[deviceInfo[dock.sn].mode_code] :
- dockInfo[dock.gateway.sn].basic_osd?.drone_in_dock === 1 ? '舱内关机' :
+ dockInfo[dock.gateway.sn]?.basic_osd?.drone_in_dock === 1 ? '舱内关机' :
EModeText[EModeCode.Disconnected]
}}
</div>
@@ -399,7 +400,7 @@
// 更新线段的位置
const drone_route = cesium.getEntityById('drone_route')
drone_route.polyline.positions = previousPositions.value
- // eslint-disable-next-line eqeqeq
+ // eslint-disable-next-line eqeqeq
} else if (data.deviceInfo[data.currentSn].mode_code == 0 || data.deviceInfo[data.currentSn].mode_code == 14) {
const drone_route = cesium.getEntityById('drone_route')
previousPositions.value = []
@@ -437,7 +438,7 @@
}
}
// 判断给定日期是否晚于当前时间
-const isDateLaterThanNow = (dateObj:any) => {
+const isDateLaterThanNow = (dateObj: any) => {
const todayTimestamp = setTodayTime(dateObj)
return todayTimestamp > Date.now()
}
@@ -535,8 +536,12 @@
e.target.style.cursor = 'not-allowed'
return
}
+
if (device.sn === osdVisible.value.sn) {
osdVisible.value.visible = !osdVisible.value.visible
+ // 临时--可能会改
+ osdVisible.value.is_dock = true
+ osdVisible.value.gateway_sn = device.gateway.sn
} else {
osdVisible.value.sn = device.sn
osdVisible.value.callsign = device.callsign
@@ -734,13 +739,16 @@
.task_wrapper {
display: flex;
align-items: center;
+
.task_content {
background-color: #41bbfa;
padding: 2px 4px;
}
+
.task_content_way {
background-color: #19be6b;
}
+
.task_title {
margin-left: 5px;
font-size: 14px;
--
Gitblit v1.9.3