行李管理相关修改

public/config.js

@@ -1,16 +1,19 @@
-var PLATFROM_CONFIG = {};
-PLATFROM_CONFIG.baseNewUrl = "http://192.168.3.74:9006"; //登录前的http请求地址
-PLATFROM_CONFIG.baseUrl = "http://106.14.243.117:9111"; // 4A-http请求地址
+var PLATFROM_CONFIG = {}
+// PLATFROM_CONFIG.baseNewUrl = "http://192.168.3.74:9006"; //登录前的http请求地址
+// PLATFROM_CONFIG.baseUrl = "http://106.14.243.117:9111"; // 4A-http请求地址
+PLATFROM_CONFIG.baseNewUrl = 'http://10.211.67.177:8043' //登录前的http请求地址
+PLATFROM_CONFIG.baseUrl = 'http://10.211.67.177:8043' // 4A-http请求地址
 // PLATFROM_CONFIG.baseUrl = "http://10.211.66.25:8074"; // http请求地址
-PLATFROM_CONFIG.appSecret = "9inu7zpllz1folzsljm498dcpi0lsog1"; //appSecret
-PLATFROM_CONFIG.appId = "q7kdjmmaf0kerwpf"; //appid
+PLATFROM_CONFIG.appSecret = '9inu7zpllz1folzsljm498dcpi0lsog1' //appSecret
+PLATFROM_CONFIG.appId = 'q7kdjmmaf0kerwpf' //appid
 // PLATFROM_CONFIG.baseURLCA = "http://106.14.243.117:9114";
 // PLATFROM_CONFIG.baseURLCA = "http://106.14.243.117:8093";
 // PLATFROM_CONFIG.baseURLCA = "http://cssc.free.idcfengye.com";
 // PLATFROM_CONFIG.baseURLCA = "http://192.168.3.17:8080";
 // PLATFROM_CONFIG.baseURLCA = "http://192.168.3.243:8093";
 // PLATFROM_CONFIG.baseURLCA = "http://ts.free.idcfengye.com";
-PLATFROM_CONFIG.baseURLCA = "http://192.168.3.74:18064"; // 登录后的http请求地址
+// PLATFROM_CONFIG.baseURLCA = "http://192.168.3.74:18064"; // 登录后的http请求地址
+PLATFROM_CONFIG.baseURLCA = 'http://10.211.67.177:8043' // 登录后的http请求地址
 
 const DATACONTENT_ID = {
   /***-----登录------***/
@@ -88,16 +91,16 @@ const DATACONTENT_ID = {
   // TerminalId: 250,//获取航站楼下拉ID
   // byAreaId: 244,//根据大区统计ID
   // byOtherId: 243,//获取大区以外统计ID
-  inOrOutId: 52,//获取进离岗下拉ID
-  AirlineId: 53,//获取航线下拉ID
-  AreaId: 54,//获取大区下拉ID
-  AirportId: 55,//获取航站下拉ID
-  TerminalId: 56,//获取航站楼下拉ID
-  byAreaId: 50,//根据大区统计ID
-  byOtherId: 49,//获取大区以外统计ID
-  baggageStatistics: 251, // 获取行李统计
+  inOrOutId: 52, //获取进离岗下拉ID
+  AirlineId: 53, //获取航线下拉ID
+  AreaId: 54, //获取大区下拉ID
+  AirportId: 55, //获取航站下拉ID
+  TerminalId: 56, //获取航站楼下拉ID
+  byAreaId: 50, //根据大区统计ID
+  byOtherId: 63, //获取大区以外统计ID
+  baggageStatistics: 73, // 获取行李统计
   nodeStatistics: 252 // 获取节点统计
-};
+}
 
 const SERVICE_ID = {
   /***-----账号管理------***/
@@ -117,8 +120,5 @@ const SERVICE_ID = {
   sysServiceEditBoxId: 4, //系统设置-服务管理-编辑服务-部署机器-多选框-id
   sysQueryTabId: 5, //系统设置-查询模板-表格-增删改-id
   sysServiceAddXyId: 10, //系统设置-服务管理-新增服务-新增数据源-提交-id
-  sysDataTabId: 11, //系统设置-数据结构-数据项-表格-增删改-id
-
-
-
-};
+  sysDataTabId: 11 //系统设置-数据结构-数据项-表格-增删改-id
+}

src/api/dataIntegration.js

