Merge branch 'master' of http://120.26.64.82:10880/BFFE/CA3.0

public/config.js

@@ -139,6 +139,14 @@ window.SERVICE_ID = {
   nodeExportAirport: 1805, // 节点统计导出-航站
   nodeAxisDesc: 90, // 节点统计指示器名称解释
 
+  /***-----统计表格------***/
+  transferBaggageProption: 1848, //中转行李比例明细
+  transferBaggageFactor: 1849, // 中转行李因素分析
+  transferBaggageDetails: 1850, // 中转行李明细
+  transferBaggageDirection: 1851, // 中转行李四个流向
+  transferBaggageDirectionDetails: 1852, // 中转行李流向明细
+  baggageServicePercentage: 1853, // 行李全流程服务水平百分比
+
   /***-----速运行李------***/
   expressTransportationUpload: 20034, // 速运行李数据上传
   expressTransportation: 1803435, // 速运行李数据查询

src/utils/table.js

@@ -243,7 +243,7 @@ export function exportToExcel(table, tableName, fileName, headerRowNumber = 1) {
         } else {
           cellStyle.alignment.horizontal = 'left'
           
-          const isNumber = !isNaN(parseFloat(cellValue)) && isFinite(cellValue)
+          const isNumber = /^[^0]/.test(cellValue) && !isNaN(parseFloat(cellValue)) && isFinite(cellValue)
           if (isNumber) {
             xlsxDatas[cellName] = {
               ...xlsxDatas[cellName],

src/views/advancedQuery/views/advancedHome.vue

@@ -1004,15 +1004,15 @@ export default {
         'checkInSequence',
         'transferArrival',
         'transferDeparture',
+        'loadType',
         'U_Device_ID',
-        'unLoad',
         'checkIn',
         'active',
         'transferIn',
         'canceled',
         'status',
         'noBSM',
-        'loadType'
+        'unLoad',
       )
       const azNum = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]*$/
       // const top2 = /^[a-zA-Z]{2}\w*$/
@@ -1074,11 +1074,11 @@ export default {
         if (key === 'baggageNO') {
           dataContent[key] = baggageFormat(this.form[key]) || null
         } else if (key === 'specialType') {
-          dataContent[key] = this.form[key].join() || null
+          dataContent[key] = this.form[key].join('/') || null
         } else if (key === 'checkInSequence') {
           dataContent[key] = digitFormat(this.form[key]) || null
         } else {
-          dataContent[key] = this.form[key] || null
+          dataContent[key] = (this.form[key] ?? '') !== '' ? this.form[key] : null
         }
       })
       this.dataContent[0] = {
@@ -1098,7 +1098,7 @@ export default {
           // needPage: ++this.page,
           serviceId: SERVICE_ID.advancedQueryId,
           page: ++this.page,
-          size: 50,
+          pageSize: 50,
           dataContent,
         })
         if (Number(code) !== 0) {
@@ -1143,7 +1143,6 @@ export default {
               }
             }
           }
-          console.log(result)
           this.tableData = [...this.tableData, ...result]
           setTableFilters(this.tableData, this.tableDataFilters)
         } else {

src/views/baggageManagementTemp/components/container/index.vue

@@ -351,7 +351,7 @@ export default {
       const classes = []
       if (row['isDEL'] === 'DEL') {
         classes.push('bgl-deleted')
-        if (row['waitOFF'] === 1) {
+        if (String(row['waitOFF']) === '1') {
           classes.push('bgl-toUnload')
         }
       }
@@ -456,7 +456,7 @@ export default {
         case 'isDEL':
           return cellValue === 'DEL' ? '删除' : ''
         case 'activeState':
-          return Number(cellValue) === 1 ? '激活' : '未激活'
+          return String(cellValue) === '1' ? '激活' : '未激活'
         default:
           return cellValue ?? ''
       }

src/views/baggageManagementTemp/components/containerHistory/index.vue

@@ -368,7 +368,7 @@ export default {
         case 'isDEL':
           return cellValue === 'DEL' ? '删除' : ''
         case 'activeState':
-          return Number(cellValue) === 1 ? '激活' : '未激活'
+          return String(cellValue) === '1' ? '激活' : '未激活'
         default:
           return cellValue ?? ''
       }

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

@@ -568,7 +568,7 @@ export default {
           case 'arrivedID':
           case 'unloadID':
           case 'NOBSM':
-            return row[key] === 1
+            return String(row[key]) === '1'
           case 'unActive':
             return row['STATUS'] === 'I'
           case 'preLoad':
@@ -576,15 +576,15 @@ export default {
           case 'loaded':
             return row['loadTime'] && row['isDEL'] !== 'DEL'
           case 'destination':
-            return row['arrivedID'] === 1 && !row['transferFlightNO']
+            return String(row['arrivedID']) === '1' && !row['transferFlightNO']
           case 'inContainer':
             return row['U_Device_ID'] && row['U_Device_ID'] !== 'FBULK'
           case 'FBULK':
             return row['U_Device_ID'] === 'FBULK'
           case 'toUnload':
-            return (row['loadTime'] || row['inflTime']) && row['isDEL'] === 'DEL' && row['waitOFF'] === 1
+            return (row['loadTime'] || row['inflTime']) && row['isDEL'] === 'DEL' && String(row['waitOFF']) === '1'
           case 'unloaded':
-            return (row['loadTime'] || row['inflTime']) && row['isDEL'] === 'DEL' && row['waitOFF'] !== 1
+            return (row['loadTime'] || row['inflTime']) && row['isDEL'] === 'DEL' && String(row['waitOFF']) !== '1'
           case 'canceled':
             return row['isDEL'] === 'DEL'
           case 'inFlightNO':
@@ -594,6 +594,12 @@ export default {
             return isWarning(row) === 2
           case 'alarm':
             return isWarning(row) === 1
+          case 'checkInTime':
+          case 'securityTime':
+          case 'sortTime':
+          case 'loadTime':
+          case 'inflTime':
+            return (row[key] ?? '') !== '' && row['isDEL'] !== 'DEL'
           default:
             return (row[key] ?? '') !== ''
         }
@@ -689,11 +695,12 @@ export default {
     } else {
       this.$router.push('/')
     }
-    const filterValues = this.savedTableFilterValuesMap[this.$route.name + '/flightBaggage']
+    // const filterValues = this.savedTableFilterValuesMap[this.$route.name + '/flightBaggage']
     Object.values(this.tableCols).forEach(({ prop, filterable, sortable }) => {
       if (filterable) {
         this.$set(this.flightBaggageTableFilters, prop, [])
-        this.$set(this.filterValues, prop, filterValues?.[prop] ?? [])
+        // this.$set(this.filterValues, prop, filterValues?.[prop] ?? [])
+        this.$set(this.filterValues, prop, [])
       }
       if (sortable) {
         this.$set(this.tableDataSortRules, prop, '')
@@ -707,6 +714,7 @@ export default {
     this.resizeHandler()
   },
   activated () {
+    this.clearFilterValues()
     const { fastFilter } = this.$route.query
     this.selectedFilter = fastFilter ? fastFilter.split(',') : []
     this.getWarningData()
@@ -757,6 +765,11 @@ export default {
       // this.$refs['transferOutBaggageTable']?.doLayout()
       this.$refs['flightBaggageTable']?.doLayout()
     },
+    clearFilterValues() {
+      Object.keys(this.filterValues).forEach(key => {
+        this.filterValues[key] = []
+      })
+    },
     setfastFilterValues () {
       const inFlightNOList = new Set()
       const transferFlightNOList = new Set()
@@ -789,11 +802,11 @@ export default {
       const classes = []
       if (
         this.warningContainers.includes(row['containerNumber']) ||
-        ((row['loadTime'] || row['inflTime']) && row['isDEL'] === 'DEL' && row['waitOFF'] === 1)
+        ((row['loadTime'] || row['inflTime']) && row['isDEL'] === 'DEL' && String(row['waitOFF']) === '1')
       ) {
         classes.push('row-warning')
       }
-      if (row['Status'] === 'DEL') {
+      if (row['isDEL'] === 'DEL') {
         classes.push('bgl-deleted')
       }
       return classes.join(' ')
@@ -1102,7 +1115,7 @@ export default {
         this.containerTableData = containerTableDataData
         this.warningContainers = []
         this.flightBaggageTableData = flightBaggageTableData.map(item => {
-          if ((item['loadTime'] || item['inflTime']) && item['isDEL'] === 'DEL' && item['waitOFF'] === 1) {
+          if ((item['loadTime'] || item['inflTime']) && item['isDEL'] === 'DEL' && String(item['waitOFF']) === '1') {
             this.warningContainers.push(item['U_Device_ID'])
           }
           return item

src/views/baggageManagementTemp/mixins/form.js

@@ -130,7 +130,12 @@ export default {
       }
     },
     dateRangeDisabled (date) {
-      return this.pickedDate ? Math.abs(date - this.pickedDate) > 2 * 24 * 60 * 60 * 1000 : false
+      if (this.pickedDate) {
+        const diff = date - this.pickedDate,
+          day = 24 * 60 * 60 * 1000
+        return diff < -3 * day || diff > 2 * day
+      }
+      return false
     },
     // 机场数据处理（多选）
     getMultipleData (arr) {

src/views/baggageManagementTemp/mixins/terminal.js

@@ -33,6 +33,7 @@ export default {
     this.resizeHandler()
   },
   activated() {
+    this.clearFilterValues()
     this.resizeHandler()
     this.debouncedResizeHandler = this._.debounce(this.resizeHandler, this.debounceTime)
     window.addEventListener('resize', this.debouncedResizeHandler)
@@ -133,7 +134,7 @@ export default {
     },
     // 设置筛选和排序
     setFilterAndSort(tableCols) {
-      const filterValues = this.savedTableFilterValuesMap[this.$route.name]
+      // const filterValues = this.savedTableFilterValuesMap[this.$route.name]
       const self = this
       Object.values(tableCols).forEach(({ prop, filterable, sortable, children }) => {
         if (children) {
@@ -141,7 +142,8 @@ export default {
         } else {
           if (Number(filterable) === 1) {
             self.$set(self.tableDataFilters, prop, [])
-            self.$set(self.filterValues, prop, filterValues?.[prop] ?? [])
+            // self.$set(self.filterValues, prop, filterValues?.[prop] ?? [])
+            self.$set(self.filterValues, prop, [])
           } else if (Number(filterable) === 2) {
             self.$set(self.tableDataFilters, prop, [])
             self.$set(self.newFilters, prop, ['=', null])
@@ -152,6 +154,11 @@ export default {
         }
       })
     },
+    clearFilterValues() {
+      Object.keys(this.filterValues).forEach(key => {
+        this.filterValues[key] = []
+      })
+    },
     // 合计行
     summaryMethod({ columns, data }) {
       const sums = []

src/views/newArrival/index.vue

@@ -52,7 +52,7 @@
     </div>
     <!--表格-->
     <div class="terminal-table">
-      <Table :istableChild="true" :pageSize="9999" @tableLoad="tableLoad" style="height:100%" :btnStyle="{ 'top':'-43px','right':'8px' }" :istableCol="true" :tableTag="tableTag" ref="table" />
+      <Table :istableChild="true" :pageSize="9999" @tableLoad="tableLoad" style="height:100%" :btnStyle="{ 'top':'-43px','right':'8px' }" :istableCol="true" :tableTag="tableTag" ref="table" :should-reset.sync="loading" />
     </div>
   </div>
 </template>
@@ -78,7 +78,7 @@ export default {
       tableDataSortRules: {
         flightCanceled: "ascending",
       },
-      loading: false,
+      loading: true,
       AirportList: [],
       tableTag: {},
       timer: null
@@ -146,7 +146,8 @@ export default {
             this.formData.currentAirport = this.TauthId && flag.length ? 'PEK' : res.returnData[0].IATACode;
           }
           this.tableTag = {
-            filter: this.formatParams()
+            filter: this.formatParams(),
+            shouldReset: type !== 1
           }
         } else {
           this.$message.error(res.message);

src/views/newArrival/mixins/form.js

@@ -131,7 +131,12 @@ export default {
       }
     },
     dateRangeDisabled (date) {
-      return this.pickedDate ? Math.abs(date - this.pickedDate) > 2 * 24 * 60 * 60 * 1000 : false
+      if (this.pickedDate) {
+        const diff = date - this.pickedDate,
+          day = 24 * 60 * 60 * 1000
+        return diff < -3 * day || diff > 2 * day
+      }
+      return false
     },
     // 机场数据处理（多选）
     getMultipleData (arr) {

src/views/newDeparture/index.vue

@@ -57,7 +57,7 @@
     </div>
     <!--表格-->
     <div class="terminal-table">
-      <Table style="height:100%" :pageSize="9999" :btnStyle="{ 'top':'-43px','right':'8px' }" @tableLoad="tableLoad" :istableCol="true" :tableTag="tableTag" ref="table" />
+      <Table style="height:100%" :pageSize="9999" :btnStyle="{ 'top':'-43px','right':'8px' }" @tableLoad="tableLoad" :istableCol="true" :tableTag="tableTag" ref="table" :should-reset.sync="loading" />
     </div>
   </div>
 </template>
@@ -83,7 +83,7 @@ export default {
       tableDataSortRules: {
         flightCanceled: "ascending",
       },
-      loading: false,
+      loading: true,
       AirportList: [],
       tableTag: {},
       timer: null
@@ -151,7 +151,8 @@ export default {
             this.formData.currentAirport = this.TauthId && flag.length ? 'PEK' : res.returnData[0].IATACode;
           }
           this.tableTag = {
-            filter: this.formatParams()
+            filter: this.formatParams(),
+            shouldReset: type !== 1
           }
         } else {
           this.$message.error(res.message);

src/views/newDeparture/mixins/form.js

@@ -150,7 +150,12 @@ export default {
       }
     },
     dateRangeDisabled (date) {
-      return this.pickedDate ? Math.abs(date - this.pickedDate) > 2 * 24 * 60 * 60 * 1000 : false
+      if (this.pickedDate) {
+        const diff = date - this.pickedDate,
+          day = 24 * 60 * 60 * 1000
+        return diff < -3 * day || diff > 2 * day
+      }
+      return false
     },
     // 机场数据处理（多选）
     getMultipleData (arr) {

src/views/newQuery/components/table.vue

@@ -58,7 +58,7 @@
 import pf from '@/layout/mixin/publicFunc'
 import { getToken } from '@/utils/auth'
 import { getAuthData, formatOrder } from '@/utils/validate'
-import { throttledExportToExcel } from '@/utils/table'
+import { exportToExcel } from '@/utils/table'
 import tableColsMixin from '../mix/tableCols'
 import Dialog from '@/layout/components/Dialog/index.vue'
 import TableHeaderCell from '@/components/TableHeaderCell/index.vue'
@@ -624,7 +624,7 @@ export default {
     exportHandler () {
       const table = this.$refs['table'].$el.cloneNode(true)
       const fileName = `${this.downName || this.AqueryParams.auth_name}.xlsx`
-      throttledExportToExcel(table, `${this.downName || this.AqueryParams.auth_name}`, fileName)
+      exportToExcel(table, `${this.downName || this.AqueryParams.auth_name}`, fileName)
     },
     formatter (row, column, cellValue, index) {
       const sameColumn = this.tableCols.find(

src/views/newTransfer/index.vue

@@ -55,7 +55,7 @@
     </div>
     <!--表格-->
     <div class="terminal-table">
-      <Table :istableChild="true" style="height:100%" :btnStyle="{ 'top':'-43px','right':'8px' }" :istableCol="true" :tableTag="tableTag" ref="table" />
+      <Table :istableChild="true" style="height:100%" :btnStyle="{ 'top':'-43px','right':'8px' }" :istableCol="true" :tableTag="tableTag" ref="table" :should-reset.sync="loading" />
     </div>
   </div>
 </template>
@@ -81,7 +81,7 @@ export default {
       tableDataSortRules: {
         flightCanceled: "ascending",
       },
-      loading: false,
+      loading: true,
       AirportList: [],
       tableTag: {},
       timer: null
@@ -154,7 +154,8 @@ export default {
             this.formData.currentAirport = this.TauthId && flag.length ? 'PEK' : res.returnData[0].IATACode;
           }
           this.tableTag = {
-            filter: this.formatParams()
+            filter: this.formatParams(),
+            shouldReset: type !== 1
           }
         } else {
           this.$message.error(res.message);

src/views/newTransfer/mixins/form.js

@@ -131,7 +131,12 @@ export default {
       }
     },
     dateRangeDisabled (date) {
-      return this.pickedDate ? Math.abs(date - this.pickedDate) > 2 * 24 * 60 * 60 * 1000 : false
+      if (this.pickedDate) {
+        const diff = date - this.pickedDate,
+          day = 24 * 60 * 60 * 1000
+        return diff < -3 * day || diff > 2 * day
+      }
+      return false
     },
     // 机场数据处理（多选）
     getMultipleData (arr) {

src/views/statisticsCharts/components/TableDialog.vue

@@ -325,7 +325,7 @@ export default {
           returnData: { listValues },
           message,
         } = await TempQuery({
-          id: 1844,
+          id: SERVICE_ID.transferBaggageDetails,
           dataContent: this.queryParams,
         })
         if (String(code) !== '0') {

src/views/statisticsCharts/components/commonBarStatisticsCharts.vue

@@ -535,7 +535,7 @@ export default {
             cellStyle.alignment.horizontal = 'left'
           }
           const cellValue = sheet[key].v
-          const isNumber = !isNaN(parseFloat(cellValue)) && isFinite(cellValue)
+          const isNumber = /^[^0]/.test(cellValue) && !isNaN(parseFloat(cellValue)) && isFinite(cellValue)
           const isPercentage = /^[0-9]+(\.[0-9]+){0,1}\%$/.test(cellValue)
           if (isNumber) {
             sheet[key] = {

src/views/statisticsCharts/views/airlineCompany/baggageStatisticsCharts.vue

@@ -33,7 +33,7 @@ export default {
             },
             {
               value: '不包含DEL',
-              label: '不包含DEL'
+              label: '实际托运'
             }
           ]
         }

src/views/statisticsCharts/views/report/Percentageofbaggage.vue

@@ -33,7 +33,7 @@ export default {
       },
       isloadings: 1,
       dataContent: [],
-      dataId: '1847',
+      dataId: SERVICE_ID.baggageServicePercentage,
       formItems: [
         {
           prop: 'dateTime',
@@ -81,7 +81,7 @@ export default {
           this.formData.airport || 'PEK',
           row.fd || Format('yyyy-MM-dd', new Date()),
           row.fd || Format('yyyy-MM-dd', new Date()),
-          ...Array(4).fill(this.formData.company || '国航'),
+          ...Array(4).fill(this.formData.company?.join(',') || '国航'),
         ]
         const flow = column.property
           .split('_')

src/views/statisticsCharts/views/report/baggageProportionTable.vue

@@ -43,12 +43,12 @@ export default {
       formData: {
         airport: '',
         dateTime: [],
-        company: '',
+        company: ['国航'],
         timedim: '',
       },
       isloadings: 1,
       dataContent: [],
-      dataId: '1842',
+      dataId: SERVICE_ID.transferBaggageProption,
       formItems: [
         {
           prop: 'airport',
@@ -67,7 +67,8 @@ export default {
           inputType: 'select',
           placeholder: '航班分类',
           requiredWarning: '请先选择航班分类',
-          clearable: true,
+          multiple: true,
+          // clearable: true,
           options: [
             {
               value: '国航',
@@ -125,31 +126,21 @@ export default {
   },
   mounted() {
     this.dataContent = [
-      '日',
-      '日',
-      '日',
-      '国航',
-      '国航',
-      '国航',
-      '国航',
-      Format('yyyy-MM-dd', new Date()),
-      Format('yyyy-MM-dd', new Date()),
-      'PEK',
+      ...Array(3).fill(this.formData.timedim || '日'),
+      ...Array(4).fill(this.formData.company?.join(',') || '国航'),
+      this.formData.dateTime[0] || Format('yyyy-MM-dd', new Date()),
+      this.formData.dateTime[1] || Format('yyyy-MM-dd', new Date()),
+      this.formData.airport || 'PEK',
     ]
   },
   methods: {
     getFormData(data) {
       this.dataContent = [
-        data.timedim,
-        data.timedim,
-        data.timedim,
-        data.company,
-        data.company,
-        data.company,
-        data.company,
-        data.dateTime[0],
-        data.dateTime[1],
-        data.airport ? data.airport : 'PEK',
+        ...Array(3).fill(data.timedim || '日'),
+        ...Array(4).fill(this.formData.company?.join(',') || '国航'),
+        data.dateTime[0] || Format('yyyy-MM-dd', new Date()),
+        data.dateTime[1] || Format('yyyy-MM-dd', new Date()),
+        data.airport || 'PEK',
       ]
     },
     exportup() {

src/views/statisticsCharts/views/report/transferBaggageTable.vue

@@ -48,7 +48,7 @@ export default {
       },
       isloadings: 1,
       dataContent: [],
-      dataId: '1843',
+      dataId: SERVICE_ID.transferBaggageFactor,
       formItems: [
         {
           prop: 'airport',
@@ -67,7 +67,8 @@ export default {
           inputType: 'select',
           placeholder: '航班分类',
           requiredWarning: '请先选择航班分类',
-          clearable: true,
+          multiple: true,
+          // clearable: true,
           options: [
             {
               value: '国航',
@@ -125,37 +126,27 @@ export default {
   },
   mounted() {
     this.dataContent = [
-      '日',
-      '日',
-      '日',
-      '国航',
-      '国航',
-      '国航',
-      '国航',
-      Format('yyyy-MM-dd', new Date()),
-      Format('yyyy-MM-dd', new Date()),
-      'PEK',
-      Format('yyyy-MM-dd', new Date()),
-      Format('yyyy-MM-dd', new Date()),
-      'PEK',
+      ...Array(3).fill(this.formData.timedim || '日'),
+      ...Array(4).fill(this.formData.company?.join(',') || '国航'),
+      this.formData.dateTime[0] || Format('yyyy-MM-dd', new Date()),
+      this.formData.dateTime[1] || Format('yyyy-MM-dd', new Date()),
+      this.formData.airport || 'PEK',
+      this.formData.dateTime[0] || Format('yyyy-MM-dd', new Date()),
+      this.formData.dateTime[1] || Format('yyyy-MM-dd', new Date()),
+      this.formData.airport || 'PEK',
     ]
   },
   methods: {
     getFormData(data) {
       this.dataContent = [
-        data.timedim,
-        data.timedim,
-        data.timedim,
-        data.company,
-        data.company,
-        data.company,
-        data.company,
-        data.dateTime[0],
-        data.dateTime[1],
-        data.airport ? data.airport : 'PEK',
-        data.dateTime[0],
-        data.dateTime[1],
-        data.airport ? data.airport : 'PEK',
+        ...Array(3).fill(data.timedim || '日'),
+        ...Array(4).fill(this.formData.company?.join(',') || '国航'),
+        data.dateTime[0] || Format('yyyy-MM-dd', new Date()),
+        data.dateTime[1] || Format('yyyy-MM-dd', new Date()),
+        data.airport || 'PEK',
+        data.dateTime[0] || Format('yyyy-MM-dd', new Date()),
+        data.dateTime[1] || Format('yyyy-MM-dd', new Date()),
+        data.airport || 'PEK',
       ]
     },
     exportup() {

src/views/statisticsCharts/views/report/transferDirectionTable.vue

@@ -54,7 +54,7 @@ export default {
       formData: {
         airport: '',
         dateTime: '',
-        company: '',
+        company: ['国航'],
         timedim: '',
         dateTime: [],
         trd: [],
@@ -62,7 +62,7 @@ export default {
       },
       isloadings: 1,
       dataContent: [],
-      dataId: '1846',
+      dataId: SERVICE_ID.transferBaggageDirectionDetails,
       formItems: [
         {
           prop: 'trd',
@@ -133,7 +133,8 @@ export default {
           inputType: 'select',
           placeholder: '航班分类',
           requiredWarning: '请先选择航班分类',
-          clearable: true,
+          multiple: true,
+          // clearable: true,
           options: [
             {
               value: '国航',
@@ -199,7 +200,7 @@ export default {
       this.formData.airport || 'PEK',
       this.formData.dateTime[0] || Format('yyyy-MM-dd', new Date()),
       this.formData.dateTime[1] || Format('yyyy-MM-dd', new Date()),
-      ...Array(4).fill(this.formData.company || '国航'),
+      ...Array(4).fill(this.formData.company?.join(',') || '国航'),
     ]
   },
   methods: {
@@ -207,16 +208,11 @@ export default {
       this.textShow = data.trd
       this.textShowtp = data.ts
       this.dataContent = [
-        data.timedim,
-        data.timedim,
-        data.timedim,
-        'PEK',
-        data.dateTime[0],
-        data.dateTime[1],
-        data.company,
-        data.company,
-        data.company,
-        data.company,
+        ...Array(3).fill(data.timedim || '日'),
+        data.formData || 'PEK',
+        data.dateTime[0] || Format('yyyy-MM-dd', new Date()),
+        data.dateTime[1] || Format('yyyy-MM-dd', new Date()),
+        ...Array(4).fill(this.formData.company?.join(',') || '国航'),
       ]
     },
     exportup() {
@@ -232,7 +228,7 @@ export default {
           this.formData.airport || 'PEK',
           row.fd || Format('yyyy-MM-dd', new Date()),
           row.fd || Format('yyyy-MM-dd', new Date()),
-          ...Array(4).fill(this.formData.company || '国航'),
+          ...Array(4).fill(this.formData.company?.join(',') || '国航'),
         ]
         const flow = column.property
           .split('_')

src/views/statisticsCharts/views/report/transitTables.vue

@@ -28,13 +28,13 @@ export default {
       formData: {
         airport: '',
         dateTime: [],
-        company: '',
+        company: ['国航'],
         timedim: '',
         trd: [],
       },
       isloadings: 1,
       dataContent: [],
-      dataId: '1845',
+      dataId: SERVICE_ID.transferBaggageDirection,
       formItems: [
         {
           prop: 'trd',
@@ -79,7 +79,9 @@ export default {
           inputType: 'select',
           placeholder: '航班分类',
           requiredWarning: '请先选择航班分类',
-          clearable: true,
+          multiple: true,
+          width: '160px',
+          // clearable: true,
           options: [
             {
               value: '国航',
@@ -145,23 +147,18 @@ export default {
       this.formData.airport || 'PEK',
       this.formData.dateTime[0] || Format('yyyy-MM-dd', new Date()),
       this.formData.dateTime[1] || Format('yyyy-MM-dd', new Date()),
-      ...Array(4).fill(this.formData.company || '国航'),
+      ...Array(4).fill(this.formData.company?.join(',') || '国航'),
     ]
   },
   methods: {
     getFormData (data) {
       this.textShow = data.trd
       this.dataContent = [
-        data.timedim,
-        data.timedim,
-        data.timedim,
-        data.airport ? data.airport : 'PEK',
-        data.dateTime[0],
-        data.dateTime[1],
-        data.company,
-        data.company,
-        data.company,
-        data.company,
+        ...Array(3).fill(data.timedim || '日'),
+        data.airport || 'PEK',
+        data.dateTime[0] || Format('yyyy-MM-dd', new Date()),
+        data.dateTime[1] || Format('yyyy-MM-dd', new Date()),
+        ...Array(4).fill(this.formData.company?.join(',') || '国航'),
       ]
     },
     exportup () {
@@ -177,7 +174,7 @@ export default {
           this.formData.airport || 'PEK',
           row.fd || Format('yyyy-MM-dd', new Date()),
           row.fd || Format('yyyy-MM-dd', new Date()),
-          ...Array(4).fill(this.formData.company || '国航'),
+          ...Array(4).fill(this.formData.company?.join(',') || '国航'),
         ]
         const flow = column.property
           .split('_')