From 3667807a7b7418efc090ee3fa6a6b734bc3080bf Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Wed, 13 Sep 2023 20:36:29 +0800
Subject: [PATCH] Merge branch 'develop' of http://s16s652780.51mypc.cn:49896/r/yskj/iot_drone_web into develop
---
src/store/index.ts | 56 ++++++++++++++++++++++++++++++++------------------------
1 files changed, 32 insertions(+), 24 deletions(-)
diff --git a/src/store/index.ts b/src/store/index.ts
index 95d170b..56d32af 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -5,12 +5,15 @@
import { getLayers } from '/@/api/layer'
import { LayerType } from '/@/types/mapLayer'
import { WaylineFile } from '/@/types/wayline'
+import getter from './getters'
import { DevicesCmdExecuteInfo } from '/@/types/device-cmd'
+import map from './map'
+import common from '/@/store/common'
const initStateFunc = () => ({
Layers: [
{
- name: 'default',
+ name: '默认',
id: '',
is_distributed: true,
elements: [],
@@ -19,7 +22,7 @@
type: 1
},
{
- name: 'share',
+ name: '共享',
id: '',
is_distributed: true,
elements: [],
@@ -65,15 +68,16 @@
[sn: string]: DockOsd
},
currentSn: '',
- currentType: ''
+ currentType: -1
},
- osdVisible: {
+ osdVisible: { // osd 显示设备相关信息
sn: '',
callsign: '',
model: '',
visible: false,
gateway_sn: '',
is_dock: false,
+ payloads: null
} as OSDVisible,
waylineInfo: {
@@ -86,7 +90,9 @@
},
// 机场指令执行状态信息
devicesCmdExecuteInfo: {
- } as DevicesCmdExecuteInfo
+ } as DevicesCmdExecuteInfo,
+ mqttState: null as any, // mqtt 实例
+ clientId: '', // mqtt 连接 唯一客户端id
})
export type RootStateType = ReturnType<typeof initStateFunc>
@@ -112,31 +118,22 @@
return
}
if (!state.deviceState.dockInfo[info.sn]) {
- state.deviceState.dockInfo[info.sn] = info.host
- return
+ state.deviceState.dockInfo[info.sn] = { } as DockOsd
}
state.deviceState.currentSn = info.sn
state.deviceState.currentType = EDeviceTypeName.Dock
const dock = state.deviceState.dockInfo[info.sn]
+ if (info.host.mode_code !== undefined) {
+ dock.basic_osd = info.host
+ return
+ }
if (info.host.sdr) {
- dock.sdr = info.host.sdr
- dock.media_file_detail = info.host.media_file_detail
- dock.wireless_link = info.host.wireless_link
+ dock.link_osd = info.host
return
}
- if (info.host.job_number) {
- if (info.host.drone_battery_maintenance_info) {
- dock.drone_battery_maintenance_info = info.host.drone_battery_maintenance_info
- }
- return
+ if (info.host.job_number !== undefined) {
+ dock.work_osd = info.host
}
- const sdr = dock.sdr
- const mediaFileDetail = dock.media_file_detail
- const wireless = dock.wireless_link
- state.deviceState.dockInfo[info.sn] = info.host
- state.deviceState.dockInfo[info.sn].sdr = sdr
- state.deviceState.dockInfo[info.sn].media_file_detail = mediaFileDetail
- state.deviceState.dockInfo[info.sn].wireless_link = wireless
},
SET_DRAW_VISIBLE_INFO (state, bool) {
state.drawVisible = bool
@@ -193,7 +190,13 @@
} else {
state.devicesCmdExecuteInfo[info.sn] = [info]
}
- }
+ },
+ SET_MQTT_STATE (state, mqttState) {
+ state.mqttState = mqttState
+ },
+ SET_CLIENT_ID (state, clientId) {
+ state.clientId = clientId
+ },
}
const actions: ActionTree<RootStateType, RootStateType> = {
@@ -240,7 +243,12 @@
state: initStateFunc,
getters,
mutations,
- actions
+ actions,
+ modules: {
+ getter,
+ map,
+ common
+ },
}
const rootStore = createStore(storeOptions)
--
Gitblit v1.9.3