Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev

src/components/layouts/BasicLayout.vue

@@ -1,10 +1,9 @@
 <template>
   <global-layout>
     <transition name="page-transition">
-      <keep-alive v-if="keepAlive">
+      <keep-alive>
         <router-view />
       </keep-alive>
-      <router-view v-else />
     </transition>
   </global-layout>
 </template>
@@ -22,14 +21,6 @@
 
       }
     },
-    computed: {
-      keepAlive () {
-        return this.$route.meta.keepAlive
-      }
-    },
-    methods: {
-
-    },
   }
 </script>
 

src/components/layouts/RouteView.vue

@@ -1,9 +1,8 @@
 <template>
   <div class="main">
-  <keep-alive :include="includedComponents">
-    <router-view v-if="keepAlive" />
+  <keep-alive>
+    <router-view />
   </keep-alive>
-  <router-view v-if="!keepAlive" />
   </div>
 </template>
 

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: [

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: [

src/views/logManage/index.vue

@@ -99,6 +99,7 @@ const columns = [
 ]
 
 export default {
+  name: 'LogManage',
   mixins: [JeecgListMixin],
   components: {
     TreeWithLine

src/views/spectrumAnalysis/index.vue

@@ -259,6 +259,7 @@ const ANALYZE_TYPE = {
   BETA_GAMMA: 'betaGammaAnalysis',
 }
 export default {
+  name: 'SpectrumAnalysis',
   components: {
     BetaGammaAnalysis,
     GammaAnalysis,

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,