Merge pull request '去掉返回' (#295) from lyc-dev into main
This commit is contained in:
commit
03f98c8beb
|
@ -4,14 +4,14 @@
|
||||||
<Header />
|
<Header />
|
||||||
</el-header>
|
</el-header>
|
||||||
<el-main>
|
<el-main>
|
||||||
<template v-if="currentRoute.path != '/home'">
|
<!-- <template v-if="currentRoute.path != '/home'">
|
||||||
<el-page-header @back="goBack">
|
<el-page-header @back="goBack">
|
||||||
<template #content>
|
<template #content>
|
||||||
<span class="text-large mr-3"> {{ currentRoute.meta.title }} </span>
|
<span class="text-large mr-3"> {{ currentRoute.meta.title }} </span>
|
||||||
</template>
|
</template>
|
||||||
</el-page-header>
|
</el-page-header>
|
||||||
</template>
|
</template> -->
|
||||||
<AppMain :style="{ height: currentRoute.path == '/home' ? '100%' : 'calc(100% - 45px)'}" />
|
<AppMain />
|
||||||
</el-main>
|
</el-main>
|
||||||
<Uploader v-if="uploaderStore.uploadList && uploaderStore.uploadList.length > 0" />
|
<Uploader v-if="uploaderStore.uploadList && uploaderStore.uploadList.length > 0" />
|
||||||
<AiChart/>
|
<AiChart/>
|
||||||
|
@ -29,15 +29,15 @@ import uploaderState from '@/store/modules/uploader'
|
||||||
import { ref } from 'vue'
|
import { ref } from 'vue'
|
||||||
|
|
||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
const currentRoute = ref('')
|
// const currentRoute = ref('')
|
||||||
|
|
||||||
watch(
|
// watch(
|
||||||
() => router.currentRoute.value,
|
// () => router.currentRoute.value,
|
||||||
(newValue) => {
|
// (newValue) => {
|
||||||
currentRoute.value = newValue
|
// currentRoute.value = newValue
|
||||||
},
|
// },
|
||||||
{ immediate: true }
|
// { immediate: true }
|
||||||
)
|
// )
|
||||||
|
|
||||||
let uploaderStore = ref(uploaderState())
|
let uploaderStore = ref(uploaderState())
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue