Bladeren bron

实时视图-中转视图移动到国际出港目录下

zhongxiaoyu 2 jaren geleden
bovenliggende
commit
4cd296140a

+ 9 - 9
public/config.js

@@ -193,8 +193,8 @@ var DATACONTENT_ID = {
   internationalDepartureAirportCount: 1803542, // 国际离港统计
   internationalArrivalAirport: 1803523, // 国际进港航站
   internationalArrivalAirportCount: 1803552, // 国际进港统计
-  internationalTransferDepartureAirport: 1803645, // 中转航站
-  internationalTransferDepartureAirportCount: 1803646, // 中转统计
+  internationalDepartureTransferAirport: 1803645, // 中转航站
+  internationalDepartureTransferAirportCount: 1803646, // 中转统计
   warningRules: 18040, // 报警预警策略
   // 航班
   departureFlightInfo: 1803511, // 国内离港航班基础信息
@@ -213,10 +213,10 @@ var DATACONTENT_ID = {
   internationalArrivalFlightWaybill: 1803527, // 国际进港航班运单
   // internationalArrivalFlightContainer: 1803618, // 国际进港航班集装器
   internationalArrivalFlightContainerWaybill: 1803619, // 国际进港航班-集装器内运单
-  internationalTransferDepartureFlightInfo: 1803528, // 中转航班基础信息
-  internationalTransferDepartureFlightWaybill: 1803529, // 中转航班运单
-  internationalTransferDepartureFlightContainer: 1803530, // 中转航班集装器
-  internationalTransferDepartureFlightContainerWaybill: 1803531, // 中转航班-集装器内运单
+  internationalDepartureTransferFlightInfo: 1803528, // 中转航班基础信息
+  internationalDepartureTransferFlightWaybill: 1803529, // 中转航班运单
+  internationalDepartureTransferFlightContainer: 1803530, // 中转航班集装器
+  internationalDepartureTransferFlightContainerWaybill: 1803531, // 中转航班-集装器内运单
   airportNameZh: 1803517, // 机场中文名
   // 运单
   departureWaybillInfo: 1803520, // 国内离港运单基础信息
@@ -229,9 +229,9 @@ var DATACONTENT_ID = {
   internationalDepartureWaybillPull: 100102, // 国际离港运单拉下信息
   internationalArrivalWaybillInfo: 1803520, // 国际进港运单基础信息
   internationalTransferArrivalWaybillGoods: 1803641, // 国际进港运单节点跟踪
-  internationalTransferDepartureWaybillInfo: 1803642, // 中转运单基础信息
-  internationalTransferDepartureWaybillGoods: 1803643, // 中转运单节点跟踪
-  internationalTransferDepartureWaybillPull: 100102, // 中转运单拉下信息
+  internationalDepartureTransferWaybillInfo: 1803642, // 中转运单基础信息
+  internationalDepartureTransferWaybillGoods: 1803643, // 中转运单节点跟踪
+  internationalDepartureTransferWaybillPull: 100102, // 中转运单拉下信息
   // 货物
   goodsInfo: 100008, // 货物基础信息
   goodsAirline: 100009, // 货物航段

+ 1 - 1
src/layout/Layout.vue

@@ -67,7 +67,7 @@ ResizeHook()
   .sidebar-container {
     width: 54px;
     :deep .menuIcon {
-      margin-right: 0;
+      margin-right: 0 !important;
     }
   }
   .main-container {

+ 1 - 1
src/layout/components/AppMain.vue

@@ -29,7 +29,7 @@ const settings = computed(() => {
 })
 
 const key = computed(() =>
-  route.matched[0].name === 'RealTime' ? 'RealTime' : route.path
+  route.matched[0].name === 'RealTime' ? route.matched[2].path : route.path
 )
 
 const cachedViews = computed(() => {

+ 0 - 3
src/layout/components/Sidebar/Sidebar.vue

@@ -66,7 +66,4 @@ const activeMenu = computed(() => {
 :deep .el-menu-item.is-active {
   background: #ac014d;
 }
-:deep .el-menu--inline .el-menu-item {
-  padding-left: 50px !important;
-}
 </style>

+ 61 - 40
src/layout/components/Sidebar/SidebarItem.vue

@@ -50,11 +50,11 @@
 
 <script setup lang="ts">
 /*初始化参数比如引入组件,proxy,state等*/
-import Link from "./Link.vue";
-import Item from "./Item";
-import { isExternal } from "@/utils/validate";
-import path from "path";
-import { RouteItemTy } from "~/router";
+import Link from './Link.vue'
+// import Item from './Item'
+import { isExternal } from '@/utils/validate'
+import path from 'path'
+import { RouteItemTy } from '~/router'
 const props = defineProps({
   //每一个router Item
   item: {
@@ -69,78 +69,99 @@ const props = defineProps({
   //基础路径,用于拼接
   basePath: {
     type: String,
-    default: "",
+    default: '',
   },
-});
+})
 onMounted(() => {
   // console.log("我挂载了");
   // console.log(proxy.item);
-});
+})
 //显示sidebarItem 的情况
-let onlyOneChild: any = ref(null);
+let onlyOneChild: any = ref(null)
 const showSidebarItem = (children = [], parent: RouteItemTy) => {
   const showingChildren = children.filter((item: RouteItemTy) => {
     if (item.hidden) {
-      return false;
+      return false
     } else {
       // Temp set(will be used if only has one showing child)
-      onlyOneChild.value = item;
-      return true;
+      onlyOneChild.value = item
+      return true
     }
-  });
+  })
   if (showingChildren.length === 1 && !parent?.alwaysShow) {
-    return true;
+    return true
   }
   if (showingChildren.length === 0) {
-    onlyOneChild.value = { ...parent, path: "", noChildren: true };
-    return true;
+    onlyOneChild.value = { ...parent, path: '', noChildren: true }
+    return true
   }
-  return false;
-};
+  return false
+}
 const resolvePath = (routePath: string) => {
   if (isExternal(routePath)) {
-    return routePath;
+    return routePath
   }
   if (isExternal(props.basePath)) {
-    return props.basePath;
+    return props.basePath
   }
-  return path.resolve(props.basePath, routePath);
-};
+  return path.resolve(props.basePath, routePath)
+}
 </script>
 
 <style lang="scss" scoped>
-.menuIcon {
-  width: 16px;
-  height: 16px;
-  background-repeat: no-repeat;
-  background-size: 100% 100%;
-  margin-right: 16px;
+#Sidebar
+  > .el-scrollbar
+  > .el-scrollbar__wrap
+  > .el-scrollbar__view
+  > .el-menu {
+  > a > .el-menu-item,
+  > a > .el-menu-item > .el-menu-tooltip__trigger,
+  > .el-sub-menu > .el-sub-menu__title {
+    > .menuIcon {
+      width: 16px;
+      height: 16px;
+      background-repeat: no-repeat;
+      background-size: 100% 100%;
+      margin-right: 16px;
+    }
+    > .menuText {
+      font-size: 14px;
+      font-family: Microsoft YaHei;
+      font-weight: bold;
+      color: #ffffff;
+    }
+  }
 }
-.menuText {
-  font-size: 14px;
-  font-family: Microsoft YaHei;
-  font-weight: bold;
-  color: #ffffff;
+
+#Sidebar .el-sub-menu :deep .el-menu {
+  .el-menu-item,
+  .el-menu-item-group__title,
+  .el-sub-menu__title {
+    padding-left: calc(
+      var(--el-menu-base-level-padding) + var(--el-menu-level) *
+        var(--el-menu-level-padding) + 10px
+    );
+  }
 }
 .dashboard {
-  background-image: url("@/assets/menus/ic_cockpit_menu.png");
+  background-image: url('@/assets/menus/ic_cockpit_menu.png');
 }
 .realTime {
-  background-image: url("@/assets/menus/ic_view_nav\ .png");
+  background-image: url('@/assets/menus/ic_view_nav\ .png');
 }
 .dataQuery {
-  background-image: url("@/assets/menus/ic_data_query\ .png");
+  background-image: url('@/assets/menus/ic_data_query\ .png');
 }
 .userManagement {
-  background-image: url("@/assets/menus/ic_user_manage_nav.png");
+  background-image: url('@/assets/menus/ic_user_manage_nav.png');
 }
 .BasicsData {
-  background-image: url("@/assets/menus/ic_basic_data_nav.png");
+  background-image: url('@/assets/menus/ic_basic_data_nav.png');
 }
 .systemSettings {
-  background-image: url("@/assets/menus/ic_system_setting_nav.png");
+  background-image: url('@/assets/menus/ic_system_setting_nav.png');
 }
 .statisticalanalysis {
-  background-image: url("@/assets/menus/ic_statistics_nav.png");
+  background-image: url('@/assets/menus/ic_statistics_nav.png');
 }
 </style>

+ 49 - 49
src/router/index.ts

@@ -1,50 +1,50 @@
-import { createRouter, createWebHashHistory, Router } from "vue-router";
-import Layout from "@/layout";
-import { RouterTy } from "~/router";
-import routesOne from "./routes/routes-file-one";
-import routesTwo from "./routes/routes-file-two";
-import routesThree from "./routes/routes-file-three";
-import routesFour from "./routes/routes-file-four";
-import routesFive from "./routes/routes-file-five";
-import routesSix from "./routes/routes-file-six";
-import routesSeven from "./routes/routes-file-seven";
-import { Route, useKeepAlive } from "@/store/keepAlive";
+import { createRouter, createWebHashHistory, Router } from 'vue-router'
+import Layout from '@/layout'
+import { RouterTy } from '~/router'
+import routesOne from './routes/routes-file-one'
+import routesTwo from './routes/routes-file-two'
+import routesThree from './routes/routes-file-three'
+import routesFour from './routes/routes-file-four'
+import routesFive from './routes/routes-file-five'
+import routesSix from './routes/routes-file-six'
+import routesSeven from './routes/routes-file-seven'
+import { Route, useKeepAlive } from '@/store/keepAlive'
 
 const routesPush = (arr, routes) => {
-  if (!Array.isArray(arr)) return "请传入数组格式路由表";
+  if (!Array.isArray(arr)) return '请传入数组格式路由表'
   for (let i = 0; i < arr.length; i++) {
-    routes.push(arr[i]);
+    routes.push(arr[i])
   }
-};
+}
 
 export const constantRoutes: RouterTy = [
   {
-    path: "/redirect",
+    path: '/redirect',
     component: Layout,
     hidden: true,
     children: [
       {
-        path: "/redirect/:path(.*)",
-        component: () => import("@/views/redirect"),
+        path: '/redirect/:path(.*)',
+        component: () => import('@/views/redirect'),
       },
     ],
   },
   {
-    path: "/login",
-    component: () => import("@/views/login/Login.vue"),
+    path: '/login',
+    component: () => import('@/views/login/Login.vue'),
     hidden: true,
   },
   {
-    path: "/404",
-    component: () => import("@/views/error-page/404.vue"),
+    path: '/404',
+    component: () => import('@/views/error-page/404.vue'),
     hidden: true,
   },
   {
-    path: "/401",
-    component: () => import("@/views/error-page/401.vue"),
+    path: '/401',
+    component: () => import('@/views/error-page/401.vue'),
     hidden: true,
   },
-];
+]
 /**
  * asyncRoutes
  * the routes that need to be dynamically loaded based on user roles
@@ -52,8 +52,8 @@ export const constantRoutes: RouterTy = [
 export const asyncRoutes: RouterTy = [
   // 404 page must be placed at the end !!!
   // using pathMatch install of "*" in vue-router 4.0
-  { path: "/:pathMatch(.*)", redirect: "/404", hidden: true },
-];
+  { path: '/:pathMatch(.*)', redirect: '/404', hidden: true },
+]
 
 // 插入路由
 routesPush(
@@ -67,15 +67,15 @@ routesPush(
     ...routesSeven,
   ],
   asyncRoutes
-);
+)
 
 const router: Router = createRouter({
   history: createWebHashHistory(),
   scrollBehavior: () => ({ top: 0 }),
   routes: constantRoutes,
-});
+})
 
-router.beforeEach((to, from, next) => {
+router.beforeEach(async (to, from, next) => {
   const {
     savedRoutes,
     saveRoute,
@@ -84,47 +84,47 @@ router.beforeEach((to, from, next) => {
     // delCachedView,
     delCachedViewAll,
     delCachedViewUntil,
-  } = useKeepAlive();
-  if (from.matched?.[0]?.name === "RealTime") {
-    if (to.matched[1].name !== from.matched[1].name) {
-      delCachedViewAll();
+  } = useKeepAlive()
+  if (from.matched?.[0]?.name === 'RealTime') {
+    if (to.matched[2].name !== from.matched[2].name) {
+      delCachedViewAll()
     } else if (to.matched.length < from.matched.length) {
-      delCachedViewUntil(to.name as string);
+      delCachedViewUntil(to.name as string)
     }
 
     if (
-      typeof from.name === "string" &&
-      ((from.name.includes("FlightView") &&
+      typeof from.name === 'string' &&
+      ((from.name.includes('FlightView') &&
         from.query.flightNO &&
         from.query.flightDate) ||
-        (from.name.includes("WaybillView") && from.query.waybillNO))
+        (from.name.includes('WaybillView') && from.query.waybillNO))
     ) {
-      saveRoute(from as Route);
+      saveRoute(from as Route)
     }
   }
 
-  if (to.matched?.[0]?.name === "RealTime") {
+  if (to.matched?.[0]?.name === 'RealTime') {
     if (to.meta.keepAlive) {
-      addCachedViewAll(to.matched.map((route) => route.name) as string[]);
+      addCachedViewAll(to.matched.map(route => route.name) as string[])
     }
 
     if (
-      typeof to.name === "string" &&
-      ((to.name.includes("FlightView") &&
+      typeof to.name === 'string' &&
+      ((to.name.includes('FlightView') &&
         (!to.query.flightNO || !to.query.flightDate)) ||
-        (to.name.includes("WaybillView") && !to.query.waybillNO))
+        (to.name.includes('WaybillView') && !to.query.waybillNO))
     ) {
       const savedRoute = savedRoutes.find(
-        (savedRoute) => savedRoute.name === to.name
-      );
+        savedRoute => savedRoute.name === to.name
+      )
       if (savedRoute) {
-        next(savedRoute.fullPath);
+        next(savedRoute.fullPath)
       }
     }
   }
 
-  next();
-});
+  next()
+})
 
 // export function resetRouter() {
 //   const newRouter = createRouter({
@@ -134,4 +134,4 @@ router.beforeEach((to, from, next) => {
 //   })
 // }
 
-export default router;
+export default router

+ 116 - 106
src/router/routes/routes-file-six.ts

@@ -160,75 +160,158 @@ const ActualTimeRoutes = {
       path: '/realTime/internationalDeparture',
       name: 'InternationalDeparture',
       meta: {
-        title: '国际出港',
+        title: '国际出港航站视图',
         roles: ['view_of_international_departure_terminal_page'],
         breadcrumb: false,
       },
       component: KeepAliveRouterView('InternationalDeparture'),
       children: [
         {
-          path: '/realTime/internationalDeparture/airport',
-          name: 'InternationalDepartureAirport',
-          meta: { title: '国际出港航站视图' },
-          component: KeepAliveRouterView('InternationalDepartureAirport'),
+          path: '/realTime/internationalDeparture',
+          name: 'InternationalDepartureDirect',
+          meta: {
+            title: '国际出港直航航站视图',
+          },
+          component: KeepAliveRouterView('InternationalDepartureDirect'),
           children: [
             {
-              path: '',
-              name: 'InternationalDepartureAirportView',
-              meta: { keepAlive: true },
-              component: () =>
-                import(
-                  '@/views/realTime/internationalDeparture/airport/index.vue'
-                ),
-            },
-            {
-              path: '/realTime/internationalDeparture/flight',
-              name: 'InternationalDepartureFlight',
-              meta: {
-                title: '国际出港航班视图',
-              },
-              component: KeepAliveRouterView('InternationalDepartureFlight'),
+              path: '/realTime/internationalDeparture/airport',
+              name: 'InternationalDepartureAirport',
+              meta: { title: '直航', breadcrumb: false },
+              component: KeepAliveRouterView('InternationalDepartureAirport'),
               children: [
                 {
                   path: '',
-                  name: 'InternationalDepartureFlightView',
+                  name: 'InternationalDepartureAirportView',
                   meta: { keepAlive: true },
                   component: () =>
                     import(
-                      '@/views/realTime/internationalDeparture/flight/index.vue'
+                      '@/views/realTime/internationalDeparture/airport/index.vue'
                     ),
                 },
                 {
-                  path: '/realTime/internationalDeparture/waybill',
-                  name: 'InternationalDepartureWaybill',
+                  path: '/realTime/internationalDeparture/flight',
+                  name: 'InternationalDepartureFlight',
                   meta: {
-                    title: '国际出港运单视图',
+                    title: '国际出港航班视图',
                   },
                   component: KeepAliveRouterView(
-                    'InternationalDepartureWaybill'
+                    'InternationalDepartureFlight'
                   ),
                   children: [
                     {
                       path: '',
-                      name: 'InternationalDepartureWaybillView',
+                      name: 'InternationalDepartureFlightView',
                       meta: { keepAlive: true },
                       component: () =>
                         import(
-                          '@/views/realTime/internationalDeparture/waybill/index.vue'
+                          '@/views/realTime/internationalDeparture/flight/index.vue'
                         ),
                     },
                     {
-                      path: '/realTime/internationalDeparture/goods',
-                      name: 'InternationalDepartureGoods',
+                      path: '/realTime/internationalDeparture/waybill',
+                      name: 'InternationalDepartureWaybill',
                       meta: {
-                        title: '国际出港货物视图',
-                        keepAlive: true,
+                        title: '国际出港运单视图',
                       },
+                      component: KeepAliveRouterView(
+                        'InternationalDepartureWaybill'
+                      ),
+                      children: [
+                        {
+                          path: '',
+                          name: 'InternationalDepartureWaybillView',
+                          meta: { keepAlive: true },
+                          component: () =>
+                            import(
+                              '@/views/realTime/internationalDeparture/waybill/index.vue'
+                            ),
+                        },
+                        {
+                          path: '/realTime/internationalDeparture/goods',
+                          name: 'InternationalDepartureGoods',
+                          meta: {
+                            title: '国际出港货物视图',
+                            keepAlive: true,
+                          },
+                          component: () =>
+                            import(
+                              '@/views/realTime/internationalDeparture/goods/index.vue'
+                            ),
+                        },
+                      ],
+                    },
+                  ],
+                },
+              ],
+            },
+          ],
+        },
+        {
+          path: '/realTime/internationalDepartureTransfer',
+          name: 'InternationalDepartureTransfer',
+          meta: {
+            title: '国际出港中转航站视图',
+          },
+          component: KeepAliveRouterView('InternationalDepartureTransfer'),
+          children: [
+            {
+              path: '/realTime/internationalDepartureTransfer/airport',
+              name: 'InternationalDepartureTransferAirport',
+              meta: { title: '中转', breadcrumb: false },
+              component: KeepAliveRouterView(
+                'InternationalDepartureTransferAirport'
+              ),
+              children: [
+                {
+                  path: '',
+                  name: 'InternationalDepartureTransferAirportView',
+                  meta: { keepAlive: true },
+                  component: () =>
+                    import(
+                      '@/views/realTime/internationalDepartureTransfer/airport/index.vue'
+                    ),
+                },
+                {
+                  path: '/realTime/internationalDepartureTransfer/flight',
+                  name: 'InternationalDepartureTransferFlight',
+                  meta: {
+                    title: '中转航班视图',
+                  },
+                  component: KeepAliveRouterView(
+                    'InternationalDepartureTransferFlight'
+                  ),
+                  children: [
+                    {
+                      path: '',
+                      name: 'InternationalDepartureTransferFlightView',
+                      meta: { keepAlive: true },
                       component: () =>
                         import(
-                          '@/views/realTime/internationalDeparture/goods/index.vue'
+                          '@/views/realTime/internationalDepartureTransfer/flight/index.vue'
                         ),
                     },
+                    {
+                      path: '/realTime/internationalDepartureTransfer/waybill',
+                      name: 'InternationalDepartureTransferWaybill',
+                      meta: {
+                        title: '中转运单视图',
+                      },
+                      component: KeepAliveRouterView(
+                        'InternationalDepartureTransferWaybill'
+                      ),
+                      children: [
+                        {
+                          path: '',
+                          name: 'InternationalDepartureTransferWaybillView',
+                          meta: { keepAlive: true },
+                          component: () =>
+                            import(
+                              '@/views/realTime/internationalDepartureTransfer/waybill/index.vue'
+                            ),
+                        },
+                      ],
+                    },
                   ],
                 },
               ],
@@ -316,79 +399,6 @@ const ActualTimeRoutes = {
         },
       ],
     },
-    {
-      path: '/realTime/internationalTransferDeparture',
-      name: 'InternationalTransferDeparture',
-      meta: {
-        title: '中转',
-        breadcrumb: false,
-        roles: ['view_of_international_transfer_terminal_page'],
-      },
-      component: KeepAliveRouterView('InternationalTransferDeparture'),
-      children: [
-        {
-          path: '/realTime/internationalTransferDeparture/airport',
-          name: 'InternationalTransferDepartureAirport',
-          meta: { title: '中转航站视图' },
-          component: KeepAliveRouterView(
-            'InternationalTransferDepartureAirport'
-          ),
-          children: [
-            {
-              path: '',
-              name: 'InternationalTransferDepartureAirportView',
-              meta: { keepAlive: true },
-              component: () =>
-                import(
-                  '@/views/realTime/internationalTransferDeparture/airport/index.vue'
-                ),
-            },
-            {
-              path: '/realTime/internationalTransferDeparture/flight',
-              name: 'InternationalTransferDepartureFlight',
-              meta: {
-                title: '中转航班视图',
-              },
-              component: KeepAliveRouterView(
-                'InternationalTransferDepartureFlight'
-              ),
-              children: [
-                {
-                  path: '',
-                  name: 'InternationalTransferDepartureFlightView',
-                  meta: { keepAlive: true },
-                  component: () =>
-                    import(
-                      '@/views/realTime/internationalTransferDeparture/flight/index.vue'
-                    ),
-                },
-                {
-                  path: '/realTime/internationalTransferDeparture/waybill',
-                  name: 'InternationalTransferDepartureWaybill',
-                  meta: {
-                    title: '中转运单视图',
-                  },
-                  component: KeepAliveRouterView(
-                    'InternationalTransferDepartureWaybill'
-                  ),
-                  children: [
-                    {
-                      path: '',
-                      name: 'InternationalTransferDepartureWaybillView',
-                      meta: { keepAlive: true },
-                      component: () =>
-                        import(
-                          '@/views/realTime/internationalTransferDeparture/waybill/index.vue'
-                        ),
-                    },
-                  ],
-                },
-              ],
-            },
-          ],
-        },
-      ],
-    },
     // {
     //   path: '/realTime/trackMap',
     //   name: 'TrackMap',

+ 1 - 1
src/views/realTime/components/AirportView/index.vue

@@ -466,7 +466,7 @@ const permissionMap = {
     UTC: 'the_view_of_international_inbound_terminal_opens_utc_button',
     columnSet: 'view_column_setting_of_international_inbound_terminal_button',
   },
-  InternationalTransferDepartureAirport: {
+  InternationalDepartureTransferAirport: {
     count:
       'number_of_pieces_displayed_in_international_transfer_terminal_view_button',
     UTC: 'international_transfer_terminal_view_opens_utc_button',

+ 1 - 1
src/views/realTime/components/AirportView/useAirportTable.ts

@@ -818,7 +818,7 @@ const columnGroupsMap: {
       ],
     },
   ],
-  InternationalTransferDepartureAirport: [
+  InternationalDepartureTransferAirport: [
     {
       groupName: '航班相关',
       children: [

+ 4 - 4
src/views/realTime/hooks/useTable.ts

@@ -891,7 +891,7 @@ const tableColumnsMap: {
     { columnLabel: '发往位置', columnName: 'C12' },
     { columnLabel: '发往位置描述', columnName: 'C13' },
   ],
-  InternationalTransferDepartureFlightContainer: [
+  InternationalDepartureTransferFlightContainer: [
     {
       columnLabel: '集装器编号',
       columnName: 'stowageNo',
@@ -915,7 +915,7 @@ const tableColumnsMap: {
       className: 'cell-filter cell-filter-yellow',
     },
   ],
-  InternationalTransferDepartureFlightWaybill: [
+  InternationalDepartureTransferFlightWaybill: [
     { columnLabel: '运单号', columnName: 'stockCode', width: 120 },
     { columnLabel: '目的地', columnName: 'destination' },
     { columnLabel: '分类', columnName: 'type' },
@@ -939,7 +939,7 @@ const tableColumnsMap: {
     // { columnLabel: '拉下件数', columnName: 'pullNum', needCount: 1 },
     // { columnLabel: '退运件数', columnName: 'returnNum', needCount: 1 },
   ],
-  InternationalTransferDepartureWaybillGoods: [
+  InternationalDepartureTransferWaybillGoods: [
     {
       columnLabel: '航班号',
       columnName: 'flightNO',
@@ -996,7 +996,7 @@ const tableColumnsMap: {
       className: 'cell-filter cell-filter-green node-departure',
     },
   ],
-  InternationalTransferDepartureWaybillPull: [
+  InternationalDepartureTransferWaybillPull: [
     {
       columnLabel: '集装器编号',
       columnName: 'ULDNO',

+ 3 - 3
src/views/realTime/hooks/useTrackData.ts

@@ -195,7 +195,7 @@ const trackNodesMap = {
       nodeCode: 'DLV报',
     },
   ],
-  internationalTransferDeparture: [
+  internationalDepartureTransfer: [
     {
       name: '入园',
       nodeCode: 'EPORTREL',
@@ -272,7 +272,7 @@ export function useTrackData(name: string, trackData: MaybeRef<CommonData[]>) {
           [
             ...trackNodesMap.departure,
             ...trackNodesMap.internationalDeparture,
-            ...trackNodesMap.internationalTransferDeparture,
+            ...trackNodesMap.internationalDepartureTransfer,
           ].some(node => node.nodeCode === nodeCode) ||
           (name.includes('Departure') &&
             ![
@@ -298,7 +298,7 @@ export function useTrackData(name: string, trackData: MaybeRef<CommonData[]>) {
         }
         const nodeList = trackNodesMap[
           isTransfer
-            ? 'internationalTransferDeparture'
+            ? 'internationalDepartureTransfer'
             : isDeparture
             ? isInternational
               ? 'internationalDeparture'

+ 2 - 2
src/views/realTime/internationalTransferDeparture/airport/index.vue → src/views/realTime/internationalDepartureTransfer/airport/index.vue

@@ -1,12 +1,12 @@
 <template>
-  <AirportView name="InternationalTransferDepartureAirport" />
+  <AirportView name="InternationalDepartureTransferAirport" />
 </template>
 
 <script lang="ts">
 import AirportView from '../../components/AirportView/index.vue'
 
 export default defineComponent({
-  name: 'InternationalTransferDepartureAirportView',
+  name: 'InternationalDepartureTransferAirportView',
   components: { AirportView },
 })
 </script>

+ 2 - 2
src/views/realTime/internationalTransferDeparture/flight/index.vue → src/views/realTime/internationalDepartureTransfer/flight/index.vue

@@ -1,12 +1,12 @@
 <template>
-  <FlightView name="InternationalTransferDepartureFlight" />
+  <FlightView name="InternationalDepartureTransferFlight" />
 </template>
 
 <script lang="ts">
 import FlightView from '../../components/FlightView/index.vue'
 
 export default defineComponent({
-  name: 'InternationalTransferDepartureFlightView',
+  name: 'InternationalDepartureTransferFlightView',
   components: { FlightView },
 })
 </script>

+ 2 - 2
src/views/realTime/internationalTransferDeparture/waybill/index.vue → src/views/realTime/internationalDepartureTransfer/waybill/index.vue

@@ -1,12 +1,12 @@
 <template>
-  <WaybillView name="InternationalTransferDepartureWaybill" />
+  <WaybillView name="InternationalDepartureTransferWaybill" />
 </template>
 
 <script lang="ts">
 import WaybillView from '../../components/WaybillView/index.vue'
 
 export default defineComponent({
-  name: 'InternationalTransferDepartureWaybillView',
+  name: 'InternationalDepartureTransferWaybillView',
   components: { WaybillView },
 })
 </script>