Merge branch 'master' of http://120.26.64.82:3000/BFFE/CABaggageData2.0

src/layout/components/AppMain.vue

@@ -10,7 +10,7 @@
   <section class="app-main">
     <div class="app-main-content">
       <transition name="fade-transform" mode="out-in">
-        <keep-alive v-if="$route.meta && $route.meta.keepAlive">
+        <keep-alive v-if="$route.meta && $route.meta.keepAlive" :max="6">
           <router-view  :key="key"  class="router-view">
           </router-view>
         </keep-alive>

src/router/routes/routes-file-five.js

@@ -57,7 +57,7 @@ const departureRoutes = {
                   path: '/departure/baggageView',
                   name: 'DepartureBaggageView',
                   component: () => import('@/views/baggageManagement/components/departure/baggage'),
-                  meta: { title: '行李视图', keepAlive: true }
+                  meta: { title: '行李视图', keepAlive: false }
                 }
               ]
             }
@@ -111,7 +111,7 @@ const arrivalRoutes = {
                   path: '/arrival/baggageView',
                   name: 'ArrivalBaggageView',
                   component: () => import('@/views/baggageManagement/components/arrival/baggage'),
-                  meta: { title: '行李视图', keepAlive: true }
+                  meta: { title: '行李视图', keepAlive: false }
                 }
               ]
             }
@@ -125,7 +125,7 @@ const arrivalRoutes = {
 const transferRoutes = {
   path: '/transfer',
   component: Layout,
-  meta: { roles: ['is_showTransit'] },
+  meta: { roles: ['is_showTransit'],keepAlive: true },
   children: [
     {
       path: '/transfer',
@@ -166,7 +166,7 @@ const transferRoutes = {
                   path: '/transfer/arrival/baggageView',
                   name: 'TransferArrivalBaggageView',
                   component: () => import('@/views/baggageManagement/components/transferArrival/baggage'),
-                  meta: { title: '行李视图', keepAlive: true }
+                  meta: { title: '行李视图', keepAlive: false }
                 }
               ]
             }
@@ -201,7 +201,7 @@ const transferRoutes = {
                   path: '/transfer/departure/baggageView',
                   name: 'TransferDepartureBaggageView',
                   component: () => import('@/views/baggageManagement/components/transferDeparture/baggage'),
-                  meta: { title: '行李视图', keepAlive: true }
+                  meta: { title: '行李视图', keepAlive: false }
                 }
               ]
             }
@@ -257,7 +257,7 @@ const advanceRoutes = {
               path: 'baggageView',
               name: 'advancedBag',
               component: () => import('@/views/advancedQuery/views/advancedBag.vue'),
-              meta: { title: '行李视图', keepAlive: true }
+              meta: { title: '行李视图', keepAlive: false }
             }
           ]
         }

src/router/routes/routes-file-four.js

