diff --git a/src/components/layouts/BasicLayout.vue b/src/components/layouts/BasicLayout.vue index 65b40cd..2f1c697 100644 --- a/src/components/layouts/BasicLayout.vue +++ b/src/components/layouts/BasicLayout.vue @@ -1,10 +1,9 @@ @@ -22,14 +21,6 @@ } }, - computed: { - keepAlive () { - return this.$route.meta.keepAlive - } - }, - methods: { - - }, } diff --git a/src/components/layouts/RouteView.vue b/src/components/layouts/RouteView.vue index 5482e2b..6b37da8 100644 --- a/src/components/layouts/RouteView.vue +++ b/src/components/layouts/RouteView.vue @@ -1,9 +1,8 @@ diff --git a/src/config/router.config.js b/src/config/router.config.js index bdf036e..caabb1f 100644 --- a/src/config/router.config.js +++ b/src/config/router.config.js @@ -1,4 +1,4 @@ -import { TabLayout, RouteView, BlankLayout, PageView } from '@/components/layouts' +import { TabLayout, RouteView, BlankLayout, PageView, BasicLayout } from '@/components/layouts' import Login from '@/views/user/Login' /** @@ -10,7 +10,7 @@ export const asyncRouterMap = [ { path: '/', name: 'dashboard', - component: TabLayout, + component: BasicLayout, meta: { title: '首页' }, redirect: '/station-operation', children: [ diff --git a/src/utils/util.js b/src/utils/util.js index ca46492..452a351 100644 --- a/src/utils/util.js +++ b/src/utils/util.js @@ -88,7 +88,7 @@ export function generateIndexRouter(data) { path: '/', name: 'dashboard', //component: () => import('@/components/layouts/BasicLayout'), - component: resolve => require(['@/components/layouts/TabLayout'], resolve), + component: resolve => require(['@/components/layouts/BasicLayout'], resolve), meta: { title: '首页' }, redirect: '/station-operation', children: [ diff --git a/src/views/logManage/index.vue b/src/views/logManage/index.vue index 8c2742e..2a71486 100644 --- a/src/views/logManage/index.vue +++ b/src/views/logManage/index.vue @@ -99,6 +99,7 @@ const columns = [ ] export default { + name: 'LogManage', mixins: [JeecgListMixin], components: { TreeWithLine diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue index be7e12a..f0a7682 100644 --- a/src/views/spectrumAnalysis/index.vue +++ b/src/views/spectrumAnalysis/index.vue @@ -259,6 +259,7 @@ const ANALYZE_TYPE = { BETA_GAMMA: 'betaGammaAnalysis', } export default { + name: 'SpectrumAnalysis', components: { BetaGammaAnalysis, GammaAnalysis, diff --git a/src/views/stationOperation/index.vue b/src/views/stationOperation/index.vue index f1259c1..10993c5 100644 --- a/src/views/stationOperation/index.vue +++ b/src/views/stationOperation/index.vue @@ -173,6 +173,7 @@ import { getAction } from '../../api/manage' import { cloneDeep } from 'lodash' const key = 'updateList' export default { + name: 'StationOperation', components: { Map, MapMarker,