航班视图修改

public/config.js

@@ -76,6 +76,13 @@ const DATACONTENT_ID = {
   departureAviLeaveLtId: 74, //离港管理-离港承运航司-id
   departureTableLtId: 68, //离港管理-表格-id
 
+  /***-----航班视图------***/
+  flightAirline: 1141,
+  flightInfo: 1142,
+  flightContainer: 1143,
+  flightBaggage: 1144,
+
+
   /***-----基础数据------***/
   deployNodeId: 54, //基础数据-节点信息维护-获取二级节点(表格)-id
   deployNodeteoId: 60, //基础数据-节点信息维护-二级页面-id

src/views/advancedQuery/views/advancedHome.vue

@@ -76,7 +76,7 @@
         height="calc(100vh - 158px)"
         style="width: 100%"
         show-summary
-        :summary-method="summaryRow(tableData.length)"
+        :summary-method="summaryRow(dealedTableData.length)"
         :header-cell-class-name="headerCellClass"
         :row-class-name="tableRowClassName"
         :cell-class-name="cellClass"

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

@@ -8,8 +8,17 @@
 <template>
   <div class="arrival-one">
     <!--功能区-表单-->
-    <div ref="formWrap" class="terminal-form-wrap">
-      <el-form ref="form" :inline="true" :model="formData" :rules="rules" class="form">
+    <div
+      ref="formWrap"
+      class="terminal-form-wrap"
+    >
+      <el-form
+        ref="form"
+        :inline="true"
+        :model="formData"
+        :rules="rules"
+        class="form"
+      >
         <div class="form-left">
           <el-form-item prop="currentAirport">
             <!-- <el-cascader
@@ -24,8 +33,21 @@
             filterable
             @change="setCurrentAirport"
           /> -->
-            <el-select v-model="formData.currentAirport" class="input-shadow" size="small" style="width: 150px;" filterable placeholder="请选择机场" @change="airPortChange">
-              <el-option v-for="(item, index) in AirportList" :key="index" :label="item.planLandingApt" :value="item.planLandingApt" />
+            <el-select
+              v-model="formData.currentAirport"
+              class="input-shadow"
+              size="small"
+              style="width: 150px;"
+              filterable
+              placeholder="请选择机场"
+              @change="airPortChange"
+            >
+              <el-option
+                v-for="(item, index) in AirportList"
+                :key="index"
+                :label="item.planLandingApt"
+                :value="item.planLandingApt"
+              />
             </el-select>
           </el-form-item>
           <!-- <el-form-item prop="startDate">
@@ -52,48 +74,147 @@
               @change="endDateChangeHandler"
             />
           </el-form-item> -->
-          <el-form-item prop="flightDate" label="航班日期">
-            <el-date-picker v-model="formData.flightDate" size="small" style="width: 300px;" type="daterange" value-format="yyyy-MM-dd" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="dateRangePickerOptions" @change="dateChangeHandler" />
+          <el-form-item
+            prop="flightDate"
+            label="航班日期"
+          >
+            <el-date-picker
+              v-model="formData.flightDate"
+              size="small"
+              style="width: 300px;"
+              type="daterange"
+              value-format="yyyy-MM-dd"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :picker-options="dateRangePickerOptions"
+              @change="dateChangeHandler"
+            />
           </el-form-item>
           <el-form-item>
             <div class="box-item">
               <p>预计装载总数：</p>
-              <li v-for="(item, index) in orderNum" :key="index" :class="{ 'number-item': !isNaN(item), 'mark-item': isNaN(item) }">
+              <li
+                v-for="(item, index) in orderNum"
+                :key="index"
+                :class="{ 'number-item': !isNaN(item), 'mark-item': isNaN(item) }"
+              >
                 <span v-if="!isNaN(item)">
                   <i ref="numberItem">0123456789</i>
                 </span>
-                <span v-else class="comma">{{ item }}</span>
+                <span
+                  v-else
+                  class="comma"
+                >{{ item }}</span>
               </li>
             </div>
           </el-form-item>
         </div>
-        <div class="form-right" @keyup.enter="onSubmit(1)">
+        <div
+          class="form-right"
+          @keyup.enter="onSubmit(1)"
+        >
           <el-form-item prop="search">
-            <el-popover :value="popoverVisible" placement="bottom" trigger="manual">
+            <el-popover
+              :value="popoverVisible"
+              placement="bottom"
+              trigger="manual"
+            >
               <span>请输入航班号（示例：CA1234）或行李牌号（示例：1234567890）</span>
-              <el-input slot="reference" v-model="formData.search" class="input-shadow" style="width: 240px; margin-left: 105px" size="small" placeholder="请输入内容" prefix-icon="el-icon-search" clearable @focus="popoverVisible = true" @blur="popoverVisible = false" />
+              <el-input
+                slot="reference"
+                v-model="formData.search"
+                class="input-shadow"
+                style="width: 240px; margin-left: 105px"
+                size="small"
+                placeholder="请输入内容"
+                prefix-icon="el-icon-search"
+                clearable
+                @focus="popoverVisible = true"
+                @blur="popoverVisible = false"
+              />
             </el-popover>
           </el-form-item>
           <el-form-item>
-            <el-button class="btn-shadow" size="mini" type="primary" @click="onSubmit(1)">搜索</el-button>
+            <el-button
+              class="btn-shadow"
+              size="mini"
+              type="primary"
+              @click="onSubmit(1)"
+            >搜索</el-button>
           </el-form-item>
           <el-form-item v-is="['is_timeIcon']">
             <TimeZoneSelector />
           </el-form-item>
           <el-form-item v-is="['is_columnSettings']">
-            <img class="btn-img btn-shadow" src="../../../../assets/baggage/ic_setting.png" @click="show">
+            <img
+              class="btn-img btn-shadow"
+              src="../../../../assets/baggage/ic_setting.png"
+              title="列设置"
+              @click="show"
+            >
+          </el-form-item>
+          <el-form-item v-is="['dm_dt_columnSettings']">
+            <img
+              class="btn-img btn-shadow"
+              src="../../../../assets/baggage/ic_export.png"
+              title="导出"
+              @click="exportHandler('table', '航站进港列表')"
+            >
           </el-form-item>
         </div>
       </el-form>
     </div>
     <!--表格-->
-    <div v-loading="loading" class="terminal-table" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.8)">
-      <el-table ref="table" class="table" :height="computedTableHeight" :data="dealedTableData" :header-cell-class-name="headerCellClass" :row-class-name="tableRowClassName" :cell-class-name="cellClass" show-summary :summary-method="summaryMethod" border stripe fit @cell-click="cellClickHandler">
-        <el-table-column v-for="col in tableColsCopy" :key="col.prop" :prop="col.prop" :label="col.label" :width="col.width" :fixed="col.fixed">
-          <el-table-column v-for="childCol in col.children" :key="childCol.prop" :prop="childCol.prop" :label="childCol.label" :width="childCol.width" :formatter="tableFormat">
+    <div
+      v-loading="loading"
+      class="terminal-table"
+      element-loading-text="拼命加载中"
+      element-loading-spinner="el-icon-loading"
+      element-loading-background="rgba(0, 0, 0, 0.8)"
+    >
+      <el-table
+        ref="table"
+        class="table"
+        :height="computedTableHeight"
+        :data="dealedTableData"
+        :header-cell-class-name="headerCellClass"
+        :row-class-name="tableRowClassName"
+        :cell-class-name="cellClass"
+        show-summary
+        :summary-method="summaryMethod"
+        border
+        stripe
+        fit
+        @cell-click="cellClickHandler"
+      >
+        <el-table-column
+          v-for="col in tableColsCopy"
+          :key="col.prop"
+          :prop="col.prop"
+          :label="col.label"
+          :width="col.width"
+          :fixed="col.fixed"
+        >
+          <el-table-column
+            v-for="childCol in col.children"
+            :key="childCol.prop"
+            :prop="childCol.prop"
+            :label="childCol.label"
+            :width="childCol.width"
+            :formatter="tableFormat"
+          >
             <template #header>
