123

src/views/advancedQuery/views/advancedHome.vue

@@ -49,6 +49,10 @@
       element-loading-background="rgba(0, 0, 0, 0.8)"
       class="advance__table"
     >
+      <!-- <el-table ref="table" max-height="100%" show-summary class="table" :data="tableData" border stripe height="calc(100vh - 155px)" style="width: 100%">
+        <el-table-column v-for="(item, index) in tableColsCopy" :prop="item.statCode" :label="item.statName" :key="index">
+        </el-table-column>
+      </el-table> -->
       <el-table
         ref="table"
         max-height="100%"
@@ -62,61 +66,131 @@
         :summary-method="summaryRow(tableData.length)"
       >
         <el-table-column
-          v-for="item in tableColsCopy"
-          :key="item.index"
-          :prop="item.prop"
-          :label="item.name"
-          :width="item.width"
-          :align="item.align || 'center'"
-          :filters="tableFilters[item.prop]"
-          :filter-method="tableFilters[item.prop] && filterHandler"
+          prop="index"
+          label="序号"
+        />
+        <el-table-column
+          prop="FlightNO"
+          label="航班号"
+          :filters="FlightNOItem"
+          :filter-method="filterHandler"
         >
-          <template
-            v-if="item.prop === 'FlightNO'"
-            slot-scope="scope"
-          >
+          <template slot-scope="scope">
             <el-button
               size="mini"
-              style="text-overflow: ellipsis;
-                white-space: normal;
-                word-break: break-all;"
               @click="flightClickHandler(scope.row)"
             >{{ scope.row.FlightNO }}</el-button>
           </template>
-          <template
-            v-else-if="item.prop === 'BagSN'"
-            slot-scope="scope"
-          >
+        </el-table-column>
+        <el-table-column
+          prop="FlightDate"
+          label="航班日期"
+          :filters="FlightDateItem"
+          :filter-method="filterHandler"
+        />
+        <el-table-column
+          prop="SourceAirport"
+          label="起飞站"
+          :filters="SourceAirportItem"
+          :filter-method="filterHandler"
+        />
+        <el-table-column
+          prop="TargetAirport"
+          label="目的地"
+          :filters="TargetAirportItem"
+          :filter-method="filterHandler"
+        />
+        <el-table-column
+          prop="PassengerNameUpcase"
+          label="旅客姓名"
+          :filters="PassengerNameUpcaseItem"
+          :filter-method="filterHandler"
+        />
+        <el-table-column
+          prop="BagSN"
+          label="行李牌号"
+          width="130"
+        >
+          <template slot-scope="scope">
             <el-button
               size="mini"
               @click="baggageClickHandler(scope.row)"
             >{{ scope.row.BagSN }}</el-button>
           </template>
-          <template v-else>1</template>
         </el-table-column>
+        <el-table-column
+          prop="SpecialType"
+          label="特殊行李类型"
+          :filters="SpecialTypeItem"
+          :filter-method="filterHandler"
+        />
+        <el-table-column
+          prop="checkIn"
+          label="值机"
+          :filters="checkInItem"
+          :filter-method="filterHandler"
+        />
+        <el-table-column
+          label="删除"
+          prop="deleted"
+          :filters="deletedItem"
+          :filter-method="filterHandler"
+        >
+          <!-- <template slot-scope="scope">
+            <div>{{ scope.row.deleted == "DEL" ? 1 : 0 }}</div>
+          </template> -->
+        </el-table-column>
+        <el-table-column
+          label="激活"
+          prop="activated"
+          :filters="activatedItem"
+          :filter-method="filterHandler"
+        >
+          <!-- <template slot-scope="scope">
+            <div>{{ scope.row.activated == "I" ? 0 : 1 }}</div>
+          </template> -->
+        </el-table-column>
+        <el-table-column
+          prop="BagWeight"
+          label="重量"
+        />
+        <el-table-column
+          prop="latestStatus"
+          label="最新状态"
+          :filters="latestStatusItem"
+          :filter-method="filterHandler"
+        />
+        <el-table-column
+          prop="bagLocation"
+          label="最新位置"
+          :filters="bagLocationItem"
+          :filter-method="filterHandler"
+        />
+        <el-table-column
+          prop="TransferFlightNO"
+          label="中转进航班"
+          :filters="TransferFlightNOItem"
+          :filter-method="filterHandler"
+        />
       </el-table>
     </div>
     <!--列设置-->
