From f0701f57ac7ee651c21fe97c9ccae269018bfcaf Mon Sep 17 00:00:00 2001
From: husq <931347610@qq.com>
Date: Tue, 26 Sep 2023 10:43:46 +0800
Subject: [PATCH] 修改获取workSpaceID的位置
---
src/pages/page-web/projects/wayline.vue | 5 +++--
src/pages/page-web/projects/devices.vue | 2 +-
src/pages/page-web/projects/implement.vue | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
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..b0bd873 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 () {
@@ -279,7 +280,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
--
Gitblit v1.9.3