From f260ee9c8d023c28f6915eb62c4d74d7f05e7d9d Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Fri, 11 Apr 2025 16:18:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/SignMachineNest/MachineRight/MachineStatus/MachineStatus.vue | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/views/SignMachineNest/MachineRight/MachineStatus/MachineStatus.vue b/src/views/SignMachineNest/MachineRight/MachineStatus/MachineStatus.vue
index 00dd6b4..499504b 100644
--- a/src/views/SignMachineNest/MachineRight/MachineStatus/MachineStatus.vue
+++ b/src/views/SignMachineNest/MachineRight/MachineStatus/MachineStatus.vue
@@ -13,7 +13,7 @@
</div>
<div class="close-wb">
<div class="close">{{ AircraftStatus ? AircraftStatus : '舱内关机' }}</div>
- <div class="wb">需要维保</div>
+ <!-- <div class="wb">需要维保</div> -->
</div>
</div>
</div>
@@ -136,13 +136,16 @@
let mode_code = ref('已断开连接');
// 监听实时信息
-watch(store.state.home.wsMessage, (newValue) => {
- // if (newValue || newValue.mode_code === 14) return
- // if (Object.keys(newValue).length === 0) return
- console.log(newValue,'咋没数据呀');
- detailInfo.value.longitudee = newValue?.longitude.toFixed(6) || '--';
+watch(
+ () => store.state.home.wsMessage,
+ (newValue) => {
+ if (newValue.mode_code === 14) return
+ if (Object.keys(newValue).length === 0) return
+ // console.log(newValue, '顶顶顶111')
+ detailInfo.value.longitude = newValue?.longitude.toFixed(6) || '--';
detailInfo.value.latitude = newValue?.latitude.toFixed(6) || '--';
- getLnglatAltitude(newValue?.longitude,newValue?.latitude).then((res) => {
+ getLnglatAltitude(Number(detailInfo.value.longitude), Number(detailInfo.value.latitude)).then((res) => {
+ console.log(res, '顶顶顶')
const height = newValue?.height - res?.height;
//针对西安实时高度进行降低
const wId = localStorage.getItem('bs_workspace_id');
--
Gitblit v1.9.3