航站视图-表格高度调整，航班视图-图标修改

src/components/TimeZoneSelector/index.vue

@@ -13,7 +13,7 @@
   >
     <img
       class="btn-img"
-      src="../../assets/departure/ic_time.png"
+      src="../../assets/baggage/ic_time.png"
     >
     <!-- <span class="time-zone-text">{{ currentDropdownItem.text }}</span> -->
     <el-dropdown-menu

src/router/routes/routes-file-five.js

@@ -1,7 +1,7 @@
 /*
  * @Author: zk
  * @Date: 2022-01-17 10:40:48
- * @LastEditTime: 2022-05-16 15:40:43
+ * @LastEditTime: 2022-05-18 09:38:55
  * @LastEditors: your name
  * @Description: 离港路由
  */
@@ -151,10 +151,10 @@ const transferRoutes = {
           name: 'TransferArrivalOne',
           component: () => import('@/views/baggageManagement'),
           meta: { title: '中转进港', roles: ['transit_inbound_page'], keepAlive: true, deepth: 1 },
-          redirect: '/transfer/arrival/terminalView',
+          redirect: '/transfer/arrival',
           children: [
             {
-              path: '/transfer/arrival/terminalView',
+              path: '/transfer/arrival',
               name: 'TransferArrivalTerminalView',
               component: () => import('@/views/baggageManagement/components/transferArrival'),
               meta: { keepAlive: true, deepth: 2 }
@@ -186,10 +186,10 @@ const transferRoutes = {
           name: 'TransferDepartureOne',
           component: () => import('@/views/baggageManagement'),
           meta: { title: '中转离港', roles: ['transit_departure_page'], keepAlive: true, deepth: 1 },
-          redirect: '/transfer/departure/terminalView',
+          redirect: '/transfer/departure',
           children: [
             {
-              path: '/transfer/departure/terminalView',
+              path: '/transfer/departure',
               name: 'TransferDepartureTerminalView',
               component: () => import('@/views/baggageManagement/components/transferDeparture'),
               meta: { keepAlive: true, deepth: 2 }

src/views/advancedQuery/views/advancedHome.vue

@@ -842,7 +842,7 @@ export default {
       width: 32px;
       cursor: pointer;
       background-size: 100% 100%;
-      background: url('../../../assets/departure/ic_setting.png') no-repeat;
+      background: url('../../../assets/baggage/ic_setting.png') no-repeat;
       margin-left: 12px;
       position: relative;
       top: 2px;

src/views/baggageManagement/components/arrival/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zk
  * @Date: 2022-01-17 10:39:22
- * @LastEditTime: 2022-05-17 20:18:19
+ * @LastEditTime: 2022-05-18 09:36:58
  * @LastEditors: your name
  * @Description: 进港01
 -->
@@ -119,7 +119,7 @@
           <el-form-item>
             <img
               class="btn-img"
-              src="../../../../assets/departure/ic_setting.png"
+              src="../../../../assets/baggage/ic_setting.png"
               @click="show"
             >
           </el-form-item>
@@ -147,7 +147,6 @@
         ref="table"
         :data="tableData"
         class="table"
-        :height="computedTableHeight"
         :header-cell-class-name="headerCellClassName"
         :row-class-name="tableRowClassName"
         show-summary
@@ -668,6 +667,7 @@ export default {
   width: 100%;
   ::v-deep .table {
     width: 100%;
+    height: calc(100vh - 177px);
     .cell {
       padding: 0;
       text-align: center;

src/views/baggageManagement/components/departure/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zk
  * @Date: 2022-01-17 10:39:22
- * @LastEditTime: 2022-05-17 20:18:06
+ * @LastEditTime: 2022-05-18 09:37:04
  * @LastEditors: your name
  * @Description: 离港01
 -->
@@ -119,7 +119,7 @@
           <el-form-item>
             <img
               class="btn-img"
-              src="../../../../assets/departure/ic_setting.png"
+              src="../../../../assets/baggage/ic_setting.png"
               @click="show"
             >
 
@@ -149,7 +149,6 @@
         ref="table"
         :data="tableData"
         class="table"
-        :height="computedTableHeight"
         :header-cell-class-name="headerCellClassName"
         :row-class-name="tableRowClassName"
         show-summary
@@ -223,7 +222,6 @@ import formMixin from '../../mixins/form'
 import tableColsMixin from '../../mixins/tableCols'
 import timeZoneMixin from '../../mixins/timeZone'
 import { getQuery } from '@/api/flight'
-import { mapGetters } from 'vuex'
 
 export default {
   name: 'DepartureTerminalView',
@@ -615,6 +613,7 @@ export default {
   width: 100%;
   ::v-deep .table {
     width: 100%;
+    height: calc(100vh - 177px);
     .cell {
       padding: 0;
       text-align: center;

src/views/baggageManagement/components/flight/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2022-01-17 10:39:22
- * @LastEditTime: 2022-05-17 18:35:16
+ * @LastEditTime: 2022-05-18 10:03:49
  * @LastEditors: your name
  * @Description: 航班视图
 -->
@@ -272,11 +272,11 @@
           <TimeZoneSelector />
           <img
             class="btn-square"
-            src="../../../../assets/departure/ic_setting.png"
+            src="../../../../assets/baggage/ic_export.png"
           >
           <img
             class="btn-square"
-            src="../../../../assets/departure/ic_setting.png"
+            src="../../../../assets/baggage/ic_setting.png"
             @click="show"
           >
         </div>
@@ -449,6 +449,10 @@ export default {
       transferOutBaggageTableData: [], // 中转出
       flightBaggageTableData: [], // 行李列表
       flightBaggageTableFilters: {
+        PassengerNameUpcase: [],
+        BagSN: [],
+        SpecialType: [],
+        U_Device_ID: [],
         latestStatus: []
       }
     }

src/views/baggageManagement/components/transferArrival/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zk
  * @Date: 2022-01-17 10:39:22
- * @LastEditTime: 2022-05-17 20:24:51
+ * @LastEditTime: 2022-05-18 11:30:27
  * @LastEditors: your name
  * @Description: 离港01
 -->
@@ -151,7 +151,7 @@
           <el-form-item>
             <img
               class="btn-img"
-              src="../../../../assets/departure/ic_setting.png"
+              src="../../../../assets/baggage/ic_setting.png"
               @click="show"
             >
           </el-form-item>
@@ -180,7 +180,6 @@
         :data="tableData"
         class="table"
         max-height="100%"
-        :height="computedTableHeight"
         show-summary
         :summary-method="summaryMethod"
         :span-method="arraySpanMethod"
@@ -261,7 +260,6 @@ import formMixin from '../../mixins/form'
 import tableColsMixin from '../../mixins/tableCols'
 import timeZoneMixin from '../../mixins/timeZone'
 import { getQuery } from '@/api/flight'
-import { commonTableCellClass } from '@/utils/table'
 
 export default {
   name: 'DepartureTerminalView',
@@ -423,49 +421,49 @@ export default {
   //   },
   // },
   methods: {
-    cellClass({ row, column, rowIndex, columnIndex }) {
-      let classString = commonTableCellClass({ row, column, rowIndex, columnIndex })
-      if (['FlightNO', 'PreFlightNO', 'inTransferBaggageCount'].includes(column.property)) {
-        classString += '' + 'cell-click'
-        if (this.clickedCells.some(cell => cell.pageName === this.$route.name && cell.cellValue === row[column.property])) {
-          classString += ' cell-clicked'
-        }
-      }
-      return classString
-    },
-    cellClick(row, column, cell, event) {
-      if (['FlightNO'].includes(column.property)) {
-        this.$store.dispatch('keepAlive/addClickedCell', {
-          cellValue: row[column.property],
-          columnProp: column.property,
-          pageName: this.$route.name
-        })
-      }
-      switch (column.property) {
-        case 'FlightNO':
-          this.$router.push({ path: '/transfer/arrival/flightView', query: row })
-          break
-        case 'PreFlightNO': {
-          const row2 = this._.cloneDeep(row)
-          row2.FlightNO = row2.PreFlightNO
-          this.$router.push({ path: '/transfer/arrival/flightView', query: row2 })
-          break
-        }
-        case 'inTransferBaggageCount':
-          this.$router.push({
-            path: '/advance',
-            query: {
-              FlightNO: row.FlightNO,
-              transferArrival: row.PreFlightNO,
-              startDate: row.FlightDate,
-              endDate: row.FlightDate
-            }
-          })
-          break
-        default:
-          break
-      }
-    },
+    // cellClass({ row, column, rowIndex, columnIndex }) {
+    //   let classString = commonTableCellClass({ row, column, rowIndex, columnIndex })
+    //   if (['FlightNO', 'PreFlightNO', 'inTransferBaggageCount'].includes(column.property)) {
+    //     classString += '' + 'cell-click'
+    //     if (this.clickedCells.some(cell => cell.pageName === this.$route.name && cell.cellValue === row[column.property])) {
+    //       classString += ' cell-clicked'
+    //     }
+    //   }
+    //   return classString
+    // },
+    // cellClick(row, column, cell, event) {
+    //   if (['FlightNO'].includes(column.property)) {
+    //     this.$store.dispatch('keepAlive/addClickedCell', {
+    //       cellValue: row[column.property],
+    //       columnProp: column.property,
+    //       pageName: this.$route.name
+    //     })
+    //   }
+    //   switch (column.property) {
+    //     case 'FlightNO':
+    //       this.$router.push({ path: '/transfer/arrival/flightView', query: row })
+    //       break
+    //     case 'PreFlightNO': {
+    //       const row2 = this._.cloneDeep(row)
+    //       row2.FlightNO = row2.PreFlightNO
+    //       this.$router.push({ path: '/transfer/arrival/flightView', query: row2 })
+    //       break
+    //     }
+    //     case 'inTransferBaggageCount':
+    //       this.$router.push({
+    //         path: '/advance',
+    //         query: {
+    //           FlightNO: row.FlightNO,
+    //           transferArrival: row.PreFlightNO,
+    //           startDate: row.FlightDate,
+    //           endDate: row.FlightDate
+    //         }
+    //       })
+    //       break
+    //     default:
+    //       break
+    //   }
+    // },
     changeView() {
       this.$router.replace({
         path: '/transfer/departure'
@@ -563,8 +561,8 @@ export default {
       if (!this.currentAirport) {
         return
       }
-      const arrs1 = [this.formData.inboundCarrier.length == 0 ? '' : this.formData.inboundCarrier[0]]
-      const arrs2 = [this.formData.outgoingAirline.length == 0 ? '' : this.formData.outgoingAirline[0]]
+      const arrs1 = [this.formData.inboundCarrier.length === 0 ? '' : this.formData.inboundCarrier[0]]
+      const arrs2 = [this.formData.outgoingAirline.length === 0 ? '' : this.formData.outgoingAirline[0]]
       const arr = [
         this.formData.currentAirport,
         this.formData.startDate,
@@ -871,6 +869,7 @@ export default {
   width: 100%;
   ::v-deep .table {
     width: 100%;
+    height: calc(100vh - 177px);
     .cell {
       padding: 0;
       text-align: center;

src/views/baggageManagement/components/transferDeparture/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zk
  * @Date: 2022-01-17 10:39:22
- * @LastEditTime: 2022-05-17 20:21:01
+ * @LastEditTime: 2022-05-18 11:30:20
  * @LastEditors: your name
  * @Description: 离港01
 -->
@@ -151,7 +151,7 @@
           <el-form-item>
             <img
               class="btn-img"
-              src="../../../../assets/departure/ic_setting.png"
+              src="../../../../assets/baggage/ic_setting.png"
               @click="show"
             >
           </el-form-item>
@@ -180,7 +180,6 @@
         :data="tableData"
         class="table"
         max-height="100%"
-        :height="computedTableHeight"
         show-summary
         :summary-method="summaryMethod"
         :span-method="arraySpanMethod"
@@ -261,7 +260,6 @@ import formMixin from '../../mixins/form'
 import tableColsMixin from '../../mixins/tableCols'
 import timeZoneMixin from '../../mixins/timeZone'
 import { getQuery } from '@/api/flight'
-import { commonTableCellClass } from '@/utils/table'
 
 export default {
   name: 'DepartureTerminalView',
@@ -411,49 +409,49 @@ export default {
     clearInterval(this.loopEvent)
   },
   methods: {
-    cellClass({ row, column, rowIndex, columnIndex }) {
-      let classString = commonTableCellClass({ row, column, rowIndex, columnIndex })
-      if (['FlightNO', 'PreFlightNO', 'inTransferBaggageCount'].includes(column.property)) {
-        classString += '' + 'cell-click'
-        if (this.clickedCells.some(cell => cell.pageName === this.$route.name && cell.cellValue === row[column.property])) {
-          classString += ' cell-clicked'
-        }
-      }
-      return classString
-    },
-    cellClick(row, column, cell, event) {
-      if (['FlightNO'].includes(column.property)) {
-        this.$store.dispatch('keepAlive/addClickedCell', {
-          cellValue: row[column.property],
-          columnProp: column.property,
-          pageName: this.$route.name
-        })
-      }
-      switch (column.property) {
-        case 'FlightNO':
-          this.$router.push({ path: '/transfer/departure/flightView', query: row })
-          break
-        case 'PreFlightNO': {
-          const row2 = this._.cloneDeep(row)
-          row2.FlightNO = row2.PreFlightNO
-          this.$router.push({ path: '/transfer/departure/flightView', query: row2 })
-          break
-        }
-        case 'inTransferBaggageCount':
-          this.$router.push({
-            path: '/advance',
-            query: {
-              FlightNO: row.FlightNO,
-              transferArrival: row.PreFlightNO,
-              startDate: row.FlightDate,
-              endDate: row.FlightDate
-            }
-          })
-          break
-        default:
-          break
-      }
-    },
+    // cellClass({ row, column, rowIndex, columnIndex }) {
+    //   let classString = commonTableCellClass({ row, column, rowIndex, columnIndex })
+    //   if (['FlightNO', 'PreFlightNO', 'inTransferBaggageCount'].includes(column.property)) {
+    //     classString += '' + 'cell-click'
+    //     if (this.clickedCells.some(cell => cell.pageName === this.$route.name && cell.cellValue === row[column.property])) {
+    //       classString += ' cell-clicked'
+    //     }
+    //   }
+    //   return classString
+    // },
+    // cellClick(row, column, cell, event) {
+    //   if (['FlightNO'].includes(column.property)) {
+    //     this.$store.dispatch('keepAlive/addClickedCell', {
+    //       cellValue: row[column.property],
+    //       columnProp: column.property,
+    //       pageName: this.$route.name
+    //     })
+    //   }
+    //   switch (column.property) {
+    //     case 'FlightNO':
+    //       this.$router.push({ path: '/transfer/departure/flightView', query: row })
+    //       break
+    //     case 'PreFlightNO': {
+    //       const row2 = this._.cloneDeep(row)
+    //       row2.FlightNO = row2.PreFlightNO
+    //       this.$router.push({ path: '/transfer/departure/flightView', query: row2 })
+    //       break
+    //     }
+    //     case 'inTransferBaggageCount':
+    //       this.$router.push({
+    //         path: '/advance',
+    //         query: {
+    //           FlightNO: row.FlightNO,
+    //           transferArrival: row.PreFlightNO,
+    //           startDate: row.FlightDate,
+    //           endDate: row.FlightDate
+    //         }
+    //       })
+    //       break
+    //     default:
+    //       break
+    //   }
+    // },
     changeView() {
       this.$router.replace({
         path: '/transfer/arrival'
@@ -837,6 +835,7 @@ export default {
   width: 100%;
   ::v-deep .table {
     width: 100%;
+    height: calc(100vh - 177px);
     .cell {
       padding: 0;
       text-align: center;

src/views/baggageManagement/mixins/form.js

@@ -1,7 +1,7 @@
 /*
  * @Author: Badguy
  * @Date: 2022-03-04 14:45:03
- * @LastEditTime: 2022-05-12 17:30:46
+ * @LastEditTime: 2022-05-18 09:34:03
  * @LastEditors: your name
  * @Description: 航站视图通用表单部分
  * have a nice day!
@@ -94,17 +94,17 @@ export default {
     endDate() {
       // return parseTime(this.formData.endDate).split(' ')[0]
       return this.formData.endDate
-    },
-    computedTableHeight() {
-      const { relatedAirport, inboundCarrier, outgoingAirline, craftType, flightAttr } = this.formData
-      return relatedAirport.length ||
-        inboundCarrier.length ||
-        outgoingAirline.length ||
-        craftType.length ||
-        flightAttr.length
-        ? 'calc(100vh - 191px)'
-        : 'calc(100vh - 177px)'
     }
+    // computedTableHeight() {
+    //   const { relatedAirport, inboundCarrier, outgoingAirline, craftType, flightAttr } = this.formData
+    //   return relatedAirport.length ||
+    //     inboundCarrier.length ||
+    //     outgoingAirline.length ||
+    //     craftType.length ||
+    //     flightAttr.length
+    //     ? 'calc(100vh - 191px)'
+    //     : 'calc(100vh - 177px)'
+    // }
   },
   methods: {
     // 机场数据处理（多选）

src/views/baggageManagement/mixins/terminal.js

@@ -1,7 +1,7 @@
 /*
  * @Author: Badguy
  * @Date: 2022-03-04 11:41:55
- * @LastEditTime: 2022-05-17 20:17:55
+ * @LastEditTime: 2022-05-18 09:45:14
  * @LastEditors: your name
  * @Description: 航站视图通用部分
  * have a nice day!
@@ -18,6 +18,7 @@ import {
   IntegratedQueryTransfer
 } from '@/api/flight'
 import { mapGetters } from 'vuex'
+import { commonTableCellClass } from '@/utils/table'
 
 export default {
   data() {
@@ -152,7 +153,7 @@ export default {
       return sums
     },
     cellClass({ row, column, rowIndex, columnIndex }) {
-      let classString = ''
+      let classString = commonTableCellClass({ row, column, rowIndex, columnIndex })
       if (['FlightNO'].includes(column.property)) {
         classString += 'cell-click'
         if (this.clickedCells.some(cell => cell.pageName === this.$route.name && cell.cellValue === row[column.property])) {
@@ -179,6 +180,27 @@ export default {
             }
           })
           break
+        case 'PreFlightNO': {
+          this.$router.push({
+            path: '/transfer/arrival/flightView',
+            query: {
+              FlightNO: row.PreFlightNO,
+              FlightDate: row.FlightDate
+            }
+          })
+          break
+        }
+        case 'inTransferBaggageCount':
+          this.$router.push({
+            path: '/advance',
+            query: {
+              FlightNO: row.FlightNO,
+              transferArrival: row.PreFlightNO,
+              startDate: row.FlightDate,
+              endDate: row.FlightDate
+            }
+          })
+          break
         default:
           break
       }