From e6f63c537608c9c8bdc77e45a03125176bea280f Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 26 Sep 2023 11:31:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/demo' into demo
---
src/pages/page-web/projects/wayline.vue | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
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