diff --git a/src/router/index.ts b/src/router/index.ts
index 0b20144..3761470 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -23,7 +23,7 @@ export const defaultRouter = [
},
},
{
- path: '/data-transfer',
+ path: '/station/data-transfer',
name: 'data-transfer',
component: () => import('@/views/stationData/transferData.vue'),
meta: {
diff --git a/src/stores/transferData.ts b/src/stores/transferData.ts
index 70e755f..c31c21a 100644
--- a/src/stores/transferData.ts
+++ b/src/stores/transferData.ts
@@ -74,7 +74,7 @@ export const useTransferDataStore = defineStore('transfer', () => {
const route = useRoute()
watch(() => route.path, (val) => {
- if (!['/data-transfer', '/station'].includes(val)) {
+ if (!['/station/data-transfer', '/station'].includes(val)) {
clearInterval(checkDeviceStatusInterval.value)
worker.unsubscribe(subDevices)
}
diff --git a/src/views/layout/index.vue b/src/views/layout/index.vue
index 11aa6f1..d5e86a4 100644
--- a/src/views/layout/index.vue
+++ b/src/views/layout/index.vue
@@ -111,7 +111,9 @@ const getIconClass = (icon: string) => {
const { push, currentRoute } = useRouter()
const activeMenu = computed(() => {
const { meta, path } = unref(currentRoute)
-
+ if (path.includes('/station/data-transfer')) {
+ return '/station'
+ }
return path
})
diff --git a/src/views/stationData/components/transferDlg.vue b/src/views/stationData/components/onLineTransferDlg.vue
similarity index 100%
rename from src/views/stationData/components/transferDlg.vue
rename to src/views/stationData/components/onLineTransferDlg.vue
diff --git a/src/views/stationData/index.vue b/src/views/stationData/index.vue
index 569f853..d0420d1 100644
--- a/src/views/stationData/index.vue
+++ b/src/views/stationData/index.vue
@@ -93,7 +93,7 @@ watch(isConnected, val => {
function onTransferData() {
router.push({
- path: '/data-transfer',
+ path: '/station/data-transfer',
query: {
type: 'export',
},
@@ -102,7 +102,7 @@ function onTransferData() {
function onSiteDetails(site: ISite) {
router.push({
- path: '/data-transfer',
+ path: '/station/data-transfer',
query: {
type: 'details',
site: JSON.stringify(site),
diff --git a/src/views/stationData/transferData.vue b/src/views/stationData/transferData.vue
index 7b715de..148641f 100644
--- a/src/views/stationData/transferData.vue
+++ b/src/views/stationData/transferData.vue
@@ -4,14 +4,16 @@
返回站点数据
-
+
确定{{ batchText }}
取消
- 批量迁移
- 批量升级
+
+ 批量迁移
+ 批量升级
+
@@ -186,7 +188,7 @@
-
+
@@ -194,7 +196,7 @@