@@ -90,7 +90,7 @@ export const queryMap = {
   transferFlight: 40,
   container: 41,
   baggageDetailsByID: 44,
-  baggageBasicInfoByID: 45,
+  baggageBasicInfoByID: 255,
   baggageByFlightNO: 46,
   transferInBaggage: 47,
   transferOutBaggage: 48,
@@ -108,7 +108,7 @@ export async function myQuery (id, ...dataContent) {
   try {
     const result = await Query(params)
     if (Number(result.code) === 0) {
-      return result.returnData
+      return result.returnData.listValues
     } else {
       Message.error(result.message ?? '失败')
       return Promise.reject(result.message)

src/views/advancedQuery/views/advancedHome.vue

@@ -102,7 +102,7 @@
                   </template>
                   <template v-else-if="item.prop === 'specialType'">
                     <el-select v-model="form.specialType" size="small" filterable allow-create default-first-option clearable @keyup.esc.native="dialogFocus">
-                      <el-option v-for="option in baggageTypeList" :key="option.ID" :label="option.TypeName" :value="option.TypeCode" />
+                      <el-option v-for="option in baggageTypeList" :key="option.specialType" :label="option.specialType" :value="option.specialType" />
                     </el-select>
                   </template>
                   <template v-else-if="item.prop === 'unLoad'">
@@ -560,6 +560,7 @@ export default {
     startDate && (this.FlightDate[0] = startDate)
     endDate && (this.FlightDate[1] = endDate)
     if (flag) {
+      console.log(1)
       this.onCheckGj(singleJump)
     } else if (this.queryForm) {
       Object.keys(this.form).forEach(key => {
@@ -692,8 +693,8 @@ export default {
           this.$router.push({
             path: '/advance/flightView',
             query: {
-              FlightNO: row.FlightNO,
-              FlightDate: row.FlightDate
+              flightNO: row.FlightNO,
+              flightDate: row.FlightDate
             }
           })
           break
@@ -701,8 +702,8 @@ export default {
           this.$router.push({
             path: '/advance/flightView',
             query: {
-              FlightNO: row.TransferFlightNO,
-              FlightDate: row.FlightDate
+              flightNO: row.TransferFlightNO,
+              flightDate: row.FlightDate
             }
           })
           break
@@ -710,9 +711,9 @@ export default {
           this.$router.push({
             path: '/advance/baggageView',
             query: {
-              FlightNO: row.FlightNO,
-              FlightDate: row.FlightDate,
-              BagSN: row.BagSN
+              flightNO: row.FlightNO,
+              flightDate: row.FlightDate,
+              bagSN: row.BagSN
             }
           })
           break
@@ -850,9 +851,9 @@ export default {
               this.$router.push({
                 path: '/advance/baggageView',
                 query: {
-                  BagSN: result[0].BagSN,
-                  FlightNO: result[0].FlightNO,
-                  FlightDate: result[0].FlightDate
+                  bagSN: result[0].BagSN,
+                  flightNO: result[0].FlightNO,
+                  flightDate: result[0].FlightDate
                 }
               })
             } else {
@@ -861,18 +862,18 @@ export default {
                   pre === null ||
                   (curr.FlightNO &&
                     curr.FlightDate &&
-                    curr.FlightNO === pre.FlightNO &&
-                    curr.FlightDate === pre.FlightDate)
+                    curr.FlightNO === pre.flightNO &&
+                    curr.FlightDate === pre.flightDate)
                 ) {
                   return {
-                    FlightNO: curr.FlightNO,
-                    FlightDate: curr.FlightDate
+                    flightNO: curr.FlightNO,
+                    flightDate: curr.FlightDate
                   }
                 } else {
                   return {}
                 }
               }, null)
-              if (onlyFlight.FlightNO) {
+              if (onlyFlight.flightNO) {
                 this.$router.push({
                   path: '/advance/flightView',
                   query: onlyFlight

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,20 @@
             filterable
             @change="setCurrentAirport"
           /> -->
-            <el-select v-model="formData.currentAirport" class="input-shadow" size="small" 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"
+              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 +73,136 @@
               @change="endDateChangeHandler"
             />
           </el-form-item> -->
-          <el-form-item prop="FlightDate" label="航班日期">
-            <el-date-picker v-model="formData.FlightDate" size="small" 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"
+              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="['i_timeIcon']">
             <TimeZoneSelector />
           </el-form-item>
           <el-form-item>
-            <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"
+              @click="show"
+            >
           </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">
+    <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"
+          >
             <template #header>
-              <el-tooltip :content="childCol.disc" 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.disc"
+                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 +210,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>
@@ -133,7 +262,7 @@ export default {
   name: 'DepartureTerminalView',
   components: { Dialog, TimeZoneSelector, TableHeaderCell },
   mixins: [terminalMixin, formMixin, tableColsMixin],
-  data () {
+  data() {
     return {
       orderNum: ['0', '0', '0', '0', '0', '0'], // 默认总数
       popoverVisible: false,
@@ -146,7 +275,7 @@ export default {
           fixed: 'left',
           children: [
             {
-              prop: 'FlightNO',
+              prop: 'flightNO',
               label: '航班号',
               disc: '指航班编号',
               width: 80,
@@ -154,7 +283,7 @@ export default {
               sortable: true
             },
             {
-              prop: 'FlightDate',
+              prop: 'flightDate',
               label: '执飞日期',
               disc: '指航班计划起飞日期（不变的，机票上），不是预计起飞日期（预计起飞时间可能多个），也不是实际起飞日期（实际起飞等于最后预计）',
               width: 105,
@@ -209,17 +338,17 @@ export default {
             {
               prop: 'checkIns',
               label: '值机',
-              disc: '指已办理值机托运的行李数量，含取消托运的行李数量，含未激活',
+              disc: '指已办理值机托运的行李数量，含取消托运的行李数量，含未激活'
             },
             {
               prop: 'projectedLoad',
               label: '预计装载',
-              disc: '指已办理值机托运的行李数量，不含取消托运的行李数量，不包含未激活',
+              disc: '指已办理值机托运的行李数量，不含取消托运的行李数量，不包含未激活'
             },
             {
               prop: 'loadedQuantity',
               label: '已装载',
-              disc: '指实际装机完成的行李数量，不包含取消托运的行李数量',
+              disc: '指实际装机完成的行李数量，不包含取消托运的行李数量'
             }
           ]
         },
@@ -230,12 +359,12 @@ export default {
             {
               prop: 'numberOfDestinationArrivals',
               label: '到达',
-              disc: '指行李到达提取转盘的行李数量，数据是变化的，仅显示最新信息',
+              disc: '指行李到达提取转盘的行李数量，数据是变化的，仅显示最新信息'
             },
             {
               prop: 'endPointNotReached',
               label: '未到达',
-              disc: '指行李仍未到达提取转盘的行李数量，数据是变化的，仅显示最新信息',
+              disc: '指行李仍未到达提取转盘的行李数量，数据是变化的，仅显示最新信息'
             },
             {
               prop: 'specialQuantity',
@@ -258,12 +387,12 @@ export default {
             {
               prop: 'uninstalled',
               label: '已卸载',
-              disc: '指卸机的行李数量，数据是变化的，仅显示最新信息',
+              disc: '指卸机的行李数量，数据是变化的，仅显示最新信息'
             },
             {
               prop: 'numberToBeUninstalled',
               label: '待卸载',
-              disc: '指仍未卸机的行李数量，数据是变化的，仅显示最新信息',
+              disc: '指仍未卸机的行李数量，数据是变化的，仅显示最新信息'
             }
           ]
         },
@@ -274,12 +403,12 @@ export default {
             {
               prop: 'terminateArrivalQuantity',
               label: '到达',
-              disc: '指旅客已到达目的站的行李数量，数据是变化的，仅显示最新信息',
+              disc: '指旅客已到达目的站的行李数量，数据是变化的，仅显示最新信息'
             },
             {
               prop: 'terminateUnreachedQuantity',
               label: '未到达',
-              disc: '指未到达目的站的行李数量，数据是变化的，仅显示最新信息',
+              disc: '指未到达目的站的行李数量，数据是变化的，仅显示最新信息'
             }
           ]
         },
@@ -290,12 +419,12 @@ export default {
             {
               prop: 'quantityShipped',
               label: '已交运',
-              disc: '指当前航班中转出的行李已完成交运的行李数量，数据是变化的，仅显示最新信息',
+              disc: '指当前航班中转出的行李已完成交运的行李数量，数据是变化的，仅显示最新信息'
             },
             {
               prop: 'undeliveredQuantity',
               label: '未交运',
-              disc: '指当前航班中转出的行李未完成交运的行李数量，数据是变化的，仅显示最新信息',
+              disc: '指当前航班中转出的行李未完成交运的行李数量，数据是变化的，仅显示最新信息'
             }
           ]
         },
@@ -306,7 +435,7 @@ export default {
             {
               prop: 'numberOfContainers',
               label: '容器',
-              disc: '指当前航班使用容器装载的行李数量，数据是变化的，仅显示最新信息',
+              disc: '指当前航班使用容器装载的行李数量，数据是变化的，仅显示最新信息'
             },
             {
               prop: 'numberOfBulk',
@@ -328,22 +457,22 @@ export default {
       hasSetTableScroll: false
     }
   },
-  mounted () {
+  computed: {
+    singleDay() {
+      return this.startDate === this.endDate
+    }
+  },
+  mounted() {
     this.getAirPortData()
   },
-  beforeDestroy () {
+  beforeDestroy() {
     if (this.loopEvent) {
       clearInterval(this.loopEvent)
       this.loopEvent = null
     }
   },
-  computed: {
-    singleDay () {
-      return this.startDate === this.endDate
-    }
-  },
   methods: {
-    resetLoopEvent () {
+    resetLoopEvent() {
       this.loading = true
       this.hasSetTableScroll = false
       if (this.loopEvent) {
@@ -355,21 +484,21 @@ 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,
           dataContent: []
         })
         if (Number(res.code) === 0) {
-          this.AirportList = this._.orderBy(res.returnData, o => o.PlanLandingApt)
+          this.AirportList = this._.orderBy(res.returnData.listValues, o => o.planLandingApt)
           this.formData.currentAirport = 'PEK'
           this.resetLoopEvent()
         } else {
@@ -379,7 +508,7 @@ export default {
         console.log('出错了', error)
       }
     },
-    tableRowClassName ({ row, rowIndex }) {
+    tableRowClassName({ row, rowIndex }) {
       const classes = []
       if (row.flightStatus === 'DLY') {
         classes.push('bgl-delayed')
@@ -395,11 +524,8 @@ export default {
       }
       return classes.join(' ')
     },
-    headerCellClass ({ row, column }) {
+    headerCellClass({ row, column }) {
       const classes = []
-      if (['transfer_all', 'departureAnomaly', 'riskWarning'].includes(column.property)) {
-        classes.push('bgl-huang')
-      }
       const rule = this.tableDataSortRules[column.property]
       if (rule) {
         classes.push(rule)
@@ -417,7 +543,7 @@ export default {
     //   this.flightAttrQuery(params)
     // },
     // 获取表格数据
-    async getTableData () {
+    async getTableData() {
       if (!this.formData.currentAirport || !this.startDate || !this.endDate) {
         return
       }
@@ -428,7 +554,7 @@ export default {
           dataContent: [...arr, ...arr, ...arr]
         })
         if (Number(res.code) === 0) {
-          this.initTableData(res.returnData)
+          this.initTableData(res.returnData.listValues)
         } else {
           console.log(res.message)
         }
@@ -442,7 +568,7 @@ export default {
         console.log('出错了', error)
       }
     },
-    initTableData (tableData) {
+    initTableData(tableData) {
       this.arrivalCount = 0
       this.baggageCount = 0
       tableData.forEach(item => {
@@ -463,13 +589,17 @@ export default {
         this.setTableScroll()
       })
     },
-    hasArrived (flight) {
-      const now = new Date()
-      const arrivalTime = new Date(flight.arrivalTime)
-      flight['hasArrived'] = now > arrivalTime && !flight['flightCanceled']
+    hasArrived(flight) {
+      if (flight.arrivalTime) {
+        const now = new Date()
+        const arrivalTime = new Date(flight.arrivalTime)
+        flight['hasArrived'] = now > arrivalTime && !flight['flightCanceled']
+      } else {
+        flight['hasArrived'] = false
+      }
       return flight['hasArrived']
     },
-    setTableScroll () {
+    setTableScroll() {
       if (!this.singleDay || this.hasSetTableScroll || this.arrivalCount === 0) {
         return
       }
@@ -489,7 +619,7 @@ export default {
       }, 0)
       this.hasSetTableScroll = true
     },
-    setNumberTransform () {
+    setNumberTransform() {
       const numberItems = this.$refs.numberItem // 拿到数字的ref，计算元素数量
       const numberArr = this.orderNum.filter(item => !isNaN(item))
       // 结合CSS 对数字字符进行滚动,显示订单数量
@@ -499,7 +629,7 @@ export default {
       }
     },
 
-    toOrderNum (num) {
+    toOrderNum(num) {
       num = num.toString()
       if (num.length < 6) {
         num = '0' + num // 如未满八位数，添加"0"补位
@@ -537,7 +667,7 @@ export default {
       optgroup,
       select,
       textarea {
-        font-family: Helvetica, "Microsoft YaHei";
+        font-family: Helvetica, 'Microsoft YaHei';
         font-size: 14px;
       }
       .el-switch__label {
@@ -643,7 +773,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 {
@@ -677,7 +807,7 @@ export default {
         &.redBorder {
           position: relative;
           &::after {
-            content: "";
+            content: '';
             position: absolute;
             left: 0;
             bottom: 0;

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

@@ -7,31 +7,62 @@
 -->
 <template>
   <div class="baggage-view">
-    <div ref="basicInfo" class="part1">
+    <div
+      ref="basicInfo"
+      class="part1"
+    >
       <div class="title">
         <span>行李基本信息</span>
-        <el-radio-group v-model="infoBtn" class="radioBtn" size="mini" fill="#FFFFFF" text-color="#28344D">
-          <el-radio-button v-for="item in infoRadios" :key="item" :label="item" />
+        <el-radio-group
+          v-model="infoBtn"
+          class="radioBtn"
+          size="mini"
+          fill="#FFFFFF"
+          text-color="#28344D"
+        >
+          <el-radio-button
+            v-for="item in infoRadios"
+            :key="item"
+            :label="item"
+          />
         </el-radio-group>
       </div>
       <div class="part1_info">
         <el-row :gutter="12">
-          <el-col v-for="(item, index) in baggageBasicInfoCols" :key="index" :xl="[1, 4, 5].includes(index % 7) ? 4 : 3" :sm="6" :xs="6">
-            <span class="label">{{ item.label }}：</span><span class="content" :title="formattedBaggageInfo(item.prop)">{{ formattedBaggageInfo(item.prop) }}</span>
+          <el-col
+            v-for="(item, index) in baggageBasicInfoCols"
+            :key="index"
+            :xl="[1, 4, 5].includes(index % 7) ? 4 : 3"
+            :sm="6"
+            :xs="6"
+          >
+            <span class="label">{{ item.label }}：</span><span
+              class="content"
+              :title="formattedBaggageInfo(item.prop)"
+            >{{ formattedBaggageInfo(item.prop) }}</span>
           </el-col>
         </el-row>
       </div>
     </div>
-    <div v-show="infoBtn === infoRadios[0]" class="part2">
+    <div
+      v-show="infoBtn === infoRadios[0]"
+      class="part2"
+    >
       <div class="part2_info">
-        <div style="width: 120px" class="title">行李跟踪信息</div>
+        <div
+          style="width: 120px"
+          class="title"
+        >行李跟踪信息</div>
         <div class="type normal">
           {{ baggageBasicInfo.BagStatus }}
         </div>
         <div class="step">
           <div class="baggage-track-chart">
             <div class="stepLine">
-              <div :style="{ width: lineWidth }" class="stepLineBlue" />
+              <div
+                :style="{ width: lineWidth }"
+                class="stepLineBlue"
+              />
             </div>
             <!-- <el-popover
               v-for="(item, index) in stepData"
@@ -56,7 +87,13 @@
                 <span>{{ item.DealTime }}</span>
               </div>
             </el-popover> -->
-            <div v-for="(item, index) in stepData" :key="index" :class="{ 'stepItem': true, activeItem: item.DealTime }" @mouseenter="itemMouseEnterHandler(item)" @mouseleave="itemMouseLeaveHandler(item)">
+            <div
+              v-for="(item, index) in stepData"
+              :key="index"
+              :class="{ 'stepItem': true, activeItem: item.DealTime }"
+              @mouseenter="itemMouseEnterHandler(item)"
+              @mouseleave="itemMouseLeaveHandler(item)"
+            >
               <span class="head">
                 <!-- {{ item.airPort }} -->
                 <!-- <span v-if="item.airPort && item.nodeName !== ''">-</span> -->
@@ -69,13 +106,24 @@
         </div>
       </div>
       <div class="btns">
-        <img class="btn-square btn-shadow" src="../../../../assets/baggage/ic_export.png">
-        <img class="btn-square btn-shadow" src="../../../../assets/baggage/ic_setting.png" @click="show">
+        <img
+          class="btn-square btn-shadow"
+          src="../../../../assets/baggage/ic_export.png"
+        >
+        <img
+          class="btn-square btn-shadow"
+          src="../../../../assets/baggage/ic_setting.png"
+          @click="show"
+        >
       </div>
     </div>
-    <div v-show="infoBtn == infoRadios[0]" class="part3" :style="{
+    <div
+      v-show="infoBtn == infoRadios[0]"
+      class="part3"
+      :style="{
         'height': `calc(100vh - 80px - ${basicInfoHeight}px - 128px - 3 * 8px - 44px)`
-      }">
+      }"
+    >
       <!-- <el-popover
         trigger="hover"
         placement="top-start"
@@ -84,8 +132,30 @@
         :disabled="!messageTooltipVisible"
       >
         <div class="pre-line">{{ messageTooltip }}</div> -->
-      <el-table ref="table" :data="baggageTableData" :height="`calc(100vh - 80px - ${basicInfoHeight}px - 128px - 3 * 8px - 44px)`" size="mini" border fit :header-cell-class-name="headerCellClass" :header-cell-style="{ color: '#101116' }" :cell-class-name="cellClass" :span-method="tableSpanMethod" @cell-mouse-enter="cellMouseEnterHandler" @cell-mouse-leave="cellMouseLeaveHandler" @cell-click="cellClickHandler">
-        <el-table-column v-for="item in tableColsCopy" :key="item.index" :prop="item.prop" :label="item.name" :align="item.align || 'center'" :width="item.width" show-overflow-tooltip>
+      <el-table
+        ref="table"
+        :data="baggageTableData"
+        :height="`calc(100vh - 80px - ${basicInfoHeight}px - 128px - 3 * 8px - 44px)`"
+        size="mini"
+        border
+        fit
+        :header-cell-class-name="headerCellClass"
+        :header-cell-style="{ color: '#101116' }"
+        :cell-class-name="cellClass"
+        :span-method="tableSpanMethod"
+        @cell-mouse-enter="cellMouseEnterHandler"
+        @cell-mouse-leave="cellMouseLeaveHandler"
+        @cell-click="cellClickHandler"
+      >
+        <el-table-column
+          v-for="item in tableColsCopy"
+          :key="item.index"
+          :prop="item.prop"
+          :label="item.name"
+          :align="item.align || 'center'"
+          :width="item.width"
+          show-overflow-tooltip
+        >
           <template slot="header">
             <div class="cell-content">{{ item.name }}</div>
           </template>
@@ -97,9 +167,13 @@
       <!-- </el-popover> -->
     </div>
 
-    <div v-show="infoBtn === infoRadios[1]" class="part4" :style="{
+    <div
+      v-show="infoBtn === infoRadios[1]"
+      class="part4"
+      :style="{
         'height': `calc(100vh - 80px - ${basicInfoHeight}px - 2 * 8px - 44px)`
-      }">
+      }"
+    >
       <header class="head">
         <div class="title">行李跟踪信息</div>
         <div class="btns">
@@ -116,8 +190,15 @@
       </header>
       <main class="main">
         <template v-if="messageList.length">
-          <el-row :gutter="24" type="flex">
-            <el-col v-for="(message, index) in messageList" :key="index" :span="6">
+          <el-row
+            :gutter="24"
+            type="flex"
+          >
+            <el-col
+              v-for="(message, index) in messageList"
+              :key="index"
+              :span="6"
+            >
               <div class="card">
                 <div class="message-date">{{ message.date + ' UTC' }}</div>
                 <div class="message-content">
@@ -137,23 +218,46 @@
           </el-row>
         </template>
         <template v-else>
-          <el-empty :image-size="1" description="暂无数据" />
+          <el-empty
+            :image-size="1"
+            description="暂无数据"
+          />
         </template>
       </main>
     </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: 'name',
               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>
@@ -170,7 +274,7 @@ export default {
     Dialog
   },
   mixins: [tableColsMixin],
-  data () {
+  data() {
     return {
       departureAirport: '',
       landingAirport: '',
@@ -183,7 +287,7 @@ export default {
         },
         {
           label: '航班号',
-          prop: 'FlightNO'
+          prop: 'flightNO'
         },
         {
           label: '企业或团队名称',
@@ -303,7 +407,7 @@ export default {
       tableCols: [
         {
           name: '航班号',
-          prop: 'flightNo'
+          prop: 'flightNO'
         },
         { name: '航班日期', prop: 'flightDate', width: 100 },
         {
@@ -344,7 +448,7 @@ export default {
     }
   },
   computed: {
-    lineWidth () {
+    lineWidth() {
       for (let i = this.stepData.length - 1; i > -1; i--) {
         if (this.stepData[i].DealTime) {
           return (i * 100) / (this.stepData.length - 1) + '%'
@@ -366,7 +470,7 @@ export default {
     //     )
     //   }
     // },
-    formattedBaggageInfo () {
+    formattedBaggageInfo() {
       return function (prop) {
         const value = this.baggageBasicInfo[prop]
         if ((value ?? '') === '') {
@@ -395,7 +499,7 @@ export default {
     }
   },
   watch: {
-    infoBtn (val) {
+    infoBtn(val) {
       const that = this
       if (val === '跟踪报文') {
         clearInterval(this.loopEvent)
@@ -414,7 +518,7 @@ export default {
       }
     },
     hoveredRow: {
-      handler (row) {
+      handler(row) {
         this.stepData.forEach(item => {
           item.tableHover = row && item.resourceFile === row.resourceFile
         })
@@ -422,7 +526,7 @@ export default {
       deep: true
     }
   },
-  mounted () {
+  mounted() {
     this.queryData = this._.cloneDeep(this.$route.query)
     // console.log(this.queryData)
     const that = this
@@ -431,11 +535,11 @@ export default {
       that.queryBaggageAll()
     }, 3000)
   },
-  updated () {
+  updated() {
     this.basicInfoHeight = this.$refs['basicInfo'].offsetHeight
     this.$refs['table']?.doLayout()
   },
-  beforeDestroy () {
+  beforeDestroy() {
     clearInterval(this.loopEvent)
     this.loopEvent = null
     clearInterval(this.queryMessageLoop)
@@ -452,7 +556,7 @@ export default {
     //     }
     //   }
     // },
-    initTableData (tableData) {
+    initTableData(tableData) {
       const spanArr = []
       let pos = 0
       for (let i = 0; i < tableData.length; i++) {
@@ -460,7 +564,7 @@ export default {
           spanArr.push(1)
         } else {
           if (
-            tableData[i]['flightNo'] === tableData[i - 1]['flightNo'] &&
+            tableData[i]['flightNO'] === tableData[i - 1]['flightNO'] &&
             tableData[i]['flightDate'] === tableData[i - 1]['flightDate'] &&
             tableData[i]['departureAirport'] === tableData[i - 1]['departureAirport'] &&
             tableData[i]['landingAirport'] === tableData[i - 1]['landingAirport']
@@ -476,14 +580,14 @@ export default {
       this.spanArr = spanArr
       this.pos = pos
     },
-    headerCellClass ({ row, column, rowIndex, columnIndex }) {
+    headerCellClass({ row, column, rowIndex, columnIndex }) {
       if (['departureAirport', 'landingAirport'].includes(column.property)) {
         return 'pre-line'
       }
     },
-    cellClass ({ row, column, rowIndex, columnIndex }) {
+    cellClass({ row, column, rowIndex, columnIndex }) {
       const classes = []
-      if (column.property === 'flightNo') {
+      if (column.property === 'flightNO') {
         classes.push('cell-click')
       }
       if (['departureAirport', 'landingAirport'].includes(column.property)) {
@@ -491,14 +595,14 @@ export default {
       }
       return classes.join(' ')
     },
-    cellClickHandler (row, column, cell, event) {
+    cellClickHandler(row, column, cell, event) {
       switch (column.property) {
-        case 'flightNo':
+        case 'flightNO':
           this.$router.push({
             path: `/${this.$route.path.split('/').slice(1, -1).join('/')}/flightView`,
             query: {
-              FlightNO: row.flightNo,
-              FlightDate: row.flightDate
+              flightNO: row.flightNO,
+              flightDate: row.flightDate
             }
           })
           break
@@ -506,8 +610,8 @@ export default {
           break
       }
     },
-    tableSpanMethod ({ row, column, rowIndex, columnIndex }) {
-      if (['flightNo', 'flightDate', 'departureAirport', 'landingAirport'].includes(column['property'])) {
+    tableSpanMethod({ row, column, rowIndex, columnIndex }) {
+      if (['flightNO', 'flightDate', 'departureAirport', 'landingAirport'].includes(column['property'])) {
         const _row = this.spanArr[rowIndex]
         const _col = _row > 0 ? 1 : 0
         return {
@@ -516,25 +620,25 @@ export default {
         }
       }
     },
-    itemMouseEnterHandler (item) {
+    itemMouseEnterHandler(item) {
       if (item.resourceFile) {
         // this.checkBaggageMessage(item.resourceFile)
         item.hover = true
       }
     },
-    itemMouseLeaveHandler (item) {
+    itemMouseLeaveHandler(item) {
       item.hover = false
     },
-    cellMouseEnterHandler (row, column, cell, event) {
+    cellMouseEnterHandler(row, column, cell, event) {
       // if (row?.resourceFile) {
       //   this.checkBaggageMessage(row.resourceFile)
       // }
       this.hoveredRow = row
     },
-    cellMouseLeaveHandler () {
+    cellMouseLeaveHandler() {
       // this.hoveredRow = null
     },
-    async checkBaggageMessage (resourceFile) {
+    async checkBaggageMessage(resourceFile) {
       if (!this.messageTooltipList.some(message => message.resourceFile === resourceFile)) {
         const result = await this.queryMessage([resourceFile])
         this.messageTooltipList.push({
@@ -544,24 +648,24 @@ export default {
       }
     },
     // 行李详情基础信息
-    queryBaggageBasicInfo (dataContent) {
+    queryBaggageBasicInfo(dataContent) {
       return myQuery(queryMap.baggageBasicInfoByID, ...dataContent)
     },
     // 行李详情追踪链
-    queryBaggageTrack (dataContent) {
+    queryBaggageTrack(dataContent) {
       return myQuery(queryMap.baggageTrackByID, ...dataContent)
     },
     // 行李详情表格
-    queryBaggageDetails (dataContent) {
+    queryBaggageDetails(dataContent) {
       return myQuery(queryMap.baggageDetailsByID, ...dataContent)
     },
     // 原始报文
-    queryMessage (dataContent) {
+    queryMessage(dataContent) {
       return myQuery(queryMap.message, ...dataContent)
     },
-    async queryBaggageAll (queryData = this.queryData) {
-      const { FlightNO, FlightDate, BagSN } = queryData
-      const dataContent = [FlightNO, FlightDate, BagSN]
+    async queryBaggageAll(queryData = this.queryData) {
+      const { flightNO, flightDate, BagSN } = queryData
+      const dataContent = [flightNO, flightDate, BagSN]
       try {
         const [
           baggageBasicInfo,
@@ -573,7 +677,7 @@ export default {
           this.queryBaggageDetails(new Array(6).fill(dataContent).flat())
         ])
         if (baggageBasicInfo.length) {
-          baggageBasicInfo[0].FlightNO = FlightNO
+          baggageBasicInfo[0].flightNO = flightNO
           this.baggageBasicInfo = baggageBasicInfo[0]
         }
         this.baggageTableData = baggageDetails.map((item, index) => {
@@ -589,8 +693,8 @@ export default {
           if (item['dealTime'].split('T').length > 1) {
             item['dealTime'] = item['dealTime'].replace('T', ' ')
           }
-          item['departureAirport'] = `${item['departureAirport']}\n${item['departureTime'].replace('T', '\n')}`
-          item['landingAirport'] = `${item['landingAirport']}\n${item['landingTime'].replace('T', '\n')}`
+          item['departureAirport'] = `${item['departureAirport']}\n${item['departureTime'] ? item['departureTime'].replace('T', '\n') : ''}`
+          item['landingAirport'] = `${item['landingAirport']}\n${item['landingTime'] ? item['landingTime'].replace('T', '\n') : ''}`
           return item
         })
         this.initTableData(this.baggageTableData)
@@ -598,9 +702,9 @@ export default {
         console.log('错误', error)
       }
     },
-    async baggageMessageQuery () {
-      const { FlightNO, FlightDate, BagSN } = this.queryData
-      const dataContent = [FlightNO, FlightDate, BagSN]
+    async baggageMessageQuery() {
+      const { flightNO, flightDate, BagSN } = this.queryData
+      const dataContent = [flightNO, flightDate, BagSN]
       try {
         const result = await this.queryMessage(dataContent)
         this.messageList = result.map(message => {
@@ -788,7 +892,7 @@ export default {
           padding: 0;
           word-spacing: 0;
           font-size: 14px;
-          font-family: Helvetica, "Microsoft YaHei";
+          font-family: Helvetica, 'Microsoft YaHei';
           font-weight: 400;
           color: #303133;
           .cell-content {
@@ -876,16 +980,16 @@ export default {
     white-space: pre-line;
   }
 }
-.el-popper[x-placement^="top"].popover-dark .popper__arrow::after {
+.el-popper[x-placement^='top'].popover-dark .popper__arrow::after {
   border-top-color: #303133;
 }
-.el-popper[x-placement^="right"].popover-dark .popper__arrow::after {
+.el-popper[x-placement^='right'].popover-dark .popper__arrow::after {
   border-right-color: #303133;
 }
-.el-popper[x-placement^="bottom"].popover-dark .popper__arrow::after {
+.el-popper[x-placement^='bottom'].popover-dark .popper__arrow::after {
   border-bottom-color: #303133;
 }
-.el-popper[x-placement^="left"].popover-dark .popper__arrow::after {
+.el-popper[x-placement^='left'].popover-dark .popper__arrow::after {
   border-left-color: #303133;
 }
 </style>

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

@@ -25,7 +25,7 @@
             @change="setCurrentAirport"
           /> -->
             <el-select v-model="formData.currentAirport" class="input-shadow" size="small" filterable placeholder="请选择机场" @change="airPortChange">
-              <el-option v-for="(item, index) in AirportList" :key="index" :label="item.PlanDepartureApt" :value="item.PlanDepartureApt" />
+              <el-option v-for="(item, index) in AirportList" :key="index" :label="item.planDepartureApt" :value="item.planDepartureApt" />
             </el-select>
           </el-form-item>
           <!-- <el-form-item prop="startDate">
@@ -52,8 +52,8 @@
               @change="endDateChangeHandler"
             />
           </el-form-item> -->
-          <el-form-item prop="FlightDate" label="航班日期">
-            <el-date-picker v-model="formData.FlightDate" size="small" 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" 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">
@@ -139,7 +139,7 @@ export default {
       // 初始表头
       tableCols: [
         {
-          prop: 'FlightNO',
+          prop: 'flightNO',
           label: '航班号',
           disc: '指航班编号',
           width: 80,
@@ -148,7 +148,7 @@ export default {
           sortable: true
         },
         {
-          prop: 'FlightDate',
+          prop: 'flightDate',
           label: '执飞日期',
           disc: '指航班计划起飞日期（不变的，机票上），不是预计起飞日期（预计起飞时间可能多个），也不是实际起飞日期（实际起飞等于最后预计）',
           width: 105,
@@ -157,7 +157,7 @@ export default {
           sortable: true
         },
         {
-          prop: 'PlanDepartureTime',
+          prop: 'planDepartureTime',
           label: '预计起飞时间',
           disc: '指航班预计起飞时间，数据是变化的，仅显示最新结果',
           width: 150,
@@ -165,28 +165,28 @@ export default {
           sortable: true
         },
         {
-          prop: 'TargetAirport',
+          prop: 'targetAirport',
           label: '目的站',
           disc: '指航班执飞航段的目的航站，以航站三字码显示',
           filterable: true,
           sortable: true
         },
         {
-          prop: 'DepartureBuild',
+          prop: 'departureBuild',
           label: '航站楼',
           disc: '指航班执飞航段的目的航站楼',
           filterable: true,
           sortable: true
         },
         {
-          prop: 'BordingGate',
+          prop: 'bordingGate',
           label: '登机口',
           disc: '指航班的登机口代码，数据是变化的，仅显示最新信息',
           filterable: true,
           sortable: true
         },
         {
-          prop: 'StandForDepartrue',
+          prop: 'standForDepartrue',
           label: '停机位',
           disc: '指航班的停机位代码，数据是变化的，仅显示最新信息',
           filterable: true,
@@ -253,12 +253,12 @@ export default {
           disc: '行李有处理信息（BPM）但无值机信息(BSM)的行李数量',
         },
         {
-          prop: 'riskWarning',
+          prop: 'warning',
           label: '风险预警',
           disc: '指依据航班信息中预计起飞时间和当前时间差，与根据分拣到停机位设置的报警阈值对比，超过阈值的为风险行李，本项显示风险预警行李数量',
         },
         {
-          prop: 'departureAnomaly',
+          prop: 'exceptions',
           label: '离港异常',
           disc: '指航班关闭货仓门后，应装而未装的行李数量',
         },
@@ -319,7 +319,7 @@ export default {
           dataContent: []
         })
         if (Number(res.code) === 0) {
-          this.AirportList = this._.orderBy(res.returnData, o => o.PlanDepartureApt)
+          this.AirportList = this._.orderBy(res.returnData.listValues, o => o.planDepartureApt)
           this.formData.currentAirport = 'PEK'
           this.resetLoopEvent()
         } else {
@@ -347,7 +347,7 @@ export default {
     },
     headerCellClass ({ row, column }) {
       const classes = []
-      if (['riskWarning', 'departureAnomaly', 'midIn'].includes(column.property)) {
+      if (['warning', 'exceptions', 'midIn'].includes(column.property)) {
         classes.push('bgl-huang')
       }
       const rule = this.tableDataSortRules[column.property]
@@ -378,7 +378,7 @@ export default {
           dataContent: [...arr, ...arr, ...arr]
         })
         if (Number(res.code) === 0) {
-          this.initTableData(res.returnData)
+          this.initTableData(res.returnData.listValues)
         } else {
           console.log(res.message)
         }
@@ -403,7 +403,7 @@ export default {
         item['landingNumber'] = item['loadNumber']
         this.baggageCount = this.baggageCount + item.preLoad
       })
-      this.tableData = this._.sortBy(tableData, ['hasTakenOff', 'PlanDepartureTime'])
+      this.tableData = this._.sortBy(tableData, ['hasTakenOff', 'planDepartureTime'])
       setTableFilters(this.tableData, this.tableDataFilters)
       this.toOrderNum(this.baggageCount)
       // setInterval(() => {

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

@@ -10,8 +10,8 @@
     <div class="flight-wrap">
       <div class="part1">
         <div class="title">
-          {{ flightInfo.PlanDepartureApt }} - {{ flightInfo.FlightNO }} -
-          {{ flightInfo.PlanLandingApt }}
+          {{ flightInfo.planDepartureApt }} - {{ flightInfo.flightNO }} -
+          {{ flightInfo.planLandingApt }}
         </div>
         <div class="part1_info">
           <div class="part1_info_box">
@@ -44,7 +44,7 @@
                 :sm="24"
                 :xl="12"
               >
-                <span>{{ flightInfo.PlanDepartureApt }}</span>
+                <span>{{ flightInfo.planDepartureApt }}</span>
               </el-col>
             </el-row>
             <el-row>
@@ -60,7 +60,7 @@
                 :sm="24"
                 :xl="12"
               >
-                <span>{{ flightInfo.DepartureBuild }}</span>
+                <span>{{ flightInfo.departureBuild }}</span>
               </el-col>
             </el-row>
             <el-row>
@@ -71,7 +71,7 @@
               >
                 <span>
                   日期：
-                  {{ flightInfo.PlanDepartureTime && flightInfo.PlanDepartureTime.split("T")[0] }}
+                  {{ flightInfo.planDepartureTime && flightInfo.planDepartureTime.split("T")[0] }}
                 </span>
               </el-col>
               <el-col
@@ -81,16 +81,16 @@
               >
                 <span>
                   时间：
-                  {{ flightInfo.PlanDepartureTime && flightInfo.PlanDepartureTime.split("T")[1] }}
+                  {{ flightInfo.planDepartureTime && flightInfo.planDepartureTime.split("T")[1] }}
                 </span>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="12">
-                <span>登机口：{{ flightInfo.BordingGate }}</span>
+                <span>登机口：{{ flightInfo.bordingGate }}</span>
               </el-col>
               <el-col :span="12">
-                <span>停机位：{{ flightInfo.StandForDepartrue }}</span>
+                <span>停机位：{{ flightInfo.standForDepartrue }}</span>
               </el-col>
             </el-row>
           </div>
@@ -100,7 +100,7 @@
                 <span>航班号：</span>
               </el-col>
               <el-col :span="12">
-                <span>{{ flightInfo.FlightNO }}</span>
+                <span>{{ flightInfo.flightNO }}</span>
               </el-col>
             </el-row>
             <el-row>
@@ -108,7 +108,7 @@
                 <span>航班状态：</span>
               </el-col>
               <el-col :span="12">
-                <span>{{ flightInfo.FlightStatus === null ? '正常' : flightInfo.FlightStatus }}</span>
+                <span>{{ flightInfo.flightStatus === null ? '正常' : flightInfo.flightStatus }}</span>
               </el-col>
             </el-row>
             <el-row>
@@ -192,7 +192,7 @@
                 :sm="24"
                 :xl="12"
               >
-                <span>{{ flightInfo.PlanLandingApt }}</span>
+                <span>{{ flightInfo.planLandingApt }}</span>
               </el-col>
             </el-row>
             <el-row>
@@ -208,7 +208,7 @@
                 :sm="24"
                 :xl="12"
               >
-                <span>{{ flightInfo.LandingBuild }}</span>
+                <span>{{ flightInfo.landingBuild }}</span>
               </el-col>
             </el-row>
             <el-row>
@@ -239,14 +239,14 @@
                 :sm="24"
                 :xl="12"
               >
-                <span>提取转盘：{{ flightInfo.Carousel }}</span>
+                <span>提取转盘：{{ flightInfo.carousel }}</span>
               </el-col>
               <el-col
                 :xs="24"
                 :sm="24"
                 :xl="12"
               >
-                <span>停机位：{{ flightInfo.StandForLanding }}</span>
+                <span>停机位：{{ flightInfo.standForLanding }}</span>
               </el-col>
             </el-row>
           </div>
@@ -505,17 +505,53 @@ const departureBaggageTableColumn = [
   { label: '特殊行李类型', prop: 'SpecialType', width: 120, filterable: true, sortable: true },
   { label: '容器编号', prop: 'U_Device_ID', width: 120, filterable: true, sortable: true },
   { label: '装载序号', prop: 'LoadSN' },
-  { label: '值机', prop: 'checkIn', width: 140 },
+  { label: '值机', prop: 'checkInTime', width: 140 },
   { label: '状态', prop: 'latestStatus', filterable: true, sortable: true },
-  { label: '安检', prop: 'DealInfo', width: 140 },
-  { label: '分拣', prop: 'sortLocationMark', width: 140 },
-  { label: '装车', prop: 'loadLocationMark', width: 140 },
-  { label: '装机', prop: 'inflLocationMark', width: 140 },
-  { label: '中转标志', prop: 'transitFlag' },
+  { label: '安检', prop: 'securityTime', width: 140 },
+  { label: '分拣', prop: 'sortTime', width: 140 },
+  { label: '装车', prop: 'loadTime', width: 140 },
+  { label: '装机', prop: 'inflTime', width: 140 },
+  { label: '中转进航班', prop: 'inFlightNO' },
+  { label: '中转出航班', prop: 'transferFlightNO' },
   { label: '卷宗号', prop: 'fileNumber' }
 ]
 export default {
   name: 'FlightView',
+  directives: {
+    dragHeight: {
+      inserted(el, binding, vnode) {
+        const that = vnode.context
+        let mousedownY
+        let dragY
+        let dragHeight
+        const offsetTop = el.offsetParent.offsetTop
+        function mousemoveHandler(e) {
+          e.stopPropagation()
+          e.preventDefault()
+          dragY = dragHeight + mousedownY - e.screenY
+          dragY = dragY < 0 ? 0 : dragY > offsetTop ? offsetTop : dragY
+          that.dragY = dragY
+        }
+        function mouseupHandler(e) {
+          e.stopPropagation()
+          e.preventDefault()
+          that.dragHeight = that.dragY
+          that.dragY = 0
+          that.dragActive = false
+          document.removeEventListener('mousemove', mousemoveHandler)
+          document.removeEventListener('mouseup', mouseupHandler)
+        }
+        el.addEventListener('mousedown', e => {
+          that.dragActive = true
+          mousedownY = e.screenY
+          dragHeight = that.dragHeight
+          that.dragY = dragHeight
+          document.addEventListener('mousemove', mousemoveHandler)
+          document.addEventListener('mouseup', mouseupHandler)
+        })
+      }
+    }
+  },
   components: {
     Dialog,
     TimeZoneSelector,
@@ -538,19 +574,19 @@ export default {
         { label: '行李数', prop: 'numberOfBags' }
       ],
       transferInTableColumn: [
-        { label: '航班号', prop: 'PreFlightNO' },
-        { label: '日期', prop: 'PreFlightDate' },
+        { label: '航班号', prop: 'preFlightNO' },
+        { label: '日期', prop: 'preFlightDate' },
         { label: '时间', prop: 'flightTime' },
-        { label: '始发站', prop: 'PlanDepartureApt' },
-        { label: '航班状态', prop: 'FlightStatus' },
+        { label: '始发站', prop: 'planDepartureApt' },
+        { label: '航班状态', prop: 'flightStatus' },
         { label: '中转数', prop: 'totalNumber' }
       ],
       transferOutTableColumn: [
-        { label: '航班号', prop: 'TransferFlightNO' },
-        { label: '日期', prop: 'TransferFlightDate' },
+        { label: '航班号', prop: 'transferFlightNO' },
+        { label: '日期', prop: 'transferFlightDate' },
         { label: '时间', prop: 'flightTime' },
-        { label: '始发站', prop: 'PlanDepartureApt' },
-        { label: '目的站', prop: 'PlanLandingApt' },
+        { label: '始发站', prop: 'planDepartureApt' },
+        { label: '目的站', prop: 'planLandingApt' },
         { label: '中转数', prop: 'transferNumber' }
       ],
       // tableCols:
@@ -571,41 +607,6 @@ export default {
       dragActive: false
     }
   },
-  directives: {
-    dragHeight: {
-      inserted(el, binding, vnode) {
-        const that = vnode.context
-        let mousedownY
-        let dragY
-        let dragHeight
-        const offsetTop = el.offsetParent.offsetTop
-        function mousemoveHandler(e) {
-          e.stopPropagation()
-          e.preventDefault()
-          dragY = dragHeight + mousedownY - e.screenY
-          dragY = dragY < 0 ? 0 : dragY > offsetTop ? offsetTop : dragY
-          that.dragY = dragY
-        }
-        function mouseupHandler(e) {
-          e.stopPropagation()
-          e.preventDefault()
-          that.dragHeight = that.dragY
-          that.dragY = 0
-          that.dragActive = false
-          document.removeEventListener('mousemove', mousemoveHandler)
-          document.removeEventListener('mouseup', mouseupHandler)
-        }
-        el.addEventListener('mousedown', e => {
-          that.dragActive = true
-          mousedownY = e.screenY
-          dragHeight = that.dragHeight
-          that.dragY = dragHeight
-          document.addEventListener('mousemove', mousemoveHandler)
-          document.addEventListener('mouseup', mouseupHandler)
-        })
-      }
-    }
-  },
   computed: {
     ...mapGetters(['clickedCells']),
     dealedTableData() {
@@ -646,9 +647,9 @@ export default {
     '$route.query': {
       handler(val) {
         this.queryData = this._.cloneDeep(val)
-        const { FlightNO, FlightDate } = this.queryData
-        if (FlightNO && FlightDate) {
-          this.queryAll([FlightNO, FlightDate])
+        const { flightNO, flightDate } = this.queryData
+        if (flightNO && flightDate) {
+          this.queryAll([flightNO, flightDate])
         } else {
           this.$router.push('/advance')
         }
@@ -681,9 +682,9 @@ export default {
   },
   mounted() {
     this.queryData = this._.cloneDeep(this.$route.query)
-    const { FlightNO, FlightDate } = this.queryData
-    if (FlightNO && FlightDate) {
-      this.queryAll([FlightNO, FlightDate])
+    const { flightNO, flightDate } = this.queryData
+    if (flightNO && flightDate) {
+      this.queryAll([flightNO, flightDate])
     } else {
       this.$router.push('/advance')
     }
@@ -722,12 +723,12 @@ export default {
     cellClass({ row, column, rowIndex, columnIndex }) {
       const classes = []
       if (
-        ['checkIn', 'DealInfo', 'sortLocationMark', 'loadLocationMark', 'inflLocationMark'].includes(column.property)
+        ['checkInTime', 'DealInfo', 'sortLocationMark', 'loadLocationMark', 'inflLocationMark'].includes(column.property)
       ) {
         classes.push('pre-line')
       }
       if (
-        ['PreFlightNO', 'totalNumber', 'TransferFlightNO', 'transferNumber', 'PassengerNameUpcase', 'BagSN'].includes(
+        ['preFlightNO', 'totalNumber', 'transferFlightNO', 'transferNumber', 'PassengerNameUpcase', 'BagSN'].includes(
           column.property
         )
       ) {
@@ -747,7 +748,7 @@ export default {
     },
     cellClickHandler(row, column, cell, event) {
       if (
-        ['PreFlightNO', 'totalNumber', 'TransferFlightNO', 'transferNumber', 'PassengerNameUpcase', 'BagSN'].includes(
+        ['preFlightNO', 'totalNumber', 'transferFlightNO', 'transferNumber', 'PassengerNameUpcase', 'BagSN'].includes(
           column.property
         )
       ) {
@@ -758,12 +759,12 @@ export default {
         })
       }
       switch (column.property) {
-        case 'PreFlightNO':
+        case 'preFlightNO':
           this.$router.push({
             path: '/advance/flightView',
             query: {
-              FlightNO: row.PreFlightNO,
-              FlightDate: row.PreFlightDate
+              flightNO: row.preFlightNO,
+              flightDate: row.preFlightDate
             }
           })
           break
@@ -771,19 +772,19 @@ export default {
           this.$router.push({
             path: '/advance',
             query: {
-              FlightNO: this.queryData.FlightNO,
-              startDate: this.queryData.FlightDate,
-              endDate: this.queryData.FlightDate,
-              transferArrival: row.PreFlightNO
+              flightNO: this.queryData.flightNO,
+              startDate: this.queryData.flightDate,
+              endDate: this.queryData.flightDate,
+              transferArrival: row.preFlightNO
             }
           })
           break
-        case 'TransferFlightNO':
+        case 'transferFlightNO':
           this.$router.push({
             path: '/advance/flightView',
             query: {
-              FlightNO: row.TransferFlightNO,
-              FlightDate: row.TransferFlightDate
+              flightNO: row.transferFlightNO,
+              flightDate: row.transferFlightDate
             }
           })
           break
@@ -791,10 +792,10 @@ export default {
           this.$router.push({
             path: '/advance',
             query: {
-              FlightNO: this.queryData.FlightNO,
-              startDate: this.queryData.FlightDate,
-              endDate: this.queryData.FlightDate,
-              transferDeparture: row.TransferFlightNO
+              flightNO: this.queryData.flightNO,
+              startDate: this.queryData.flightDate,
+              endDate: this.queryData.flightDate,
+              transferDeparture: row.transferFlightNO
             }
           })
           break
@@ -806,8 +807,8 @@ export default {
             path: `/${this.$route.path.split('/').slice(1, -1).join('/')}/baggageView`,
             query: {
               BagSN: row.BagSN,
-              FlightNO: this.queryData.FlightNO,
-              FlightDate: this.queryData.FlightDate
+              flightNO: this.queryData.flightNO,
+              flightDate: this.queryData.flightDate
             }
           })
           break
@@ -857,9 +858,9 @@ export default {
       this.$router.push({
         path: '/advance',
         query: {
-          FlightNO: this.queryData.FlightNO,
-          startDate: this.queryData.FlightDate,
-          endDate: this.queryData.FlightDate,
+          flightNO: this.queryData.flightNO,
+          startDate: this.queryData.flightDate,
+          endDate: this.queryData.flightDate,
           U_Device_ID: row.containerNumber
         }
       })
@@ -909,7 +910,7 @@ export default {
         this.warningContainers = []
         this.flightBaggageTableData = flightBaggageTableData.map((item, index) => {
           item['latestStatus'] === '待翻减' && this.warningContainers.push(item['U_Device_ID'])
-          item['transitFlag'] = item['PreFlightNO'] ? '是' : '否'
+          // item['transitFlag'] = item['preFlightNO'] || item['inFlightNO'] ? '是' : '否'
           return item
         })
         setTableFilters(this.flightBaggageTableData, this.flightBaggageTableFilters)

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

@@ -8,8 +8,17 @@
 <template>
   <div class="transfer-in">
     <!--功能区-表单-->
-    <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,15 +33,51 @@
             filterable
             @change="setCurrentAirport"
           /> -->
-            <el-select v-model="formData.currentAirport" class="input-shadow" size="small" filterable placeholder="请选择机场" @change="airPortChange">
-              <el-option v-for="(item, index) in AirportList" :key="index" :label="item.PlanDepartureApt" :value="item.PlanDepartureApt" />
+            <el-select
+              v-model="formData.currentAirport"
+              class="input-shadow"
+              size="small"
+              filterable
+              placeholder="请选择机场"
+              @change="airPortChange"
+            >
+              <el-option
+                v-for="(item, index) in AirportList"
+                :key="index"
+                :label="item.planDepartureApt"
+                :value="item.planDepartureApt"
+              />
             </el-select>
           </el-form-item>
           <el-form-item prop="inboundCarrier">
-            <el-cascader v-model="formData.inboundCarrier" class="input-shadow" style="width: 164px" size="small" :options="carrierProps" :props="optionProps" placeholder="进港承运航司" collapse-tags clearable filterable @change="resetLoopEvent" />
+            <el-cascader
+              v-model="formData.inboundCarrier"
+              class="input-shadow"
+              style="width: 164px"
+              size="small"
+              :options="carrierProps"
+              :props="optionProps"
+              placeholder="进港承运航司"
+              collapse-tags
+              clearable
+              filterable
+              @change="resetLoopEvent"
+            />
           </el-form-item>
           <el-form-item prop="outgoingAirline">
-            <el-cascader v-model="formData.outgoingAirline" class="input-shadow" style="width: 164px" size="small" :options="carrierPropsop" :props="optionPropser" placeholder="离港承运航司" collapse-tags clearable filterable @change="resetLoopEvent" />
+            <el-cascader
+              v-model="formData.outgoingAirline"
+              class="input-shadow"
+              style="width: 164px"
+              size="small"
+              :options="carrierPropsop"
+              :props="optionPropser"
+              placeholder="离港承运航司"
+              collapse-tags
+              clearable
+              filterable
+              @change="resetLoopEvent"
+            />
           </el-form-item>
           <!-- <el-form-item prop="startDate">
             <el-date-picker
@@ -58,8 +103,20 @@
               @change="endDateChangeHandler"
             />
           </el-form-item> -->
-          <el-form-item prop="FlightDate" label="航班日期">
-            <el-date-picker v-model="formData.FlightDate" size="small" 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"
+              type="daterange"
+              value-format="yyyy-MM-dd"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :picker-options="dateRangePickerOptions"
+              @change="dateChangeHandler"
+            />
           </el-form-item>
         </div>
         <!-- <el-form-item>
@@ -77,36 +134,112 @@
             </li>
           </div>
         </el-form-item> -->
-        <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;" 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;"
+                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="['ti_showTransit']">
-            <el-button class="btn-shadow" size="mini" type="primary" @click="changeView">切换视角</el-button>
+            <el-button
+              class="btn-shadow"
+              size="mini"
+              type="primary"
+              @click="changeView"
+            >切换视角</el-button>
           </el-form-item>
           <el-form-item v-is="['i_timeIcon']">
             <TimeZoneSelector />
           </el-form-item>
           <el-form-item>
-            <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"
+              @click="show"
+            >
           </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" :data="dealedTableData" :height="computedTableHeight" show-summary :summary-method="summaryMethod" :span-method="arraySpanMethod" :header-cell-class-name="headerCellClass" :row-class-name="tableRowClassName" :cell-class-name="cellClass" 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"
+        :data="dealedTableData"
+        :height="computedTableHeight"
+        show-summary
+        :summary-method="summaryMethod"
+        :span-method="arraySpanMethod"
+        :header-cell-class-name="headerCellClass"
+        :row-class-name="tableRowClassName"
+        :cell-class-name="cellClass"
+        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.disc" 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.disc"
+                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>
@@ -114,18 +247,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>
@@ -147,7 +300,7 @@ export default {
   name: 'DepartureTerminalView',
   components: { Dialog, TimeZoneSelector, TableHeaderCell },
   mixins: [terminalMixin, formMixin, tableColsMixin, timeZoneMixin],
-  data () {
+  data() {
     return {
       optionProps: {
         value: 'inAicompanyCode2',
@@ -168,7 +321,7 @@ export default {
           fixed: 'left',
           children: [
             {
-              prop: 'PreFlightNO',
+              prop: 'preFlightNO',
               label: '航班号',
               disc: '进港航班编号',
               width: 80,
@@ -176,13 +329,13 @@ export default {
               sortable: true
             },
             {
-              prop: 'PreFlightDate',
+              prop: 'preFlightDate',
               label: '航班日期',
               disc: '指航班计划起飞日期（不变的，机票上），不是预计起飞日期（预计起飞时间可能多个），也不是实际起飞日期（实际起飞等于最后预计）',
               width: 100
             },
             {
-              prop: 'PreAirport',
+              prop: 'preAirport',
               label: '起飞航站',
               disc: '指进港航班的起飞机场三字码',
               width: 100,
@@ -190,13 +343,13 @@ export default {
               sortable: true
             },
             {
-              prop: 'ActualLandingTime',
+              prop: 'actualLandingTime',
               label: '降落时间',
               disc: '指航班预计到达时间，数据是变化的，仅显示最新结果',
               width: 100
             },
             {
-              prop: 'LandingBuild',
+              prop: 'landingBuild',
               label: '降落航站楼',
               disc: '指航班降落后位于机场的哪个航站楼',
               width: 98,
@@ -204,7 +357,7 @@ export default {
               sortable: true
             },
             {
-              prop: 'Carousel',
+              prop: 'carousel',
               label: '行李转盘',
               disc: '指航班到达后行李提取的地方，仅显示最新信息',
               width: 100,
@@ -212,7 +365,7 @@ export default {
               sortable: true
             },
             {
-              prop: 'StandForLanding',
+              prop: 'standForLanding',
               label: '降落停机位',
               disc: '指航班的停机位代码，数据是变化的，仅显示最新信息',
               width: 98,
@@ -222,8 +375,7 @@ export default {
             {
               prop: 'inTransferBaggageCount',
               label: '中转行李数',
-              disc: '指航班在本航站预计需要中转至对应航班的行李数量',
-
+              disc: '指航班在本航站预计需要中转至对应航班的行李数量'
             },
             {
               prop: 'inTransferredBaggageCount',
@@ -238,7 +390,7 @@ export default {
           label: '离港航班',
           children: [
             {
-              prop: 'FlightNO',
+              prop: 'flightNO',
               label: '航班号',
               disc: '指航班编号',
               width: 80,
@@ -246,26 +398,26 @@ export default {
               sortable: true
             },
             {
-              prop: 'FlightDate',
+              prop: 'flightDate',
               label: '航班日期',
               disc: '指航班计划起飞日期（不变的，机票上），不是预计起飞日期（预计起飞时间可能多个），也不是实际起飞日期（实际起飞等于最后预计）',
               width: 100
             },
             {
-              prop: 'ActualDepartureTime',
+              prop: 'actualDepartureTime',
               label: '起飞时间',
               disc: '指航班预计起飞时间，数据是变化的，仅显示最新结果',
               width: 100
             },
             {
-              prop: 'TargetAirport',
+              prop: 'targetAirport',
               label: '目的站',
               disc: '指航班执飞航段的目的航站，以航站三字码+航站简称显示',
               filterable: true,
               sortable: true
             },
             {
-              prop: 'DepartureBuild',
+              prop: 'departureBuild',
               label: '起飞航站楼',
               disc: '指航班执飞航段的起飞航站的航站楼',
               width: 98,
@@ -273,7 +425,7 @@ export default {
               sortable: true
             },
             {
-              prop: 'BordingGate',
+              prop: 'bordingGate',
               label: '起飞登机口',
               disc: '指航班的登机口代码，数据是变化的，仅显示最新信息',
               width: 98,
@@ -281,7 +433,7 @@ export default {
               sortable: true
             },
             {
-              prop: 'StandForDepartrue',
+              prop: 'standForDepartrue',
               label: '起飞停机位',
               disc: '指航班的停机位代码，数据是变化的，仅显示最新信息',
               width: 98,
@@ -303,7 +455,7 @@ export default {
             {
               prop: 'timeDifference',
               label: '转运时间',
-              disc: '指中转动作完成时间',
+              disc: '指中转动作完成时间'
             }
           ]
         }
@@ -321,7 +473,7 @@ export default {
       flag: 0
     }
   },
-  created () {
+  created() {
     // this.getAirPortData()
     const { startDate, endDate } = this.$route.query
     Object.entries(this.$route.query).forEach(([key, value]) => {
@@ -330,29 +482,29 @@ export default {
       }
     })
     if (startDate !== null && startDate !== undefined) {
-      this.formData.FlightDate[0] = startDate
+      this.formData.flightDate[0] = startDate
     }
     if (endDate !== null && endDate !== undefined) {
-      this.formData.FlightDate[1] = endDate
+      this.formData.flightDate[1] = endDate
     }
   },
-  mounted () {
-    this.$refs['form'].validateField('FlightDate')
+  mounted() {
+    this.$refs['form'].validateField('flightDate')
     this.getAirPortData()
   },
-  beforeDestroy () {
+  beforeDestroy() {
     if (this.loopEvent) {
       clearInterval(this.loopEvent)
       this.loopEvent = null
     }
   },
   computed: {
-    singleDay () {
+    singleDay() {
       return this.startDate === this.endDate
     }
   },
   methods: {
-    resetLoopEvent () {
+    resetLoopEvent() {
       this.loading = true
       this.hasSetTableScroll = false
       if (this.loopEvent) {
@@ -364,7 +516,7 @@ export default {
         that.getTableData()
       }, 3000)
     },
-    headerCellClass ({ row, column }) {
+    headerCellClass({ row, column }) {
       const classes = []
       const rule = this.tableDataSortRules[column.property]
       if (rule) {
@@ -372,7 +524,7 @@ export default {
       }
       return classes.join(' ')
     },
-    tableRowClassName ({ row, rowIndex }) {
+    tableRowClassName({ row, rowIndex }) {
       const classes = []
       if (row.hasArrived) {
         classes.push('bgl-hui')
@@ -382,37 +534,37 @@ export default {
       }
       return classes.join(' ')
     },
-    changeView () {
+    changeView() {
       const query = {
         ...this.formData,
         startDate: this.startDate,
         endDate: this.endDate
       }
-      delete query.FlightDate
+      delete query.flightDate
       this.$router.replace({
         path: '/transfer/departure',
         query
       })
     },
-    airPortChange () {
+    airPortChange() {
       this.getAviationData()
       this.upAviationData()
       this.resetLoopEvent()
     },
-    dateChangeHandler () {
+    dateChangeHandler() {
       this.getAviationData()
       this.upAviationData()
       this.resetLoopEvent()
     },
     // 选择机场
-    async getAirPortData () {
+    async getAirPortData() {
       try {
         const res = await getQuery({
           id: DATACONTENT_ID.departureAirId,
           dataContent: []
         })
         if (Number(res.code) === 0) {
-          this.AirportList = res.returnData
+          this.AirportList = res.returnData.listValues
           this.formData.currentAirport = 'PEK'
           this.getAviationData()
           this.upAviationData()
@@ -425,14 +577,14 @@ export default {
       }
     },
     // 选择航司
-    async getAviationData () {
+    async getAviationData() {
       try {
         const res = await getQuery({
           id: DATACONTENT_ID.departureAviJoinId,
           dataContent: [this.formData.currentAirport]
         })
         if (Number(res.code) === 0) {
-          this.carrierProps = res.returnData
+          this.carrierProps = res.returnData.listValues
         } else {
           this.$message.error(res.message)
         }
@@ -441,14 +593,14 @@ export default {
       }
     },
     // 选择航司
-    async upAviationData () {
+    async upAviationData() {
       try {
         const res = await getQuery({
           id: DATACONTENT_ID.departureAviLeaveId,
           dataContent: [this.formData.currentAirport]
         })
         if (Number(res.code) === 0) {
-          this.carrierPropsop = res.returnData
+          this.carrierPropsop = res.returnData.listValues
         } else {
           this.$message.error(res.message)
         }
@@ -467,7 +619,7 @@ export default {
     //   this.flightAttrQuery(params)
     // },
     // 获取表格数据
-    async getTableData () {
+    async getTableData() {
       if (!this.formData.currentAirport || !this.startDate || !this.endDate) {
         return
       }
@@ -494,7 +646,7 @@ export default {
           dataContent: [...arr]
         })
         if (Number(res.code) === 0) {
-          this.initTableData(res.returnData)
+          this.initTableData(res.returnData.listValues)
         } else {
           console.log(res.message)
         }
@@ -508,7 +660,7 @@ export default {
         console.log('出错了', error)
       }
     },
-    initTableData (tableData) {
+    initTableData(tableData) {
       this.arrivalCount = 0
       // this.baggageCount = 0
       tableData.forEach(item => {
@@ -518,10 +670,10 @@ export default {
         // this.baggageCount = this.baggageCount + item.preLoad
       })
       this.tableData = this._.sortBy(tableData, [
-        'PreFlightDate',
-        'ActualLandingTime',
-        'FlightDate',
-        'ActualDepartureTime'
+        'preFlightDate',
+        'actualLandingTime',
+        'flightDate',
+        'actualDepartureTime'
       ])
       setTableFilters(this.tableData, this.tableDataFilters)
       // this.toOrderNum(this.baggageCount);
@@ -533,13 +685,17 @@ export default {
         this.setTableScroll()
       })
     },
-    hasArrived (flight) {
-      const now = new Date()
-      const ActualLandingTime = new Date(flight.ActualLandingTime.replace('T', ' '))
-      flight['hasArrived'] = now > ActualLandingTime && !flight['flightCanceled']
+    hasArrived(flight) {
+      if (flight.actualLandingTime) {
+        const now = new Date()
+        const actualLandingTime = new Date(flight.actualLandingTime.replace('T', ' '))
+        flight['hasArrived'] = now > actualLandingTime && !flight['flightCanceled']
+      } else {
+        flight['hasArrived'] = false
+      }
       return flight['hasArrived']
     },
-    setTableScroll () {
+    setTableScroll() {
       if (!this.singleDay || this.hasSetTableScroll || this.arrivalCount === 0) {
         return
       }
@@ -560,7 +716,7 @@ export default {
       }, 0)
       this.hasSetTableScroll = true
     },
-    setNumberTransform () {
+    setNumberTransform() {
       const numberItems = this.$refs.numberItem // 拿到数字的ref，计算元素数量
       const numberArr = this.orderNum.filter(item => !isNaN(item))
       // 结合CSS 对数字字符进行滚动,显示订单数量
@@ -570,7 +726,7 @@ export default {
       }
     },
 
-    toOrderNum (num) {
+    toOrderNum(num) {
       num = num.toString()
       if (num.length < 6) {
         num = '0' + num // 如未满八位数，添加"0"补位
@@ -583,7 +739,7 @@ export default {
       }
       this.setNumberTransform()
     },
-    arraySpanMethod ({ row, column, rowIndex, columnIndex }) {
+    arraySpanMethod({ row, column, rowIndex, columnIndex }) {
       for (let i = 0; i < 7; i++) {
         if (columnIndex === i) {
           const _row = this.spanArr[rowIndex]
@@ -620,7 +776,7 @@ export default {
       optgroup,
       select,
       textarea {
-        font-family: Helvetica, "Microsoft YaHei";
+        font-family: Helvetica, 'Microsoft YaHei';
         font-size: 14px;
       }
       .el-switch__label {
@@ -726,7 +882,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 {
@@ -760,7 +916,7 @@ export default {
         &.redBorder {
           position: relative;
           &::after {
-            content: "";
+            content: '';
             position: absolute;
             left: 0;
             bottom: 0;

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

@@ -8,8 +8,17 @@
 <template>
   <div class="transfer-out">
     <!--功能区-表单-->
-    <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,15 +33,51 @@
             filterable
             @change="setCurrentAirport"
           /> -->
-            <el-select v-model="formData.currentAirport" class="input-shadow" size="small" filterable placeholder="请选择机场" @change="airPortChange">
-              <el-option v-for="(item, index) in AirportList" :key="index" :label="item.PlanDepartureApt" :value="item.PlanDepartureApt" />
+            <el-select
+              v-model="formData.currentAirport"
+              class="input-shadow"
+              size="small"
+              filterable
+              placeholder="请选择机场"
+              @change="airPortChange"
+            >
+              <el-option
+                v-for="(item, index) in AirportList"
+                :key="index"
+                :label="item.planDepartureApt"
+                :value="item.planDepartureApt"
+              />
             </el-select>
           </el-form-item>
           <el-form-item prop="inboundCarrier">
-            <el-cascader v-model="formData.inboundCarrier" class="input-shadow" style="width: 164px" size="small" :options="carrierProps" :props="optionProps" placeholder="进港承运航司" collapse-tags clearable filterable @change="resetLoopEvent" />
+            <el-cascader
+              v-model="formData.inboundCarrier"
+              class="input-shadow"
+              style="width: 164px"
+              size="small"
+              :options="carrierProps"
+              :props="optionProps"
+              placeholder="进港承运航司"
+              collapse-tags
+              clearable
+              filterable
+              @change="resetLoopEvent"
+            />
           </el-form-item>
           <el-form-item prop="outgoingAirline">
-            <el-cascader v-model="formData.outgoingAirline" class="input-shadow" style="width: 164px" size="small" :options="carrierPropsop" :props="optionPropser" placeholder="离港承运航司" collapse-tags clearable filterable @change="resetLoopEvent" />
+            <el-cascader
+              v-model="formData.outgoingAirline"
+              class="input-shadow"
+              style="width: 164px"
+              size="small"
+              :options="carrierPropsop"
+              :props="optionPropser"
+              placeholder="离港承运航司"
+              collapse-tags
+              clearable
+              filterable
+              @change="resetLoopEvent"
+            />
           </el-form-item>
           <!-- <el-form-item prop="startDate">
             <el-date-picker
@@ -58,8 +103,20 @@
               @change="endDateChangeHandler"
             />
           </el-form-item> -->
-          <el-form-item prop="FlightDate" label="航班日期">
-            <el-date-picker v-model="formData.FlightDate" size="small" 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"
+              type="daterange"
+              value-format="yyyy-MM-dd"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :picker-options="dateRangePickerOptions"
+              @change="dateChangeHandler"
+            />
           </el-form-item>
         </div>
         <!-- <el-form-item>
@@ -77,36 +134,112 @@
             </li>
           </div>
         </el-form-item> -->
-        <div class="form-right" @keyup.enter="onSubmit(0)">
+        <div
+          class="form-right"
+          @keyup.enter="onSubmit(0)"
+        >
           <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;" 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;"
+                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(0)">搜索</el-button>
+            <el-button
+              class="btn-shadow"
+              size="mini"
+              type="primary"
+              @click="onSubmit(0)"
+            >搜索</el-button>
           </el-form-item>
           <el-form-item v-is="['ti_showTransit']">
-            <el-button class="btn-shadow" size="mini" type="primary" @click="changeView">切换视角</el-button>
+            <el-button
+              class="btn-shadow"
+              size="mini"
+              type="primary"
+              @click="changeView"
+            >切换视角</el-button>
           </el-form-item>
           <el-form-item v-is="['i_timeIcon']">
             <TimeZoneSelector />
           </el-form-item>
           <el-form-item>
-            <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"
+              @click="show"
+            >
           </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" :data="dealedTableData" :height="computedTableHeight" show-summary :summary-method="summaryMethod" :span-method="arraySpanMethod" :header-cell-class-name="headerCellClass" :row-class-name="tableRowClassName" :cell-class-name="cellClass" 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"
+        :data="dealedTableData"
+        :height="computedTableHeight"
+        show-summary
+        :summary-method="summaryMethod"
+        :span-method="arraySpanMethod"
+        :header-cell-class-name="headerCellClass"
+        :row-class-name="tableRowClassName"
+        :cell-class-name="cellClass"
+        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.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.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>
@@ -114,18 +247,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>
@@ -147,7 +300,7 @@ export default {
   name: 'DepartureTerminalView',
   components: { Dialog, TimeZoneSelector, TableHeaderCell },
   mixins: [terminalMixin, formMixin, tableColsMixin, timeZoneMixin],
-  data () {
+  data() {
     return {
       optionProps: {
         value: 'inAicompanyCode2',
@@ -168,44 +321,44 @@ export default {
           fixed: 'left',
           children: [
             {
-              prop: 'FlightNO',
+              prop: 'flightNO',
               label: '航班号',
               width: 80,
               filterable: true,
               sortable: true
             },
             {
-              prop: 'FlightDate',
+              prop: 'flightDate',
               label: '航班日期',
               width: 100
             },
             {
-              prop: 'ActualDepartureTime',
+              prop: 'actualDepartureTime',
               label: '起飞时间',
               width: 100
             },
             {
-              prop: 'TargetAirport',
+              prop: 'targetAirport',
               label: '目的站',
               filterable: true,
               sortable: true
             },
             {
-              prop: 'DepartureBuild',
+              prop: 'departureBuild',
               label: '起飞航站楼',
               width: 98,
               filterable: true,
               sortable: true
             },
             {
-              prop: 'BordingGate',
+              prop: 'bordingGate',
               label: '起飞登机口',
               width: 98,
               filterable: true,
               sortable: true
             },
             {
-              prop: 'StandForDepartrue',
+              prop: 'standForDepartrue',
               label: '起飞停机位',
               width: 98,
               filterable: true,
@@ -232,45 +385,45 @@ export default {
           label: '进港航班',
           children: [
             {
-              prop: 'PreFlightNO',
+              prop: 'preFlightNO',
               label: '航班号',
               width: 80,
               filterable: true,
               sortable: true
             },
             {
-              prop: 'PreFlightDate',
+              prop: 'preFlightDate',
               label: '航班日期',
               width: 100
             },
             {
-              prop: 'PreAirport',
+              prop: 'preAirport',
               label: '起飞航站',
               width: 100,
               filterable: true,
               sortable: true
             },
             {
-              prop: 'ActualLandingTime',
+              prop: 'actualLandingTime',
               label: '降落时间',
               width: 100
             },
             {
-              prop: 'LandingBuild',
+              prop: 'landingBuild',
               label: '降落航站楼',
               width: 98,
               filterable: true,
               sortable: true
             },
             {
-              prop: 'Carousel',
+              prop: 'carousel',
               label: '行李转盘',
               width: 100,
               filterable: true,
               sortable: true
             },
             {
-              prop: 'StandForLanding',
+              prop: 'standForLanding',
               label: '降落停机位',
               width: 98,
               filterable: true,
@@ -301,7 +454,7 @@ export default {
       flag: 0
     }
   },
-  created () {
+  created() {
     // this.getAirPortData()
     const { startDate, endDate } = this.$route.query
     Object.entries(this.$route.query).forEach(([key, value]) => {
@@ -310,29 +463,29 @@ export default {
       }
     })
     if (startDate !== null && startDate !== undefined) {
-      this.formData.FlightDate[0] = startDate
+      this.formData.flightDate[0] = startDate
     }
     if (endDate !== null && endDate !== undefined) {
-      this.formData.FlightDate[1] = endDate
+      this.formData.flightDate[1] = endDate
     }
   },
-  mounted () {
-    this.$refs['form'].validateField('FlightDate')
+  mounted() {
+    this.$refs['form'].validateField('flightDate')
     this.getAirPortData()
   },
-  beforeDestroy () {
+  beforeDestroy() {
     if (this.loopEvent) {
       clearInterval(this.loopEvent)
       this.loopEvent = null
     }
   },
   computed: {
-    singleDay () {
+    singleDay() {
       return this.startDate === this.endDate
     }
   },
   methods: {
-    resetLoopEvent () {
+    resetLoopEvent() {
       this.loading = true
       this.hasSetTableScroll = false
       if (this.loopEvent) {
@@ -344,7 +497,7 @@ export default {
         that.getTableData()
       }, 3000)
     },
-    headerCellClass ({ row, column }) {
+    headerCellClass({ row, column }) {
       const classes = []
       const rule = this.tableDataSortRules[column.property]
       if (rule) {
@@ -352,7 +505,7 @@ export default {
       }
       return classes.join(' ')
     },
-    tableRowClassName ({ row, rowIndex }) {
+    tableRowClassName({ row, rowIndex }) {
       const classes = []
       if (row.hasTakenOff) {
         classes.push('bgl-hui')
@@ -362,37 +515,37 @@ export default {
       }
       return classes.join(' ')
     },
-    changeView () {
+    changeView() {
       const query = {
         ...this.formData,
         startDate: this.startDate,
         endDate: this.endDate
       }
-      delete query.FlightDate
+      delete query.flightDate
       this.$router.replace({
         path: '/transfer/arrival',
         query
       })
     },
-    airPortChange () {
+    airPortChange() {
       this.getAviationData()
       this.upAviationData()
       this.resetLoopEvent()
     },
-    dateChangeHandler () {
+    dateChangeHandler() {
       this.getAviationData()
       this.upAviationData()
       this.resetLoopEvent()
     },
     // 选择机场
-    async getAirPortData () {
+    async getAirPortData() {
       try {
         const res = await getQuery({
           id: DATACONTENT_ID.departureAirLtId,
           dataContent: []
         })
         if (Number(res.code) === 0) {
-          this.AirportList = res.returnData
+          this.AirportList = res.returnData.listValues
           this.formData.currentAirport = 'PEK'
           this.getAviationData()
           this.upAviationData()
@@ -405,14 +558,14 @@ export default {
       }
     },
     // 选择航司
-    async getAviationData () {
+    async getAviationData() {
       try {
         const res = await getQuery({
           id: DATACONTENT_ID.departureAviJoinLtId,
           dataContent: [this.formData.currentAirport]
         })
         if (Number(res.code) === 0) {
-          this.carrierProps = res.returnData
+          this.carrierProps = res.returnData.listValues
         } else {
           this.$message.error(res.message)
         }
@@ -421,14 +574,14 @@ export default {
       }
     },
     // 选择航司
-    async upAviationData () {
+    async upAviationData() {
       try {
         const res = await getQuery({
           id: DATACONTENT_ID.departureAviLeaveLtId,
           dataContent: [this.formData.currentAirport]
         })
         if (Number(res.code) === 0) {
-          this.carrierPropsop = res.returnData
+          this.carrierPropsop = res.returnData.listValues
         } else {
           this.$message.error(res.message)
         }
@@ -447,7 +600,7 @@ export default {
     //   this.flightAttrQuery(params)
     // },
     // 获取表格数据
-    async getTableData () {
+    async getTableData() {
       if (!this.formData.currentAirport || !this.startDate || !this.endDate) {
         return
       }
@@ -481,7 +634,7 @@ export default {
           dataContent: [...arr]
         })
         if (Number(res.code) === 0) {
-          this.initTableData(res.returnData)
+          this.initTableData(res.returnData.listValues)
         } else {
           console.log(res.message)
         }
@@ -495,7 +648,7 @@ export default {
         console.log('出错了', error)
       }
     },
-    initTableData (tableData) {
+    initTableData(tableData) {
       this.leaveCount = 0
       // this.baggageCount = 0
       tableData.forEach(item => {
@@ -505,10 +658,10 @@ export default {
         // this.baggageCount = this.baggageCount + item.preLoad
       })
       this.tableData = this._.sortBy(tableData, [
-        'FlightDate',
-        'ActualDepartureTime',
-        'PreFlightDate',
-        'ActualLandingTime'
+        'flightDate',
+        'actualDepartureTime',
+        'preFlightDate',
+        'actualLandingTime'
       ])
       setTableFilters(this.tableData, this.tableDataFilters)
       // this.toOrderNum(this.baggageCount);
@@ -520,13 +673,17 @@ export default {
         this.setTableScroll()
       })
     },
-    hasTakenOff (flight) {
-      const now = new Date()
-      const ActualDepartureTime = new Date(flight.ActualDepartureTime.replace('T', ' '))
-      flight['hasTakenOff'] = now > ActualDepartureTime && !flight['flightCanceled']
+    hasTakenOff(flight) {
+      if (flight.actualDepartureTime) {
+        const now = new Date()
+        const actualDepartureTime = new Date(flight.actualDepartureTime.replace('T', ' '))
+        flight['hasTakenOff'] = now > actualDepartureTime && !flight['flightCanceled']
+      } else {
+        flight['hasTakenOff'] = false
+      }
       return flight['hasTakenOff']
     },
-    setTableScroll () {
+    setTableScroll() {
       if (!this.singleDay || this.hasSetTableScroll || this.leaveCount === 0) {
         return
       }
@@ -547,7 +704,7 @@ export default {
       }, 0)
       this.hasSetTableScroll = true
     },
-    setNumberTransform () {
+    setNumberTransform() {
       const numberItems = this.$refs.numberItem // 拿到数字的ref，计算元素数量
       const numberArr = this.orderNum.filter(item => !isNaN(item))
       // 结合CSS 对数字字符进行滚动,显示订单数量
@@ -557,7 +714,7 @@ export default {
       }
     },
 
-    toOrderNum (num) {
+    toOrderNum(num) {
       num = num.toString()
       if (num.length < 6) {
         num = '0' + num // 如未满八位数，添加"0"补位
@@ -570,7 +727,7 @@ export default {
       }
       this.setNumberTransform()
     },
-    arraySpanMethod ({ row, column, rowIndex, columnIndex }) {
+    arraySpanMethod({ row, column, rowIndex, columnIndex }) {
       for (let i = 0; i < 9; i++) {
         if (columnIndex === i) {
           const _row = this.spanArr[rowIndex]
@@ -607,7 +764,7 @@ export default {
       optgroup,
       select,
       textarea {
-        font-family: Helvetica, "Microsoft YaHei";
+        font-family: Helvetica, 'Microsoft YaHei';
         font-size: 14px;
       }
       .el-switch__label {
@@ -713,7 +870,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 {
@@ -747,7 +904,7 @@ export default {
         &.redBorder {
           position: relative;
           &::after {
-            content: "";
+            content: '';
             position: absolute;
             left: 0;
             bottom: 0;

src/views/baggageManagement/mixins/form.js

@@ -30,7 +30,7 @@ export default {
         outgoingAirline: [],
         craftType: [],
         flightAttr: [],
-        FlightDate: [defaultDate, defaultDate],
+        flightDate: [defaultDate, defaultDate],
         // startDate: defaultDate,
         // endDate: defaultDate,
         search: ''
@@ -77,7 +77,7 @@ export default {
         currentAirport: [{ required: true, message: '请选择当前机场', trigger: ['change', 'blur'] }],
         // startDate: [{ required: true, message: '请选择开始时间', trigger: 'change' }],
         // endDate: [{ required: true, message: '请选择结束时间', trigger: 'change' }]
-        FlightDate: [{ validator: dateValidator, trigger: ['change', 'blur'] }]
+        flightDate: [{ validator: dateValidator, trigger: ['change', 'blur'] }]
       }
     }
   },
@@ -103,19 +103,19 @@ export default {
     startDate() {
       // return parseTime(this.formData.startDate).split(' ')[0]
       // return this.formData.startDate
-      return this.formData.FlightDate[0]
+      return this.formData.flightDate[0]
     },
     endDate() {
       // return parseTime(this.formData.endDate).split(' ')[0]
       // return this.formData.endDate
-      return this.formData.FlightDate[1]
+      return this.formData.flightDate[1]
     }
   },
   watch: {
-    'formData.FlightDate': {
+    'formData.flightDate': {
       handler(val) {
         if (val === null) {
-          this.formData.FlightDate = ['', '']
+          this.formData.flightDate = ['', '']
         }
       },
       deep: true
@@ -247,7 +247,7 @@ export default {
             queryData['name'] = this.formData.search
           } else if (azNum.test(this.formData.search) && top2.test(this.formData.search)) {
             // 字母加数字且前两位为字母则为航班号
-            queryData['FlightNO'] = this.formData.search
+            queryData['flightNO'] = this.formData.search
           } else if (num.test(this.formData.search) && this.formData.search.length === 10) {
             // 纯数字且位数等于10则为行李牌号
             queryData['grade'] = this.formData.search

src/views/baggageManagement/mixins/terminal.js

@@ -69,8 +69,8 @@ export default {
             this.spanArr.push(1)
           } else {
             if (
-              item['FlightNO'] === arr[index - 1]['FlightNO'] &&
-              item['FlightDate'] === arr[index - 1]['FlightDate']
+              item['flightNO'] === arr[index - 1]['flightNO'] &&
+              item['flightDate'] === arr[index - 1]['flightDate']
             ) {
               this.spanArr[contactDot] += 1
               this.spanArr.push(0)
@@ -125,7 +125,6 @@ export default {
               'unLoad',
               'delbag',
               'noBSM',
-              'transfer_all',
               'reach',
               'did_not_arrive',
               'special',
@@ -188,8 +187,8 @@ export default {
       const classes = commonTableCellClass({ row, column, rowIndex, columnIndex })
       if (
         [
-          'FlightNO',
-          'PreFlightNO',
+          'flightNO',
+          'preFlightNO',
           'inTransferBaggageCount',
           'inTransferredBaggageCount',
           'tounLoad',
@@ -226,8 +225,8 @@ export default {
     cellClickHandler(row, column, cell, event) {
       if (
         [
-          'FlightNO',
-          'PreFlightNO',
+          'flightNO',
+          'preFlightNO',
           'inTransferBaggageCount',
           'inTransferredBaggageCount',
           'tounLoad',
@@ -250,21 +249,21 @@ export default {
         })
       }
       switch (column.property) {
-        case 'FlightNO':
+        case 'flightNO':
           this.$router.push({
             path: `${this.$route.path}/flightView`,
             query: {
-              FlightNO: row.FlightNO,
-              FlightDate: row.FlightDate
+              flightNO: row.flightNO,
+              flightDate: row.flightDate
             }
           })
           break
-        case 'PreFlightNO':
+        case 'preFlightNO':
           this.$router.push({
             path: '/transfer/arrival/flightView',
             query: {
-              FlightNO: row.PreFlightNO,
-              FlightDate: row.FlightDate
+              flightNO: row.preFlightNO,
+              flightDate: row.flightDate
             }
           })
           break
@@ -272,10 +271,10 @@ export default {
           this.$router.push({
             path: '/advance',
             query: {
-              FlightNO: row.PreFlightNO,
-              transferDeparture: row.FlightNO,
-              startDate: row.PreFlightDate,
-              endDate: row.PreFlightDate
+              flightNO: row.preFlightNO,
+              transferDeparture: row.flightNO,
+              startDate: row.preFlightDate,
+              endDate: row.preFlightDate
             }
           })
           break
@@ -283,10 +282,10 @@ export default {
           this.$router.push({
             path: '/advance',
             query: {
-              FlightNO: row.FlightNO,
-              transferArrival: row.PreFlightNO,
-              startDate: row.FlightDate,
-              endDate: row.FlightDate
+              flightNO: row.flightNO,
+              transferArrival: row.preFlightNO,
+              startDate: row.flightDate,
+              endDate: row.flightDate
             }
           })
           break
@@ -294,9 +293,9 @@ export default {
           this.$router.push({
             path: '/advance',
             query: {
-              FlightNO: row.FlightNO,
-              startDate: row.FlightDate,
-              endDate: row.FlightDate,
+              flightNO: row.flightNO,
+              startDate: row.flightDate,
+              endDate: row.flightDate,
               unLoad: 0
             }
           })
@@ -305,9 +304,9 @@ export default {
           this.$router.push({
             path: '/advance',
             query: {
-              FlightNO: row.FlightNO,
-              startDate: row.FlightDate,
-              endDate: row.FlightDate,
+              flightNO: row.flightNO,
+              startDate: row.flightDate,
+              endDate: row.flightDate,
               unLoad: 1
             }
           })
@@ -316,9 +315,9 @@ export default {
           this.$router.push({
             path: '/advance',
             query: {
-              FlightNO: row.FlightNO,
-              startDate: row.FlightDate,
-              endDate: row.FlightDate,
+              flightNO: row.flightNO,
+              startDate: row.flightDate,
+              endDate: row.flightDate,
               checkIn: 1
             }
           })
@@ -327,9 +326,9 @@ export default {
           this.$router.push({
             path: '/advance',
             query: {
-              FlightNO: row.FlightNO,
-              startDate: row.FlightDate,
-              endDate: row.FlightDate,
+              flightNO: row.flightNO,
+              startDate: row.flightDate,
+              endDate: row.flightDate,
               active: 0
             }
           })
@@ -338,9 +337,9 @@ export default {
           this.$router.push({
             path: '/advance',
             query: {
-              FlightNO: row.FlightNO,
-              startDate: row.FlightDate,
-              endDate: row.FlightDate,
+              flightNO: row.flightNO,
+              startDate: row.flightDate,
+              endDate: row.flightDate,
               transferIn: 1
             }
           })
@@ -349,9 +348,9 @@ export default {
           this.$router.push({
             path: '/advance',
             query: {
-              FlightNO: row.FlightNO,
-              startDate: row.FlightDate,
-              endDate: row.FlightDate,
+              flightNO: row.flightNO,
+              startDate: row.flightDate,
+              endDate: row.flightDate,
               canceled: 1
             }
           })
@@ -369,9 +368,9 @@ export default {
           this.$router.push({
             path: '/advance',
             query: {
-              FlightNO: row.FlightNO,
-              startDate: row.FlightDate,
-              endDate: row.FlightDate,
+              flightNO: row.flightNO,
+              startDate: row.flightDate,
+              endDate: row.flightDate,
               status: reflect[column.property]
             }
           })
@@ -381,9 +380,9 @@ export default {
           this.$router.push({
             path: '/advance',
             query: {
-              FlightNO: row.FlightNO,
-              startDate: row.FlightDate,
-              endDate: row.FlightDate,
+              flightNO: row.flightNO,
+              startDate: row.flightDate,
+              endDate: row.flightDate,
               checkIn: 1
             }
           })

src/views/baggageManagement/mixins/timeZone.js

@@ -21,24 +21,27 @@ export default {
     // 表格数据格式化
     tableFormat(row, column, cellValue) {
       switch (column.property) {
-        // case 'FlightDate':
-        //   return cellValue.split('-').slice(1).join('-')
         case 'PlanLandingTime':
-        case 'PlanDepartureTime':
+        case 'planDepartureTime':
           return timeInZone(cellValue, this.timeZone)
-        case 'ActualDepartureTime':
-        case 'ActualLandingTime':
+        case 'actualDepartureTime':
+        case 'actualLandingTime':
           return timeInZone((cellValue ?? '').replace('T', ' '), this.timeZone).replace(' ', '\n')
-        case 'checkIn':
-          return `${cellValue ?? ''}\n${getTimeInZone(row['checkInTime'], this.timeZone)}`
-        case 'DealInfo':
-          return `${cellValue ?? ''}\n${getTimeInZone(row['DealTime'], this.timeZone)}`
-        case 'sortLocationMark':
-          return `${cellValue ?? ''}\n${getTimeInZone(row['sortDealTime'], this.timeZone)}`
-        case 'loadLocationMark':
-          return `${cellValue ?? ''}\n${getTimeInZone(row['loadDealTime'], this.timeZone)}`
-        case 'inflLocationMark':
-          return `${cellValue ?? ''}\n${getTimeInZone(row['inflLoadDealTime'], this.timeZone)}`
+        case 'checkInTime':
+        case 'securityTime':
+        case 'sortTime':
+        case 'loadTime':
+        case 'inflTime':
+          return cellValue ? `${timeInZone(cellValue.split(',')[0], this.timeZone)}\n${cellValue.split(',')[1]}` : ''
+        // return `${cellValue ?? ''}\n${getTimeInZone(row['checkInTime'], this.timeZone)}`
+        // case 'DealInfo':
+        //   return `${cellValue ?? ''}\n${getTimeInZone(row['DealTime'], this.timeZone)}`
+        // case 'sortLocationMark':
+        //   return `${cellValue ?? ''}\n${getTimeInZone(row['sortDealTime'], this.timeZone)}`
+        // case 'loadLocationMark':
+        //   return `${cellValue ?? ''}\n${getTimeInZone(row['loadDealTime'], this.timeZone)}`
+        // case 'inflLocationMark':
+        //   return `${cellValue ?? ''}\n${getTimeInZone(row['inflLoadDealTime'], this.timeZone)}`
         case 'timeDifference':
           return cellValue <= -120 ? '-2h+' : cellValue >= 120 ? '2h+' : cellValue
         default: