From f2346c813c022d871a9bf5e8b75c0db46ee80116 Mon Sep 17 00:00:00 2001
From: husq <931347610@qq.com>
Date: Mon, 25 Sep 2023 09:57:13 +0800
Subject: [PATCH] 把设备添加项目中
---
src/components/GMap.vue | 64 +++++++++++++++++++-------------
1 files changed, 38 insertions(+), 26 deletions(-)
diff --git a/src/components/GMap.vue b/src/components/GMap.vue
index bfcdd90..d494607 100644
--- a/src/components/GMap.vue
+++ b/src/components/GMap.vue
@@ -173,7 +173,7 @@
<div class="fz16 pl5 pr5 flex-align-center flex-row flex-justify-between"
style="border-bottom: 1px solid #515151; height: 10%;">
<span>{{ osdVisible.gateway_callsign }}</span>
- <span><a style="color: white;" @click="() => osdVisible.visible = false">
+ <span><a style="color: white;" @click="closeOsdWindow">
<CloseOutlined />
</a></span>
</div>
@@ -367,7 +367,7 @@
</a-row>
<!-- 机场控制面板 -->
<DockControlPanel v-if="dockControlPanelVisible" :sn="osdVisible.gateway_sn" :deviceInfo="deviceInfo"
- @close-control-panel="onCloseControlPanel">
+ @close-control-panel="closeOperate">
</DockControlPanel>
</div>
</div>
@@ -777,12 +777,7 @@
const drawVisible = computed(() => {
return store.state.drawVisible
})
- const osdVisible = computed({
- get: () => {
- return store.state.osdVisible
- },
- set: (val) => val
- })
+ const osdVisible = computed(() => JSON.parse(JSON.stringify(store.state.osdVisible)))
const sn = computed(() => {
return store.state.hmsInfoDetailSn
})
@@ -792,6 +787,12 @@
return val
}
})
+
+ // 关闭窗口
+ const closeOsdWindow = () => {
+ store.commit('SET_OSD_VISIBLE_INFO', false)
+ }
+
// 打开监控权限
const openMonitor = () => {
showMonitor.value = !showMonitor.value
@@ -817,7 +818,6 @@
videoList.value = []
droneIndex.value = 0
cameraIndex.value = 0
- console.log(deviceInfo, 'deviceInfo', sn.value)
await getLiveCapacity({ id: store.state.common.projectId })
.then(res => {
if (res.code === 0) {
@@ -986,19 +986,6 @@
deep: true
}
)
- watch(() => store.state.osdVisible, data => {
- if (data) {
- showMonitor.value = false
- aircraftUrl.value = ''
- showAircraft.value = false
- aircraftList.value = []
- aircraSelected.value = ''
- airPortUrl.value = ''
- droneList.value = []
- }
- }, {
- deep: true
- })
watch(() => store.state.deviceState, data => {
if (data.currentType === EDeviceTypeName.Gateway && data.gatewayInfo[data.currentSn]) {
if (osdVisible.value.visible && osdVisible.value.gateway_sn !== '') {
@@ -1017,9 +1004,24 @@
}
}
}, {
- deep: true
+ deep: true,
})
-
+ watch(() => osdVisible.value, (data, oldData) => {
+ showMonitor.value = false
+ aircraftUrl.value = ''
+ showAircraft.value = false
+ aircraftList.value = []
+ aircraSelected.value = ''
+ airPortUrl.value = ''
+ droneList.value = []
+ if (deviceInfo.dock.basic_osd?.mode_code === 2) {
+ onCloseControlPanel(oldData.gateway_sn)
+ } else {
+ setDockControlPanelVisible(false)
+ }
+ }, {
+ deep: true,
+ })
watch(
() => store.state.wsEvent,
newData => {
@@ -1086,7 +1088,14 @@
setDockControlPanelVisible,
onCloseControlPanel,
} = useDockControl()
-
+ // 关闭设备控制方法
+ const closeOperate = (sn:string) => {
+ if (deviceInfo.dock.basic_osd?.mode_code === 2) {
+ onCloseControlPanel(sn)
+ } else {
+ setDockControlPanelVisible(false)
+ }
+ }
// 连接或断开drc
useConnectMqtt()
@@ -1284,6 +1293,8 @@
aircraftList,
aircraSelected,
selectChange,
+ closeOperate,
+ closeOsdWindow
}
}
})
@@ -1410,4 +1421,5 @@
position: absolute;
min-height: 2px;
border-radius: 2px;
-}</style>
+}
+</style>
--
Gitblit v1.9.3