-    <Dialog
-      :flag="dialogFlag"
-      class="dialog-check-cols"
-    >
-      <div class="col-dialog">
+    <Dialog :flag="rowFlag">
+      <div class="rowDialog">
         <div class="title">列设置</div>
         <div class="content">
-          <el-tree
-            :data="tableCols"
-            :class="colsCheckClass"
-            show-checkbox
-            node-key="index"
-            :default-expand-all="true"
-            :props="{
-              label: 'name',
-              children: 'children'
-            }"
-            :default-checked-keys="checkedKeysTemp"
-            @check="handleCheck"
-          />
+          <el-checkbox-group v-model="checkList">
+            <el-row :gutter="20">
+              <el-col
+                v-for="(item, index) in tableCols"
+                :key="index"
+                class="ck"
+                :span="6"
+              >
+                <el-checkbox :label="item">{{ item.statName }}</el-checkbox>
+              </el-col>
+            </el-row>
+          </el-checkbox-group>
         </div>
         <div class="foot right t30">
           <el-button
@@ -127,7 +201,7 @@
           >确定</el-button>
           <el-button
             size="medium"
-            @click="hide"
+            @click="close"
           >取消</el-button>
         </div>
       </div>
@@ -277,11 +351,9 @@ import Search from '@/layout/components/Search'
 import Dialog from '@/layout/components/Dialog'
 import { advancedInquiry, getQuery } from '@/api/flight'
 import { parseTime } from '@/utils/index'
