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/SignMachineNest.vue | 31 +++++++++++--------------------
1 files changed, 11 insertions(+), 20 deletions(-)
diff --git a/src/views/SignMachineNest/SignMachineNest.vue b/src/views/SignMachineNest/SignMachineNest.vue
index 5418d68..859a9e2 100644
--- a/src/views/SignMachineNest/SignMachineNest.vue
+++ b/src/views/SignMachineNest/SignMachineNest.vue
@@ -11,7 +11,7 @@
import { EBizCode } from '@/utils/staticData/enums.js';
import { EModeCode } from '@/utils/staticData/device.js';
import { useStore } from 'vuex';
-import { getDeviceDetail } from '@/api/home/machineNest';
+import { getDeviceDetail, getFlightStatistics } from '@/api/home/machineNest';
const store = useStore();
@@ -59,25 +59,6 @@
const result = res.data.data;
const child = result.children;
// 对应store 里面数据结构
- // const device = {
- // visible: true,
- // is_dock: true,
- // model: child?.device_name,
- // callsign: child?.nickname,
- // sn: child?.device_sn,
- // mode: EModeCode.Disconnected,
- // latest_wayline_job: result.latest_wayline_job,
- // gateway: {
- // model: result?.device_name,
- // callsign: result?.nickname,
- // sn: result?.device_sn,
- // domain: result?.domain,
- // device_domain: child.domain,
- // device_type: child.type,
- // device_sub_type: child.sub_type,
- // },
- // payload: child.payloads_list || [],
- // };
osdVisible.value.sn = child?.device_sn || ''
osdVisible.value.callsign = child?.nickname || '--'
osdVisible.value.model = EModeCode.Disconnected || ''
@@ -97,8 +78,18 @@
});
};
+// 获取机巢统计数据 提供给左右侧组件使用
+const getMachineData = () => {
+ getFlightStatistics(singleUavHome.value.device_sn).then(res => {
+ if (res.data.code !== 0) return;
+ const result = res.data.data;
+ store.commit('setSingleTotal', result);
+ })
+};
+
onMounted(() => {
getSingleDetails();
+ getMachineData();
});
onUnmounted(() => {
--
Gitblit v1.9.3