"20230131-0201管理端修改建议"部分修改

src/hooks/useLoop.ts

@@ -6,9 +6,22 @@ export function useLoop(
   watchSources: (WatchSource | object)[] = []
 ) {
   let queryLoop: number | null = null
+  let querying = false
+  let stopFlag = false
   const startQuery = async () => {
-    queryLoop = 1 // 先赋值，表示已经在进行查询
+    if (querying) {
+      return
+    }
+
+    querying = true
+    stopFlag = false
+
     await Promise.all(loopFunctions.map(func => func()))
+
+    if (stopFlag) {
+      return
+    }
+
     queryLoop = window.setTimeout(
       startQuery,
       typeof interval === 'string'
@@ -19,10 +32,12 @@ export function useLoop(
     )
   }
   const stopQuery = () => {
+    stopFlag = true
     if (queryLoop) {
       clearTimeout(queryLoop)
       queryLoop = null
     }
+    querying = false
   }
   if (watchSources.length) {
     watch(watchSources, () => {
@@ -30,10 +45,11 @@ export function useLoop(
       startQuery()
     })
   }
+  onMounted(() => {
+    startQuery()
+  })
   onActivated(() => {
-    if (!queryLoop) {
-      startQuery()
-    }
+    startQuery()
   })
   onDeactivated(() => {
     stopQuery()

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

@@ -6,19 +6,66 @@ const HomeRoutes = {
   name: 'dataQuery',
   redirect: '/dataQuery/flightQuery',
   //using el svg icon, the elSvgIcon first when at the same time using elSvgIcon and icon
-  meta: { title: '数据查询', elSvgIcon: 'Search', roles: ['data_query_menu'] },
+  meta: {
+    title: '数据查询',
+    elSvgIcon: 'Search',
+    breadcrumb: false,
+    roles: ['data_query_menu'],
+  },
   children: [
     {
       path: '/dataQuery/flightQuery',
       name: 'FlightQuery',
-      meta: { title: '航班查询', roles: ['flight_query_page'] },
-      component: () => import('@/views/dataQuery/flight/index.vue'),
+      meta: {
+        title: '航班查询',
+        roles: ['flight_query_page'],
+      },
+      component: {
+        render: () => h(resolveComponent('router-view')),
+      },
+      children: [
+        {
+          path: '/dataQuery/flightQuery',
+          name: 'FlightQueryView',
+          meta: { title: '航班查询', breadcrumb: false },
+          component: () => import('@/views/dataQuery/flight/index.vue'),
+        },
+        {
+          path: '/dataQuery/flightQuery/:viewName',
+          name: 'FlightQueryFlightView',
+          meta: { title: '航班视图' },
+          props: true,
+          component: () => import('@/views/dataQuery/flight/FlightView.vue'),
+          hidden: true,
+        },
+      ],
     },
     {
       path: '/dataQuery/waybillQuery',
       name: 'WaybillQuery',
-      meta: { title: '运单查询', roles: ['waybill_query_page'] },
-      component: () => import('@/views/dataQuery/waybill/index.vue'),
+      meta: {
+        title: '运单查询',
+        roles: ['waybill_query_page'],
+      },
+      component: {
+        render: () => h(resolveComponent('router-view')),
+      },
+      children: [
+        {
+          path: '/dataQuery/waybillQuery',
+          name: 'WaybillQueryView',
+          meta: { title: '运单查询', breadcrumb: false },
+          component: () => import('@/views/dataQuery/waybill/index.vue'),
+        },
+        {
+          path: '/dataQuery/waybillQuery/:viewName',
+          name: 'WaybillQueryWaybillView',
+          meta: { title: '运单视图' },
+          props: true,
+          component: () => import('@/views/dataQuery/waybill/WaybillView.vue'),
+          hidden: true,
+        },
+      ],
     },
     {
       path: '/dataQuery/freightQuery',

src/views/dataQuery/components/DataQueryView/index.vue

@@ -8,7 +8,7 @@
         class="data-query-form"
         :rules="rules"
       >
-        <div class="form-left">
+        <div v-if="name !== 'waybill'" class="form-left">
           <el-form-item prop="startDate">
             <el-date-picker
               v-model="formData.startDate"
@@ -67,7 +67,9 @@
         ref="tableRef"
         :data="tableData"
         :columns="filteredColumns"
+        :cell-class-name="cellClass"
         :column-props="{ formatter }"
+        @cell-click="cellClickHandler"
       />
     </div>
   </div>
@@ -135,7 +137,7 @@ const keyWordsValidator = (rule: any, value: any, callback: any) => {
     return callback(new Error(`请输入${searchTitle}`))
   }
   const regsMap: { [x: string]: RegExp[] } = {
-    flight: [/^[A-Za-z0-9][A-Za-z][0-9]{4}$/, /^[0-9]{4}$/],
+    flight: [/^[A-Za-z0-9][A-Za-z][0-9]{3,4}$/, /^[0-9]{3,4}$/],
     waybill: [/^[0-9]{3}\-[0-9]{8}/],
     freight: [/^[0-9]{5}$/, /^[0-9]{3}\-[0-9]{8}\-[0-9]{5}$/],
   }
@@ -176,6 +178,88 @@ const formatter: CommonTableFormatter = (row, column, cellValue, index) => {
   }
   return value
 }
+
+const cellClass = ({ row, column, rowIndex, columnIndex }) => {
+  const classes: string[] = []
+  switch (props.name) {
+    case 'flight':
+      if (['flightNO'].includes(column.property) && row[column.property]) {
+        classes.push('cell-click')
+      }
+      break
+    case 'waybill':
+      if (['stockCode'].includes(column.property) && row[column.property]) {
+        classes.push('cell-click')
+      }
+      break
+    case 'freight':
+      break
+    default:
+      break
+  }
+  return classes.join(' ')
+}
+
+const router = useRouter()
+
+const cellClickHandler = (row, column, cell, event) => {
+  switch (props.name) {
+    case 'flight': {
+      switch (column.property) {
+        case 'flightNO': {
+          if (
+            !row.flightAllNO ||
+            !row.flightDate ||
+            !['INT', 'DOM'].includes(row.DIType) ||
+            typeof row.FFID !== 'string' ||
+            !['A', 'D'].includes(row.FFID.at(-1))
+          ) {
+            ElMessage.error('航班信息缺失!')
+            return
+          }
+          const viewName = `${row.DIType === 'DOM' ? '' : 'International'}${
+            row.FFID.at(-1) === 'D' ? 'Departure' : 'Arrival'
+          }Flight`
+          router.push({
+            path: `/dataQuery/flightQuery/${viewName}`,
+            query: {
+              flightNO: row.flightAllNO,
+              flightDate: row.flightDate,
+            },
+          })
+          break
+        }
+        default:
+          break
+      }
+      break
+    }
+    case 'waybill': {
+      switch (column.property) {
+        case 'stockCode': {
+          if (!row.stockCode || !row.flightDate) {
+            ElMessage.error('运单信息缺失!')
+            return
+          }
+          const viewName = `Waybill`
+          router.push({
+            path: `/dataQuery/waybillQuery/${viewName}`,
+            query: {
+              waybillNO: row.stockCode,
+              flightDate: row.flightDate,
+            },
+          })
+          break
+        }
+      }
+      break
+    }
+    case 'freight':
+      break
+    default:
+      break
+  }
+}
 </script>
 
 <style lang="scss" scoped>

src/views/dataQuery/components/DataQueryView/useTable.ts

@@ -1,6 +1,6 @@
 import { Query } from '@/api/webApi'
 import { Ref } from 'vue'
-import { CommonData, CommonTableColumn } from '~/common'
+import { CommonData, CommonTableColumn, CommonValue } from '~/common'
 
 const idGetter = (name: string) => DATACONTENT_ID[name + 'DataQuery']
 
@@ -12,7 +12,7 @@ export function useTable(
   const tableColumns = ref<CommonTableColumn[]>([])
   const tableData = ref<CommonData[]>([])
 
-  const getTableData = async () => {
+  const getTableData = async (defaultDataContent?: CommonValue[]) => {
     if (!idGetter(tableName)) {
       return
     }
@@ -28,7 +28,7 @@ export function useTable(
         message,
       } = await Query<CommonData>({
         id: idGetter(tableName),
-        dataContent,
+        dataContent: defaultDataContent ?? dataContent,
       })
       if (Number(code) !== 0) {
         throw new Error(message || '失败')
@@ -36,9 +36,10 @@ export function useTable(
       tableColumns.value = columnSet.map(column => ({
         ...column,
         width:
-          tableName === 'flight' &&
-          ['IATACode', 'flightNO'].includes(column.columnName) &&
-          80,
+          (tableName === 'flight' &&
+            ['IATACode', 'flightNO'].includes(column.columnName) &&
+            80) ||
+          undefined,
       }))
       tableData.value = listValues.filter(
         row =>
@@ -56,7 +57,7 @@ export function useTable(
   }
 
   onMounted(() => {
-    getTableData()
+    getTableData([null, null, null])
   })
 
   return {

src/views/dataQuery/flight/FlightView.vue

@@ -0,0 +1,18 @@
+<template>
+  <FlightView :name="viewName" />
+</template>
+
+<script lang="ts">
+import FlightView from '@/views/realTime/components/FlightView/index.vue'
+
+export default defineComponent({
+  name: 'DepartureFlightView',
+  components: { FlightView },
+  props: {
+    viewName: {
+      type: String,
+      default: 'DepartureFlight',
+    },
+  },
+})
+</script>

src/views/dataQuery/flightQuery/index.vue

@@ -1,284 +0,0 @@
-<template>
-  <div class="airportInfo scroll-y">
-    <div class="wrap">
-      <Minheader
-        :is-Search="true"
-        :is-statuser="true"
-        :is-Show="true"
-        :is-Time="true"
-        search-permission="flight_query_search_button"
-        column-set-permission="flight_query_column_setting_button"
-        @showForm="showForm"
-        @searchForm="searchForm"
-      >
-        <template #header>
-          <div class="status flex-wrap">
-            <div class="manageTitle">航班查询</div>
-          </div>
-        </template></Minheader
-      >
-      <div class="app-containers">
-        <DataTable
-          :tableHeader="tableCols"
-          :tableData="tableData"
-          :tableProperty="{ rowKey: 'ID' }"
-        />
-      </div>
-      <!-- <Dialog
-        :flag="dialogFlag"
-        class="dialog-check-group"
-        msgTitle="列设置"
-        @resetForm="columnForm"
-      >
-        <div class="dialog-wrapper">
-          <div class="content">
-            <el-tree
-              :data="tableCols"
-              :class="colsCheckClass"
-              show-checkbox
-              node-key="index"
-              :default-expand-all="true"
-              :props="{
-                label: 'label',
-                children: 'children',
-              }"
-              :default-checked-keys="checkedKeysTemp"
-            />
-          </div>
-        </div>
-      </Dialog> -->
-      <TableColumnSet
-        :dialogVisible="dialogVisible"
-        :columnList="tableCols"
-        @closeDialog="closeDialog"
-      />
-    </div>
-  </div>
-</template>
-<script setup lang="ts">
-import DataTable from "@/components/tableTemp/index.vue";
-import Minheader from "@/components/minheader/index.vue";
-import Dialog from "@/components/dialog/index.vue";
-import TableColumnSet from "@/components/tableColumnSet/index.vue";
-import { Query, GeneralDataReception } from "@/api/webApi";
-import { ElMessage } from "element-plus";
-const page = ref<number>(0); //分页参数
-const dataContent = ref<object>({});
-const noMore = ref<Boolean>(false);
-const rowTitle = ref<String>("");
-const tableCols = ref([]); //表头数据
-const serviceId = ref<String>("");
-const tableObj = ref({}); //增删改数据缓存
-const dialogVisible = ref<Boolean>(false); //列设置弹窗开关
-// const tableCols = ref([
-//   {
-//     prop: "flightNO",
-//     label: "航班号",
-//     desc: "指航班编号",
-//     width: 80,
-//     fixed: "left",
-//     filterable: true,
-//     sortable: true,
-//   },
-//   {
-//     prop: "flightDate",
-//     label: "执飞日期",
-//     desc:
-//       "指航班计划起飞日期（不变的，机票上），不是预计起飞日期（预计起飞时间可能多个），也不是实际起飞日期（实际起飞等于最后预计）",
-//     width: 105,
-//     fixed: "left",
-//     filterable: true,
-//     sortable: true,
-//   },
-//   {
-//     prop: "planDepartureTime",
-//     label: "起飞时间",
-//     desc:
-//       "根据优先级别显示时间。优先级别：1.实际起飞时间，2.预计起飞时间，3.计划起飞时间",
-//     width: 150,
-//     filterable: true,
-//     sortable: true,
-//   },
-//   {
-//     prop: "targetAirport",
-//     label: "目的站",
-//     desc: "指航班执飞航段的目的航站，以航站三字码显示",
-//     filterable: true,
-//     sortable: true,
-//   },
-//   {
-//     prop: "departureBuild",
-//     label: "区域",
-//     desc: "指航班执飞航段的目的区域",
-//     filterable: true,
-//     sortable: true,
-//   },
-//   {
-//     prop: "bordingGate",
-//     label: "登机口",
-//     desc: "指航班的登机口代码，数据是变化的，仅显示最新信息",
-//     filterable: true,
-//     sortable: true,
-//   },
-//   {
-//     prop: "standForDepartrue",
-//     label: "停机位",
-//     desc: "指航班的停机位代码，数据是变化的，仅显示最新信息",
-//     filterable: true,
-//     sortable: true,
-//   },
-//   {
-//     prop: "checkInTravellerNumber",
-//     label: "托运旅客",
-//     desc: "指航班已办理行李托运业务的旅客人数，含取消托运的旅客人数",
-//   },
-//   {
-//     prop: "checkInNumber",
-//     label: "值机数",
-//     desc: "指已办理值机托运的行李数量，含取消托运的行李数量，含未激活",
-//   },
-//   {
-//     prop: "unActive",
-//     label: "未激活",
-//     desc:
-//       "指最后的 BSM 报文“.S”中行李状态为“I”的行李数量，含取消托运的行李数量",
-//   },
-//   {
-//     prop: "preLoad",
-//     label: "预计装载",
-//     desc: "指已办理值机托运的行李数量，不含取消托运的行李数量，不包含未激活",
-//   },
-//   {
-//     prop: "checkNumber",
-//     label: "安检",
-//     desc: "指进行安检的行李数量，含取消托运的行李数量",
-//   },
-//   {
-//     prop: "sortNumber",
-//     label: "分拣",
-//     desc: "指已分拣完成的行李数量，含取消托运的行李数量",
-//   },
-//   {
-//     prop: "loadNumber",
-//     label: "装车",
-//     desc: "指已在分拣口装车完成的行李数量，含取消托运的行李数量",
-//   },
-//   {
-//     prop: "boardID",
-//     label: "装机",
-//     desc: "指装机完成的行李数量，不含取消托运的行李数量",
-//   },
-//   {
-//     prop: "tounLoad",
-//     label: "待翻减",
-//     desc:
-//       "指旅客在办理行李托运后，旅客取消该行李的托运并且行李此时已经过装车节点，而没有完成翻减的行李数量（须翻减总数减去已翻减数）",
-//   },
-//   {
-//     prop: "OFFCount",
-//     label: "已翻减",
-//     desc:
-//       "指旅客在办理行李托运后，旅客取消该行李的托运并且行李此时已经过装车节点，且已完成翻减的行李数量",
-//   },
-//   {
-//     prop: "noCheckInNumber",
-//     label: "取消托运",
-//     desc: "指旅客在办理行李托运后，又取消托运的行李总数量",
-//   },
-//   {
-//     prop: "noBSM",
-//     label: "无BSM",
-//     desc: "行李有处理信息（BPM）但无值机信息(BSM)的行李数量",
-//   },
-//   {
-//     prop: "warning",
-//     label: "风险预警",
-//     desc:
-//       "指依据航班信息中预计起飞时间和当前时间差，与根据分拣到停机位设置的报警阈值对比，超过阈值的为风险行李，本项显示风险预警行李数量",
-//   },
-//   {
-//     prop: "exceptions",
-//     label: "未装机行李",
-//     desc: "指航班关闭货舱门后，应装而未装的行李数量",
-//   },
-//   {
-//     prop: "midIn",
-//     label: "中转进行李",
-//     desc: "指从其他航班中转到当前航班的行李数量",
-//   },
-// ]);
-//列表
-const tableData = ref([]);
-//表头
-const state = reactive({
-  list: [
-    { label: "起飞航站", key: "name" },
-    { label: "目的航站", key: "china" },
-    { label: "航班号", key: "englin" },
-    { label: "航班日期", key: "two" },
-    { label: "直达/中转", key: "three" },
-    { label: "货代数", key: "text" },
-    { label: "运单数", key: "text1" },
-    { label: "货物数", key: "text2" },
-    { label: "机型", key: "text3" },
-    { label: "航司", key: "text4" },
-  ],
-  listLoading: true,
-});
-//列设置
-const showForm = () => {
-  dialogVisible.value = true;
-};
-//列设置取消
-const closeDialog = () => {
-  dialogVisible.value = false;
-};
-//获取表格数据
-const getQuery = async (data) => {
-  try {
-    const { code, returnData } = await Query({
-      id: DATACONTENT_ID.flightTabId,
-      needPage: 1,
-      dataContent: data,
-    });
-    if (code === "0") {
-      if (returnData.listValues.length === 0) {
-        page.value--;
-        noMore.value = true;
-      }
-      const titleColumn = returnData.columnSet.find(
-        (item) => item.needShow === 1
-      );
-      if (titleColumn) {
-        rowTitle.value = titleColumn.columnName;
-      }
-      tableData.value.push(...returnData.listValues);
-      tableCols.value = returnData.columnSet;
-      tableCols.value.forEach((element) => {
-        element.label = element.columnLabel;
-        element.key = element.columnName;
-        // if (element.columnName === "queryTemplate") {
-        //   element.width = "300px";
-        // }
-      });
-      serviceId.value = returnData.submitID;
-    } else {
-      page.value--;
-    }
-  } catch (error) {
-    page.value--;
-  }
-};
-const searchForm = (data) => {
-  tableData.value = [];
-  getQuery(data);
-};
-</script>
-<style lang="scss" scoped>
-::v-deep .el-form-item__label {
-  width: 100px;
-}
-.app-containers {
-  height: calc(100vh - 180px);
-}
-</style>

src/views/dataQuery/freightQuery/index.vue

@@ -1,129 +0,0 @@
-<template>
-  <div class="airportInfo scroll-y">
-    <div class="wrap">
-      <Minheader
-        :is-Search="true"
-        :is-statuser="true"
-        :is-Show="true"
-        :is-Time="true"
-        search-permission="goods_query_search_button"
-        column-set-permission="goods_query_column_settings_button"
-        @showForm="showForm"
-        @searchForm="searchForm"
-      >
-        <template #header>
-          <div class="status flex-wrap">
-            <div class="manageTitle">货物查询</div>
-          </div>
-        </template></Minheader
-      >
-      <div class="app-containers">
-        <DataTable
-          :tableHeader="tableCols"
-          :tableData="tableData"
-          :tableProperty="{ rowKey: 'ID' }"
-        />
-      </div>
-      <TableColumnSet
-        :dialogVisible="dialogVisible"
-        :columnList="tableCols"
-        @closeDialog="closeDialog"
-      />
-    </div>
-  </div>
-</template>
-<script setup lang="ts">
-import DataTable from "@/components/tableTemp/index.vue";
-import Minheader from "@/components/minheader/index.vue";
-import Dialog from "@/components/dialog/index.vue";
-import TableColumnSet from "@/components/tableColumnSet/index.vue";
-import { Query, GeneralDataReception } from "@/api/webApi";
-import { ElMessage } from "element-plus";
-const page = ref<number>(0); //分页参数
-const dataContent = ref<object>({});
-const noMore = ref<Boolean>(false);
-const rowTitle = ref<String>("");
-const tableCols = ref([]); //表头数据
-const serviceId = ref<String>("");
-const tableObj = ref({}); //增删改数据缓存
-const dialogVisible = ref<Boolean>(false); //列设置弹窗开关
-//列表
-const tableData = ref([]);
-//表头
-const state = reactive({
-  list: [
-    { label: "起飞航站", key: "name" },
-    { label: "目的航站", key: "china" },
-    { label: "航班号", key: "englin" },
-    { label: "航班日期", key: "two" },
-    { label: "直达/中转", key: "three" },
-    { label: "货物牌号", key: "text" },
-    { label: "特殊货物类型", key: "text1" },
-    { label: "位置（节点）", key: "text2" },
-    { label: "状态（节点）", key: "text3" },
-    { label: "运单号", key: "text4" },
-    { label: "值机号", key: "text5" },
-    { label: "安检序号", key: "text6" },
-    { label: "货代", key: "text7" },
-    { label: "货代等级", key: "text8" },
-    { label: "批次号", key: "text9" },
-  ],
-  listLoading: true,
-});
-//列设置
-const showForm = () => {
-  dialogVisible.value = true;
-};
-//列设置取消
-const closeDialog = () => {
-  dialogVisible.value = false;
-};
-//获取表格数据
-const getQuery = async (data) => {
-  try {
-    const { code, returnData } = await Query({
-      id: DATACONTENT_ID.goodsTabId,
-      needPage: 1,
-      dataContent: data,
-    });
-    if (code === "0") {
-      if (returnData.listValues.length === 0) {
-        page.value--;
-        noMore.value = true;
-      }
-      const titleColumn = returnData.columnSet.find(
-        (item) => item.needShow === 1
-      );
-      if (titleColumn) {
-        rowTitle.value = titleColumn.columnName;
-      }
-      tableData.value.push(...returnData.listValues);
-      tableCols.value = returnData.columnSet;
-      tableCols.value.forEach((element) => {
-        element.label = element.columnLabel;
-        element.key = element.columnName;
-        // if (element.columnName === "queryTemplate") {
-        //   element.width = "300px";
-        // }
-      });
-      serviceId.value = returnData.submitID;
-    } else {
-      page.value--;
-    }
-  } catch (error) {
-    page.value--;
-  }
-};
-const searchForm = (data) => {
-  tableData.value = [];
-  getQuery(data);
-};
-</script>
-<style lang="scss" scoped>
-::v-deep .el-form-item__label {
-  width: 100px;
-}
-.app-containers {
-  height: calc(100vh - 180px);
-}
-</style>

src/views/dataQuery/waybill/WaybillView.vue

@@ -0,0 +1,18 @@
+<template>
+  <WaybillView :name="viewName" />
+</template>
+
+<script lang="ts">
+import WaybillView from '@/views/realTime/components/WaybillView/index.vue'
+
+export default defineComponent({
+  name: 'DepartureWaybillView',
+  components: { WaybillView },
+  props: {
+    viewName: {
+      type: String,
+      default: 'DepartureWaybill',
+    },
+  },
+})
+</script>

src/views/dataQuery/waybillQuery/index.vue

@@ -1,125 +0,0 @@
-<template>
-  <div class="airportInfo scroll-y">
-    <div class="wrap">
-      <Minheader
-        :is-Search="true"
-        :is-statuser="true"
-        :is-Show="true"
-        :is-Time="true"
-        search-permission="waybill_query_search_button"
-        column-set-permission="waybill_query_column_settings_button"
-        @showForm="showForm"
-        @searchForm="searchForm"
-      >
-        <template #header>
-          <div class="status flex-wrap">
-            <div class="manageTitle">运单查询</div>
-          </div>
-        </template></Minheader
-      >
-      <div class="app-containers">
-        <DataTable
-          :tableHeader="tableCols"
-          :tableData="tableData"
-          :tableProperty="{ rowKey: 'ID' }"
-        />
-      </div>
-      <TableColumnSet
-        :dialogVisible="dialogVisible"
-        :columnList="tableCols"
-        @closeDialog="closeDialog"
-      />
-    </div>
-  </div>
-</template>
-<script setup lang="ts">
-import DataTable from "@/components/tableTemp/index.vue";
-import Minheader from "@/components/minheader/index.vue";
-import Dialog from "@/components/dialog/index.vue";
-import TableColumnSet from "@/components/tableColumnSet/index.vue";
-import { Query, GeneralDataReception } from "@/api/webApi";
-import { ElMessage } from "element-plus";
-const page = ref<number>(0); //分页参数
-const dataContent = ref<object>({});
-const noMore = ref<Boolean>(false);
-const rowTitle = ref<String>("");
-const tableCols = ref([]); //表头数据
-const serviceId = ref<String>("");
-const tableObj = ref({}); //增删改数据缓存
-const dialogVisible = ref<Boolean>(false); //列设置弹窗开关
-//列表
-const tableData = ref([]);
-//表头
-const state = reactive({
-  list: [
-    { label: "起飞航站", key: "name" },
-    { label: "目的航站", key: "china" },
-    { label: "航班号", key: "englin" },
-    { label: "航班日期", key: "two" },
-    { label: "直达/中转", key: "three" },
-    { label: "运单编号", key: "text" },
-    { label: "重量", key: "text1" },
-    { label: "位置（节点）", key: "text2" },
-    { label: "状态（节点）", key: "text3" },
-    { label: "名称（货代）", key: "text4" },
-    { label: "货代等级（货代）", key: "text5" },
-  ],
-  listLoading: true,
-});
-//列设置
-const showForm = () => {
-  dialogVisible.value = true;
-};
-//列设置取消
-const closeDialog = () => {
-  dialogVisible.value = false;
-};
-//获取表格数据
-const getQuery = async (data) => {
-  try {
-    const { code, returnData } = await Query({
-      id: DATACONTENT_ID.waybillTabId,
-      needPage: 1,
-      dataContent: data,
-    });
-    if (code === "0") {
-      if (returnData.listValues.length === 0) {
-        page.value--;
-        noMore.value = true;
-      }
-      const titleColumn = returnData.columnSet.find(
-        (item) => item.needShow === 1
-      );
-      if (titleColumn) {
-        rowTitle.value = titleColumn.columnName;
-      }
-      tableData.value.push(...returnData.listValues);
-      tableCols.value = returnData.columnSet;
-      tableCols.value.forEach((element) => {
-        element.label = element.columnLabel;
-        element.key = element.columnName;
-        // if (element.columnName === "queryTemplate") {
-        //   element.width = "300px";
-        // }
-      });
-      serviceId.value = returnData.submitID;
-    } else {
-      page.value--;
-    }
-  } catch (error) {
-    page.value--;
-  }
-};
-const searchForm = (data) => {
-  tableData.value = [];
-  getQuery(data);
-};
-</script>
-<style lang="scss" scoped>
-::v-deep .el-form-item__label {
-  width: 100px;
-}
-.app-containers {
-  height: calc(100vh - 180px);
-}
-</style>

src/views/realTime/components/AirportView/index.vue

@@ -340,13 +340,13 @@ const defaultSortFunction = (a: CommonData, b: CommonData) => {
     }
   }
 
-  if (a.hasTakenOff) {
-    if (b.hasTakenOff) {
+  if (a.hasTakenOff === 'Y') {
+    if (b.hasTakenOff === 'Y') {
       return departureTimeCompare(a, b)
     } else {
       return -1
     }
-  } else if (b.hasTakenOff) {
+  } else if (b.hasTakenOff === 'Y') {
     return 1
   } else {
     if (a.loadPlaneSureTime) {

src/views/realTime/components/FlightView/useFlightInfo.ts

@@ -92,10 +92,10 @@ const flightInfoItemsMap = {
         label: '特货信息/货物数',
         key: 'speCargoInfo',
       },
-      {
-        label: '卸载运单数/货物数',
-        key: 'unLoadListInfo',
-      },
+      // {
+      //   label: '卸载运单数/货物数',
+      //   key: 'unLoadListInfo',
+      // },
       // {
       //   label: '中转进运单/货物数',
       //   key: "transIn",

src/views/realTime/components/WaybillView/index.vue

@@ -171,7 +171,6 @@ watch(trackData, data => {
       typeof nodeCode === 'string' && anotherAirportNodes.includes(nodeCode)
   )
   if (!hasAnotherAirportData) {
-    console.log(1)
     tableColumns.value = tableColumns.value.filter(
       ({ className }) =>
         typeof className !== 'string' ||