-              <el-tooltip :content="childCol.desc || childCol.label" placement="top">
-                <TableHeaderCell :label="childCol.label" :filter-options="tableDataFilters[childCol.prop]" :filter-values.sync="filterValues[childCol.prop]" :sortable="childCol.sortable" :sort-rule.sync="tableDataSortRules[childCol.prop]" />
+              <el-tooltip
+                :content="childCol.desc || childCol.label"
+                placement="top"
+              >
+                <TableHeaderCell
+                  :label="childCol.label"
+                  :filter-options="tableDataFilters[childCol.prop]"
+                  :filter-values.sync="filterValues[childCol.prop]"
+                  :sortable="childCol.sortable"
+                  :sort-rule.sync="tableDataSortRules[childCol.prop]"
+                />
               </el-tooltip>
             </template>
           </el-table-column>
@@ -101,18 +222,38 @@
       </el-table>
     </div>
     <!--列设置-->
-    <Dialog :flag="dialogFlag" class="dialog-check-cols">
+    <Dialog
+      :flag="dialogFlag"
+      class="dialog-check-cols"
+    >
       <div class="col-dialog">
         <div class="title">列设置</div>
         <div class="content">
-          <el-tree :data="tableCols" :class="colsCheckClass" show-checkbox node-key="index" :default-expand-all="true" :props="{
+          <el-tree
+            :data="tableCols"
+            :class="colsCheckClass"
+            show-checkbox
+            node-key="index"
+            :default-expand-all="true"
+            :props="{
               label: 'label',
               children: 'children'
