صفحهٔ اصلی گشت‌و‌گذار راهنما
ثبت نام ورود
BFFE
/
SZYGM1.0
2
0
انشعاب 0
پرونده‌ها مشکلات 0 درخواست واکشی 0 ویکی
فهرست منبع

2.16修改建议

zhongxiaoyu 2 سال پیش
والد
ee3df7b912
کامیت
a35c377fbb
14فایلهای تغییر یافته به همراه277 افزوده شده و 91 حذف شده
مشاهده تقسیم شده نمایش آمار تفاوت ها
  1. 3 2
      index.html
  2. 1 3
      public/configLoader.js
  3. 28 21
      src/components/SimpleTable/index.vue
  4. 2 2
      src/router/routes/routes-file-five.ts
  5. 12 12
      src/router/routes/routes-file-six.ts
  6. 115 28
      src/views/dataQuery/components/DataQueryView/index.vue
  7. 25 9
      src/views/dataQuery/components/DataQueryView/useTable.ts
  8. 1 1
      src/views/realTime/components/AirportView/AirportForm.vue
  9. 61 3
      src/views/realTime/components/AirportView/index.vue
  10. 3 3
      src/views/realTime/components/AirportView/useAirportTable.ts
  11. 8 2
      src/views/realTime/components/CountBox/index.vue
  12. 8 0
      src/views/realTime/components/FlightView/useFlightInfo.ts
  13. 6 1
      src/views/realTime/components/WaybillView/useWaybillInfo.ts
  14. 4 4
      src/views/realTime/hooks/useTrackData.ts

+ 3 - 2
index.html
مشاهده فایل 

@@ -6,11 +6,12 @@
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
     <title><%= title %></title>
 
     <%- injectScript %>
 
-    <script src="./configLoader.js"></script>
 
+    <script src="./config.js" id="configJS" type="text/javascript"></script>
 
+    <script src="./configLoader.js" type="text/javascript"></script>
 
   </head>
 
   <body>
 
     <div id="app"></div>
 
-    <script src="./nodeCode.js"></script>
 
     <script type="module" src="/src/main.ts"></script>
 
+    <script src="./nodeCode.js" type="text/javascript"></script>
 
   </body>
 
 </html>

+ 1 - 3
public/configLoader.js
مشاهده فایل 

@@ -1,5 +1,3 @@
 
-setConfigJS()
 
