查询痕迹判断条件修改

src/views/advancedQuery/mixins/tableCols.js

@@ -1,7 +1,7 @@
 /*
  * @Author: Badguy
  * @Date: 2022-03-04 11:50:22
- * @LastEditTime: 2022-03-15 17:56:34
+ * @LastEditTime: 2022-05-18 19:54:21
  * @LastEditors: your name
  * @Description: 航站视图表格通用部分
  * have a nice day!
@@ -68,7 +68,7 @@ export default {
       setTimeout(() => {
         this.tableData = tableDataTemp
         this.loading = false
-      }, 1000)
+      }, 0)
     },
     colsFilter(cols) {
       const temp = cols.filter(col => {

src/views/advancedQuery/views/advancedHome.vue

@@ -545,7 +545,9 @@ export default {
       Object.entries(query).forEach(([key, value]) => {
         if (!['startDate', 'endDate'].includes(key) && (value ?? '') !== '') {
           flag = true
-          this.form[key] = ['unLoad', 'checkIn', 'active', 'transferIn', 'canceled'].includes(key) ? Number(value) : value
+          this.form[key] = ['unLoad', 'checkIn', 'active', 'transferIn', 'canceled'].includes(key)
+            ? Number(value)
+            : value
         }
       })
       startDate && (this.time[0] = startDate)
@@ -595,7 +597,14 @@ export default {
       let classString = ''
       if (['FlightNO', 'TransferFlightNO', 'BagSN'].includes(column.property)) {
         classString += 'cell-click'
-        if (this.clickedCells.some(cell => cell.pageName === 'advance' && cell.cellValue === row[column.property])) {
+        if (
+          this.clickedCells.some(
+            cell =>
+              cell.pageName === 'advance' &&
+              Object.entries(cell.row).every(([key, value]) => row[key] === value) &&
+              cell.columnProp === column.property
+          )
+        ) {
           classString += ' cell-clicked'
         }
       }
@@ -604,7 +613,7 @@ export default {
     cellClick(row, column, cell, event) {
       if (['FlightNO', 'TransferFlightNO', 'BagSN'].includes(column.property)) {
         this.$store.dispatch('keepAlive/addClickedCell', {
-          cellValue: row[column.property],
+          row,
           columnProp: column.property,
           pageName: 'advance'
         })
@@ -773,10 +782,7 @@ export default {
             if (index === 0) {
               this.spanArr.push(1)
             } else {
-              if (
-                item.FlightNO === arr[index - 1].FlightNO &&
-                item.FlightDate === arr[index - 1].FlightDate
-              ) {
+              if (item.FlightNO === arr[index - 1].FlightNO && item.FlightDate === arr[index - 1].FlightDate) {
                 this.spanArr[contactDot] += 1
                 this.spanArr.push(0)
               } else {

src/views/baggageManagement/mixins/terminal.js

@@ -1,7 +1,7 @@
 /*
  * @Author: Badguy
  * @Date: 2022-03-04 11:41:55
- * @LastEditTime: 2022-05-18 18:03:17
+ * @LastEditTime: 2022-05-19 09:07:37
  * @LastEditors: your name
  * @Description: 航站视图通用部分
  * have a nice day!
@@ -170,7 +170,12 @@ export default {
       ) {
         classString += 'cell-click'
         if (
-          this.clickedCells.some(cell => cell.pageName === this.$route.name && cell.cellValue === row[column.property])
+          this.clickedCells.some(
+            cell =>
+              cell.pageName === this.$route.name &&
+              Object.entries(cell.row).every(([key, value]) => row[key] === value) &&
+              cell.columnProp === column.property
+          )
         ) {
           classString += ' cell-clicked'
         }
@@ -192,7 +197,7 @@ export default {
         ].includes(column.property)
       ) {
         this.$store.dispatch('keepAlive/addClickedCell', {
-          cellValue: row[column.property],
+          row,
           columnProp: column.property,
           pageName: this.$route.name
         })