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/hooks/use-connect-websocket.ts | 4 ++--
src/pages/page-web/projects/tsa.vue | 7 +------
src/pages/page-web/projects/workspace.vue | 20 +++++---------------
3 files changed, 8 insertions(+), 23 deletions(-)
diff --git a/src/hooks/use-connect-websocket.ts b/src/hooks/use-connect-websocket.ts
index 43fb527..805c14d 100644
--- a/src/hooks/use-connect-websocket.ts
+++ b/src/hooks/use-connect-websocket.ts
@@ -7,8 +7,8 @@
* 接收一个message函数
* @param messageHandler
*/
-export function useConnectWebSocket (messageHandler: MessageHandler) {
- const webSocket = new ConnectWebSocket(getWebsocketUrl())
+export function useConnectWebSocket (messageHandler: MessageHandler, url?:string) {
+ const webSocket = new ConnectWebSocket(url || getWebsocketUrl())
onMounted(() => {
webSocket?.registerMessageHandler(messageHandler)
diff --git a/src/pages/page-web/projects/tsa.vue b/src/pages/page-web/projects/tsa.vue
index b9ef43d..15740ef 100644
--- a/src/pages/page-web/projects/tsa.vue
+++ b/src/pages/page-web/projects/tsa.vue
@@ -354,12 +354,7 @@
const parent = element?.parentNode as HTMLDivElement
scorllHeight.value = parent?.clientHeight - parent?.firstElementChild?.clientHeight
})
-const messageHandler = async (payload: any) => {
- // if (payload.type === 'hms') {
- // const { data
-}
-// 监听ws 消息
-// useConnectWebSocket(messageHandler)
+
function getOnlineTopo () {
getDeviceTopo(workSpaceId.value).then((res) => {
if (res.code !== 0) {
diff --git a/src/pages/page-web/projects/workspace.vue b/src/pages/page-web/projects/workspace.vue
index 7d8900d..e23fd03 100644
--- a/src/pages/page-web/projects/workspace.vue
+++ b/src/pages/page-web/projects/workspace.vue
@@ -6,28 +6,16 @@
<router-view />
</div>
</div>
- <!-- <div class="right">
- <div class="map-wrapper">
- <GMap />
- </div>
- <div class="media-wrapper" v-if="root.$route.name === ERouterName.MEDIA">
- <MediaPanel />
- </div>
- <div class="task-wrapper" v-if="root.$route.name === ERouterName.TASK">
- <TaskPanel />
- </div>
- </div> -->
</div>
</template>
<script lang="ts" setup>
import Sidebar from '/@/components/common/sidebar.vue'
-import MediaPanel from '/@/components/MediaPanel.vue'
-import TaskPanel from '/@/components/task/TaskPanel.vue'
-import GMap from '/@/components/GMap.vue'
import { EBizCode, ERouterName } from '/@/types'
import { getRoot } from '/@/root'
import { useMyStore } from '/@/store'
import { useConnectWebSocket } from '/@/hooks/use-connect-websocket'
+import { getWebsocketUrl } from '/@/websocket/util/config'
+
import EventBus from '/@/event-bus'
const root = getRoot()
@@ -117,8 +105,10 @@
}
}
+const webSorketUrl = getWebsocketUrl() + '&workspace-id=' + workspace_id.value
+console.log(webSorketUrl, 'webSorketUrl')
// 监听ws 消息
-useConnectWebSocket(messageHandler)
+useConnectWebSocket(messageHandler, webSorketUrl)
</script>
<style lang="scss" scoped>
--
Gitblit v1.9.3