实时视图修改

src/views/realTime/components/FlightView/ContainerWaybillDialog.vue

@@ -91,12 +91,12 @@ const tableColumnsMap = {
     },
     {
       columnLabel: '运单件数',
-      columnName: 'messageCargos_in',
+      columnName: 'luggageCount',
       needCount: 1,
     },
     {
       columnLabel: '理货件数',
-      columnName: 'acCargos_in',
+      columnName: 'tallyCount',
       needCount: 1,
     },
     { columnLabel: '最新节点', columnName: 'nodeCode' },
@@ -162,6 +162,11 @@ const resetTable = () => {
   tableColumns.value = []
   tableData.value = []
 }
+watchEffect(() => {
+  tableData.value.forEach(row => {
+    row.tallyCount = row.luggageCount
+  })
+})
 
 watch(
   () => props.flag,

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

@@ -52,7 +52,7 @@
           :table-columns="waybillTableColumns"
           @checked-submit="columnChecked"
         />
-        <Search @search="search" @clear="clear" />
+        <!-- <Search @search="search" @clear="clear" /> -->
       </div>
       <div class="waybill-list">
         <SimpleTable
@@ -76,7 +76,7 @@
 </template>
 <script setup lang="ts">
 import OverflowTooltip from '@/components/OverflowTooltip/index.vue'
-import Search from '@/components/search/index.vue'
+// import Search from '@/components/search/index.vue'
 import { CaretRight } from '@element-plus/icons-vue'
 import ContainerWaybillDialog from './ContainerWaybillDialog.vue'
 import SimpleTable from '@/components/SimpleTable/index.vue'
@@ -137,6 +137,14 @@ const {
   getTableData: getWaybillTableData,
 } = useTable(`${props.name}Waybill`, dataContent)
 
+watchEffect(() => {
+  if (props.name === 'ArrivalFlight') {
+    waybillTableData.value.forEach(row => {
+      row.tallyCount = row.luggageCount
+    })
+  }
+})
+
 const tableFormatter: CommonTableFormatter = (
   row,
   column,

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

@@ -24,7 +24,7 @@
         <div class="status">正常</div>
       </div>
       <div class="waybill-header-operate flex-wrap">
-        <Search @clear="clear" @search="search" />
+        <!-- <Search @clear="clear" @search="search" /> -->
         <el-button class="button-sqaure" color="#ac014d" @click="exportHandler">
           <i class="icon-export" />
         </el-button>
@@ -109,7 +109,7 @@
 
 <script setup lang="ts">
 import OverflowTooltip from '@/components/OverflowTooltip/index.vue'
-import Search from '@/components/search/index.vue'
+// import Search from '@/components/search/index.vue'
 import Steps from '@/components/steps/index.vue'
 import ColumnSet from '@/components/ColumnSet/index.vue'
 import SimpleTable from '@/components/SimpleTable/index.vue'
@@ -295,9 +295,7 @@ const formatter: CommonTableFormatter = (row, column, cellValue, index) => {
   return value.join('\n')
 }
 
-const search = (text: string) => {
-  console.log(text)
-}
+const search = (text: string) => {}
 const clear = () => {}
 
 const tableRef = ref<InstanceType<typeof SimpleTable> | null>(null)

src/views/realTime/hooks/useTable.ts

@@ -95,6 +95,8 @@ const tableColumnsMap: {
     {
       columnLabel: '特货信息',
       columnName: 'speCargoInfo',
+      needCount: 1,
+      countMode: 'notNull',
       customRender: ellipsisCell,
     },
     { columnLabel: '运单件数', columnName: 'luggageCount', needCount: 1 },
@@ -337,6 +339,7 @@ const tableColumnsMap: {
       columnLabel: '特货信息',
       columnName: 'speCargoInfo',
       needCount: 1,
+      countMode: 'notNull',
       customRender: ellipsisCell,
     },
     {
@@ -348,7 +351,7 @@ const tableColumnsMap: {
     {
       columnLabel: '理货件数',
       // columnName: 'acCargos_in',
-      columnName: 'luggageCount',
+      columnName: 'tallyCount',
       needCount: 1,
     },
     {
@@ -593,6 +596,8 @@ const tableColumnsMap: {
     {
       columnLabel: '特货信息',
       columnName: 'speCargoInfo',
+      needCount: 1,
+      countMode: 'notNull',
       customRender: ellipsisCell,
     },
     { columnLabel: '运单件数', columnName: 'luggageCount', needCount: 1 },
@@ -798,6 +803,7 @@ const tableColumnsMap: {
       columnLabel: '特货信息',
       columnName: 'speCargoInfo',
       needCount: 1,
+      countMode: 'notNull',
       customRender: ellipsisCell,
     },
     {
@@ -945,6 +951,8 @@ const tableColumnsMap: {
     {
       columnLabel: '特货信息',
       columnName: 'speCargoInfo',
+      needCount: 1,
+      countMode: 'notNull',
       customRender: ellipsisCell,
     },
     { columnLabel: '运单件数', columnName: 'luggageCount', needCount: 1 },

src/views/realTime/hooks/useTableStyle.ts

@@ -83,7 +83,7 @@ export function useTableStyle(
         }
       }
 
-      if (warningNodes) {
+      if (!tableName?.includes('Transfer') && warningNodes) {
         const matchedNode = unref(warningNodes).find(
           node =>
             node.node_code === column.property &&