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/common/topbar.vue | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/components/common/topbar.vue b/src/components/common/topbar.vue
index 72cd5f2..6528629 100644
--- a/src/components/common/topbar.vue
+++ b/src/components/common/topbar.vue
@@ -44,9 +44,16 @@
import { ELocalStorageKey, ERouterName } from '/@/types'
import { UserOutlined, ExportOutlined } from '@ant-design/icons-vue'
import cloudapi from '/@/assets/icons/cloudapi.png'
-
const root = getRoot()
-
+const selected = ref<string>(root.$route.path)
+const route = useRoute()
+watch(route, (newVal) => {
+ if (newVal) {
+ selected.value = newVal.path
+ }
+}, {
+ immediate: true,
+})
interface IOptions {
key: number
label: string
@@ -62,13 +69,11 @@
const workspaceName = ref('')
const options = [
- { key: 0, label: '项目', path: '/' + ERouterName.PROJECT },
+ { key: 0, label: '项目', path: '/' + ERouterName.PROJECT_LIST },
{ key: 1, label: '人员管理', path: '/' + ERouterName.MEMBERS },
{ key: 2, label: '设备管理', path: '/' + ERouterName.DEVICES },
// { key: 3, label: ERouterName.FIRMWARES.charAt(0).toUpperCase() + ERouterName.FIRMWARES.substr(1), path: '/' + ERouterName.FIRMWARES },
]
-
-const selected = ref<string>(root.$route.path)
onMounted(() => {
// getPlatformInfo().then(res => {
@@ -81,8 +86,7 @@
}
const logout = async () => {
- const res = await loginOut()
- console.log(res, 'Res')
+ // const res = await loginOut()
localStorage.clear()
root.$router.push(ERouterName.LOGIN)
}
--
Gitblit v1.9.3