From 01e5133c54adf39957213fcc3d5a79ef834acf14 Mon Sep 17 00:00:00 2001
From: husq <931347610@qq.com>
Date: Wed, 13 Sep 2023 08:55:57 +0800
Subject: [PATCH] 部分问题修改完善
---
src/pages/page-web/projects/project_list/list_page/list.vue | 9 +
src/hooks/use-connect-websocket.ts | 4
src/components/cesiumMap/cesium.vue | 12 --
src/websocket/util/config.ts | 9 +
src/pages/page-web/projects/tsa.vue | 208 +++++++++++++++++++++++++++-------------
src/pages/page-web/projects/workspace.vue | 2
src/websocket/index.ts | 5
src/hooks/use-center-point.ts | 19 ++-
src/pages/page-web/home.vue | 2
src/pages/page-web/projects/project_list/list_page/components/ProjectList.vue | 10 +
10 files changed, 180 insertions(+), 100 deletions(-)
diff --git a/src/components/cesiumMap/cesium.vue b/src/components/cesiumMap/cesium.vue
index 110559e..946f26c 100644
--- a/src/components/cesiumMap/cesium.vue
+++ b/src/components/cesiumMap/cesium.vue
@@ -1,13 +1,3 @@
-<!--
- * @Author: 胡思旗 931347610@qq.com
- * @Date: 2023-08-22 17:50:30
- * @LastEditors: husq 931347610@qq.com
- * @LastEditTime: 2023-09-11 09:57:01
- * @FilePath: \Cloud-API-Demo-Web\src\components\cesiumMap\cesium.vue
- * @Description:
- *
- * Copyright (c) 2023 by ${git_name_email}, All Rights Reserved.
--->
<template>
<div class="height-100 width-100 cesium" id="cesiumContainer"></div>
<div v-if="centerConfig.type && !centerConfig.latitude" class="pointLongitude">在地图上点击绘制项目中心点</div>
@@ -141,7 +131,7 @@
// 设置项目中所有的项目中心坐标
watch(() => store.state.map.pointList, (newVal) => {
- if (newVal && newVal.length > 0) {
+ if (newVal) {
pointCenter(viewer, newVal)
clickPoint(viewer, newVal)
}
diff --git a/src/hooks/use-center-point.ts b/src/hooks/use-center-point.ts
index a1262f3..de17dde 100644
--- a/src/hooks/use-center-point.ts
+++ b/src/hooks/use-center-point.ts
@@ -5,12 +5,12 @@
// 删除地图中所有标识点
viewer.entities.removeAll()
if (longitudeList.length === 0) return
- longitudeList.forEach((item: { id:string, longitude: number; latitude: number, label: string }) => {
+ longitudeList.forEach((item: { id: string, longitude: number; latitude: number, label: string }) => {
addPoint(viewer, item.id, item.longitude, item.latitude, item.label)
})
}
// 绘制点
-function addPoint (viewer: any, id:string, longitude: number, latitude: number, label: string) {
+function addPoint (viewer: any, id: string, longitude: number, latitude: number, label: string) {
const entity = viewer.entities.add({
position: Cesium.Cartesian3.fromDegrees(longitude, latitude),
id,
@@ -37,7 +37,7 @@
const pickedObject = viewer.scene.pick(click.position)
console.log(pickedObject, 'pickObject')
if (Cesium.defined(pickedObject)) {
- const list = longitudeList.filter((v: { id:string, longitude: number; latitude: number; }) => v.id === pickedObject.id.id)
+ const list = longitudeList.filter((v: { id: string, longitude: number; latitude: number; }) => v.id === pickedObject.id.id)
if (pickedObject.id.label) {
pickedObject.id.label = null
} else {
@@ -48,10 +48,19 @@
}
}
- // const point = pickedObject.id.point
- //
+ // const point = pickedObject.id.point
+ //
}
}
, Cesium.ScreenSpaceEventType.LEFT_CLICK)
// handler.removeInputAction(Cesium.ScreenSpaceEventType.LEFT_CLICK)
}
+
+// 飞到项目中心点
+export function flyTo (viewer: any, longitude: number, latitude: number) {
+ // console.log()
+ const targetPosition = { longitude, latitude }
+ viewer.camera.flyTo({
+ destination: targetPosition,
+ })
+}
diff --git a/src/hooks/use-connect-websocket.ts b/src/hooks/use-connect-websocket.ts
index 43fb527..c0ba921 100644
--- a/src/hooks/use-connect-websocket.ts
+++ b/src/hooks/use-connect-websocket.ts
@@ -1,14 +1,14 @@
import { onMounted, onUnmounted } from 'vue'
import ReconnectingWebSocket from 'reconnecting-websocket'
import ConnectWebSocket, { MessageHandler } from '/@/websocket'
-import { getWebsocketUrl } from '/@/websocket/util/config'
+import { getWebsocketUrl, getMyWebSocketUrl } from '/@/websocket/util/config'
/**
* 接收一个message函数
* @param messageHandler
*/
export function useConnectWebSocket (messageHandler: MessageHandler) {
- const webSocket = new ConnectWebSocket(getWebsocketUrl())
+ const webSocket = new ConnectWebSocket(getMyWebSocketUrl())
onMounted(() => {
webSocket?.registerMessageHandler(messageHandler)
diff --git a/src/pages/page-web/home.vue b/src/pages/page-web/home.vue
index 4a73951..2cebdf5 100644
--- a/src/pages/page-web/home.vue
+++ b/src/pages/page-web/home.vue
@@ -42,7 +42,7 @@
}
}
// 监听ws 消息
-useConnectWebSocket(messageHandler)
+// useConnectWebSocket(messageHandler)
onMounted(() => {
const token = localStorage.getItem(ELocalStorageKey.Token)
diff --git a/src/pages/page-web/projects/project_list/list_page/components/ProjectList.vue b/src/pages/page-web/projects/project_list/list_page/components/ProjectList.vue
index 49dbb85..58fbca9 100644
--- a/src/pages/page-web/projects/project_list/list_page/components/ProjectList.vue
+++ b/src/pages/page-web/projects/project_list/list_page/components/ProjectList.vue
@@ -2,7 +2,7 @@
* @Author: 胡思旗 931347610@qq.com
* @Date: 2023-08-28 15:23:47
* @LastEditors: husq 931347610@qq.com
- * @LastEditTime: 2023-09-08 09:14:02
+ * @LastEditTime: 2023-09-11 17:00:46
* @FilePath: \Cloud-API-Demo-Web\src\pages\page-web\projects\project_list\list_page\components\ProjectList.vue
* @Description:项目列表组件
*
@@ -64,7 +64,7 @@
import { status, projectCard } from './data'
import { del, edit } from '/@/api/project-page'
import { Modal, message } from 'ant-design-vue'
-import { useMyStore} from "/@/store";
+import { useMyStore } from '/@/store'
const store = useMyStore()
const router = useRouter()
const emit = defineEmits(['refreshList', 'update:modelValue'])
@@ -129,14 +129,16 @@
name: ERouterName.EDIT_PROJECT,
query: { id: item.id }
})
+ store.commit('SET_POINT_LIST', [])
}
const goDetail = (item: any) => {
- console.log(11)
+ console.log(item, 'item')
store.commit('SET_PROJECT_ID', item.id)
+ store.commit('SET_POINT_LIST', [])
router.push({
name: ERouterName.WORKSPACE,
- query: { id: item.id }
+ query: { id: item.id },
})
}
diff --git a/src/pages/page-web/projects/project_list/list_page/list.vue b/src/pages/page-web/projects/project_list/list_page/list.vue
index 84f0f77..f3680ed 100644
--- a/src/pages/page-web/projects/project_list/list_page/list.vue
+++ b/src/pages/page-web/projects/project_list/list_page/list.vue
@@ -39,6 +39,8 @@
import { useMyStore } from '/@/store'
import Select from '/@/components/Search/Select.vue'
import List from './components/ProjectList.vue'
+const { appContext } = getCurrentInstance()
+const global = appContext.config.globalProperties
const router = useRouter()
const store = useMyStore()
const sort = ref('createTime')
@@ -62,14 +64,15 @@
const goDetail = () => {
router.push({ name: ERouterName.WORKSPACE })
+ store.commit('SET_POINT_LIST', [])
}
const goAdd = () => {
router.push({ name: ERouterName.ADD_PROJECT })
+ store.commit('SET_POINT_LIST', [])
}
const cardList = ref<projectCard[]>([])
// 全部状态、全部项目筛选方法
const handleChange = (e: any) => {
- console.log(e, params.value, '=============')
init()
}
// 排序方法
@@ -85,7 +88,7 @@
spinning.value = false
})
cardList.value = res.data.records
- const longitudeList = res.data.records.map((item: { id:string, longitude: any; latitude: any, projectName:string }) => {
+ const longitudeList = res.data.records.map((item: { id: string, longitude: any; latitude: any, projectName: string }) => {
return {
longitude: item.longitude,
latitude: item.latitude,
@@ -93,12 +96,12 @@
id: item.id
}
})
- console.log(longitudeList, 'longitudeList')
store.commit('SET_POINT_LIST', longitudeList)
spinning.value = false
}
onMounted(() => {
init()
+ console.log(global, '+++++')
})
</script>
diff --git a/src/pages/page-web/projects/tsa.vue b/src/pages/page-web/projects/tsa.vue
index ea78241..259fd6c 100644
--- a/src/pages/page-web/projects/tsa.vue
+++ b/src/pages/page-web/projects/tsa.vue
@@ -8,57 +8,69 @@
<a-col :span="1"></a-col>
</a-row>
</div>
- <div class="scrollbar" :style="{ height: scorllHeight + 'px'}">
+ <div class="scrollbar" :style="{ height: scorllHeight + 'px' }">
<a-collapse :bordered="false" expandIconPosition="right" accordion style="background: #232323;">
<a-collapse-panel :key="EDeviceTypeName.Dock" header="机场" style="border-bottom: 1px solid #4f4f4f;">
<div v-if="onlineDocks.data.length === 0" style="height: 150px; color: white;">
<a-empty style="color: #fff;" :image="simpleImage" description="暂无数据" :image-style="{ height: '60px' }" />
</div>
<div v-else class="fz12" style="color: white;">
- <div v-for="dock in onlineDocks.data" :key="dock.sn" style="background: #3c3c3c; height: 90px; margin-bottom: 10px;">
- <div style="border-radius: 2px; height: 100%; width: 100%;" class="flex-row flex-justify-between flex-align-center">
+ <div v-for="dock in onlineDocks.data" :key="dock.sn"
+ style="background: #3c3c3c; height: 90px; margin-bottom: 10px;">
+ <div style="border-radius: 2px; height: 100%; width: 100%;"
+ class="flex-row flex-justify-between flex-align-center">
<div style="float: left; padding: 0px 5px 8px 8px; width: 88%">
<div style="width: 80%; height: 30px; line-height: 30px; font-size: 16px;">
<a-tooltip :title="`${dock.gateway.callsign} - ${dock.callsign ?? 'No Drone'}`">
- <div class="text-hidden" style="max-width: 200px;">{{ dock.gateway.callsign }} - {{ dock.callsign ?? 'No Drone' }}</div>
+ <div class="text-hidden" style="max-width: 200px;">{{ dock.gateway.callsign }} - {{ dock.callsign ??
+ 'No Drone' }}</div>
</a-tooltip>
</div>
<div class="mt5 flex-align-center flex-row flex-justify-between" style="background: #595959;">
<div class="flex-align-center flex-row">
- <span class="ml5 mr5"><RobotOutlined /></span>
+ <span class="ml5 mr5">
+ <RobotOutlined />
+ </span>
132
- <div class="font-bold text-hidden" style="max-width: 80px;" :style="dockInfo[dock.gateway.sn] && dockInfo[dock.gateway.sn].basic_osd?.mode_code !== EDockModeCode.Disconnected ? 'color: #00ee8b' : 'color: red;'">
- {{ dockInfo[dock.gateway.sn] ? EDockModeCode[dockInfo[dock.gateway.sn].basic_osd?.mode_code] : EDockModeCode[EDockModeCode.Disconnected] }}
+ <div class="font-bold text-hidden" style="max-width: 80px;"
+ :style="dockInfo[dock.gateway.sn] && dockInfo[dock.gateway.sn].basic_osd?.mode_code !== EDockModeCode.Disconnected ? 'color: #00ee8b' : 'color: red;'">
+ {{ dockInfo[dock.gateway.sn] ? EDockModeCode[dockInfo[dock.gateway.sn].basic_osd?.mode_code] :
+ EDockModeCode[EDockModeCode.Disconnected] }}
</div>
</div>
<div class="mr5 flex-align-center flex-row" style="width: 85px; margin-right: 0; height: 18px;">
<div v-if="hmsInfo[dock.gateway.sn]" class="flex-align-center flex-row">
- <div :class="hmsInfo[dock.gateway.sn][0].level === EHmsLevel.CAUTION ? 'caution-blink' :
- hmsInfo[dock.gateway.sn][0].level === EHmsLevel.WARN ? 'warn-blink' : 'notice-blink'" style="width: 18px; height: 16px; text-align: center;">
- <span :style="hmsInfo[dock.gateway.sn].length > 99 ? 'font-size: 11px' : 'font-size: 12px'">{{ hmsInfo[dock.gateway.sn].length }}</span>
- <span class="fz10">{{ hmsInfo[dock.gateway.sn].length > 99 ? '+' : ''}}</span>
- </div>
- <a-popover trigger="click" placement="bottom" color="black" v-model:visible="hmsVisible[dock.gateway.sn]"
+ <div :class="hmsInfo[dock.gateway.sn][0].level === EHmsLevel.CAUTION ? 'caution-blink' :
+ hmsInfo[dock.gateway.sn][0].level === EHmsLevel.WARN ? 'warn-blink' : 'notice-blink'"
+ style="width: 18px; height: 16px; text-align: center;">
+ <span :style="hmsInfo[dock.gateway.sn].length > 99 ? 'font-size: 11px' : 'font-size: 12px'">{{
+ hmsInfo[dock.gateway.sn].length }}</span>
+ <span class="fz10">{{ hmsInfo[dock.gateway.sn].length > 99 ? '+' : '' }}</span>
+ </div>
+ <a-popover trigger="click" placement="bottom" color="black"
+ v-model:visible="hmsVisible[dock.gateway.sn]"
@visibleChange="readHms(hmsVisible[dock.gateway.sn], dock.gateway.sn)"
- :overlayStyle="{width: '200px', height: '300px'}">
+ :overlayStyle="{ width: '200px', height: '300px' }">
<div :class="hmsInfo[dock.gateway.sn][0].level === EHmsLevel.CAUTION ? 'caution' :
- hmsInfo[dock.gateway.sn][0].level === EHmsLevel.WARN ? 'warn' : 'notice'" style="margin-left: 3px; width: 62px; height: 16px;">
+ hmsInfo[dock.gateway.sn][0].level === EHmsLevel.WARN ? 'warn' : 'notice'"
+ style="margin-left: 3px; width: 62px; height: 16px;">
<span class="word-loop">{{ hmsInfo[dock.gateway.sn][0].message_en }}</span>
</div>
<template #content>
- <a-collapse style="background: black; height: 300px; overflow-y: auto;" :bordered="false" expand-icon-position="right" :accordion="true">
- <a-collapse-panel v-for="hms in hmsInfo[dock.gateway.sn]" :key="hms.hms_id" :showArrow="false"
+ <a-collapse style="background: black; height: 300px; overflow-y: auto;" :bordered="false"
+ expand-icon-position="right" :accordion="true">
+ <a-collapse-panel v-for="hms in hmsInfo[dock.gateway.sn]" :key="hms.hms_id"
+ :showArrow="false"
style=" margin: 0 auto 3px auto; border: 0; width: 140px; border-radius: 3px"
- :class="hms.level === EHmsLevel.CAUTION ? 'caution' : hms.level === EHmsLevel.WARN ? 'warn' : 'notice'"
- >
+ :class="hms.level === EHmsLevel.CAUTION ? 'caution' : hms.level === EHmsLevel.WARN ? 'warn' : 'notice'">
<template #header="{ isActive }">
<div class="flex-row flex-align-center" style="width: 130px;">
<div style="width: 110px;">
<span class="word-loop">{{ hms.message_en }}</span>
</div>
- <div style="width: 20px; height: 15px; font-size: 10px; z-index: 2 " class="flex-row flex-align-center flex-justify-center"
- :class="hms.level === EHmsLevel.CAUTION ? 'caution' : hms.level === EHmsLevel.WARN ? 'warn' : 'notice'"
- >
+ <div style="width: 20px; height: 15px; font-size: 10px; z-index: 2 "
+ class="flex-row flex-align-center flex-justify-center"
+ :class="hms.level === EHmsLevel.CAUTION ? 'caution' : hms.level === EHmsLevel.WARN ? 'warn' : 'notice'">
<DoubleRightOutlined :rotate="isActive ? 90 : 0" />
</div>
</div>
@@ -77,38 +89,46 @@
</div>
<div class="mt5 flex-align-center flex-row flex-justify-between" style="background: #595959;">
<div class="flex-row">
- <span class="ml5 mr5"><RocketOutlined /></span>
- <div class="font-bold text-hidden" style="max-width: 80px" :style="deviceInfo[dock.sn] && deviceInfo[dock.sn].mode_code !== EModeCode.Disconnected ? 'color: #00ee8b' : 'color: red;'">
- {{ deviceInfo[dock.sn] ? EModeCode[deviceInfo[dock.sn].mode_code] : EModeCode[EModeCode.Disconnected] }}
+ <span class="ml5 mr5">
+ <RocketOutlined />
+ </span>
+ <div class="font-bold text-hidden" style="max-width: 80px"
+ :style="deviceInfo[dock.sn] && deviceInfo[dock.sn].mode_code !== EModeCode.Disconnected ? 'color: #00ee8b' : 'color: red;'">
+ {{ deviceInfo[dock.sn] ? EModeCode[deviceInfo[dock.sn].mode_code] :
+ EModeCode[EModeCode.Disconnected] }}
</div>
</div>
<div class="mr5 flex-align-center flex-row" style="width: 85px; margin-right: 0; height: 18px;">
<div v-if="hmsInfo[dock.sn]" class="flex-align-center flex-row">
<div :class="hmsInfo[dock.sn][0].level === EHmsLevel.CAUTION ? 'caution-blink' :
- hmsInfo[dock.sn][0].level === EHmsLevel.WARN ? 'warn-blink' : 'notice-blink'" style="width: 18px; height: 16px; text-align: center;">
- <span :style="hmsInfo[dock.sn].length > 99 ? 'font-size: 11px' : 'font-size: 12px'">{{ hmsInfo[dock.sn].length }}</span>
- <span class="fz10">{{ hmsInfo[dock.sn].length > 99 ? '+' : ''}}</span>
+ hmsInfo[dock.sn][0].level === EHmsLevel.WARN ? 'warn-blink' : 'notice-blink'"
+ style="width: 18px; height: 16px; text-align: center;">
+ <span :style="hmsInfo[dock.sn].length > 99 ? 'font-size: 11px' : 'font-size: 12px'">{{
+ hmsInfo[dock.sn].length }}</span>
+ <span class="fz10">{{ hmsInfo[dock.sn].length > 99 ? '+' : '' }}</span>
</div>
- <a-popover trigger="click" placement="bottom" color="black" v-model:visible="hmsVisible[dock.sn]" @visibleChange="readHms(hmsVisible[dock.sn], dock.sn)"
- :overlayStyle="{width: '200px', height: '300px'}">
+ <a-popover trigger="click" placement="bottom" color="black" v-model:visible="hmsVisible[dock.sn]"
+ @visibleChange="readHms(hmsVisible[dock.sn], dock.sn)"
+ :overlayStyle="{ width: '200px', height: '300px' }">
<div :class="hmsInfo[dock.sn][0].level === EHmsLevel.CAUTION ? 'caution' :
- hmsInfo[dock.sn][0].level === EHmsLevel.WARN ? 'warn' : 'notice'" style="margin-left: 3px; width: 62px; height: 16px;">
+ hmsInfo[dock.sn][0].level === EHmsLevel.WARN ? 'warn' : 'notice'"
+ style="margin-left: 3px; width: 62px; height: 16px;">
<span class="word-loop">{{ hmsInfo[dock.sn][0].message_en }}</span>
</div>
<template #content>
- <a-collapse style="background: black; height: 300px; overflow-y: auto;" :bordered="false" expand-icon-position="right" :accordion="true">
+ <a-collapse style="background: black; height: 300px; overflow-y: auto;" :bordered="false"
+ expand-icon-position="right" :accordion="true">
<a-collapse-panel v-for="hms in hmsInfo[dock.sn]" :key="hms.hms_id" :showArrow="false"
style=" margin: 0 auto 3px auto; border: 0; width: 140px; border-radius: 3px"
- :class="hms.level === EHmsLevel.CAUTION ? 'caution' : hms.level === EHmsLevel.WARN ? 'warn' : 'notice'"
- >
+ :class="hms.level === EHmsLevel.CAUTION ? 'caution' : hms.level === EHmsLevel.WARN ? 'warn' : 'notice'">
<template #header="{ isActive }">
<div class="flex-row flex-align-center" style="width: 130px;">
<div style="width: 110px;">
<span class="word-loop">{{ hms.message_en }}</span>
</div>
- <div style="width: 20px; height: 15px; font-size: 10px; z-index: 2 " class="flex-row flex-align-center flex-justify-center"
- :class="hms.level === EHmsLevel.CAUTION ? 'caution' : hms.level === EHmsLevel.WARN ? 'warn' : 'notice'"
- >
+ <div style="width: 20px; height: 15px; font-size: 10px; z-index: 2 "
+ class="flex-row flex-align-center flex-justify-center"
+ :class="hms.level === EHmsLevel.CAUTION ? 'caution' : hms.level === EHmsLevel.WARN ? 'warn' : 'notice'">
<DoubleRightOutlined :rotate="isActive ? 90 : 0" />
</div>
</div>
@@ -126,10 +146,16 @@
</div>
</div>
</div>
- <div style="float: right; background: #595959; height: 100%; width: 40px;" class="flex-row flex-justify-center flex-align-center">
- <div class="fz16" @click="switchVisible($event, dock, true, dockInfo[dock.gateway.sn] && dockInfo[dock.gateway.sn].basic_osd?.mode_code !== EDockModeCode.Disconnected)">
- <a v-if="osdVisible.gateway_sn === dock.gateway.sn && osdVisible.visible"><EyeOutlined /></a>
- <a v-else><EyeInvisibleOutlined /></a>
+ <div style="float: right; background: #595959; height: 100%; width: 40px;"
+ class="flex-row flex-justify-center flex-align-center">
+ <div class="fz16"
+ @click="switchVisible($event, dock, true, dockInfo[dock.gateway.sn] && dockInfo[dock.gateway.sn].basic_osd?.mode_code !== EDockModeCode.Disconnected)">
+ <a v-if="osdVisible.gateway_sn === dock.gateway.sn && osdVisible.visible">
+ <EyeOutlined />
+ </a>
+ <a v-else>
+ <EyeInvisibleOutlined />
+ </a>
</div>
</div>
</div>
@@ -140,45 +166,61 @@
<a-collapse :bordered="false" expandIconPosition="right" accordion style="background: #232323;">
<a-collapse-panel :key="EDeviceTypeName.Aircraft" header="在线设备" style="border-bottom: 1px solid #4f4f4f;">
<div v-if="onlineDevices.data.length === 0" style="height: 150px; color: white;">
- <a-empty :image="simpleImage" style="color: #fff;" description="暂无数据" :image-style="{ height: '60px' }" />
+ <a-empty :image="simpleImage" style="color: #fff;" description="暂无数据" :image-style="{ height: '60px' }" />
</div>
<div v-else class="fz12" style="color: white;">
- <div v-for="device in onlineDevices.data" :key="device.sn" style="background: #3c3c3c; height: 90px; margin-bottom: 10px;">
+ <div v-for="device in onlineDevices.data" :key="device.sn"
+ style="background: #3c3c3c; height: 90px; margin-bottom: 10px;">
<div class="battery-slide" v-if="deviceInfo[device.sn]">
<div style="background: #535759; width: 100%;"></div>
- <div class="capacity-percent" :style="{ width: deviceInfo[device.sn].battery.capacity_percent + '%'}"></div>
- <div class="return-home" :style="{ width: deviceInfo[device.sn].battery.return_home_power + '%'}"></div>
- <div class="landing" :style="{ width: deviceInfo[device.sn].battery.landing_power + '%'}"></div>
+ <div class="capacity-percent" :style="{ width: deviceInfo[device.sn].battery.capacity_percent + '%' }">
+ </div>
+ <div class="return-home" :style="{ width: deviceInfo[device.sn].battery.return_home_power + '%' }"></div>
+ <div class="landing" :style="{ width: deviceInfo[device.sn].battery.landing_power + '%' }"></div>
<div class="battery" :style="{ left: deviceInfo[device.sn].battery.capacity_percent + '%' }"></div>
</div>
- <div style="border-bottom: 1px solid #515151; border-radius: 2px; height: 50px; width: 100%;" class="flex-row flex-justify-between flex-align-center">
+ <div style="border-bottom: 1px solid #515151; border-radius: 2px; height: 50px; width: 100%;"
+ class="flex-row flex-justify-between flex-align-center">
<div style="float: left; padding: 5px 5px 8px 8px; width: 88%">
<div style="width: 100%; height: 100%;">
<a-tooltip>
- <template #title>{{ device.model ? `${device.model} - ${device.callsign}` : 'No Drone'}}</template>
- <span class="text-hidden" style="max-width: 200px; display: block; height: 20px;">{{ device.model ? `${device.model} - ${device.callsign}` : 'No Drone'}}</span>
+ <template #title>{{ device.model ? `${device.model} - ${device.callsign}` : 'No Drone' }}</template>
+ <span class="text-hidden" style="max-width: 200px; display: block; height: 20px;">{{ device.model ?
+ `${device.model} - ${device.callsign}` : 'No Drone' }}</span>
</a-tooltip>
</div>
<div class="mt5" style="background: #595959;">
- <span class="ml5 mr5"><RocketOutlined /></span>
- <span class="font-bold" :style="deviceInfo[device.sn] && deviceInfo[device.sn].mode_code !== EModeCode.Disconnected ? 'color: #00ee8b' : 'color: red;'">
- {{ deviceInfo[device.sn] ? EModeCode[deviceInfo[device.sn].mode_code] : EModeCode[EModeCode.Disconnected] }}
+ <span class="ml5 mr5">
+ <RocketOutlined />
+ </span>
+ <span class="font-bold"
+ :style="deviceInfo[device.sn] && deviceInfo[device.sn].mode_code !== EModeCode.Disconnected ? 'color: #00ee8b' : 'color: red;'">
+ {{ deviceInfo[device.sn] ? EModeCode[deviceInfo[device.sn].mode_code] :
+ EModeCode[EModeCode.Disconnected] }}
</span>
</div>
</div>
- <div style="float: right; background: #595959; height: 50px; width: 40px;" class="flex-row flex-justify-center flex-align-center">
- <div class="fz16" @click="switchVisible($event, device, false, deviceInfo[device.sn] && deviceInfo[device.sn].mode_code !== EModeCode.Disconnected)">
- <a v-if="osdVisible.sn === device.sn && osdVisible.visible"><EyeOutlined /></a>
- <a v-else><EyeInvisibleOutlined /></a>
+ <div style="float: right; background: #595959; height: 50px; width: 40px;"
+ class="flex-row flex-justify-center flex-align-center">
+ <div class="fz16"
+ @click="switchVisible($event, device, false, deviceInfo[device.sn] && deviceInfo[device.sn].mode_code !== EModeCode.Disconnected)">
+ <a v-if="osdVisible.sn === device.sn && osdVisible.visible">
+ <EyeOutlined />
+ </a>
+ <a v-else>
+ <EyeInvisibleOutlined />
+ </a>
</div>
</div>
</div>
<div class="flex-row flex-justify-center flex-align-center" style="height: 40px;">
- <div class="flex-row" style="height: 20px; background: #595959; width: 94%;" >
- <span class="mr5"><a-image style="margin-left: 2px; margin-top: -2px; height: 20px; width: 20px;" :src="rc" /></span>
+ <div class="flex-row" style="height: 20px; background: #595959; width: 94%;">
+ <span class="mr5"><a-image style="margin-left: 2px; margin-top: -2px; height: 20px; width: 20px;"
+ :src="rc" /></span>
<a-tooltip>
<template #title>{{ device.gateway.model }} - {{ device.gateway.callsign }} </template>
- <div class="text-hidden" style="max-width: 200px;">{{ device.gateway.model }} - {{ device.gateway.callsign }}</div>
+ <div class="text-hidden" style="max-width: 200px;">{{ device.gateway.model }} - {{
+ device.gateway.callsign }}</div>
</a-tooltip>
</div>
</div>
@@ -195,6 +237,8 @@
<script lang="ts" setup>
import { styleDrawer } from './common/common'
+import { useConnectWebSocket } from '/@/hooks/use-connect-websocket'
+import { flyTo } from '/@/hooks/use-center-point'
import { computed, onMounted, reactive, ref, watch, WritableComputedRef } from 'vue'
import { EDeviceTypeName, ELocalStorageKey } from '/@/types'
import Drawer from '/@/components/Drawer/Drawer.vue'
@@ -208,8 +252,10 @@
import { EHmsLevel } from '/@/types/enums'
import { UranusMqtt } from '/@/mqtt/index'
import DockConfig from './components/DockConfig.vue'
+
const { appContext } = getCurrentInstance()
const global = appContext.config.globalProperties
+const route = useRoute()
const simpleImage = Empty.PRESENTED_IMAGE_SIMPLE
const store = useMyStore()
const username = ref(localStorage.getItem(ELocalStorageKey.Username))
@@ -259,9 +305,7 @@
})
onMounted(() => {
- console.log(global, 'global')
- // const mqtt = new UranusMqtt('ws://192.168.1.198:8083/mqtt', {})
- // mqtt.initMqtt()
+ // flyTo(global.$viewer, route.params.longitude as unknown as number, route.params.latitude as unknown as number)
getOnlineTopo()
setTimeout(() => {
watch(() => store.state.deviceStatusEvent,
@@ -281,7 +325,13 @@
const parent = element?.parentNode as HTMLDivElement
scorllHeight.value = parent?.clientHeight - parent?.firstElementChild?.clientHeight
})
-
+const messageHandler = async (payload: any) => {
+ console.log(payload, 'payload')
+ // if (payload.type === 'hms') {
+ // const { data
+}
+// 监听ws 消息
+useConnectWebSocket(messageHandler)
function getOnlineTopo () {
getDeviceTopo(workspaceId.value).then((res) => {
if (res.code !== 0) {
@@ -385,22 +435,26 @@
</script>
<style lang="scss">
-.project-tsa-wrapper > :first-child {
+.project-tsa-wrapper> :first-child {
height: 50px;
line-height: 50px;
align-items: center;
border-bottom: 1px solid #4f4f4f;
}
+
.project-tsa-wrapper {
height: 100%;
+
.scrollbar {
overflow: auto;
}
+
::-webkit-scrollbar {
display: none;
}
}
-.ant-collapse > .ant-collapse-item > .ant-collapse-header {
+
+.ant-collapse>.ant-collapse-item>.ant-collapse-header {
color: white;
border: 0;
padding-left: 14px;
@@ -412,21 +466,26 @@
white-space: nowrap;
-o-text-overflow: ellipsis;
}
+
.font-bold {
font-weight: 700;
}
.battery-slide {
width: 100%;
+
.capacity-percent {
background: #00ee8b;
}
+
.return-home {
background: #ff9f0a;
}
+
.landing {
background: #f5222d;
}
+
.battery {
background: white;
border-radius: 1px;
@@ -435,13 +494,15 @@
margin-top: -3px;
}
}
-.battery-slide > div {
+
+.battery-slide>div {
position: relative;
margin-top: -2px;
min-height: 2px;
border-radius: 2px;
white-space: nowrap;
}
+
.disable {
cursor: not-allowed;
}
@@ -450,54 +511,63 @@
background: $success;
animation: blink 500ms infinite;
}
+
.caution-blink {
background: orange;
animation: blink 500ms infinite;
}
+
.warn-blink {
background: red;
animation: blink 500ms infinite;
}
+
.notice {
background: $success;
overflow: hidden;
cursor: pointer;
}
+
.caution {
background: orange;
cursor: pointer;
overflow: hidden;
}
+
.warn {
background: red;
cursor: pointer;
overflow: hidden;
}
+
.word-loop {
white-space: nowrap;
display: inline-block;
animation: 10s loop linear infinite normal;
}
+
@keyframes blink {
from {
opacity: 1;
}
+
50% {
opacity: 0.35;
}
+
to {
opacity: 1;
}
}
+
@keyframes loop {
0% {
transform: translateX(20px);
-webkit-transform: translateX(20px);
}
+
100% {
transform: translateX(-100%);
-webkit-transform: translateX(-100%);
}
-}
-
-</style>
+}</style>
diff --git a/src/pages/page-web/projects/workspace.vue b/src/pages/page-web/projects/workspace.vue
index 5ad885b..f0bc3d3 100644
--- a/src/pages/page-web/projects/workspace.vue
+++ b/src/pages/page-web/projects/workspace.vue
@@ -115,7 +115,7 @@
}
// 监听ws 消息
-useConnectWebSocket(messageHandler)
+// useConnectWebSocket(messageHandler)
</script>
<style lang="scss" scoped>
diff --git a/src/websocket/index.ts b/src/websocket/index.ts
index cb602c4..9025d84 100644
--- a/src/websocket/index.ts
+++ b/src/websocket/index.ts
@@ -1,4 +1,3 @@
-
import { message } from 'ant-design-vue'
import ReconnectingWebSocket from 'reconnecting-websocket'
import { ELocalStorageKey } from '../types'
@@ -37,9 +36,7 @@
if (!this._url) {
return
}
- const token: string = localStorage.getItem(ELocalStorageKey.Token) || '' as string
// 会自动重连，无需处理重连逻辑
- console.log(token, 'token')
this._socket = new ReconnectingWebSocket(this._url, [], {
maxReconnectionDelay: 20000, // 断开后最大的重连时间： 20s，每多一次重连，会增加 1.3 倍，5 * 1.3 * 1.3 * 1.3...
minReconnectionDelay: 5000, // 断开后最短的重连时间： 5s
@@ -72,7 +69,7 @@
_onMessage (msg: MessageEvent) {
const data = JSON.parse(msg.data)
this._messageHandler && this._messageHandler(data)
- // console.log('接受消息', message)
+ console.log('接受消息', msg)
}
sendMessage = (message: WebSocketOptions): void => {
diff --git a/src/websocket/util/config.ts b/src/websocket/util/config.ts
index 15fa08a..23b708b 100644
--- a/src/websocket/util/config.ts
+++ b/src/websocket/util/config.ts
@@ -1,9 +1,18 @@
import { ELocalStorageKey } from '/@/types/enums'
import { CURRENT_CONFIG } from '/@/api/http/config'
+const user = localStorage.getItem('user_info')
+
export function getWebsocketUrl () {
const token: string = localStorage.getItem(ELocalStorageKey.Token) || '' as string
const url = CURRENT_CONFIG.websocketURL
// const url = CURRENT_CONFIG.websocketURL + '?Authorization=' + encodeURI(token)
return url
}
+
+// 我们自己的webSocket逻辑
+export function getMyWebSocketUrl () {
+ const obj = JSON.parse(user)
+ const url = CURRENT_CONFIG.websocketURL + '/' + obj.id
+ return url
+}
--
Gitblit v1.9.3