航站视图-表格排序

src/components/TableHeaderCell/index.vue

@@ -42,7 +42,7 @@
           </el-icon>
         </div>
         <div v-if="sortable" class="sort-button" @click="sortChange">
-          <el-icon>
+          <el-icon :color="sortRule ? '#2d7cff' : '#000000'">
             <SortUp v-show="sortRule === 'ascending'" />
             <SortDown v-show="sortRule === 'descending'" />
             <Sort v-show="!sortRule" />

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

@@ -184,6 +184,7 @@ const rowClass: RowClassGetter = params => {
   if (rowData.hasTakenOff === 'Y' || rowData.hasLanded === 'Y') {
     classes.push('bg-gray')
     if (
+      ['planDepartureTime', 'planLandingTime'].some(key => sortRuleMap[key] === 'ascending') &&
       dealedCount.value < tableData.value.length &&
       rowIndex === dealedCount.value - 1
     ) {
@@ -278,7 +279,7 @@ const {
 } = useTableFilterAndSort(tableColumns, tableData, {
   defaultFilterValueMap,
   extraFilterValueMap: flightStateFilter,
-  extraSortRuleMap: {
+  defaultSortRuleMap: {
     [props.name.includes('Departure')
       ? 'planDepartureTime'
       : 'planLandingTime']: 'ascending',
@@ -324,10 +325,10 @@ const getPermission = (type?: string) => {
 }
 
 const hasSetTableScroll = ref(false)
-watch(formData, (newData, oldData) => {
+watch([() => formData.startDate, () => formData.endDate], ([startDate, endDate], [preStartDate, preEndDate]) => {
   if (
-    newData.startDate !== oldData.startDate ||
-    newData.endDate !== oldData.endDate
+    startDate !== preStartDate ||
+    endDate !== preEndDate
   ) {
     hasSetTableScroll.value = false
   }

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

@@ -727,7 +727,7 @@ export function useAirportTable(name: string, formData: CommonData) {
             needGroup: null,
             needSearch: null,
             needShow: 1,
-            needSort: null,
+            needSort: 1,
             orderNumber: null,
             queryTemplateColumnSetID: null,
             queryTemplateID: null,