行李视图修改

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

@@ -117,7 +117,7 @@
       v-show="infoBtn == infoRadios[0]"
       class="part3"
       :style="{
-        'height': `calc(100vh - 80px - ${basicInfoHeight}px - 176px - 3 * 8px - 44px)`
+        'height': `calc(100vh - 80px - ${basicInfoHeight}px - 176px - 3 * 8px - 20px)`
       }"
     >
       <el-table
@@ -141,6 +141,7 @@
           :align="item.align || 'center'"
           :width="item.width"
           show-overflow-tooltip
+          :fixed="item.fixed"
         >
           <template slot="header">
             <div class="cell-content">{{ item.name }}</div>
@@ -156,7 +157,7 @@
       v-show="infoBtn === infoRadios[1]"
       class="part4"
       :style="{
-        'height': `calc(100vh - 80px - ${basicInfoHeight}px - 2 * 8px - 44px)`
+        'height': `calc(100vh - 80px - ${basicInfoHeight}px - 2 * 8px - 20px)`
       }"
     >
       <header class="head">
@@ -246,6 +247,7 @@ import { throttledExportToExcel } from '@/utils/table'
 import * as XLSX from 'xlsx'
 import XLSX_STYLE from 'xlsx-style'
 import FileSaver from 'file-saver'
+import { mapGetters } from 'vuex'
 
 export default {
   name: 'BaggageView',
@@ -365,39 +367,26 @@ export default {
       messageList: [],
       stepNodes: [],
       tableCols: [
-        {
-          name: '航班号',
-          prop: 'flightNO'
-        },
-        { name: '航班日期', prop: 'flightDate', width: 100 },
-        {
-          name: '起飞航站\n起飞时间',
-          prop: 'departureInfo',
-          width: 111
-        },
-        {
-          name: '目的航站\n降落时间',
-          prop: 'landingInfo',
-          sortable: 'custom',
-          width: 111
-        },
+        { name: '航班号', prop: 'flightNO', fixed: true },
+        { name: '航班日期', prop: 'flightDate', width: 95, fixed: true },
+        { name: '起飞航站\n起飞时间', prop: 'departureInfo', width: 100 },
+        { name: '目的航站\n降落时间', prop: 'landingInfo', width: 100 },
         { name: '旅客舱位', prop: 'passengerCompartment', width: 70 },
         { name: '旅客座位号', prop: 'passengerSeatNumber' },
         { name: '值机序号', prop: 'passengerCheckInNumber', width: 70 },
         { name: '节点标识', prop: 'nodeCode', width: 100 },
-        { name: '节点名称', prop: 'nodeName' },
+        { name: '节点名称', prop: 'nodeName', width: 70 },
         { name: '位置标识', prop: 'locationCode' },
-        // { name: '位置码', prop: '',  },
-        { name: '位置描述', prop: 'locationRemark' },
+        { name: '位置描述', prop: 'locationRemark'},
         { name: '读取时间', prop: 'dealTime', width: 158 },
-        { name: '结果', prop: 'status' },
+        { name: '结果', prop: 'status', width: 60 },
         { name: '次级代码', prop: 'secondaryCode', width: 70 },
-        { name: '操作人', prop: 'AgentCode', width: 100 },
+        { name: '操作人', prop: 'AgentCode', width: 90 },
         { name: '设备ID', prop: 'DeviceCode' },
-        { name: '发往位置', prop: 'toLocation' },
-        { name: '发往位置描述', prop: 'toLocationMark', width: 110 },
-        { name: '装载序号', prop: 'LoadSN' },
-        { name: '容器编号', prop: 'U_Device_ID', width: 100 },
+        { name: '发往位置', prop: 'toLocation', width: 70 },
+        { name: '发往位置描述', prop: 'toLocationMark', width: 100 },
+        { name: '装载序号', prop: 'LoadSN', width: 70 },
+        { name: '容器编号', prop: 'U_Device_ID', width: 110 },
         { name: '数据来源', prop: 'dataSource' }
       ],
       baggageTableData: [],
@@ -408,6 +397,7 @@ export default {
     }
   },
   computed: {
+    ...mapGetters(['sidebar']),
     activeStepLine() {
       return function (index) {
         return this.stepNodes[index].status && this.stepNodes[index + 1].status
@@ -490,7 +480,10 @@ export default {
     selectedAirline() {
       this.stopQueryTrack()
       this.startQueryTrack()
-    }
+    },
+    'sidebar.expand'() {
+      this.$refs['table']?.doLayout()
+    },
   },
   created() {
     this.resetStepNodes()
@@ -834,10 +827,18 @@ export default {
         const result = await this.queryBaggageAirline(dataContent)
         this.airlineList = result.map(({ flightNO, flightDate, departureAirport, arriveAirport, luggageSN }) => ({
           label: `${departureAirport}-${arriveAirport}`,
-          value: `${flightNO},${flightDate},${luggageSN}`
+          value: `${flightNO},${flightDate},${luggageSN}`,
+          flightNO,
+          flightDate
         }))
         if (this.airlineList.length) {
-          this.selectedAirline = this.airlineList[0].value
+          let currentIndex = this.airlineList.findIndex(
+            ({ flightNO, flightDate }) =>
+              flightNO === queryData.flightNO &&
+              flightDate === queryData.flightDate
+          )
+          currentIndex = currentIndex > -1 ? currentIndex : 0
+          this.selectedAirline = this.airlineList[currentIndex].value
         } else {
           this.selectedAirline = ''
         }
@@ -898,7 +899,7 @@ export default {
 <style lang="scss" scoped>
 .baggage-view {
   width: 100%;
-  height: calc(100vh - 81px);
+  height: calc(100vh - 80px);
   overflow: hidden;
   background: #dfe3ea;
   padding: 8px 8px 0;