From 1ff0d0141c85aff072beba71fa9b7f8b485b43b7 Mon Sep 17 00:00:00 2001
From: husq <931347610@qq.com>
Date: Sat, 23 Sep 2023 10:34:14 +0800
Subject: [PATCH] websocket添加项目id
---
src/components/GMap.vue | 313 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 279 insertions(+), 34 deletions(-)
diff --git a/src/components/GMap.vue b/src/components/GMap.vue
index a7bd038..bfcdd90 100644
--- a/src/components/GMap.vue
+++ b/src/components/GMap.vue
@@ -1,9 +1,10 @@
<template>
<div class="g-map-wrapper">
<!-- 地图区域 -->
- <div id="g-container" :style="{ width: '100%', height: '100%' }" />
+ <!-- <div id="g-container" :style="{ width: '100%', height: '100%' }" /> -->
+ <Cesium />
<!-- 绘制面板 -->
- <div class="g-action-panel" :style="{ right: drawVisible ? '316px' : '16px' }">
+ <!-- <div class="g-action-panel" :style="{ right: drawVisible ? '316px' : '16px' }">
<div :class="state.currentType === 'pin' ? 'g-action-item selection' : 'g-action-item'" @click="draw('pin', true)">
<a><a-image :src="pin" :preview="false" /></a>
</div>
@@ -24,7 +25,7 @@
<CloseOutlined />
</a>
</div>
- </div>
+ </div> -->
<!-- 飞机OSD -->
<div v-if="osdVisible.visible && !osdVisible.is_dock" class="osd-panel fz12">
<div class="pl5 pr5 flex-align-center flex-row flex-justify-between"
@@ -168,7 +169,7 @@
</div>
</div>
<!-- 机场OSD -->
- <div v-if="osdVisible.visible && osdVisible.is_dock" class="osd-panel fz12">
+ <div class="osd-panel fz12" v-if="osdVisible.visible && osdVisible.is_dock">
<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>
@@ -194,9 +195,12 @@
:style="deviceInfo.dock.basic_osd?.mode_code === EDockModeCode.Disconnected ? 'color: red; font-weight: 700;' : 'color: rgb(25,190,107)'">
{{ EDockModeText[deviceInfo.dock.basic_osd?.mode_code] }}</a-col>
<!-- <a-col span="1">{{ hmsInfo[sn]?.length || 1 }}</a-col> -->
- <a-col span="1" class="num">1</a-col>
- <a-col span="13" style="background-color: #ff9900;width: 100%;padding-left:5px ;"> <span>{{ '机场配电柜门打开'
- }}</span> </a-col>
+ <a-col span="1" class="num" v-if="hmsInfo[sn]">{{ hmsInfo[sn]?.length }}</a-col>
+ <a-col span="14" v-if="hmsInfo[sn] && hmsInfo[sn].length>0" style="width: 100%;padding-left:5px ;">
+ <a-tooltip :title="hmsInfo[sn][0].message_zh">
+ <div class="overflow">{{ hmsInfo[sn][0].message_zh }}</div>
+ </a-tooltip>
+ </a-col>
</a-row>
<a-row>
<!-- <a-col span="12">
@@ -350,7 +354,7 @@
</a-row> -->
<a-row class="p5" justify="space-between">
<a-col span="11">
- <a-button :class="[showMonitor?'active-color':'unactive-color']" class="width-100" type="primary" size="small">
+ <a-button :class="[showMonitor?'active-color':'unactive-color']" class="width-100" type="primary" size="small" @click="openMonitor">
监控
</a-button>
</a-col>
@@ -367,6 +371,11 @@
</DockControlPanel>
</div>
</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" />
+ <!-- </a-spin> -->
+ </a-row>
<!-- 飞机-->
<div class="flex-display">
<div class="flex-column flex-align-stretch flex-justify-center" style="width: 60px; background: #2d2d2d;">
@@ -384,21 +393,27 @@
{{ !deviceInfo.device ? EModeText[EModeCode.Disconnected] : EModeText[deviceInfo.device?.mode_code]
}}</a-col>
<a-col span="15">
- <a-select :showArrow="false" :bordered="false" :placeholder="EModeCode.Disconnected==14?'N/A':'请选择'" :disabled="EModeCode.Disconnected==14?true:false" size="small" style="width:100%;background-color: #5d5f61;color: #fff;"></a-select>
+ <a-select :showArrow="false" v-model:value="aircraSelected" :bordered="false" :options="aircraftList" :placeholder="aircraftList.length==0?'N/A':'请选择'" :disabled="aircraftList.length==0?true:false" size="small" style="width:100%;background-color: #5d5f61;color: #fff;" @change="selectChange"></a-select>
</a-col>
</a-row>
<a-row align="middle" justify="center">
- <a-col span="24"> <div style="color:#494949;" class="flex-display flex-justify-center mt5 mb5">当前设备已关机，无法进行直播</div> </a-col>
+ <a-col span="24"> <div v-if="deviceInfo.device?.mode_code == 14 || !deviceInfo.device" style="color:#494949;" class="flex-display flex-justify-center mt5 mb5">当前设备已关机，无法进行直播</div> </a-col>
</a-row>
<a-row align="middle" justify="center">
<a-col span="24">
- <a-button :class="[showFly?'active-color':'unactive-color']" class="width-100" type="primary" size="small">
+ <a-button :disabled="deviceInfo.device?.mode_code == 14 || !deviceInfo.device?true:false" :class="[showAircraft?'active-color':'unactive-color']" class="width-100" type="primary" size="small" @click="openAircra">
飞行控制
</a-button>
</a-col>
</a-row>
</div>
</div>
+ <!-- 飞机直播 -->
+ <a-row class="p5" v-if="showAircraft">
+ <!-- <a-spin :spinning="spinning"> -->
+ <Jessibuca v-if="aircraftUrl" :videoUrl="aircraftUrl" width="100%" height="300px" />
+ <!-- </a-spin> -->
+ </a-row>
<!-- 飞机图标信息 -->
<div class="osd-info flex-1">
<!-- <a-row align="middle">
@@ -584,14 +599,14 @@
</a-row>
</div>
<!-- 飞行控制 -->
- <div class="fly-control flex-display">
+ <!-- <div class="fly-control flex-display">
<div class="flex-column flex-align-stretch flex-justify-center" style="width: 100px; background: #2d2d2d;">
<div style="cursor: pointer;" class="p10 flex-column flex-align-center flex-justify-center">
<span><a-image :src="M30" :preview="false" /></span>
<span>一键起飞</span>
</div>
</div>
- </div>
+ </div> -->
<div class="battery-slide" v-if="deviceInfo.device && deviceInfo.device.battery.remain_flight_time !== 0"
style="border: 1px solid red">
<div style="background: #535759;" class="width-100"></div>
@@ -619,6 +634,7 @@
generatePointContent,
generatePolyContent
} from '../utils/map-layer-utils'
+import { message } from 'ant-design-vue'
import { postElementsReq } from '/@/api/layer'
import { MapDoodleType, MapElementEnum } from '/@/constants/map'
import { useGMapManage } from '/@/hooks/use-g-map'
@@ -632,6 +648,9 @@
import { uuidv4 } from '/@/utils/uuid'
import { gcj02towgs84, wgs84togcj02 } from '/@/vendors/coordtransform'
import { deviceTsaUpdate } from '/@/hooks/use-g-map-tsa'
+import Jessibuca from '/@/components/Jessibuca/Jessibuca.vue'
+import { CURRENT_CONFIG as config } from '/@/api/http/config'
+import { getLiveCapacity, startLivestream, stopLivestream } from '/@/api/manage'
import {
DeviceOsd, DeviceStatus, DockOsd, EGear, EModeCode, GatewayOsd, EDockModeCode, EDockModeText, EModeText,
NetworkStateQualityEnum, NetworkStateTypeEnum, RainfallEnum, DroneInDockEnum
@@ -648,7 +667,7 @@
import { useDockControl } from './g-map/use-dock-control'
import DroneControlPanel from './g-map/DroneControlPanel.vue'
import { useConnectMqtt } from './g-map/use-connect-mqtt'
-
+import Cesium from './cesiumMap/cesium.vue'
export default defineComponent({
components: {
BorderOutlined,
@@ -679,15 +698,38 @@
const useMouseToolHook = useMouseTool()
const useGMapManageHook = useGMapManage()
const deviceTsaUpdateHook = deviceTsaUpdate()
+ interface SelectOption {
+ value: any,
+ label: string,
+ more?: any
+}
const root = getRoot()
// 监控显示
const showMonitor = ref(false)
// 操作显示
const showOption = ref(false)
- // 飞行控制显示
- const showFly = ref(false)
const mouseMode = ref(false)
const store = useMyStore()
+ // 机场直播地址
+ const airPortUrl = ref('')
+ // 设备列表
+ const droneList = ref()
+ // 设备相机
+ const cameraList = ref()
+ // 相机设备选择值
+ const cameraIndex = ref(0)
+ // 设备列表选择值
+ const droneIndex = ref(0)
+ // 视频列表选择值
+ const videoList = ref()
+ const videoIndex = ref(0)
+
+ // 飞机视频播放地址
+ const aircraftUrl = ref('')
+ const showAircraft = ref(false)
+ // 飞机视频列表
+ const aircraftList = ref([])
+ const aircraSelected = ref('')
const state = reactive({
currentType: '',
coverIndex: 0
@@ -735,8 +777,11 @@
const drawVisible = computed(() => {
return store.state.drawVisible
})
- const osdVisible = computed(() => {
- return store.state.osdVisible
+ const osdVisible = computed({
+ get: () => {
+ return store.state.osdVisible
+ },
+ set: (val) => val
})
const sn = computed(() => {
return store.state.hmsInfoDetailSn
@@ -747,15 +792,189 @@
return val
}
})
+ // 打开监控权限
+ const openMonitor = () => {
+ showMonitor.value = !showMonitor.value
+ if (showMonitor.value) {
+ loadVideo()
+ } else {
+ onClose()
+ }
+ }
+ // 打开飞机监控
+ const openAircra = () => {
+ showAircraft.value = !showAircraft.value
+ if (showAircraft.value) {
+ loadDroneVideo()
+ } else {
+ closeFly()
+ }
+ }
+ // 加载该设备的视频信息
+ const loadVideo = async () => {
+ droneList.value = []
+ cameraList.value = []
+ 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) {
+ if (res.data === null) {
+ console.warn('warning: get live capacity is null!!!')
+ return
+ }
+ // 机场数据
+ const airport = res.data.find(v => v.sn === sn.value)
+ const temp: Array<SelectOption> = []
+ if (airport) {
+ temp.push({ label: airport.name, value: airport.sn, more: airport.cameras_list })
+ // 设备列表
+ droneList.value = temp.filter(v => v.value === sn.value)
+ // 设备直播处理
+ if (droneList.value[0].more && droneList.value[0].more.length > 0) {
+ cameraList.value = droneList.value[droneIndex.value].more.map((v: { name: any; index: any; videos_list: any }) => {
+ return {
+ label: v.name,
+ value: v.index,
+ more: v.videos_list
+ }
+ })
+ videoList.value = cameraList.value[cameraIndex.value].more.map((v) => {
+ return {
+ label: v.type,
+ value: v.index,
+ }
+ })
+ onStart()
+ } else {
+ showMonitor.value = false
+ message.error('该设备暂无直播设备开启')
+ }
+ }
+ }
+ })
+ .catch(error => {
+ message.error(error)
+ })
+ }
+ // 加载无人机的视频信息
+ const loadDroneVideo = async () => {
+ aircraftList.value = []
+ await getLiveCapacity({ id: store.state.common.projectId })
+ .then(res => {
+ if (res.code === 0) {
+ if (res.data === null) {
+ console.warn('warning: get live capacity is null!!!')
+ return
+ }
+ const resData: Array<[]> = res.data
+ const drone = res.data.find(v => v.sn === deviceInfo.dock.basic_osd.sub_device?.device_sn)
+ const temp: Array<SelectOption> = []
+ if (drone) {
+ temp.push({ label: drone.name, value: drone.sn, more: drone.cameras_list })
+ } // 无人机列表
+ const airList = temp.filter(v => v.value === deviceInfo.dock.basic_osd?.sub_device?.device_sn)
+ // 无人机设备处理
+ if (airList[0].more && airList[0].more.length > 0) {
+ aircraftList.value = airList[0].more.map(v => {
+ return {
+ label: v.name,
+ value: v.index,
+ vadeosList: v.videos_list
+ }
+ })
+ aircraSelected.value = aircraftList.value[0].value
+ flyOnStart()
+ } else {
+ showAircraft.value = false
+ message.error('该无人机暂无直播设备开启')
+ }
+ }
+ })
+ .catch(error => {
+ message.error(error)
+ })
+ }
+ // 设备开始播放
+ const onStart = async () => {
+ 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
+ await startLivestream({
+ url: liveURL,
+ video_id: videoId,
+ url_type: 1,
+ video_quality: 0
+ })
+ .then(res => {
+ if (res.code !== 0) return
+ airPortUrl.value = res.data.url
+ })
+ }
+ // 下拉框选择变化
+ const selectChange = async (e) => {
+ // await closeFly()
+ // setTimeout(async () => {
+ await flyOnStart()
+ // }, 500)
+ }
+ // 关闭设备直播
+ const onClose = async () => {
+ const videoId = droneList.value[droneIndex.value].value + '/' + cameraList.value[cameraIndex.value].value + '/' + videoList.value[videoIndex.value].value
+ stopLivestream({
+ video_id: videoId
+ }).then(res => {
+ if (res.code === 0) {
+ airPortUrl.value = ''
+ }
+ })
+ }
+ // 飞机设备播放
+ const flyOnStart = async () => {
+ aircraftUrl.value = ''
+ const videoId = deviceInfo.dock.basic_osd?.sub_device?.device_sn + '/' + aircraSelected.value + '/' + 'normal-0'
+ const streamId = deviceInfo.dock.basic_osd?.sub_device?.device_sn + '-' + aircraSelected.value + '-' + 'normal-0'
+ const liveURL = config.rtmpURL + streamId
+ await startLivestream({
+ url: liveURL,
+ video_id: videoId,
+ url_type: 1,
+ video_quality: 0
+ })
+ .then(res => {
+ if (res.code !== 0) return
+ aircraftUrl.value = res.data.url
+ })
+ }
+ // 飞行设备关闭
+ const closeFly = async () => {
+ aircraftList.value.forEach(item => {
+ const videoId = deviceInfo.dock.basic_osd?.sub_device?.device_sn + '/' + item.value + '/' + 'normal-0'
+ stopLivestream({
+ video_id: videoId
+ }).then(res => {
+ if (res.code === 0) {
+ aircraftUrl.value = ''
+ }
+ }).catch(e => {
+ console.log(e, 'errrrrrrrrrrrrrr')
+ })
+ })
+ // const videoId = deviceInfo.dock.basic_osd?.sub_device?.device_sn + '/' + aircraSelected.value + '/' + 'normal-0'
+ aircraftList.value = []
+ aircraSelected.value = ''
+ }
watch(() => store.state.deviceStatusEvent,
data => {
if (Object.keys(data.deviceOnline).length !== 0) {
- deviceTsaUpdateHook.initMarker(data.deviceOnline.domain, data.deviceOnline.device_callsign, data.deviceOnline.sn)
+ // deviceTsaUpdateHook.initMarker(data.deviceOnline.domain, data.deviceOnline.device_callsign, data.deviceOnline.sn)
store.state.deviceStatusEvent.deviceOnline = {} as DeviceStatus
}
if (Object.keys(data.deviceOffline).length !== 0) {
- deviceTsaUpdateHook.removeMarker(data.deviceOffline.sn)
+ // 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)
@@ -767,22 +986,31 @@
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]) {
- deviceTsaUpdateHook.moveTo(data.currentSn, data.gatewayInfo[data.currentSn].longitude, data.gatewayInfo[data.currentSn].latitude)
if (osdVisible.value.visible && osdVisible.value.gateway_sn !== '') {
deviceInfo.gateway = data.gatewayInfo[osdVisible.value.gateway_sn]
}
}
if (data.currentType === EDeviceTypeName.Aircraft && data.deviceInfo[data.currentSn]) {
- deviceTsaUpdateHook.moveTo(data.currentSn, data.deviceInfo[data.currentSn].longitude, data.deviceInfo[data.currentSn].latitude)
if (osdVisible.value.visible && osdVisible.value.sn !== '') {
deviceInfo.device = data.deviceInfo[osdVisible.value.sn]
}
}
if (data.currentType === EDeviceTypeName.Dock && data.dockInfo[data.currentSn]) {
- deviceTsaUpdateHook.initMarker(EDeviceTypeName.Dock, [EDeviceTypeName.Dock], data.currentSn, data.dockInfo[data.currentSn].basic_osd?.longitude, data.dockInfo[data.currentSn].basic_osd?.latitude)
if (osdVisible.value.visible && osdVisible.value.is_dock && osdVisible.value.gateway_sn !== '') {
deviceInfo.dock = data.dockInfo[osdVisible.value.gateway_sn]
deviceInfo.device = data.deviceInfo[deviceInfo.dock.basic_osd.sub_device?.device_sn ?? osdVisible.value.sn]
@@ -863,8 +1091,8 @@
useConnectMqtt()
onMounted(() => {
- const app = getApp()
- useGMapManageHook.globalPropertiesConfig(app)
+ // const app = getApp()
+ // useGMapManageHook.globalPropertiesConfig(app)
})
function getDrawCallback ({ obj }) {
@@ -882,7 +1110,7 @@
break
}
}
- async function postPinPositionResource (obj) {
+ async function postPinPositionResource (obj: { setExtData: (arg0: { id: string; name: any }) => void }) {
const req = getPinPositionResource(obj)
setLayers(req)
const coordinates = req.resource.content.geometry.coordinates
@@ -893,7 +1121,7 @@
store.state.coverList.push(obj)
// console.log(store.state.coverList)
}
- async function postPolylineResource (obj) {
+ async function postPolylineResource (obj: { setExtData: (arg0: { id: string; name: any }) => void }) {
const req = getPolylineResource(obj)
setLayers(req)
updateCoordinates('gcj02-wgs84', req)
@@ -902,7 +1130,7 @@
store.state.coverList.push(obj)
// console.log(store.state.coverList)
}
- async function postPolygonResource (obj) {
+ async function postPolygonResource (obj: { setExtData: (arg0: { id: string; name: any }) => void }) {
const req = getPoygonResource(obj)
setLayers(req)
updateCoordinates('gcj02-wgs84', req)
@@ -912,7 +1140,7 @@
// console.log(store.state.coverList)
}
- function getPinPositionResource (obj) {
+ function getPinPositionResource (obj: { getPosition: () => any; _originOpts: { title: any } }) {
const position = obj.getPosition()
const resource = generatePointContent(position)
const name = obj._originOpts.title
@@ -923,7 +1151,7 @@
resource
}
}
- function getPolylineResource (obj) {
+ function getPolylineResource (obj: { getPath: () => any; _opts: any }) {
const path = obj.getPath()
const resource = generateLineContent(path)
const { name, id } = getBaseInfo(obj._opts)
@@ -933,7 +1161,7 @@
resource
}
}
- function getPoygonResource (obj) {
+ function getPoygonResource (obj: { getPath: () => any; _opts: any }) {
const path = obj.getPath()
const resource = generatePolyContent(path)
const { name, id } = getBaseInfo(obj._opts)
@@ -943,7 +1171,7 @@
resource
}
}
- function getBaseInfo (obj) {
+ function getBaseInfo (obj: { title: any }) {
const name = obj.title
const id = uuidv4()
return { name, id }
@@ -1047,7 +1275,15 @@
sn,
showMonitor,
showOption,
- showFly
+ airPortUrl,
+ openMonitor,
+ droneIndex,
+ openAircra,
+ showAircraft,
+ aircraftUrl,
+ aircraftList,
+ aircraSelected,
+ selectChange,
}
}
})
@@ -1103,6 +1339,15 @@
border-radius: 2px;
opacity: 0.8;
}
+
+.overflow {
+ width: 100%;
+ overflow: hidden;
+ background-color: #ff9900;
+ // padding: 2px 5px;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+}
.osd-info {
margin: 15px 10px;
}
--
Gitblit v1.9.3