From dc349bff332e75f8dfc948b4225c8e0f6581fc22 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 26 Sep 2023 16:25:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/demo' into demo
---
src/components/GMap.vue | 31 ++++++++++++++++++++++---------
src/components/common/sidebar.vue | 2 ++
src/pages/page-web/projects/wayline.vue | 6 +++---
src/components/Jessibuca/Jessibuca.vue | 4 +++-
src/pages/page-web/projects/workspace.vue | 4 ++--
src/pages/page-web/projects/devices.vue | 2 +-
src/pages/page-web/projects/implement.vue | 2 +-
7 files changed, 34 insertions(+), 17 deletions(-)
diff --git a/src/components/GMap.vue b/src/components/GMap.vue
index 83938f5..8c8a784 100644
--- a/src/components/GMap.vue
+++ b/src/components/GMap.vue
@@ -373,7 +373,7 @@
</div>
<a-row class="p5" v-if="showMonitor" justify="center" align="middle">
<!-- <a-spin :spinning="spinning"> -->
- <Jessibuca v-if="airPortUrl" :videoUrl="airPortUrl" width="100%" height="300px" />
+ <Jessibuca v-if="airPortUrl" @timeout="airTimeout" :videoUrl="airPortUrl" width="100%" height="300px" />
<!-- </a-spin> -->
</a-row>
<!-- 飞机-->
@@ -406,7 +406,7 @@
</a-button>
</a-col>
<a-col span="11">
- <a-button :disabled="deviceInfo.device?.mode_code == 14 || !deviceInfo.device?true:false" :class="[openDroneControl?'active-color':'unactive-color']" class="width-100" type="primary" size="small"
+ <a-button :class="[openDroneControl?'active-color':'unactive-color']" class="width-100" type="primary" size="small"
@click="openDeviceSetting">
操作
</a-button>
@@ -417,7 +417,7 @@
<!-- 飞机直播 -->
<a-row class="p5" v-if="showAircraft">
<!-- <a-spin :spinning="spinning"> -->
- <Jessibuca v-if="aircraftUrl" :videoUrl="aircraftUrl" width="100%" height="300px" />
+ <Jessibuca v-if="aircraftUrl" @timeout="flyTimeout" :videoUrl="aircraftUrl" width="100%" height="300px" />
<!-- </a-spin> -->
</a-row>
<!-- 飞机图标信息 -->
@@ -905,8 +905,24 @@
message.error(error)
})
}
+ // 机场视频超时说明可能直播被关闭需要重新开启直播
+ const airTimeout = () => {
+ try {
+ onStart()
+ } catch (e) {
+ onClose()
+ }
+ }
+ const flyTimeout = () => {
+ try {
+ flyOnStart()
+ } catch (e) {
+ closeFly()
+ }
+ }
// 设备开始播放
const onStart = async () => {
+ airPortUrl.value = ''
const videoId = droneList.value[droneIndex.value].value + '/' + cameraList.value[cameraIndex.value].value + '/' + videoList.value[videoIndex.value].value
const streamId = droneList.value[droneIndex.value].value + '-' + cameraList.value[cameraIndex.value].value + '-' + videoList.value[videoIndex.value].value
const liveURL = config.rtmpURL + streamId
@@ -992,11 +1008,6 @@
store.state.deviceStatusEvent.deviceOnline = {} as DeviceStatus
}
if (Object.keys(data.deviceOffline).length !== 0) {
- // deviceTsaUpdateHook.removeMarker(data.deviceOffline.sn)
- if ((data.deviceOffline.sn === osdVisible.value.sn) || (osdVisible.value.is_dock && data.deviceOffline.sn === osdVisible.value.gateway_sn)) {
- osdVisible.value.visible = false
- store.commit('SET_OSD_VISIBLE_INFO', osdVisible)
- }
store.state.deviceStatusEvent.deviceOffline = {}
}
},
@@ -1315,7 +1326,9 @@
closeOsdWindow,
openDroneControl,
openFlySetting,
- openDeviceSetting
+ openDeviceSetting,
+ airTimeout,
+ flyTimeout
}
}
})
diff --git a/src/components/Jessibuca/Jessibuca.vue b/src/components/Jessibuca/Jessibuca.vue
index 618d06d..2a98fc4 100644
--- a/src/components/Jessibuca/Jessibuca.vue
+++ b/src/components/Jessibuca/Jessibuca.vue
@@ -3,7 +3,7 @@
</template>
<script setup lang="ts">
-import { onMounted, onUnmounted, ref, defineProps } from 'vue'
+import { onMounted, onUnmounted, ref, defineProps, defineEmits } from 'vue'
import Jessibuca from '../../../public/jessibuca/jessibuca'
const props = defineProps({
videoUrl: {
@@ -19,6 +19,7 @@
default: '200px'
}
})
+const emits = defineEmits(['timeout'])
let jessibuca: null | Jessibuca = null
const container = ref(null)
const buffer = ref(null)
@@ -107,6 +108,7 @@
jessibuca.on('timeout', function () {
console.log('timeout')
+ emits('timeout')
})
jessibuca.on('start', function () {
diff --git a/src/components/common/sidebar.vue b/src/components/common/sidebar.vue
index 9cbe1df..433e2b1 100644
--- a/src/components/common/sidebar.vue
+++ b/src/components/common/sidebar.vue
@@ -77,6 +77,8 @@
await UnBind(v)
})
store.commit('SET_OSD_VISIBLE_INFO', { ...query, visible: false })
+ store.commit('SET_SELECT_WAYLINE_INFO', {})
+ store.commit('SET_SELECT_DOCK_INFO', {})
root.$router.push('/' + ERouterName.PROJECT_LIST)
}
return {
diff --git a/src/pages/page-web/projects/devices.vue b/src/pages/page-web/projects/devices.vue
index 8e267d3..cde515a 100644
--- a/src/pages/page-web/projects/devices.vue
+++ b/src/pages/page-web/projects/devices.vue
@@ -279,7 +279,7 @@
}
type Pagination = TableState['pagination']
-const workspaceId = computed(() => store.state.common.projectId)
+const workspaceId = computed(() => store.state.common.projectId || localStorage.getItem(ELocalStorageKey.WorkspaceId))
const editableData: UnwrapRef<Record<string, Device>> = reactive({})
const current = ref([EDeviceTypeName.Aircraft])
diff --git a/src/pages/page-web/projects/implement.vue b/src/pages/page-web/projects/implement.vue
index d8845e8..fb7199c 100644
--- a/src/pages/page-web/projects/implement.vue
+++ b/src/pages/page-web/projects/implement.vue
@@ -216,7 +216,7 @@
const route = useRoute()
const store = useMyStore()
-const workspaceId = ref(localStorage.getItem(ELocalStorageKey.WorkspaceId)!)
+const workspaceId = computed(() => store.state.common.projectId || localStorage.getItem(ELocalStorageKey.WorkspaceId))
const hmsVisible = new Map<string, boolean>()
const deviceInfo = computed(() => store.state.deviceState.deviceInfo)
const dockInfo = computed(() => store.state.deviceState.dockInfo)
diff --git a/src/pages/page-web/projects/wayline.vue b/src/pages/page-web/projects/wayline.vue
index c6df563..3ea0aaf 100644
--- a/src/pages/page-web/projects/wayline.vue
+++ b/src/pages/page-web/projects/wayline.vue
@@ -113,7 +113,7 @@
})
const root = getRoot()
-const workspaceId = computed(() => store.state.common.projectId)
+const workspaceId = computed(() => store.state.common.projectId || localStorage.getItem(ELocalStorageKey.WorkspaceId))
const deleteTip = ref(false)
const deleteWaylineId = ref<string>('')
const canRefresh = ref(true)
@@ -134,6 +134,7 @@
pagination.page++
getWaylines()
}, 1000)
+ console.log(workspaceId.value)
})
function getWaylines () {
@@ -192,7 +193,6 @@
function selectRoute (wayline: WaylineFile) {
loading.value = true
getWayLineFile(workspaceId.value, wayline.id).then(res => {
- console.log(res, 'res')
store.commit('SET_SELECT_WAYLINE_INFO', wayline)
initKmlFile(res.data)
}).finally(() => {
@@ -279,7 +279,7 @@
fileData.append('file', file, file.name)
await importKmzFile(workspaceId.value, fileData).then((res) => {
if (res.code === 0) {
- message.success(`${file.name} file uploaded successfully`)
+ message.success(`${file.name} 文件上传成功`)
canRefresh.value = true
pagination.total = 0
pagination.page = 1
diff --git a/src/pages/page-web/projects/workspace.vue b/src/pages/page-web/projects/workspace.vue
index 7ec0794..b1b5e5d 100644
--- a/src/pages/page-web/projects/workspace.vue
+++ b/src/pages/page-web/projects/workspace.vue
@@ -10,7 +10,7 @@
</template>
<script lang="ts" setup>
import Sidebar from '/@/components/common/sidebar.vue'
-import { EBizCode, ERouterName } from '/@/types'
+import { EBizCode, ELocalStorageKey, ERouterName } from '/@/types'
import { getRoot } from '/@/root'
import { useMyStore } from '/@/store'
import { useConnectWebSocket } from '/@/hooks/use-connect-websocket'
@@ -20,7 +20,7 @@
const root = getRoot()
const store = useMyStore()
-const workspace_id = computed(() => store.state.common.projectId)
+const workspace_id = computed(() => store.state.common.projectId || localStorage.getItem(ELocalStorageKey.WorkspaceId))
const messageHandler = async (payload: any) => {
if (!payload) {
return
--
Gitblit v1.9.3