-import tableColsMixin from '../mixins/tableCols'
 export default {
   name: 'Advance',
   components: { Search, Dialog },
-  mixins: [tableColsMixin],
   data() {
     return {
       loading: false,
@@ -305,24 +377,9 @@ export default {
         //   TransferFlightNO: ''
         // }
       ],
+      tableColsCopy: [],
       checkList: [],
-      tableCols: [
-        { name: '序号', prop: 'index', width: 60 },
-        { name: '航班号', prop: 'FlightNO' },
-        { name: '航班日期', prop: 'FlightDate' },
-        { name: '起飞站', prop: 'SourceAirport' },
-        { name: '目的地', prop: 'TargetAirport' },
-        { name: '旅客姓名', prop: 'PassengerNameUpcase' },
-        { name: '行李牌号', prop: 'BagSN', width: 130 },
-        { name: '特殊行李类型', prop: 'SpecialType', width: 130 },
-        { name: '值机', prop: 'checkIn' },
-        { name: '删除', prop: 'deleted' },
-        { name: '激活', prop: 'activated' },
-        { name: '重量', prop: 'BagWeight' },
-        { name: '最新状态', prop: 'latestStatus' },
-        { name: '最新位置', prop: 'bagLocation' },
-        { name: '中转进航班', prop: 'TransferFlightNO' }
-      ],
+      tableCols: [],
       timeStart: parseTime(new Date(), '{y}-{m}-{d}'),
       timeEnd: parseTime(new Date(), '{y}-{m}-{d}'),
       form: {
@@ -345,32 +402,18 @@ export default {
         //   { required: true, message: "请输入有效航班号", trigger: "blur" },
         // ],
       },
-      // PassengerNameUpcaseItem: [],
-      // FlightNOItem: [],
-      // FlightDateItem: [],
-      // SourceAirportItem: [],
-      // TargetAirportItem: [],
-      // SpecialTypeItem: [],
-      // checkInItem: [],
-      // deletedItem: [],
-      // activatedItem: [],
-      // latestStatusItem: [],
-      // bagLocationItem: [],
-      // TransferFlightNOItem: [],
-      tableFilters: {
-        FlightNO: [],
-        FlightDate: [],
-        SourceAirport: [],
-        TargetAirport: [],
-        PassengerNameUpcase: [],
-        SpecialType: [],
-        checkIn: [],
-        deleted: [],
-        activated: [],
-        latestStatus: [],
-        bagLocation: [],
-        TransferFlightNO: []
-      }
+      PassengerNameUpcaseItem: [],
+      FlightNOItem: [],
+      FlightDateItem: [],
+      SourceAirportItem: [],
+      TargetAirportItem: [],
+      SpecialTypeItem: [],
+      checkInItem: [],
+      deletedItem: [],
+      activatedItem: [],
+      latestStatusItem: [],
+      bagLocationItem: [],
+      TransferFlightNOItem: []
     }
   },
   created() {
@@ -387,43 +430,50 @@ export default {
     document.querySelector('.interfaceLog_head_time_start .el-input__prefix').innerHTML = '开始：'
     document.querySelector('.interfaceLog_head_time_end .el-input__prefix i').remove()
     document.querySelector('.interfaceLog_head_time_end .el-input__prefix').innerHTML = '结束：'
-    const { FlightNO, FlightDate, name, grade, startDate, endDate, station } = this.$route.query
+    const { FlightNO, FlightDate,name,grade,startDate,endDate,station } = this.$route.query
     if (FlightNO && FlightDate) {
       this.$router.replace(this.$route.path)
       const parsedTime = parseTime(new Date(FlightDate), '{y}-{m}-{d}')
       this.timeStart = this.timeEnd = parsedTime
       this.$refs['search'].setSearch(FlightNO)
     }
-    if (name && startDate && endDate && station) {
-      this.timeStart = startDate
-      this.timeEnd = endDate
-      this.form['time'] = [startDate, endDate]
-      this.form['name'] = name
+    if(name&&startDate&&endDate&&station){
+      this.timeStart = startDate;
+      this.timeEnd = endDate;
+      this.form['time'] = [startDate,endDate];
+      this.form['name'] = name;
       this.form['station'] = station
       this.onCheckGj()
     }
 
-    if (grade && startDate && endDate && station) {
-      this.timeStart = startDate
-      this.timeEnd = endDate
-      this.form['time'] = [startDate, endDate]
-      this.form['grade'] = grade
+    if(grade&&startDate&&endDate&&station){
+      this.timeStart = startDate;
+      this.timeEnd = endDate;
+      this.form['time'] = [startDate,endDate];
+      this.form['grade'] = grade;
       this.form['station'] = station
       this.onCheckGj()
     }
 
-    if (FlightNO && startDate && endDate && station) {
-      this.timeStart = startDate
-      this.timeEnd = endDate
-      this.form['time'] = [startDate, endDate]
-      this.form['flightNumber'] = FlightNO
+    if(FlightNO&&startDate&&endDate&&station){
+      this.timeStart = startDate;
+      this.timeEnd = endDate;
+      this.form['time'] = [startDate,endDate];
+      this.form['flightNumber'] = FlightNO;
       this.form['station'] = station
       this.onCheckGj()
     }
   },
+  updated() {
+    // table数据更新
+    this.$nextTick(() => {
+      this.$refs.table.doLayout()
+    })
+  },
   methods: {
     // 查询
     getSearchData(val) {
+      alert(111)
       this.form = {
         time: '',
         status: '',
@@ -470,6 +520,25 @@ export default {
     clearSearchData() {
       this.tableData = []
     },
+    // 列设置-确定
+    onCheck() {
+      this.tableColsCopy = _.cloneDeep(this.checkList)
+      const datas = _.sortBy(this.tableColsCopy, o => o.showOrder)
+      this.tableColsCopy = datas
+      this.tableCopy = this.checkList
+      this.rowFlag = false
+    },
+    // 弹框展开
+    show() {
+      this.tableCopy = this.checkList
+      this.rowFlag = true
+    },
+    // 弹框关闭
+    close() {
+      this.rowFlag = false
+      this.checkList = this.tableCopy
+      this.tableColsCopy = _.cloneDeep(this.checkList)
+    },
     // 高级查询-确定
     onCheckGj() {
       // 参数顺序   【航班开始日期，航班结束日期，航班号，航班号，行李牌号，行李牌号，起飞站，起飞站，目的站，目的站，特殊行李类型，特殊 行李类型，旅客姓名大写拼音，旅客姓名大写拼音，pnr,pnr,值机号，值机号】
@@ -523,24 +592,11 @@ export default {
       }
     },
     // 表格行点击处理
-    flightClickHandler({ FlightNO, FlightDate }) {
-      this.$router.push({
-        path: '/advance/flightView',
-        query: {
-          FlightNO,
-          FlightDate
-        }
-      })
+    flightClickHandler(row) {
+      this.$router.push({ path: '/advance/flightView', query: row })
     },
-    baggageClickHandler({ FlightNO, FlightDate, BagSN }) {
-      this.$router.push({
-        path: '/advance/baggageView',
-        query: {
-          FlightNO,
-          FlightDate,
-          BagSN
-        }
-      })
+    baggageClickHandler(row) {
+      this.$router.push({ path: '/advance/baggageView', query: row })
     },
     // 综合查询
     async integratedQuery(obj = {}) {
@@ -568,12 +624,9 @@ export default {
         if (res.code == 0) {
           this.tableData = res.returnData.map((item, index) => {
             item['index'] = index + 1
-            item['deleted'] = item['deleted'] === 'DEL' ? 'DEL' : ''
-            item['activated'] = item['activated'] === 'I' ? '未激活' : '已激活'
             return item
           })
-          // this.getTableFilterItem()
-          this.setTableFilters(this.tableData, this.tableFilters)
+          this.getTableFilterItem()
         } else {
           this.$message.error(res.message)
         }
@@ -597,169 +650,126 @@ export default {
         console.log('出错了', error)
       }
     },
-    // 表格添加过滤条件
-    setTableFilters(tableData, filters) {
-      const tempFilters = {}
-      const tempArrays = {}
-      Object.keys(filters).forEach(key => {
-        tempFilters[key] = []
-        tempArrays[key] = []
-      })
-      tableData.forEach(item => {
-        Object.keys(tempFilters).forEach(key => {
-          if ((item[key] ?? '') !== '' && !tempArrays[key].includes(item[key])) {
-            tempArrays[key].push(item[key])
-            tempFilters[key].push({
-              text: item[key],
-              value: item[key]
-            })
-          }
-        })
-      })
-      Object.keys(tempFilters).forEach(key => {
-        filters[key] = this._.orderBy(tempFilters[key], o => o.value)
-      })
-    },
     filterHandler(value, row, column) {
       const property = column['property']
       return row[property] === value
     },
-    // getTableFilterItem() {
-    //   let PassengerNameUpcaseItemArr = [],
-    //     FlightNOItemArr = [],
-    //     FlightDateItemArr = [],
-    //     SourceAirportItemArr = [],
-    //     TargetAirportItemArr = [],
-    //     SpecialTypeItemArr = [],
-    //     checkInItemArr = [],
-    //     deletedItemArr = [],
-    //     activatedItemArr = [],
-    //     latestStatusItemArr = [],
-    //     bagLocationItemArr = [],
-    //     TransferFlightNOItemArr = []
+    getTableFilterItem() {
+      let PassengerNameUpcaseItemArr = [],
+        FlightNOItemArr = [],
+        FlightDateItemArr = [],
+        SourceAirportItemArr = [],
+        TargetAirportItemArr = [],
+        SpecialTypeItemArr = [],
+        checkInItemArr = [],
+        deletedItemArr = [],
+        activatedItemArr = [],
+        latestStatusItemArr = [],
+        bagLocationItemArr = [],
+        TransferFlightNOItemArr = []
 
-    //   this.PassengerNameUpcaseItem.length = 0
-    //   this.FlightNOItem.length = 0
-    //   this.FlightDateItem.length = 0
-    //   this.SourceAirportItem.length = 0
-    //   this.TargetAirportItem.length = 0
-    //   this.SpecialTypeItem.length = 0
-    //   this.checkInItem.length = 0
-    //   this.deletedItem.length = 0
-    //   this.activatedItem.length = 0
-    //   this.latestStatusItem.length = 0
-    //   this.bagLocationItem.length = 0
-    //   this.TransferFlightNOItem.length = 0
+      this.PassengerNameUpcaseItem.length = 0
+      this.FlightNOItem.length = 0
+      this.FlightDateItem.length = 0
+      this.SourceAirportItem.length = 0
+      this.TargetAirportItem.length = 0
+      this.SpecialTypeItem.length = 0
+      this.checkInItem.length = 0
+      this.deletedItem.length = 0
+      this.activatedItem.length = 0
+      this.latestStatusItem.length = 0
+      this.bagLocationItem.length = 0
+      this.TransferFlightNOItem.length = 0
 
-    //   this.tableData.forEach(item => {
-    //     if (
-    //       PassengerNameUpcaseItemArr.indexOf(item.PassengerNameUpcase) == -1 &&
-    //       item.PassengerNameUpcase != '' &&
-    //       item.PassengerNameUpcase != null
-    //     ) {
-    //       PassengerNameUpcaseItemArr.push(item.PassengerNameUpcase)
-    //       this.PassengerNameUpcaseItem.push({
-    //         text: item.PassengerNameUpcase,
-    //         value: item.PassengerNameUpcase
-    //       })
-    //     }
-    //     if (FlightNOItemArr.indexOf(item.FlightNO) == -1 && item.FlightNO != '' && item.FlightNO != null) {
-    //       FlightNOItemArr.push(item.FlightNO)
-    //       this.FlightNOItem.push({
-    //         text: item.FlightNO,
-    //         value: item.FlightNO
-    //       })
-    //     }
+      this.tableData.forEach(item => {
+        if (PassengerNameUpcaseItemArr.indexOf(item.PassengerNameUpcase) == -1 && item.PassengerNameUpcase != ''&& item.PassengerNameUpcase != null) {
+          PassengerNameUpcaseItemArr.push(item.PassengerNameUpcase)
+          this.PassengerNameUpcaseItem.push({
+            text: item.PassengerNameUpcase,
+            value: item.PassengerNameUpcase
+          })
+        }
+        if (FlightNOItemArr.indexOf(item.FlightNO) == -1 && item.FlightNO != ''&& item.FlightNO != null) {
+          FlightNOItemArr.push(item.FlightNO)
+          this.FlightNOItem.push({
+            text: item.FlightNO,
+            value: item.FlightNO
+          })
+        }
 
-    //     if (FlightDateItemArr.indexOf(item.FlightDate) == -1 && item.FlightDate != '' && item.FlightDate != null) {
-    //       FlightDateItemArr.push(item.FlightDate)
-    //       this.FlightDateItem.push({
-    //         text: item.FlightDate,
-    //         value: item.FlightDate
-    //       })
-    //     }
-    //     if (
-    //       SourceAirportItemArr.indexOf(item.SourceAirport) == -1 &&
-    //       item.SourceAirport != '' &&
-    //       item.SourceAirport != null
-    //     ) {
-    //       SourceAirportItemArr.push(item.SourceAirport)
-    //       this.SourceAirportItem.push({
-    //         text: item.SourceAirport,
-    //         value: item.SourceAirport
-    //       })
-    //     }
-    //     if (
-    //       TargetAirportItemArr.indexOf(item.TargetAirport) == -1 &&
-    //       item.TargetAirport != '' &&
-    //       item.TargetAirport != null
-    //     ) {
-    //       TargetAirportItemArr.push(item.TargetAirport)
-    //       this.TargetAirportItem.push({
-    //         text: item.TargetAirport,
-    //         value: item.TargetAirport
-    //       })
-    //     }
-    //     if (SpecialTypeItemArr.indexOf(item.SpecialType) == -1 && item.SpecialType != '' && item.SpecialType != null) {
-    //       SpecialTypeItemArr.push(item.SpecialType)
-    //       this.SpecialTypeItem.push({
-    //         text: item.SpecialType,
-    //         value: item.SpecialType
-    //       })
-    //     }
+        if (FlightDateItemArr.indexOf(item.FlightDate) == -1 && item.FlightDate != ''&& item.FlightDate != null) {
+          FlightDateItemArr.push(item.FlightDate)
+          this.FlightDateItem.push({
+            text: item.FlightDate,
+            value: item.FlightDate
+          })
+        }
+        if (SourceAirportItemArr.indexOf(item.SourceAirport) == -1 && item.SourceAirport != ''&& item.SourceAirport != null) {
+          SourceAirportItemArr.push(item.SourceAirport)
+          this.SourceAirportItem.push({
+            text: item.SourceAirport,
+            value: item.SourceAirport
+          })
+        }
+        if (TargetAirportItemArr.indexOf(item.TargetAirport) == -1 && item.TargetAirport != ''&& item.TargetAirport != null) {
+          TargetAirportItemArr.push(item.TargetAirport)
+          this.TargetAirportItem.push({
+            text: item.TargetAirport,
+            value: item.TargetAirport
+          })
+        }
+        if (SpecialTypeItemArr.indexOf(item.SpecialType) == -1 && item.SpecialType != ''&& item.SpecialType != null) {
+          SpecialTypeItemArr.push(item.SpecialType)
+          this.SpecialTypeItem.push({
+            text: item.SpecialType,
+            value: item.SpecialType
+          })
+        }
 
-    //     if (checkInItemArr.indexOf(item.checkIn) == -1 && item.checkIn != '' && item.checkIn != null) {
-    //       checkInItemArr.push(item.checkIn)
-    //       this.checkInItem.push({
-    //         text: item.checkIn,
-    //         value: item.checkIn
-    //       })
-    //     }
-    //     if (deletedItemArr.indexOf(item.deleted) == -1 && item.deleted != '' && item.deleted != null) {
-    //       deletedItemArr.push(item.deleted)
-    //       this.deletedItem.push({
-    //         text: item.deleted,
-    //         value: item.deleted
-    //       })
-    //     }
-    //     if (activatedItemArr.indexOf(item.activated) == -1 && item.activated != '' && item.activated != null) {
-    //       activatedItemArr.push(item.activated)
-    //       this.activatedItem.push({
-    //         text: item.activated,
-    //         value: item.activated
-    //       })
-    //     }
-    //     if (
-    //       latestStatusItemArr.indexOf(item.latestStatus) == -1 &&
-    //       item.latestStatus != '' &&
-    //       item.latestStatus != null
-    //     ) {
-    //       latestStatusItemArr.push(item.latestStatus)
-    //       this.latestStatusItem.push({
-    //         text: item.latestStatus,
-    //         value: item.latestStatus
-    //       })
-    //     }
-    //     if (bagLocationItemArr.indexOf(item.bagLocation) == -1 && item.bagLocation != '' && item.bagLocation != null) {
-    //       bagLocationItemArr.push(item.bagLocation)
-    //       this.bagLocationItem.push({
-    //         text: item.bagLocation,
-    //         value: item.bagLocation
-    //       })
-    //     }
-    //     if (
-    //       TransferFlightNOItemArr.indexOf(item.TransferFlightNO) == -1 &&
-    //       item.TransferFlightNO != '' &&
-    //       item.TransferFlightNO != null
-    //     ) {
-    //       TransferFlightNOItemArr.push(item.TransferFlightNO)
-    //       this.TransferFlightNOItem.push({
-    //         text: item.TransferFlightNO,
-    //         value: item.TransferFlightNO
-    //       })
-    //     }
-    //   })
-    // },
+        if (checkInItemArr.indexOf(item.checkIn) == -1 && item.checkIn != ''&& item.checkIn != null) {
+          checkInItemArr.push(item.checkIn)
+          this.checkInItem.push({
+            text: item.checkIn,
+            value: item.checkIn
+          })
+        }
+        if (deletedItemArr.indexOf(item.deleted) == -1 && item.deleted != ''&& item.deleted != null) {
+          deletedItemArr.push(item.deleted)
+          this.deletedItem.push({
+            text: item.deleted,
+            value: item.deleted
+          })
+        }
+        if (activatedItemArr.indexOf(item.activated) == -1 && item.activated != ''&& item.activated != null) {
+          activatedItemArr.push(item.activated)
+          this.activatedItem.push({
+            text: item.activated,
+            value: item.activated
+          })
+        }
+        if (latestStatusItemArr.indexOf(item.latestStatus) == -1 && item.latestStatus != ''&& item.latestStatus != null) {
+          latestStatusItemArr.push(item.latestStatus)
+          this.latestStatusItem.push({
+            text: item.latestStatus,
+            value: item.latestStatus
+          })
+        }
+        if (bagLocationItemArr.indexOf(item.bagLocation) == -1 && item.bagLocation != ''&& item.bagLocation != null) {
+          bagLocationItemArr.push(item.bagLocation)
+          this.bagLocationItem.push({
+            text: item.bagLocation,
+            value: item.bagLocation
+          })
+        }
+        if (TransferFlightNOItemArr.indexOf(item.TransferFlightNO) == -1 && item.TransferFlightNO != ''&& item.TransferFlightNO != null) {
+          TransferFlightNOItemArr.push(item.TransferFlightNO)
+          this.TransferFlightNOItem.push({
+            text: item.TransferFlightNO,
+            value: item.TransferFlightNO
+          })
+        }
+      })
+    },
 
     // 统计行数
     summaryRow(num) {

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

@@ -221,7 +221,7 @@ export default {
         {
           statCode: "FlightNO",
           statName: "航班号",
-          width: 80,
+          width: 100,
         },
         {
           statCode: "FlightDate",
@@ -239,7 +239,7 @@ export default {
         },
         {
           statCode: "arrivalTerminal",
-          statName: "到达航站楼",
+          statName: "到达航站",
         },
         {
           statCode: "luggageCarousel",
@@ -314,11 +314,13 @@ export default {
       flightBaggageTableFilters: {
         FlightNO: [],
         FlightDate: [],
-        PlanDepartureTime: [],
-        TargetAirport: [],
-        BordingGate: [],
-        StandForDepartrue: [],
-        DepartureBuild: [],
+        asarrivalTime: [],
+        departureTerminal: [],
+        arrivalTerminal: [],
+        luggageCarousel: [],
+        parkingSpace: [],
+        numberOfContainers: [],
+
       },
       loopEvent: null,
       leaveCount: 0,
@@ -408,14 +410,14 @@ export default {
           this.leaveCount++;
         }
         // item["waitfanj"] = item["noCheckInNumber"] - item["unLoad"];
-        this.baggageCount = this.baggageCount + item.preLoad;
+        this.baggageCount = this.baggageCount + item.projectedLoad;
       });
       this.tableData = this._.sortBy(tableData, [
         "FlightDate",
         "PlanDepartureTime",
       ]);
-      // this.setTableFilters();
-      // this.toOrderNum(this.baggageCount);
+       this.setTableFilters();
+       this.toOrderNum(this.baggageCount);
       // setInterval(() => {
       //   this.baggageCount = this.baggageCount+1;
       //    // 这里输入数字即可调用

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

@@ -418,7 +418,7 @@ export default {
         item['waitfanj'] = item['noCheckInNumber'] - item['unLoad'];
         this.baggageCount = this.baggageCount + item.preLoad;
       })
-      this.tableData = this._.sortBy(tableData, ['FlightDate', 'PlanDepartureTime'])
+      this.tableData = this._.sortBy(tableData, ['hasTakenOff','PlanDepartureTime'])
       this.setTableFilters()
       this.toOrderNum(this.baggageCount)
       // setInterval(() => {

src/views/baggageManagement/mixins/terminal.js

@@ -126,7 +126,20 @@ export default {
               'unActive',
               'preLoad',
               'noCheckInNumber',
-              'midIn'
+              'midIn',
+              'checkIns',
+              'projectedLoad',
+              'loadedQuantity',
+              'numberOfDestinationArrivals',
+              'endPointNotReached',
+              'specialQuantity',
+              'numberOfClaims',
+              'numberToBeUninstalled',
+              'terminateArrivalQuantity',
+              'terminateUnreachedQuantity',
+              'quantityShipped',
+              'undeliveredQuantity',
+              'numberOfBulk'
             ].includes(column.property)
           ) {
             const values = data.map(item => Number(item[column.property]))