Merge branch 'master' of http://120.26.64.82:10880/BFFE/SZYGM1.0

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

@@ -221,7 +221,7 @@ const getPermission = (type?: string) => {
 
 // 因为使用了keepalive，需要记录下滚动位置，返回时先滚动到初始位置，再滚动到记录的位置，不然表格会变成空白
 const tableRef = ref<TableV2Instance | null>(null)
-const visibility = ref('visible')
+const visibility = ref<'visible' | 'hidden'>('visible')
 const scrollPosition = reactive({
   x: 0,
   y: 0,

src/views/realTime/components/AirportView/useAirportTable.ts

@@ -1,4 +1,5 @@
 import { Query } from '@/api/webApi'
+import { AnyColumn } from 'element-plus/es/components/table-v2/src/common'
 import { CommonData, CommonTableColumn } from '~/common'
 
 interface SimpleColumn {
@@ -707,12 +708,12 @@ const computedWidth = (column: SimpleColumn) => {
 }
 
 export function useAirportTable(name: string, formData: CommonData) {
-  const tableColumns = ref<CommonTableColumn[]>([])
+  const tableColumns = ref<(CommonTableColumn & AnyColumn)[]>([])
   const tableData = ref<CommonData[]>([])
   const getTableColumns = () => {
     const groups = columnGroupsMap[name]
     tableColumns.value = groups.reduce(
-      (columns: CommonTableColumn[], group, groupIndex) => {
+      (columns: (CommonTableColumn & AnyColumn)[], group, groupIndex) => {
         group.children.forEach(column => {
           columns.push({
             key: column.columnName,

src/views/realTime/components/AirportView/useCount.ts

@@ -7,10 +7,9 @@ export function useCount(flag: Ref<boolean>) {
   }
 
   const tableDataFormatter = ({
-    rowData,
+    cellData,
     column: { columnName, columnLabel },
   }: CellRenderProps) => {
-    const cellValue = rowData[columnName]
     if (!unref(flag)) {
       const matched = columnLabel.match(/(?<=\()\S+(?=\))/)
       if (matched) {
@@ -18,20 +17,20 @@ export function useCount(flag: Ref<boolean>) {
         const countIndex = machedStr.split('/').findIndex(str => str === '件')
         if (
           countIndex > -1 &&
-          typeof cellValue === 'string' &&
-          cellValue.split('/')[countIndex]
+          typeof cellData === 'string' &&
+          cellData.split('/')[countIndex]
         ) {
-          return cellValue
+          return cellData
             .split('/')
             .filter((_, index) => index !== countIndex)
             .join('/')
         }
       }
     }
-    if (columnName.includes('Time') && typeof cellValue === 'string') {
-      return cellValue.replace('T', '\n')
+    if (columnName.includes('Time') && typeof cellData === 'string') {
+      return cellData.replace('T', '\n')
     }
-    return cellValue
+    return cellData
   }
 
   return {

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

@@ -103,6 +103,7 @@ const flightInfoItemsMap = {
       {
         label: '已卸载集装器',
         key: 'unloadStowageNum',
+        showOverflowTooltip: true,
       },
       {
         label: '卸载数量（板/箱/卡）',