@@ -13,7 +13,7 @@ import Layout from '@/layout'
 const authorityRoutes = {
   path: '/authority',
   component: Layout,
-  meta: { roles: ['authority_menu'], keepAlive: true },
+  meta: { roles: ['authority_menu'], keepAlive: false },
   children: [
     {
       path: '/authority',
@@ -23,7 +23,7 @@ const authorityRoutes = {
         icon: 'authority',
         imgstyle: 'ic_list_nav_permissions_default.png',
         imgstyleup: 'ic_list_nav_permissions_check.png',
-        keepAlive: true
+        keepAlive: false
       },
       children: [
         {
@@ -35,36 +35,36 @@ const authorityRoutes = {
             }
           },
           redirect: '/',
-          meta: { title: '权限项管理', isPage: 'authority_page', keepAlive: true },
+          meta: { title: '权限项管理', isPage: 'authority_page', keepAlive: false },
           children: [
             {
               path: '/',
-              meta: { title: '权限项管理', isPage: 'authority_page', keepAlive: true },
+              meta: { title: '权限项管理', isPage: 'authority_page', keepAlive: false },
               component: () => import('@/views/authorityManagement/components/authorityHome')
             },
             {
               path: 'appAdd',
               name: 'AuthorityAppAdd',
               component: () => import('@/views/authorityManagement/components/authorityAppAdd'),
-              meta: { title: '新增应用', keepAlive: true }
+              meta: { title: '新增应用', keepAlive: false }
             },
             {
               path: 'appEdit',
               name: 'AuthorityAppEdit',
               component: () => import('@/views/authorityManagement/components/authorityAppEdit'),
-              meta: { title: '编辑应用', keepAlive: true }
+              meta: { title: '编辑应用', keepAlive: false }
             },
             {
               path: 'addPower',
               name: 'AuthorityPowerAdd',
               component: () => import('@/views/authorityManagement/components/authorityPowerAdd'),
-              meta: { title: '新增权限项', keepAlive: true }
+              meta: { title: '新增权限项', keepAlive: false }
             },
             {
               path: 'editPower',
               name: 'AuthorityPowerEdit',
               component: () => import('@/views/authorityManagement/components/authorityPowerEdit'),
-              meta: { title: '编辑权限项', keepAlive: true }
+              meta: { title: '编辑权限项', keepAlive: false }
             }
           ]
         }
@@ -77,7 +77,7 @@ const authorityRoutes = {
 const roleRoutes = {
   path: '/role',
   component: Layout,
-  meta: { roles: ['role_menu'], keepAlive: true },
+  meta: { roles: ['role_menu'], keepAlive: false },
   children: [
     {
       path: '/role',
@@ -87,7 +87,7 @@ const roleRoutes = {
         icon: 'role',
         imgstyle: 'ic_list_nav_character_default.png',
         imgstyleup: 'ic_list_nav_character_check.png',
-        keepAlive: true
+        keepAlive: false
       },
       children: [
         {
@@ -99,24 +99,24 @@ const roleRoutes = {
             }
           },
           redirect: '/',
-          meta: { title: '角色管理', isPage: 'role_page', keepAlive: true },
+          meta: { title: '角色管理', isPage: 'role_page', keepAlive: false },
           children: [
             {
               path: '/',
               component: () => import('@/views/authorityManagement/components/authorityRoleHome'),
-              meta: { title: '角色管理', keepAlive: true },
+              meta: { title: '角色管理', keepAlive: false },
             },
             {
               path: 'addRole',
               name: 'AuthorityRoleAdd',
               component: () => import('@/views/authorityManagement/components/authorityRoleAdd'),
-              meta: { title: '新增角色', keepAlive: true }
+              meta: { title: '新增角色', keepAlive: false }
             },
             {
               path: 'editRole',
               name: 'AuthorityRoleEdit',
               component: () => import('@/views/authorityManagement/components/authorityRoleEdit'),
-              meta: { title: '账号权限', keepAlive: true }
+              meta: { title: '账号权限', keepAlive: false }
             }
           ]
         }
@@ -129,7 +129,7 @@ const roleRoutes = {
 const accountRoutes = {
   path: '/account',
   component: Layout,
-  meta: { roles: ['account_menu'], keepAlive: true },
+  meta: { roles: ['account_menu'], keepAlive: false },
   children: [
     {
       path: '/account',
@@ -140,7 +140,7 @@ const accountRoutes = {
         icon: 'account',
         imgstyle: 'ic_list_nav_account_default.png',
         imgstyleup: 'ic_list_nav_account_check.png',
-        keepAlive: true
+        keepAlive: false
       },
       children: [
         {
@@ -158,7 +158,7 @@ const accountRoutes = {
           // },
           meta: {
             title: '账号管理',
-            keepAlive: true
+            keepAlive: false
           },
           children: [
             {
@@ -166,7 +166,7 @@ const accountRoutes = {
               component: () => import('@/views/accountManagement/components/accountHome'),
               meta: {
                 title: '账号管理',
-                keepAlive: true
+                keepAlive: false
               },
             },
             {
@@ -174,7 +174,7 @@ const accountRoutes = {
               name: 'accountAdd',
               component: () => import('@/views/accountManagement/components/accountEdit'),
               meta: {
-                title: '新增账号', keepAlive: true
+                title: '新增账号', keepAlive: false
               }
             },
             {
@@ -184,7 +184,7 @@ const accountRoutes = {
               meta: {
                 title: '编辑账号',
                 doesAccountExist: true,
-                keepAlive: true
+                keepAlive: false
               }
             },
             {
@@ -193,7 +193,7 @@ const accountRoutes = {
               component: () => import('@/views/accountManagement/components/accountAuth'),
               meta: {
                 title: '账号权限',
-                keepAlive: true
+                keepAlive: false
               }
             }
           ]

src/router/routes/routes-file-one.js

@@ -2,20 +2,20 @@ import Layout from '@/layout'
 const BasicsDataRoutes = {
   path: '/BasicsData',
   component: Layout,
-  meta: { roles: ['system_menu'], keepAlive: true },
+  meta: { roles: ['system_menu'], keepAlive: false },
   children: [
     {
       path: '/BasicsData',
       name: 'BasicsData',
       component: () => import('@/views/BasicsData/index'),
-      meta: { title: '基础数据', icon: 'BasicsData', imgstyle: 'ic_setting_nav_default.png', imgstyleup: 'ic_setting_nav_check.png', keepAlive: true },
+      meta: { title: '基础数据', icon: 'BasicsData', imgstyle: 'ic_setting_nav_default.png', imgstyleup: 'ic_setting_nav_check.png', keepAlive: false },
       children: [
         // 权限airline_information_page导致航司信息维护不显示
         {
           path: '/BasicsData',
           name: 'airlineCompanyInfo',
           component: () => import('@/views/BasicsData/views/airlineCompany/airlineCompanyInfo'),
-          meta: { title: '航司信息维护', keepAlive: true },
+          meta: { title: '航司信息维护', keepAlive: false },
           hidden: true,
           src: require('@/assets/nav/ic_data_top_default @2x.png'),
           srcer: require('@/assets/nav/ic_data_top_check@2x.png')
@@ -25,7 +25,7 @@ const BasicsDataRoutes = {
           name: 'airportInfo',
           component: { render(c) { return c('router-view') } },
           redirect: '/BasicsData/airportInfo',
-          meta: { title: '机场信息维护', keepAlive: true },
+          meta: { title: '机场信息维护', keepAlive: false },
           hidden: true,
           src: require('@/assets/nav/ic_data_top_default @2x.png'),
           srcer: require('@/assets/nav/ic_data_top_check@2x.png'),
@@ -33,13 +33,13 @@ const BasicsDataRoutes = {
             {
               path: '/BasicsData/airportInfo',
               component: () => import('@/views/BasicsData/views/airport/airportInfo'),
-              meta: { title: '机场信息维护', keepAlive: true },
+              meta: { title: '机场信息维护', keepAlive: false },
             },
             {
               path: '/BasicsData/airportInfoDetails',
               name: 'airportInfoDetails',
               component: () => import('@/views/BasicsData/views/airport/airportInfoDetails'),
-              meta: { title: '基本信息', keepAlive: true },
+              meta: { title: '基本信息', keepAlive: false },
               hidden: false,
               isAlone: true,
               src: require('@/assets/nav/ic_setting_top@2x.png')
@@ -48,7 +48,7 @@ const BasicsDataRoutes = {
               path: '/BasicsData/airportInfoChild',
               name: 'airportInfoChild',
               component: () => import('@/views/BasicsData/views/airport/airportInfoChild'),
-              meta: { title: '航站设置', keepAlive: true },
+              meta: { title: '航站设置', keepAlive: false },
               hidden: false,
               isAlone: true,
               src: require('@/assets/nav/ic_setting_top@2x.png')
@@ -59,7 +59,7 @@ const BasicsDataRoutes = {
           path: '/BasicsData/deployNode',
           name: 'deployNode',
           component: { render(c) { return c('router-view') } },
-          meta: { title: '节点信息维护', keepAlive: true },
+          meta: { title: '节点信息维护', keepAlive: false },
           hidden: true,
           src: require('@/assets/nav/ic_data_top_default @2x.png'),
           srcer: require('@/assets/nav/ic_data_top_check@2x.png'),
@@ -67,13 +67,13 @@ const BasicsDataRoutes = {
             {
               path: '/BasicsData/deployNode',
               component: () => import('@/views/BasicsData/views/deployNode/deployNodeHome'),
-              meta: { title: '节点信息维护', keepAlive: true },
+              meta: { title: '节点信息维护', keepAlive: false },
             },
             {
               path: '/BasicsData/deployNodeChild',
               name: 'deployNodeChild',
               component: () => import('@/views/BasicsData/views/deployNode/deployNodeChild'),
-              meta: { title: '节点设置', keepAlive: true },
+              meta: { title: '节点设置', keepAlive: false },
               hidden: false,
               isAlone: true,
               src: require('@/assets/nav/ic_setting_top@2x.png')
@@ -108,7 +108,7 @@ const BasicsDataRoutes = {
           path: '/BasicsData/BaggageType',
           name: 'BaggageType',
           component: () => import('@/views/BasicsData/views/BaggageType/BaggageType'),
-          meta: { title: '特殊行李维护', keepAlive: true },
+          meta: { title: '特殊行李维护', keepAlive: false },
           hidden: true,
           src: require('@/assets/nav/ic_data_top_default @2x.png'),
           srcer: require('@/assets/nav/ic_data_top_check@2x.png')

src/router/routes/routes-file-six.js

@@ -4,7 +4,7 @@ const statisticsChartsRoutes = {
   path: '/statisticsCharts',
   component: Layout,
   meta: {
-    title: '统计图表', keepAlive: true
+    title: '统计图表', keepAlive: false
   },
   children: [
     {
@@ -16,7 +16,7 @@ const statisticsChartsRoutes = {
         title: '统计图表',
         imgstyle: 'ic_list_nav_arrive_default.png',
         imgstyleup: 'ic_list_nav_arrive_check.png',
-        keepAlive: true
+        keepAlive: false
       },
       children: [
         {
@@ -24,21 +24,21 @@ const statisticsChartsRoutes = {
           name: 'FlightStatisticsCharts',
           hidden: true,
           component: () => import('@/views/statisticsCharts/views/flightStatisticsCharts'),
-          meta: { title: '航班量统计', keepAlive: true }
+          meta: { title: '航班量统计', keepAlive: false }
         },
         {
           path: '/statisticsCharts/node',
           name: 'NodeStatisticsCharts',
           hidden: true,
           component: () => import('@/views/statisticsCharts/views/nodeStatisticsCharts'),
-          meta: { title: '扫描节点与位置分析', keepAlive: true }
+          meta: { title: '扫描节点与位置分析', keepAlive: false }
         },
         {
           path: '/statisticsCharts/baggage',
           name: 'BaggageStatisticsCharts',
           hidden: true,
           component: () => import('@/views/statisticsCharts/views/baggageStatisticsCharts'),
-          meta: { title: '行李统计', keepAlive: true }
+          meta: { title: '行李统计', keepAlive: false }
         }
       ]
     }

src/router/routes/routes-file-three.js

@@ -2,12 +2,12 @@ import Layout from '@/layout'
 const integrationRoutes = {
   path: '/integration',
   component: Layout,
-  meta: { roles: ['system_menu'], keepAlive: true },
+  meta: { roles: ['system_menu'], keepAlive: false },
   children: [
     {
       path: '/integration',
       component: () => import('@/views/dataIntegration/index.vue'),
-      meta: { title: '数据整合', icon: 'dataParser', imgstyle: 'ic_list_nav_search_default.png', imgstyleup: 'ic_list_nav_search_check.png', keepAlive: true },
+      meta: { title: '数据整合', icon: 'dataParser', imgstyle: 'ic_list_nav_search_default.png', imgstyleup: 'ic_list_nav_search_check.png', keepAlive: false },
       children: [
         {
           path: '/integration',
@@ -17,25 +17,25 @@ const integrationRoutes = {
               return c('router-view')
             }
           },
-          meta: { title: '数据整合', keepAlive: true },
+          meta: { title: '数据整合', keepAlive: false },
           children: [
             {
               path: '/integration',
               name: 'integrationHome',
-              meta: { title: '数据整合', keepAlive: true },
+              meta: { title: '数据整合', keepAlive: false },
               component: () => import('@/views/dataIntegration/views/integrationHome.vue')
             },
             {
               path: '/integration/interfaceEdit',
               name: 'InterfaceEdit',
               component: () => import('@/views/dataIntegration/views/interfaceEdit'),
-              meta: { title: '编辑接口', keepAlive: true }
+              meta: { title: '编辑接口', keepAlive: false }
             },
             {
               path: '/integration/interfaceLog',
               name: 'InterfaceLog',
               component: () => import('@/views/dataIntegration/views/interfaceLog'),
-              meta: { title: '日志查询', keepAlive: true }
+              meta: { title: '日志查询', keepAlive: false }
             }
           ]
         }

src/router/routes/routes-file-two.js

@@ -2,34 +2,34 @@ import Layout from '@/layout'
 const systemSettingsRoutes = {
   path: '/systemSettings',
   component: Layout,
-  meta: { roles: ['system_menu'], keepAlive: true },
+  meta: { roles: ['system_menu'], keepAlive: false },
   children: [
     {
       path: '/systemSettings',
       name: 'systemSettings',
       component: () => import('@/views/systemSettings/index'),
-      meta: { title: '系统设置', icon: 'systemSettings', imgstyle: 'ic_setting_nav_default.png', imgstyleup: 'ic_setting_nav_check.png', keepAlive: true },
+      meta: { title: '系统设置', icon: 'systemSettings', imgstyle: 'ic_setting_nav_default.png', imgstyleup: 'ic_setting_nav_check.png', keepAlive: false },
       children: [
         {
           path: '/systemSettings',
           name: 'serviceManagement',
           component: { render(c) { return c('router-view') } },
           redirect: '/systemSettings',
-          meta: { title: '服务管理', keepAlive: true },
+          meta: { title: '服务管理', keepAlive: false },
           hidden: true,
           src: require('@/assets/nav/ic_setting_top_default.png'),
           srcer: require('@/assets/nav/ic_setting_top_check.png'),
           children: [
             {
               path: '/systemSettings',
-              meta: { title: '服务管理', keepAlive: true },
+              meta: { title: '服务管理', keepAlive: false },
               component: () => import('@/views/systemSettings/views/serviceManagement/serviceHome'),
             },
             {
               path: '/systemSettings/serviceEdit',
               name: 'serviceEdit',
               component: () => import('@/views/systemSettings/views/serviceManagement/serviceEdit'),
-              meta: { title: '编辑服务监控', keepAlive: true },
+              meta: { title: '编辑服务监控', keepAlive: false },
               hidden: false,
               isAlone: true,
               src: require('@/assets/nav/ic_setting_top@2x.png')
@@ -38,7 +38,7 @@ const systemSettingsRoutes = {
               path: '/systemSettings/serviceAdd',
               name: 'serviceAdd',
               component: () => import('@/views/systemSettings/views/serviceManagement/serviceAdd'),
-              meta: { title: '新增服务监控', keepAlive: true },
+              meta: { title: '新增服务监控', keepAlive: false },
               hidden: false,
               isAlone: true,
               src: require('@/assets/nav/ic_setting_top@2x.png')
@@ -47,7 +47,7 @@ const systemSettingsRoutes = {
               path: '/systemSettings/serviceTopology',
               name: 'serviceTopology',
               component: () => import('@/views/systemSettings/views/serviceManagement/serviceTopology'),
-              meta: { title: '服务拓扑', keepAlive: true },
+              meta: { title: '服务拓扑', keepAlive: false },
               hidden: false,
               isAlone: true,
               src: require('@/assets/nav/ic_setting_top@2x.png')
@@ -58,7 +58,7 @@ const systemSettingsRoutes = {
           path: '/systemSettings/protocolManagement',
           name: 'protocolManagement',
           component: () => import('@/views/systemSettings/views/protocolManagement/protocolHome'),
-          meta: { title: '协议管理', keepAlive: true },
+          meta: { title: '协议管理', keepAlive: false },
           hidden: true,
           src: require('@/assets/nav/ic_setting_top_default.png'),
           srcer: require('@/assets/nav/ic_setting_top_check.png')
@@ -77,20 +77,20 @@ const systemSettingsRoutes = {
           name: 'queryTemplate',
           component: { render(c) { return c('router-view') } },
           redirect: '/systemSettings/queryTemplate',
-          meta: { title: '查询模板', keepAlive: true },
+          meta: { title: '查询模板', keepAlive: false },
           hidden: true,
           src: require('@/assets/nav/ic_setting_top_default.png'),
           srcer: require('@/assets/nav/ic_setting_top_check.png'),
           children: [{
             path: '/systemSettings/queryTemplate',
-            meta: { title: '查询模板', keepAlive: true },
+            meta: { title: '查询模板', keepAlive: false },
             component: () => import('@/views/systemSettings/views/queryTemplate/queryTemplate'),
           },
           {
             path: '/systemSettings/queryTemplateadd',
             name: 'queryTemplateadd',
             component: () => import('@/views/systemSettings/views/queryTemplate/queryTemplateadd'),
-            meta: { title: '新增查询模板', keepAlive: true },
+            meta: { title: '新增查询模板', keepAlive: false },
             hidden: false,
             isAlone: true,
             src: require('@/assets/nav/ic_setting_top@2x.png')
@@ -99,7 +99,7 @@ const systemSettingsRoutes = {
             path: '/systemSettings/queryTemplateedit',
             name: 'queryTemplateedit',
             component: () => import('@/views/systemSettings/views/queryTemplate/queryTemplateedit'),
-            meta: { title: '编辑查询模板', keepAlive: true },
+            meta: { title: '编辑查询模板', keepAlive: false },
             hidden: false,
             isAlone: true,
             src: require('@/assets/nav/ic_setting_top@2x.png')
@@ -108,7 +108,7 @@ const systemSettingsRoutes = {
             path: '/systemSettings/queryTemplateChild',
             name: 'queryTemplateChild',
             component: () => import('@/views/systemSettings/views/queryTemplate/queryTemplateChild'),
-            meta: { title: '查询项设置', keepAlive: true },
+            meta: { title: '查询项设置', keepAlive: false },
             hidden: false,
             isAlone: true,
             src: require('@/assets/nav/ic_setting_top@2x.png')
@@ -119,20 +119,20 @@ const systemSettingsRoutes = {
           path: '/systemSettings/datastructure',
           name: 'datastructure',
           component: { render(c) { return c('router-view') } },
-          meta: { title: '数据结构', keepAlive: true },
+          meta: { title: '数据结构', keepAlive: false },
           hidden: true,
           src: require('@/assets/nav/ic_setting_top_default.png'),
           srcer: require('@/assets/nav/ic_setting_top_check.png'),
           children: [{
             path: '/systemSettings/datastructure',
-            meta: { title: '数据结构', keepAlive: true },
+            meta: { title: '数据结构', keepAlive: false },
             component: () => import('@/views/systemSettings/views/datastructure/datastructureHome'),
           },
           {
             path: '/systemSettings/datastructureChild',
             name: 'datastructureChild',
             component: () => import('@/views/systemSettings/views/datastructure/datastructureChild'),
-            meta: { title: '数据项', keepAlive: true },
+            meta: { title: '数据项', keepAlive: false },
             hidden: false,
             isAlone: true,
             src: require('@/assets/nav/ic_setting_top@2x.png')
@@ -152,7 +152,7 @@ const systemSettingsRoutes = {
           path: '/systemSettings/sourceservice',
           name: 'sourceservice',
           component: () => import('@/views/systemSettings/views/sourceservice/sourceserviceHome'),
-          meta: { title: '数据源服务', keepAlive: true },
+          meta: { title: '数据源服务', keepAlive: false },
           hidden: true,
           src: require('@/assets/nav/ic_setting_top_default.png'),
           srcer: require('@/assets/nav/ic_setting_top_check.png')
@@ -161,7 +161,7 @@ const systemSettingsRoutes = {
           path: '/systemSettings/log',
           name: 'log',
           component: () => import('@/views/systemSettings/views/log'),
-          meta: { title: '日志查询', keepAlive: true },
+          meta: { title: '日志查询', keepAlive: false },
           hidden: true,
           src: require('@/assets/nav/ic_setting_top_default.png'),
           srcer: require('@/assets/nav/ic_setting_top_check.png')

src/views/advancedQuery/views/advancedHome.vue

@@ -643,6 +643,7 @@ export default {
       spanArr: [],
       contactDot: 0,
       scrollTop:0,
+      dom: null
     }
   },
   computed: {
@@ -726,16 +727,14 @@ export default {
     // this.statItemsQueryByStatMain(dataContent);
   },
   mounted() {
-
-  },
-  activated(){
     this.baggageTypeQuery()
     this.dom = this.$refs.table.bodyWrapper;
     let that = this
     this.dom.addEventListener('scroll',()=>{
       that.scrollTop = this.dom.scrollTop
     })
-
+  },
+  activated(){
     let flag = false
     const query = this.$route.query
     const { startDate, endDate, singleJump } = query
@@ -745,8 +744,14 @@ export default {
         this.form[key] = ['unLoad', 'checkIn', 'active', 'transferIn', 'canceled'].includes(key) ? Number(value) : value
       }
     })
-    startDate && (this.flightDate[0] = startDate)
-    endDate && (this.flightDate[1] = endDate)
+    if (startDate) {
+      this.$set(this.flightDate, 0, startDate)
+    }
+    if (endDate) {
+      this.$set(this.flightDate, 1, endDate)
+    }
+    // startDate && (this.flightDate[0] = startDate)
+    // endDate && (this.flightDate[1] = endDate)
     if (flag) {
       this.onCheckGj(singleJump)
     } else if (this.queryForm) {

src/views/baggageManagement/components/arrival/index.vue

@@ -456,7 +456,8 @@ export default {
       loopEvent: null,
       arrivalCount: 0,
       baggageCount: 0,
-      hasSetTableScroll: false
+      hasSetTableScroll: false,
+      table: null
     }
   },
   computed: {
@@ -466,6 +467,20 @@ export default {
   },
   mounted() {
     this.getAirPortData()
+    this.table = this.$refs.table.bodyWrapper
+    let that = this
+    this.table.addEventListener('scroll', () => {
+      that.scrollTop = this.table.scrollTop
+    })
+  },
+  activated() {
+    this.table.scrollTop = this.scrollTop
+  },
+  deactivated() {
+    if (this.loopEvent) {
+      clearInterval(this.loopEvent)
+      this.loopEvent = null
+    }
   },
   beforeDestroy() {
     if (this.loopEvent) {

src/views/baggageManagement/components/departure/index.vue

@@ -400,11 +400,20 @@ export default {
       loopEvent: null,
       leaveCount: 0,
       baggageCount: 0,
-      hasSetTableScroll: false
+      hasSetTableScroll: false,
+      table: null
     }
   },
-  activated() {
+  mounted() {
     this.getAirPortData()
+    this.table = this.$refs.table.bodyWrapper
+    let that = this
+    this.table.addEventListener('scroll', () => {
+      that.scrollTop = this.table.scrollTop
+    })
+  },
+  activated() {
+    this.table.scrollTop = this.scrollTop
   },
   deactivated() {
     if (this.loopEvent) {
@@ -467,7 +476,7 @@ export default {
       if (row.flightStatus === 'CAN') {
         classes.push('bgl-canceled')
       }
-      if (row.hasTakenOff === 0) {
+      if (row.hasTakeOff === 0) {
         classes.push('bgl-hui')
         if (rowIndex === this.leaveCount - 1) {
           classes.push('redBorder')
@@ -527,13 +536,13 @@ export default {
       this.baggageCount = 0
       tableData.forEach(item => {
         item['flightCanceled'] = item['flightStatus'] === 'CAN' ? 1 : 0
-        if (item['hasTakenOff'] === 0 && !item['flightCanceled']) {
+        if (item['hasTakeOff'] === 0 && !item['flightCanceled']) {
           this.leaveCount++
         }
         item['landingNumber'] = item['landingNumber'] ?? 0
         this.baggageCount = this.baggageCount + item.preLoad
       })
-      this.tableData = this._.sortBy(tableData, ['hasTakenOff', 'planDepartureTime'])
+      this.tableData = this._.sortBy(tableData, ['hasTakeOff', 'planDepartureTime'])
       setTableFilters(this.tableData, this.tableDataFilters)
       this.toOrderNum(this.baggageCount)
       // setInterval(() => {

src/views/baggageManagement/components/flight/index.vue

@@ -71,7 +71,10 @@
               >
                 <span>
                   日期：
-                  {{ flightInfo.planDepartureTime && flightInfo.planDepartureTime.split("T")[0] }}
+                  {{
+                    flightInfo.planDepartureTime &&
+                    flightInfo.planDepartureTime.split("T")[0]
+                  }}
                 </span>
               </el-col>
               <el-col
@@ -81,7 +84,10 @@
               >
                 <span>
                   时间：
-                  {{ flightInfo.planDepartureTime && flightInfo.planDepartureTime.split("T")[1] }}
+                  {{
+                    flightInfo.planDepartureTime &&
+                    flightInfo.planDepartureTime.split("T")[1]
+                  }}
                 </span>
               </el-col>
             </el-row>
@@ -108,7 +114,11 @@
                 <span>航班状态：</span>
               </el-col>
               <el-col :span="12">
-                <span>{{ flightInfo.flightStatus === null ? '正常' : flightInfo.flightStatus }}</span>
+                <span>{{
+                  flightInfo.flightStatus === null
+                    ? "正常"
+                    : flightInfo.flightStatus
+                }}</span>
               </el-col>
             </el-row>
             <el-row>
@@ -219,7 +229,10 @@
               >
                 <span>
                   日期：
-                  {{ flightInfo.ExpectLandingTime && flightInfo.ExpectLandingTime.split("T")[0] }}
+                  {{
+                    flightInfo.ExpectLandingTime &&
+                    flightInfo.ExpectLandingTime.split("T")[0]
+                  }}
                 </span>
               </el-col>
               <el-col
@@ -229,7 +242,10 @@
               >
                 <span>
                   时间：
-                  {{ flightInfo.ExpectLandingTime && flightInfo.ExpectLandingTime.split("T")[1] }}
+                  {{
+                    flightInfo.ExpectLandingTime &&
+                    flightInfo.ExpectLandingTime.split("T")[1]
+                  }}
                 </span>
               </el-col>
             </el-row>
@@ -279,7 +295,7 @@
       </div>
       <div
         class="part3"
-        style="padding-right: 4px;"
+        style="padding-right: 4px"
       >
         <div class="title">中转进</div>
         <el-table
@@ -308,7 +324,7 @@
       </div>
       <div
         class="part3"
-        style="padding-left: 4px;"
+        style="padding-left: 4px"
       >
         <div class="title">中转出</div>
         <el-table
@@ -337,7 +353,7 @@
       </div>
       <div
         class="drag-mask"
-        :class="{ 'active': dragActive }"
+        :class="{ active: dragActive }"
       />
       <div
         class="part4"
@@ -346,7 +362,7 @@
         <div
           v-drag-height
           class="drag-box"
-          :class="{ 'active': dragActive }"
+          :class="{ active: dragActive }"
         >
           <i class="drag-icon el-icon-d-caret" />
           <!-- <i class="drag-icon el-icon-caret-top" />
@@ -382,12 +398,12 @@
           <img
             class="btn-square btn-shadow"
             src="../../../../assets/baggage/ic_export.png"
-          >
+          />
           <img
             class="btn-square btn-shadow"
             src="../../../../assets/baggage/ic_setting.png"
             @click="show"
-          >
+          />
         </div>
         <el-table
           ref="flightBaggageTable"
@@ -444,7 +460,7 @@
             :default-expand-all="true"
             :props="{
               label: 'label',
-              children: 'children'
+              children: 'children',
             }"
             :default-checked-keys="checkedKeysTemp"
             @check="handleCheck"
@@ -500,10 +516,36 @@ import { mapGetters } from 'vuex'
 // ]
 const departureBaggageTableColumn = [
   // { label: '序号', prop: 'index' },
-  { label: '旅客姓名', prop: 'PassengerNameUpcase', width: 140, fixed: 'left', filterable: true, sortable: true },
-  { label: '行李牌号', prop: 'BagSN', width: 120, fixed: 'left', filterable: true, sortable: true },
-  { label: '特殊行李类型', prop: 'SpecialType', width: 120, filterable: true, sortable: true },
-  { label: '容器编号', prop: 'U_Device_ID', width: 120, filterable: true, sortable: true },
+  {
+    label: '旅客姓名',
+    prop: 'PassengerNameUpcase',
+    width: 140,
+    fixed: 'left',
+    filterable: true,
+    sortable: true
+  },
+  {
+    label: '行李牌号',
+    prop: 'BagSN',
+    width: 120,
+    fixed: 'left',
+    filterable: true,
+    sortable: true
+  },
+  {
+    label: '特殊行李类型',
+    prop: 'SpecialType',
+    width: 120,
+    filterable: true,
+    sortable: true
+  },
+  {
+    label: '容器编号',
+    prop: 'U_Device_ID',
+    width: 120,
+    filterable: true,
+    sortable: true
+  },
   { label: '装载序号', prop: 'LoadSN' },
   { label: '值机', prop: 'checkInTime', width: 140 },
   { label: '状态', prop: 'latestStatus', filterable: true, sortable: true },
@@ -644,13 +686,13 @@ export default {
     }
   },
   watch: {
-    '$route.query': {
+    $route: {
       handler(val) {
-        this.queryData = this._.cloneDeep(val)
+        this.queryData = this._.cloneDeep(val.query)
         const { flightNO, flightDate } = this.queryData
         if (flightNO && flightDate) {
           this.queryAll([flightNO, flightDate])
-        } else {
+        } else if (val.path.includes('flight')) {
           this.$router.push('/advance')
         }
       },
@@ -683,12 +725,14 @@ export default {
   mounted() {
     this.queryData = this._.cloneDeep(this.$route.query)
     const { flightNO, flightDate } = this.queryData
-    if (flightNO && flightDate) {
-      this.queryAll([flightNO, flightDate])
-    } else {
+    if (!flightNO || !flightDate) {
       this.$router.push('/advance')
     }
   },
+  activated() {
+    const { flightNO, flightDate } = this.queryData
+    this.queryAll([flightNO, flightDate])
+  },
   updated() {
     this.$nextTick(() => {
       this.$refs['containerTable'].doLayout()
@@ -697,6 +741,9 @@ export default {
       this.$refs['flightBaggageTable'].doLayout()
     })
   },
+  deactivated() {
+    this.loading?.close()
+  },
   beforeDestroy() {
     this.loading?.close()
   },
@@ -723,7 +770,9 @@ export default {
     cellClass({ row, column, rowIndex, columnIndex }) {
       const classes = []
       if (
-        ['checkInTime', 'DealInfo', 'sortLocationMark', 'loadLocationMark', 'inflLocationMark'].includes(column.property)
+        ['checkInTime', 'DealInfo', 'sortLocationMark', 'loadLocationMark', 'inflLocationMark'].includes(
+          column.property
+        )
       ) {
         classes.push('pre-line')
       }

src/views/baggageManagement/components/transferArrival/index.vue

@@ -470,7 +470,8 @@ export default {
       hasSetTableScroll: false,
       spanArr: [],
       contactDot: 0,
-      flag: 0
+      flag: 0,
+      table: null
     }
   },
   computed: {
@@ -505,22 +506,36 @@ export default {
   },
   created() {
     // this.getAirPortData()
-    const { startDate, endDate } = this.$route.query
-    Object.entries(this.$route.query).forEach(([key, value]) => {
-      if ((value ?? '') !== '' && JSON.stringify(value) !== '[]') {
-        this.formData[key] = value
-      }
-    })
-    if (startDate !== null && startDate !== undefined) {
-      this.formData.flightDate[0] = startDate
-    }
-    if (endDate !== null && endDate !== undefined) {
-      this.formData.flightDate[1] = endDate
-    }
   },
   mounted() {
     this.$refs['form'].validateField('flightDate')
     this.getAirPortData()
+    this.table = this.$refs.table.bodyWrapper
+    let that = this
+    this.table.addEventListener('scroll', () => {
+      that.scrollTop = this.table.scrollTop
+    })
+  },
+  activated() {
+    this.table.scrollTop = this.scrollTop
+    // const { startDate, endDate } = this.$route.query
+    // Object.entries(this.$route.query).forEach(([key, value]) => {
+    //   if ((value ?? '') !== '' && JSON.stringify(value) !== '[]') {
+    //     this.formData[key] = value
+    //   }
+    // })
+    // if (startDate !== null && startDate !== undefined) {
+    //   this.formData.flightDate[0] = startDate
+    // }
+    // if (endDate !== null && endDate !== undefined) {
+    //   this.formData.flightDate[1] = endDate
+    // }
+  },
+  deactivated() {
+    if (this.loopEvent) {
+      clearInterval(this.loopEvent)
+      this.loopEvent = null
+    }
   },
   beforeDestroy() {
     if (this.loopEvent) {
@@ -560,16 +575,17 @@ export default {
       return classes.join(' ')
     },
     changeView() {
-      const query = {
-        ...this.formData,
-        startDate: this.startDate,
-        endDate: this.endDate
-      }
-      delete query.flightDate
-      this.$router.replace({
-        path: '/transfer/departure',
-        query
-      })
+      // const query = {
+      //   ...this.formData,
+      //   startDate: this.startDate,
+      //   endDate: this.endDate
+      // }
+      // delete query.flightDate
+      // this.$router.replace({
+      //   path: '/transfer/departure',
+      //   query
+      // })
+      this.$router.push('/transfer/departure')
     },
     airPortChange() {
       this.getAviationData()

src/views/baggageManagement/components/transferDeparture/index.vue

@@ -451,27 +451,42 @@ export default {
       hasSetTableScroll: false,
       spanArr: [],
       contactDot: 0,
-      flag: 0
+      flag: 0,
+      table: null
     }
   },
   created() {
     // this.getAirPortData()
-    const { startDate, endDate } = this.$route.query
-    Object.entries(this.$route.query).forEach(([key, value]) => {
-      if ((value ?? '') !== '' && JSON.stringify(value) !== '[]') {
-        this.formData[key] = value
-      }
-    })
-    if (startDate !== null && startDate !== undefined) {
-      this.formData.flightDate[0] = startDate
-    }
-    if (endDate !== null && endDate !== undefined) {
-      this.formData.flightDate[1] = endDate
-    }
   },
   mounted() {
     this.$refs['form'].validateField('flightDate')
     this.getAirPortData()
+    this.table = this.$refs.table.bodyWrapper
+    let that = this
+    this.table.addEventListener('scroll', () => {
+      that.scrollTop = this.table.scrollTop
+    })
+  },
+  activated() {
+    this.table.scrollTop = this.scrollTop
+    // const { startDate, endDate } = this.$route.query
+    // Object.entries(this.$route.query).forEach(([key, value]) => {
+    //   if ((value ?? '') !== '' && JSON.stringify(value) !== '[]') {
+    //     this.formData[key] = value
+    //   }
+    // })
+    // if (startDate !== null && startDate !== undefined) {
+    //   this.formData.flightDate[0] = startDate
+    // }
+    // if (endDate !== null && endDate !== undefined) {
+    //   this.formData.flightDate[1] = endDate
+    // }
+  },
+  deactivated() {
+    if (this.loopEvent) {
+      clearInterval(this.loopEvent)
+      this.loopEvent = null
+    }
   },
   beforeDestroy() {
     if (this.loopEvent) {
@@ -507,7 +522,7 @@ export default {
     },
     tableRowClassName({ row, rowIndex }) {
       const classes = []
-      if (row.hasTakenOff) {
+      if (row.hasTakeOff) {
         classes.push('bgl-hui')
         if (rowIndex === this.leaveCount - 1) {
           classes.push('redBorder')
@@ -516,16 +531,17 @@ export default {
       return classes.join(' ')
     },
     changeView() {
-      const query = {
-        ...this.formData,
-        startDate: this.startDate,
-        endDate: this.endDate
-      }
-      delete query.flightDate
-      this.$router.replace({
-        path: '/transfer/arrival',
-        query
-      })
+      // const query = {
+      //   ...this.formData,
+      //   startDate: this.startDate,
+      //   endDate: this.endDate
+      // }
+      // delete query.flightDate
+      // this.$router.replace({
+      //   path: '/transfer/arrival',
+      //   query
+      // })
+      this.$router.push('/transfer/arrival')
     },
     airPortChange() {
       this.getAviationData()
@@ -652,7 +668,7 @@ export default {
       this.leaveCount = 0
       // this.baggageCount = 0
       tableData.forEach(item => {
-        if (this.hasTakenOff(item)) {
+        if (this.hasTakeOff(item)) {
           this.leaveCount++
         }
         // this.baggageCount = this.baggageCount + item.preLoad
@@ -668,15 +684,15 @@ export default {
         this.setTableScroll()
       })
     },
-    hasTakenOff(flight) {
+    hasTakeOff(flight) {
       if (flight.actualDepartureTime) {
         const now = new Date()
         const actualDepartureTime = new Date(flight.actualDepartureTime.replace('T', ' '))
-        flight['hasTakenOff'] = now > actualDepartureTime && !flight['flightCanceled']
+        flight['hasTakeOff'] = now > actualDepartureTime && !flight['flightCanceled']
       } else {
-        flight['hasTakenOff'] = false
+        flight['hasTakeOff'] = false
       }
-      return flight['hasTakenOff']
+      return flight['hasTakeOff']
     },
     setTableScroll() {
       if (!this.singleDay || this.hasSetTableScroll || this.leaveCount === 0) {

src/views/baggageManagement/mixins/terminal.js

@@ -33,6 +33,12 @@ export default {
     const formWrapHeight = this.$refs['formWrap'].offsetHeight
     this.computedTableHeight = `calc(100vh - ${headerHeight + bottomBlankHeight + formWrapHeight}px)`
   },
+  activated() {
+    const headerHeight = 80
+    const bottomBlankHeight = 41
+    const formWrapHeight = this.$refs['formWrap'].offsetHeight
+    this.computedTableHeight = `calc(100vh - ${headerHeight + bottomBlankHeight + formWrapHeight}px)`
+  },
   computed: {
     ...mapGetters(['clickedCells']),
     dealedTableData() {
@@ -86,7 +92,7 @@ export default {
   },
   methods: {
     // 设置筛选和排序
-    setFilterAndSort (tableCols) {
+    setFilterAndSort(tableCols) {
       const self = this
       Object.values(tableCols).forEach(({ prop, filterable, sortable, children }) => {
         if (children) {