-
 
 if (!window.configLoadLoop) {
 
   window.configLoadLoop = setInterval(function () {
 
     document.head.removeChild(document.getElementById('configJS'))
 
@@ -11,6 +9,6 @@ function setConfigJS() {
 
   const config = document.createElement('script')
 
   config.id = 'configJS'
 
   config.type = 'text/javascript'
 
-  config.src = './config.js?t=' + new Date().getTime()
 
+  config.src = './config.js?t=' + Date.now()
 
   document.head.appendChild(config)
 
 }

+ 28 - 21
src/components/SimpleTable/index.vue
مشاهده فایل 

@@ -2,6 +2,7 @@
 
   <el-table
 
     ref="table"
 
     v-bind="tableProps"
 
+    v-el-table-infinite-scroll="scrollOver"
 
     :data="dealedTableData"
 
     @cell-click="(...args:any[]) => { emit('cellClick', ...args) }"
 
     @cell-contextmenu="(...args:any[]) => { emit('cellContextmenu', ...args) }"
 
@@ -207,28 +208,29 @@ const props = withDefaults(
 
   }
 
 )
 
 
-const defaultSummaryMethod = ({ columns, data }) => {
 
-  const sums: (string | number)[] = []
 
+const defaultSummaryMethod: SummaryMethod<CommonData> = ({ columns, data }) => {
 
+  const sums: string[] = []
 
   columns.forEach((column, index) => {
 
-    tableColumns.value.forEach(col => {
 
-      if (column.property === col.columnName && col.needCount) {
 
-        sums[index] = data.reduce((prev: number, curr: CommonData) => {
 
-          const cellData = curr[column.property]
 
-          if (col.countMode === 'all') {
 
-            return prev + 1
 
-          }
 
-          if (col.countMode === 'notNull') {
 
-            return cellData ? prev + 1 : prev
 
-          }
 
-          const value = Number(cellData)
 
-          if (!isNaN(value)) {
 
-            return prev + value
 
-          } else {
 
-            return prev
 
-          }
 
-        }, 0)
 
-      }
 
-    })
 
+    const countColumn = tableColumns.value.find(
 
+      col => column.property === col.columnName && col.needCount
 
+    )
 
+    if (countColumn) {
 
+      const sumNumber = data.reduce((prev: number, curr: CommonData) => {
 
+        const cellData = curr[column.property]
 
+        if (countColumn.countMode === 'all') {
 
+          return prev + 1
 
+        }
 
+        if (countColumn.countMode === 'notNull') {
 
+          return cellData ? prev + 1 : prev
 
+        }
 
+        const value = Number(cellData)
 
+        if (!Number.isNaN(value)) {
 
+          prev += value
 
+        }
 
+        return prev
 
+      }, 0)
 
+      sums[index] = sumNumber.toString()
 
+    }
 
   })
 
   sums[0] = '合计：' + (sums[0] ?? '')
 
   return sums
 
@@ -342,8 +344,13 @@ const emit = defineEmits([
 
   'headerDragend',
 
   'expandChange',
 
   'sortRuleChange',
 
+  'scrollOver',
 
 ])
 
 
+const scrollOver = () => {
 
+  emit('scrollOver')
 
+}
 
+
 
 const table = ref<InstanceType<typeof ElTable> | null>(null)
 
 defineExpose({
 
   table,

+ 2 - 2
src/router/routes/routes-file-five.ts
مشاهده فایل 

@@ -25,7 +25,7 @@ const HomeRoutes = {
 
       },
 
       children: [
 
         {
 
-          path: '/dataQuery/flightQuery',
 
+          path: '',
 
           name: 'FlightQueryView',
 
           meta: { title: '航班查询', breadcrumb: false },
 
           component: () => import('@/views/dataQuery/flight/index.vue'),
 
@@ -52,7 +52,7 @@ const HomeRoutes = {
 
       },
 
       children: [
 
         {
 
-          path: '/dataQuery/waybillQuery',
 
+          path: '',
 
           name: 'WaybillQueryView',
 
           meta: { title: '运单查询', breadcrumb: false },
 
           component: () => import('@/views/dataQuery/waybill/index.vue'),

+ 12 - 12
src/router/routes/routes-file-six.ts
مشاهده فایل 

@@ -31,7 +31,7 @@ const ActualTimeRoutes = {
 
           component: KeepAliveRouterView('DepartureAirport'),
 
           children: [
 
             {
 
-              path: '/realTime/departure/airport',
 
+              path: '',
 
               name: 'DepartureAirportView',
 
               meta: { keepAlive: true },
 
               component: () =>
 
@@ -46,7 +46,7 @@ const ActualTimeRoutes = {
 
               component: KeepAliveRouterView('DepartureFlight'),
 
               children: [
 
                 {
 
-                  path: '/realTime/departure/flight',
 
+                  path: '',
 
                   name: 'DepartureFlightView',
 
                   meta: { keepAlive: true },
 
                   component: () =>
 
@@ -61,7 +61,7 @@ const ActualTimeRoutes = {
 
                   component: KeepAliveRouterView('DepartureWaybill'),
 
                   children: [
 
                     {
 
-                      path: '/realTime/departure/waybill',
 
+                      path: '',
 
                       name: 'DepartureWaybillView',
 
                       meta: { keepAlive: true },
 
                       component: () =>
 
@@ -102,7 +102,7 @@ const ActualTimeRoutes = {
 
           component: KeepAliveRouterView('ArrivalAirport'),
 
           children: [
 
             {
 
-              path: '/realTime/arrival/airport',
 
+              path: '',
 
               name: 'ArrivalAirportView',
 
               meta: { keepAlive: true },
 
               component: () =>
 
@@ -117,7 +117,7 @@ const ActualTimeRoutes = {
 
               component: KeepAliveRouterView('ArrivalFlight'),
 
               children: [
 
                 {
 
-                  path: '/realTime/arrival/flight',
 
+                  path: '',
 
                   name: 'ArrivalFlightView',
 
                   meta: { keepAlive: true },
 
                   component: () =>
 
@@ -132,7 +132,7 @@ const ActualTimeRoutes = {
 
                   component: KeepAliveRouterView('ArrivalWaybill'),
 
                   children: [
 
                     {
 
-                      path: '/realTime/arrival/waybill',
 
+                      path: '',
 
                       name: 'ArrivalWaybillView',
 
                       meta: { keepAlive: true },
 
                       component: () =>
 
@@ -173,7 +173,7 @@ const ActualTimeRoutes = {
 
           component: KeepAliveRouterView('InternationalDepartureAirport'),
 
           children: [
 
             {
 
-              path: '/realTime/internationalDeparture/airport',
 
+              path: '',
 
               name: 'InternationalDepartureAirportView',
 
               meta: { keepAlive: true },
 
               component: () =>
 
@@ -190,7 +190,7 @@ const ActualTimeRoutes = {
 
               component: KeepAliveRouterView('InternationalDepartureFlight'),
 
               children: [
 
                 {
 
-                  path: '/realTime/internationalDeparture/flight',
 
+                  path: '',
 
                   name: 'InternationalDepartureFlightView',
 
                   meta: { keepAlive: true },
 
                   component: () =>
 
@@ -209,7 +209,7 @@ const ActualTimeRoutes = {
 
                   ),
 
                   children: [
 
                     {
 
-                      path: '/realTime/internationalDeparture/waybill',
 
+                      path: '',
 
                       name: 'InternationalDepartureWaybillView',
 
                       meta: { keepAlive: true },
 
                       component: () =>
 
@@ -254,7 +254,7 @@ const ActualTimeRoutes = {
 
           component: KeepAliveRouterView('InternationalArrivalAirport'),
 
           children: [
 
             {
 
-              path: '/realTime/internationalArrival/airport',
 
+              path: '',
 
               name: 'InternationalArrivalAirportView',
 
               meta: { keepAlive: true },
 
               component: () =>
 
@@ -271,7 +271,7 @@ const ActualTimeRoutes = {
 
               component: KeepAliveRouterView('InternationalArrivalFlight'),
 
               children: [
 
                 {
 
-                  path: '/realTime/internationalArrival/flight',
 
+                  path: '',
 
                   name: 'InternationalArrivalFlightView',
 
                   meta: { keepAlive: true },
 
                   component: () =>
 
@@ -288,7 +288,7 @@ const ActualTimeRoutes = {
 
                   component: KeepAliveRouterView('InternationalArrivalWaybill'),
 
                   children: [
 
                     {
 
-                      path: '/realTime/internationalArrival/waybill',
 
+                      path: '',
 
                       name: 'InternationalArrivalWaybillView',
 
                       meta: { keepAlive: true },
 
                       component: () =>

+ 115 - 28
src/views/dataQuery/components/DataQueryView/index.vue
مشاهده فایل 

@@ -9,7 +9,7 @@
 
         :rules="rules"
 
         @submit.native.prevent
 
       >
 
-        <div v-if="name !== 'waybill'" class="form-left">
 
+        <div v-if="name === 'freight'" class="form-dates">
 
           <el-form-item prop="startDate">
 
             <el-date-picker
 
               v-model="formData.startDate"
 
@@ -36,17 +36,43 @@
 
             />
 
           </el-form-item>
 
         </div>
 
-        <div class="form-right">
 
+        <div class="form-keyWords">
 
           <el-form-item prop="keyWords">
 
             <el-input
 
               v-model.trim="formData.keyWords"
 
               size="default"
 
-              placeholder="请输入要搜索的内容"
 
+              :placeholder="keyWordsPlaceHolder"
 
               :prefix-icon="Search"
 
               clearable
 
               @keyup.enter.prevent="dataQuery"
 
             />
 
           </el-form-item>
 
+          <el-form-item v-if="name === 'flight'" prop="company">
 
+            <el-select
 
+              v-model="formData.company"
 
+              size="default"
 
+              placeholder="请选择航空公司进行搜索"
 
+              clearable
 
+            >
 
+              <el-option
 
+                v-for="{ value, label } in companyOptions"
 
+                :key="value"
 
+                :value="value"
 
+                :label="label"
 
+              />
 
+            </el-select>
 
+          </el-form-item>
 
+          <el-form-item v-if="name === 'flight'" prop="flightDate">
 
+            <el-date-picker
 
+              v-model="formData.flightDate"
 
+              format="YYYY-MM-DD"
 
+              value-format="YYYY-MM-DD"
 
+              size="default"
 
+              type="date"
 
+              placeholder="请选择航班日期"
 
+              :clearable="false"
 
+            />
 
+          </el-form-item>
 
         </div>
 
       </el-form>
 
       <el-button size="default" type="primary" @click="dataQuery"
 
@@ -60,7 +86,6 @@
 
     <div
 
       v-loading="loading"
 
       element-loading-text="拼命加载中"
 
-      element-loading-spinner="el-icon-loading"
 
       element-loading-background="rgba(0, 0, 0, 0.8)"
 
       class="data-query-table"
 
     >
 
@@ -71,6 +96,7 @@
 
         :cell-class-name="cellClass"
 
         :column-props="{ formatter }"
 
         @cell-click="cellClickHandler"
 
+        @scroll-over="load"
 
       />
 
     </div>
 
   </div>
 
@@ -85,6 +111,7 @@ import { parseTime } from '@/utils/validate'
 
 import { useTable } from './useTable'
 
 import { useTableColumnSet } from '@/hooks/useTableColumnSet'
 
 import { CommonTableFormatter } from '~/common'
 
+import { Query } from '@/api/webApi'
 
 
 const props = defineProps({
 
   name: {
 
@@ -99,9 +126,11 @@ const props = defineProps({
 
 
 const today = parseTime(new Date(), '{y}-{m}-{d}') as string
 
 const formData = reactive({
 
-  startDate: props.name === 'waybill' ? null : today,
 
-  endDate: props.name === 'waybill' ? null : today,
 
+  startDate: today,
 
+  endDate: today,
 
   keyWords: '',
 
+  company: '',
 
+  flightDate: today,
 
 })
 
 watchEffect(() => {
 
   if (!formData.startDate || !formData.endDate) {
 
@@ -127,12 +156,45 @@ const datePreTitle = (title: string) => {
 
   return <div class="date-pre-title">{title}：</div>
 
 }
 
 
-const keyWordsValidator = (rule: any, value: any, callback: any) => {
 
-  const searchTitleMap = {
 
-    flight: '航班号',
 
-    waybill: '运单号',
 
-    freight: '货物编码',
 
+const searchTitleMap = {
 
+  flight: '航班号',
 
+  waybill: '运单号',
 
+  freight: '货物编码',
 
+}
 
+
 
+const keyWordsPlaceHolder = computed(
 
+  () => `请输入${searchTitleMap[props.name] ?? '内容'}进行搜索`
 
+)
 
+
 
+const companyOptions = ref<{ value: string; label: string }[]>([])
 
+const getCompanys = async () => {
 
+  try {
 
+    const {
 
+      code,
 
+      returnData: { listValues },
 
+      message,
 
+    } = await Query<{ [x: string]: string }>({
 
+      id: DATACONTENT_ID.twoCharacterOptions,
 
+      dataContent: [],
 
+    })
 
+    if (Number(code) !== 0) {
 
+      throw new Error(message || '失败')
 
+    }
 
+    companyOptions.value = listValues.map(({ v }) => ({
 
+      value: v,
 
+      label: v,
 
+    }))
 
+  } catch (error) {
 
+    console.error(error)
 
   }
 
+}
 
+onMounted(() => {
 
+  if (props.name === 'flight') {
 
+    getCompanys()
 
+  }
 
+})
 
+
 
+const keyWordsValidator = (rule: any, value: any, callback: any) => {
 
   const searchTitle = searchTitleMap[props.name] ?? '关键词'
 
   if (!value) {
 
     if (['flight'].includes(props.name)) {
 
@@ -143,8 +205,8 @@ const keyWordsValidator = (rule: any, value: any, callback: any) => {
 
   }
 
   const regsMap: { [x: string]: RegExp[] } = {
 
     // flight: [/^[A-Za-z0-9][A-Za-z][0-9]{3,4}$/, /^[0-9]{3,4}$/],
 
-    flight: [/^[A-Za-z0-9]{1,6}$/],
 
-    waybill: [/^[0-9]{3}\-[0-9]{8}/],
 
+    flight: [/^[0-9]{1,4}$/],
 
+    waybill: [/^[0-9]{8}$/, /^[0-9]{3}\-[0-9]{8}$/],
 
     freight: [/^[0-9]{5}$/, /^[0-9]{3}\-[0-9]{8}\-[0-9]{5}$/],
 
   }
 
   const regs = regsMap[props.name] ?? []
 
@@ -158,22 +220,40 @@ const rules = {
 
   startDate: [{ required: true, message: '请选择开始日期', trigger: 'blur' }],
 
   endDate: [{ required: true, message: '请选择结束日期', trigger: 'blur' }],
 
   keyWords: [{ validator: keyWordsValidator, trigger: 'blur' }],
 
+  flightDate: [{ required: true, message: '请选择航班日期', trigger: 'blur' }],
 
 }
 
 const formRef = ref<FormInstance | null>()
 
 const dataQuery = () => {
 
   formRef.value?.validate(valid => {
 
     if (valid) {
 
-      getTableData()
 
+      tableInit()
 
+      load()
 
     }
 
   })
 
 }
 
 
 const loading = ref(false)
 
+const page = ref(1)
 
+const noMore = ref(false)
 
 const { tableColumns, tableData, getTableData } = useTable(
 
   props.name,
 
   formData,
 
+  page,
 
+  noMore,
 
   loading
 
 )
 
+const load = () => {
 
+  if (loading.value || noMore.value) {
 
+    return
 
+  }
 
+  page.value++
 
+  getTableData()
 
+}
 
+const tableInit = () => {
 
+  page.value = 0
 
+  noMore.value = false
 
+  tableData.value = []
 
+}
 
 
 const { columnChecked } = useTableColumnSet(tableColumns)
 
 
@@ -293,19 +373,38 @@ const cellClickHandler = (row, column, cell, event) => {
 
     flex: 1;
 
     display: flex;
 
     justify-content: flex-end;
 
-    .form-left {
 
+    .form-dates {
 
       flex: 1;
 
       display: flex;
 
       .el-form-item {
 
         width: 168px;
 
         margin-right: 8px;
 
+        .el-date-editor {
 
+          .el-input__prefix {
 
+            flex-basis: 42px;
 
+            padding-left: 15px;
 
+            .date-pre-title {
 
+              font-style: normal;
 
+              font-size: 14px;
 
+              font-family: Microsoft YaHei;
 
+              color: #303133;
 
+            }
 
+          }
 
+        }
 
       }
 
     }
 
-    .form-right {
 
+    .form-keyWords {
 
       display: flex;
 
       justify-content: flex-end;
 
       .el-form-item {
 
         width: 280px;
 
+        &:not(:last-of-type) {
 
+          margin-right: 10px;
 
+        }
 
+        .el-select,
 
+        .el-date-editor {
 
+          width: 100%;
 
+        }
 
       }
 
     }
 
     .el-form-item {
 
@@ -316,18 +415,6 @@ const cellClickHandler = (row, column, cell, event) => {
 
         font-family: Helvetica, Microsoft YaHei;
 
         color: #303133;
 
       }
 
-      .el-date-editor {
 
-        .el-input__prefix {
 
-          flex-basis: 42px;
 
-          padding-left: 15px;
 
-          .date-pre-title {
 
-            font-style: normal;
 
-            font-size: 14px;
 
-            font-family: Microsoft YaHei;
 
-            color: #303133;
 
-          }
 
-        }
 
-      }
 
     }
 
   }
 
   &-table {

+ 25 - 9
src/views/dataQuery/components/DataQueryView/useTable.ts
مشاهده فایل 

@@ -1,12 +1,14 @@
 
 import { Query } from '@/api/webApi'
 
 import { Ref } from 'vue'
 
-import { CommonData, CommonTableColumn, CommonValue } from '~/common'
 
+import { CommonData, CommonTableColumn, CommonValue, MaybeRef } from '~/common'
 
 
 const idGetter = (name: string) => DATACONTENT_ID[name + 'DataQuery']
 
 
 export function useTable(
 
   tableName: string,
 
   formData: CommonData,
 
+  page: Ref<number>,
 
+  noMore: Ref<boolean>,
 
   loading?: Ref<boolean>
 
 ) {
 
   const tableColumns = ref<CommonTableColumn[]>([])
 
@@ -20,8 +22,11 @@ export function useTable(
 
       loading.value = true
 
     }
 
     try {
 
-      const { startDate, endDate, keyWords } = formData
 
-      const dataContent = [startDate, endDate, keyWords || null]
 
+      const { startDate, endDate, keyWords, company, flightDate } = formData
 
+      const dataContent =
 
+        tableName === 'flight'
 
+          ? [keyWords || null, company || null, flightDate]
 
+          : [startDate, endDate, keyWords || null]
 
       const {
 
         code,
 
         returnData: { columnSet, listValues },
 
@@ -29,6 +34,7 @@ export function useTable(
 
       } = await Query<CommonData>({
 
         id: idGetter(tableName),
 
         dataContent: defaultDataContent ?? dataContent,
 
+        needPage: page.value,
 
       })
 
       if (Number(code) !== 0) {
 
         throw new Error(message || '失败')
 
@@ -41,15 +47,25 @@ export function useTable(
 
             80) ||
 
           undefined,
 
       }))
 
-      tableData.value = listValues.filter(
 
-        row =>
 
-          !Object.values(row).some(
 
-            cellValue =>
 
-              typeof cellValue === 'string' && cellValue.includes('undefined')
 
+      if (listValues.length) {
 
+        tableData.value.push(
 
+          ...listValues.filter(
 
+            row =>
 
+              !Object.values(row).some(
 
+                cellValue =>
 
+                  typeof cellValue === 'string' &&
 
+                  cellValue.includes('undefined')
 
+              )
 
           )
 
-      )
 
+        )
 
+      } else {
 
+        page.value--
 
+        noMore.value = true
 
+      }
 
     } catch (error) {
 
       console.error(error)
 
+      page.value--
 
+      noMore.value = true
 
     }
 
     if (loading) {
 
       loading.value = false

+ 1 - 1
src/views/realTime/components/AirportView/AirportForm.vue
مشاهده فایل 

@@ -152,7 +152,7 @@ const flightStateOptions = ref([
 
 onMounted(() => {
 
   if (props.name.includes('InternationalDeparture')) {
 
     flightStateOptions.value.push({
 
-      label: '机场地服',
 
+      label: '机场代理',
 
       value: 'groundService',
 
     })
 
   }

+ 61 - 3
src/views/realTime/components/AirportView/index.vue
مشاهده فایل 

@@ -15,7 +15,7 @@
 
         />
 
         <CountBox
 
           :count-number="airportCount.weight"
 
-          label="已转载重量KG"
 
+          label="已转载重量（吨）"
 
           :length="8"
 
         />
 
       </div>
 
@@ -45,6 +45,7 @@
 
         scrollbar-always-on
 
         :stripe="false"
 
         show-summary
 
+        :summary-method="summaryMethod"
 
         :cache-keys="cacheKeys"
 
         :filter-sort-options="filterSortOptions"
 
         :label-formatter="tableColumnFormatter"
 
@@ -73,7 +74,7 @@ import { useLoop } from '@/hooks/useLoop'
 
 import { useTableSettingsStore } from '@/store/tableSettings'
 
 import { useFlightState } from './useFlightState'
 
 import { Query } from '@/api/webApi'
 
-import { ElMessage } from 'element-plus'
 
+import { ElMessage, SummaryMethod } from 'element-plus'
 
 
 const props = defineProps({
 
   name: {
 
@@ -125,7 +126,7 @@ const getAirportCount = async () => {
 
     const { flightNum, finishFlightNum, weight } = listValues[0]
 
     airportCount.flightNum = flightNum ?? 0
 
     airportCount.finishFlightNum = finishFlightNum ?? 0
 
-    airportCount.weight = weight ?? 0
 
+    airportCount.weight = weight ? parseFloat((weight / 1000).toFixed(2)) : 0
 
   } catch (error) {
 
     console.error(error)
 
   }
 
@@ -155,6 +156,63 @@ const { tableColumnFormatter, tableDataFormatter } = useFormatter(countFlag)
 
 
 // const UTCFlag = ref(true)
 
 
+const summaryMethod: SummaryMethod<CommonData> = ({ columns, data }) => {
 
+  const sums: string[] = []
 
+  columns.forEach((column, index) => {
 
+    const countColumn = tableColumns.value.find(
 
+      col => column.property === col.columnName && col.needCount
 
+    )
 
+    if (countColumn) {
 
+      if (countColumn.countMode === 'split') {
 
+        let sumArr = data.reduce((prev: number[], curr: CommonData) => {
 
+          const cellData = curr[column.property]
 
+          if (typeof cellData === 'string') {
 
+            const splitData = cellData.split('/')
 
+            splitData.forEach((str, i) => {
 
+              const num = Number(str)
 
+              if (!Number.isNaN(num)) {
 
+                if (prev[i]) {
 
+                  prev[i] += num
 
+                } else {
 
+                  prev[i] = num
 
+                }
 
+              }
 
+            })
 
+          }
 
+          return prev
 
+        }, [])
 
+        const matched = column.label.match(/(?<=\()\S+(?=\))/)
 
+        if (matched && !countFlag.value) {
 
+          const machedStr = matched[0]
 
+          const countIndex = machedStr.split('/').findIndex(str => str === '件')
 
+          if (countIndex > -1 && countIndex < sumArr.length) {
 
+            sumArr.splice(countIndex, 1)
 
+          }
 
+        }
 
+        sums[index] = sumArr.join('/')
 
+      } else {
 
+        const sumNumber = data.reduce((prev: number, curr: CommonData) => {
 
+          const cellData = curr[column.property]
 
+          if (countColumn.countMode === 'all') {
 
+            return prev + 1
 
+          }
 
+          if (countColumn.countMode === 'notNull') {
 
+            return cellData ? prev + 1 : prev
 
+          }
 
+          const value = Number(cellData)
 
+          if (!Number.isNaN(value)) {
 
+            prev += value
 
+          }
 
+          return prev
 
+        }, 0)
 
+        sums[index] = sumNumber.toString()
 
+      }
 
+    }
 
+  })
 
+  sums[0] = '合计：' + (sums[0] ?? '')
 
+  return sums
 
+}
 
+
 
 /* 离港视图默认的排序方式：
 
  * 1.已起飞排在前
 
  * 2.未起飞中已装机在前

+ 3 - 3
src/views/realTime/components/AirportView/useAirportTable.ts
مشاهده فایل 

@@ -44,7 +44,7 @@ const columnGroupsMap: {
 
         },
 
         {
 
           columnName: 'target',
 
-          columnLabel: '目的站',
 
+          columnLabel: '航程',
 
           needFilters: 1,
 
           fixed: true,
 
         },
 
@@ -374,7 +374,7 @@ const columnGroupsMap: {
 
         },
 
         {
 
           columnName: 'target',
 
-          columnLabel: '目的站',
 
+          columnLabel: '航程',
 
           needFilters: 1,
 
           fixed: true,
 
         },
 
@@ -773,7 +773,7 @@ export function useAirportTable(name: string, formData: CommonData) {
 
             dataType: '',
 
             listqueryTemplateID: null,
 
             needCount: ['航班相关'].includes(group.groupName) ? 0 : 1,
 
-            countMode: 'notNull',
 
+            countMode: column.columnLabel.includes('/') ? 'split' : 'notNull',
 
             needFilters: null,
 
             needGroup: null,
 
             needSearch: null,

+ 8 - 2
src/views/realTime/components/CountBox/index.vue
مشاهده فایل 

@@ -3,7 +3,7 @@
 
     <span class="label">{{ label }}</span>
 
     <li v-for="(_, index) in numberItems" :key="index" class="number-item">
 
       <span class="number-box">
 
-        <i ref="numberBoxes" class="number-list">0123456789</i>
 
+        <i ref="numberBoxes" class="number-list">0123456789.</i>
 
       </span>
 
     </li>
 
   </div>
 
@@ -43,7 +43,13 @@ watch(numberItems, items => {
 
   for (let index = 0; index < numberBoxes.value.length; index++) {
 
     const box = numberBoxes.value[index]
 
     if (box) {
 
-      box.style.transform = `translate(-50%, -${Number(items[index]) * 10}%)`
 
+      if (items[index] === '.') {
 
+        box.style.transform = `translate(-50%, -${1000 / 11}%)`
 
+      } else {
 
+        box.style.transform = `translate(-50%, -${
 
+          (Number(items[index]) * 100) / 11
 
+        }%)`
 
+      }
 
     }
 
   }
 
 })

+ 8 - 0
src/views/realTime/components/FlightView/useFlightInfo.ts
مشاهده فایل 

@@ -113,6 +113,14 @@ const flightInfoItemsMap = {
 
       //   label: '货站交接数量（板/箱/卡）',
 
       //   key: 'pull',
 
       // },
 
+      {
 
+        label: '理货完成运单数/件数',
 
+        key: 'tally',
 
+      },
 
+      {
 
+        label: '出库运单数/件数',
 
+        key: 'outWarehouse',
 
+      },
 
     ],
 
     [
 
       {

+ 6 - 1
src/views/realTime/components/WaybillView/useWaybillInfo.ts
مشاهده فایل 

@@ -45,7 +45,7 @@ const waybillInfoItemsMap = {
 
     },
 
     {
 
       label: '运单类型',
 
-      key: 'stockType',
 
+      key: 'type',
 
     },
 
     {
 
       label: '货代公司',
 
@@ -68,6 +68,11 @@ const waybillInfoItemsMap = {
 
       label: '目的机场',
 
       key: 'arriveAirport',
 
     },
 
+    {
 
+      label: '机场代理',
 
+      key: 'proxy',
 
+      getter: info => (info.proxy === 1 ? '是' : '否'),
 
+    },
 
   ],
 
 }

+ 4 - 4
src/views/realTime/hooks/useTrackData.ts
مشاهده فایل 

@@ -155,10 +155,10 @@ const trackNodesMap = {
 
       name: '拉下',
 
       nodeCode: 'CARGOS_OFFLOAD',
 
     },
 
-    {
 
-      name: '实配',
 
-      nodeCode: 'LS_CARGO',
 
-    },
 
+    // {
 
+    //   name: '实配',
 
+    //   nodeCode: 'LS_CARGO',
 
+    // },
 
     // {
 
     //   name: '退运',
 
     //   nodeCode: '',