-            }" :default-checked-keys="checkedKeysTemp" @check="handleCheck" />
+            }"
+            :default-checked-keys="checkedKeysTemp"
+            @check="handleCheck"
+          />
         </div>
         <div class="foot right t30">
-          <el-button size="medium" class="r24" type="primary" @click="onCheck">确定</el-button>
-          <el-button size="medium" @click="hide">取消</el-button>
+          <el-button
+            size="medium"
+            class="r24"
+            type="primary"
+            @click="onCheck"
+          >确定</el-button>
+          <el-button
+            size="medium"
+            @click="hide"
+          >取消</el-button>
         </div>
       </div>
     </Dialog>
@@ -128,13 +269,13 @@ import tableColsMixin from '../../mixins/tableCols'
 import timeZoneMixin from '../../mixins/timeZone'
 import { getQuery } from '@/api/flight'
 import TableHeaderCell from '@/components/TableHeaderCell'
-import { setTableFilters } from '@/utils/table'
+import { setTableFilters, throttledExportToExcel } from '@/utils/table'
 
 export default {
   name: 'DepartureTerminalView',
   components: { Dialog, TimeZoneSelector, TableHeaderCell },
   mixins: [terminalMixin, formMixin, tableColsMixin, timeZoneMixin],
-  data () {
+  data() {
     return {
       orderNum: ['0', '0', '0', '0', '0', '0'], // 默认总数
       popoverVisible: false,
@@ -331,11 +472,11 @@ export default {
     }
   },
   computed: {
-    singleDay () {
+    singleDay() {
       return this.startDate === this.endDate
     }
   },
-  mounted () {
+  mounted() {
     this.getAirPortData()
     this.table = this.$refs.table.bodyWrapper
     const that = this
@@ -343,7 +484,7 @@ export default {
       that.scrollTop = this.table.scrollTop
     })
   },
-  activated () {
+  activated() {
     this.table.scrollTop = this.scrollTop
     this.getTableData()
     const that = this
@@ -351,20 +492,20 @@ export default {
       that.getTableData()
     }, 3000)
   },
-  deactivated () {
+  deactivated() {
     if (this.loopEvent) {
       clearInterval(this.loopEvent)
       this.loopEvent = null
     }
   },
-  beforeDestroy () {
+  beforeDestroy() {
     if (this.loopEvent) {
       clearInterval(this.loopEvent)
       this.loopEvent = null
     }
   },
   methods: {
-    resetLoopEvent () {
+    resetLoopEvent() {
       this.loading = true
       this.hasSetTableScroll = false
       if (this.loopEvent) {
@@ -376,14 +517,14 @@ export default {
         that.getTableData()
       }, 3000)
     },
-    airPortChange () {
+    airPortChange() {
       this.resetLoopEvent()
     },
-    dateChangeHandler () {
+    dateChangeHandler() {
       this.resetLoopEvent()
     },
     // 选择机场
-    async getAirPortData () {
+    async getAirPortData() {
       try {
         const res = await getQuery({
           id: DATACONTENT_ID.arrivalAirId,
@@ -400,7 +541,7 @@ export default {
         console.log('出错了', error.message || error)
       }
     },
-    tableRowClassName ({ row, rowIndex }) {
+    tableRowClassName({ row, rowIndex }) {
       const classes = []
       if (row.flightStatus === 'DLY') {
         classes.push('bgl-delayed')
@@ -416,7 +557,7 @@ export default {
       }
       return classes.join(' ')
     },
-    headerCellClass ({ row, column }) {
+    headerCellClass({ row, column }) {
       const classes = []
       const rule = this.tableDataSortRules[column.property]
       if (rule) {
@@ -435,7 +576,7 @@ export default {
     //   this.flightAttrQuery(params)
     // },
     // 获取表格数据
-    async getTableData () {
+    async getTableData() {
       if (!this.formData.currentAirport || !this.startDate || !this.endDate) {
         return
       }
@@ -460,7 +601,7 @@ export default {
         console.log('出错了', error.message || error)
       }
     },
-    initTableData (tableData) {
+    initTableData(tableData) {
       this.arrivalCount = 0
       this.baggageCount = 0
       tableData.forEach(item => {
@@ -481,7 +622,7 @@ export default {
         this.setTableScroll()
       })
     },
-    hasArrived (flight) {
+    hasArrived(flight) {
       if (flight.arrivalTime) {
         const now = new Date()
         const arrivalTime = new Date(flight.arrivalTime)
@@ -491,7 +632,7 @@ export default {
       }
       return flight['hasArrived']
     },
-    setTableScroll () {
+    setTableScroll() {
       if (!this.singleDay || this.hasSetTableScroll || this.arrivalCount === 0) {
         return
       }
@@ -511,7 +652,7 @@ export default {
       }, 0)
       this.hasSetTableScroll = true
     },
-    setNumberTransform () {
+    setNumberTransform() {
       const numberItems = this.$refs.numberItem // 拿到数字的ref，计算元素数量
       const numberArr = this.orderNum.filter(item => !isNaN(item))
       // 结合CSS 对数字字符进行滚动,显示订单数量
@@ -521,7 +662,7 @@ export default {
       }
     },
 
-    toOrderNum (num) {
+    toOrderNum(num) {
       num = num.toString()
       if (num.length < 6) {
         num = '0' + num // 如未满八位数，添加"0"补位
@@ -533,6 +674,14 @@ export default {
         this.$message.warning('总量数字过大')
       }
       this.setNumberTransform()
+    },
+    exportHandler(refName, tableName) {
+      if (this.loading) {
+        return
+      }
+      const table = this.$refs[refName].$el.cloneNode(true)
+      const fileName = `${tableName}-${this.currentAirport}-${this.startDate}-${this.endDate}.xlsx`
+      throttledExportToExcel(table, tableName, fileName)
     }
   }
 }
@@ -549,7 +698,7 @@ export default {
       flex: 1;
     }
     .form-right {
-      flex: 0 1 498px;
+      flex: 0 1 auto;
     }
     .el-form-item {
       margin-bottom: 0px;
@@ -559,7 +708,7 @@ export default {
       optgroup,
       select,
       textarea {
-        font-family: Helvetica, "Microsoft YaHei";
+        font-family: Helvetica, 'Microsoft YaHei';
         font-size: 14px;
       }
       .el-switch__label {
@@ -665,7 +814,7 @@ export default {
       padding: 0;
       text-align: center;
       font-size: 14px;
-      font-family: Helvetica, "Microsoft YaHei";
+      font-family: Helvetica, 'Microsoft YaHei';
       letter-spacing: 0;
     }
     .cell-click {
@@ -699,7 +848,7 @@ export default {
         &.redBorder {
           position: relative;
           &::after {
-            content: "";
+            content: '';
             position: absolute;
             left: 0;
             bottom: 0;

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

@@ -566,6 +566,7 @@ export default {
     }
   },
   activated() {
+    this.infoBtn = '跟踪信息'
     this.basicInfoHeight = this.$refs['basicInfo'].offsetHeight
     this.$refs['table']?.doLayout()
   },

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

@@ -619,7 +619,7 @@ export default {
       const table = this.$refs[refName].$el.cloneNode(true)
       const fileName = `${tableName}-${this.currentAirport}-${this.startDate}-${this.endDate}.xlsx`
       throttledExportToExcel(table, tableName, fileName)
-    },
+    }
   }
 }
 </script>

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

@@ -13,9 +13,19 @@
           <span class="manageTitle">航班基本信息</span>
         </div>
         <div class="part1-wrapper">
-          <div class="airline">
-            {{ flightInfo.planDepartureApt }} - {{ flightInfo.flightNO }} -
-            {{ flightInfo.planLandingApt }}
+          <div class="airline">{{ queryData.flightNO }}
+            <el-select
+              v-model="selectedAirline"
+              size="mini"
+              class="airline-select"
+            >
+              <el-option
+                v-for="airline in airlineList"
+                :key="airline.value"
+                :value="airline.value"
+                :label="airline.label"
+              />
+            </el-select>
           </div>
           <div class="part1_info">
             <div class="part1_info_box">
@@ -403,7 +413,7 @@
           stripe
           size="mini"
           show-summary
-          :summary-method="summaryRow(flightBaggageTableData.length)"
+          :summary-method="summaryRow(dealedTableData.length)"
           :header-cell-class-name="headerCellClass"
           :header-cell-style="{ color: '#101116' }"
           :row-class-name="rowClass"
@@ -474,7 +484,7 @@
 <script>
 import Dialog from '@/layout/components/Dialog/index.vue'
 import TimeZoneSelector from '@/components/TimeZoneSelector'
-import { queryMap, myQuery } from '@/api/dataIntegration'
+import { myQuery } from '@/api/dataIntegration'
 import tableColsMixin from '../../mixins/tableCols'
 import timeZoneMixin from '../../mixins/timeZone'
 import TableHeaderCell from '@/components/TableHeaderCell'
@@ -528,6 +538,8 @@ export default {
   data() {
     return {
       fullscreenLoading: false,
+      airlineList: [],
+      selectedAirline: '',
       queryData: {},
       flightInfo: {},
       keyWords: '',
@@ -591,8 +603,8 @@ export default {
         { label: '分拣', prop: 'sortTime', width: 140 },
         { label: '装车', prop: 'loadTime', width: 140 },
         { label: '装机', prop: 'inflTime', width: 140 },
-        { label: '中转进航班', prop: 'inFlightNO' },
-        { label: '中转出航班', prop: 'transferFlightNO' },
+        { label: '中转进航班', prop: 'inFlightNO', filterable: true, sortable: true, width: 105 },
+        { label: '中转出航班', prop: 'transferFlightNO', filterable: true, sortable: true, width: 105 },
         { label: '卷宗号', prop: 'fileNumber' }
       ],
       containerTableData: [], // 容器统计
@@ -650,7 +662,7 @@ export default {
         this.queryData = this._.cloneDeep(query)
         const { flightNO, flightDate } = query
         if (flightNO && flightDate) {
-          this.queryAll([flightNO, flightDate])
+          this.queryAirline([flightNO, flightDate])
         } else if (path.includes('flight')) {
           this.$router.push('/advance')
         }
@@ -668,6 +680,11 @@ export default {
       } else {
         this.loading?.close()
       }
+    },
+    selectedAirline(val) {
+      const { flightNO, flightDate } = this.queryData
+      const [departureAirport, landingAirport] = val.split('-')
+      this.queryAll([flightNO, flightDate, departureAirport, landingAirport])
     }
   },
   created() {
@@ -687,7 +704,7 @@ export default {
     if (!flightNO || !flightDate) {
       this.$router.push('/advance')
     }
-    this.queryAll([flightNO, flightDate])
+    this.queryAirline([flightNO, flightDate])
   },
   activated() {
     this.$nextTick(() => {
@@ -899,35 +916,33 @@ export default {
       throttledExportToExcel(table, tableName, fileName)
     },
     queryflightInfo(dataContent) {
-      return myQuery(queryMap.flightInfo, ...dataContent)
+      return myQuery(DATACONTENT_ID.flightInfo, ...dataContent)
     },
     queryContainer(dataContent) {
-      return myQuery(queryMap.container, ...dataContent)
-    },
-    queryTrasferOutBaggage(dataContent) {
-      return myQuery(queryMap.transferOutBaggage, ...dataContent)
-    },
-    queryTrasferInBaggage(dataContent) {
-      return myQuery(queryMap.transferInBaggage, ...dataContent)
+      return myQuery(DATACONTENT_ID.flightContainer, ...dataContent)
     },
     queryBaggageByFlightNO(dataContent) {
-      return myQuery(queryMap.baggageByFlightNO, ...dataContent)
+      return myQuery(DATACONTENT_ID.flightBaggage, ...dataContent)
+    },
+    async queryAirline(dataContent) {
+      try {
+        const listValues = await myQuery(DATACONTENT_ID.flightAirline, ...dataContent)
+        this.airlineList = listValues.map(airline => ({
+          label: `${airline.departureAirport}-${airline.landingAirport}`,
+          value: `${airline.departureAirport}-${airline.landingAirport}`
+        }))
+        this.selectedAirline = this.airlineList[0].value
+      } catch (error) {
+        console.log('出错了', error.message || error)
+      }
     },
     async queryAll(dataContent) {
       this.fullscreenLoading = true
       this.flightInfo = {}
       try {
-        const [
-          flightInfo,
-          containerTableDataData,
-          // transferOutBaggageTableData,
-          // transferInBaggageTableData,
-          flightBaggageTableData
-        ] = await Promise.all([
+        const [flightInfo, containerTableDataData, flightBaggageTableData] = await Promise.all([
           this.queryflightInfo(dataContent),
           this.queryContainer(dataContent),
-          // this.queryTrasferOutBaggage(dataContent),
-          // this.queryTrasferInBaggage(dataContent),
           this.queryBaggageByFlightNO(dataContent)
         ])
         if (flightInfo.length) {
@@ -1005,6 +1020,18 @@ export default {
           font-size: 18px;
           font-weight: bold;
           color: #ffffff;
+          ::v-deep .airline-select {
+            .el-input__inner {
+              width: 150px;
+              background-color: transparent;
+              font-size: 18px;
+              font-weight: bold;
+              color: #ffffff;
+            }
+            .el-select__caret {
+              color: #ffffff;
+            }
+          }
         }
         .part1_info {
           width: 100%;
@@ -1012,7 +1039,7 @@ export default {
           flex-direction: row;
           justify-content: space-between;
           align-items: center;
-          padding-top: 32px;
+          padding-top: 24px;
 
           .part1_info_box {
             width: calc(33.333% - 48px);