From c45531e760a5f4cc69dd2314a4f5bbcdc881d30a Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Thu, 03 Apr 2025 09:55:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/SignMachineNest/components/MachineRight/MachineStatus.vue | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/src/views/SignMachineNest/components/MachineRight/MachineStatus.vue b/src/views/SignMachineNest/components/MachineRight/MachineStatus.vue
index 0c3549f..197277b 100644
--- a/src/views/SignMachineNest/components/MachineRight/MachineStatus.vue
+++ b/src/views/SignMachineNest/components/MachineRight/MachineStatus.vue
@@ -1,6 +1,6 @@
<!-- 机巢状态 -->
<template>
- <CommonTitle title="机巢状态" />
+ <CommonTitle title="机巢状态" @details="detailsFun" />
<div :style="{ marginLeft: pxToRem(14) }">
<div class="machine-status">
<div class="info">
@@ -54,18 +54,19 @@
<img src="@/assets/images/signMachineNest/machineRight/distance.png" alt="">
<span class="text">飞行距离</span>
</div>
- <div class="text-data">98<span class="text">km</span></div>
+ <div class="text-data">{{ singleTotal.flight_mileage }}<span class="text">km</span></div>
</div>
<div class="card">
<div>
<img src="@/assets/images/signMachineNest/machineRight/duration.png" alt="">
<span class="text">飞行时长</span>
</div>
- <div class="text-data">188<span class="text">min</span></div>
+ <div class="text-data">{{ singleTotal.hour_count }}<span class="text">h</span></div>
</div>
</div>
</div>
</div>
+ <!-- <MachineTableDetails :dialogVisible="isShowDetails" /> -->
</template>
<script setup>
@@ -76,7 +77,13 @@
import { useStore } from 'vuex';
const store = useStore();
+// 获取机巢信息
let osdVisible = computed(() => store.state.home.osdVisible);
+// 单个机巢统计数据
+const singleTotal = computed(() => store.state.home.singleTotal);
+// 是否展示机机巢状态详情
+let isShowDetails = ref(false);
+
let str = '--';
let drone_charge_state = ref({
capacity_percent: '--',
@@ -243,6 +250,11 @@
}
return theFinheight.toFixed(1);
};
+
+// 详情
+const detailsFun = () => {
+ isShowDetails.value = true;
+};
</script>
<style lang="scss" scoped>
--
Gitblit v1.9.3