航站视图-搜索修改

src/layout/components/Search/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-10-18 17:44:42
- * @LastEditTime: 2022-05-12 14:58:12
+ * @LastEditTime: 2022-05-12 17:34:22
  * @LastEditors: your name
  * @Description: In User Settings Edit
  * @FilePath: \Foshan4A\src\views\account\components\search.vue
@@ -12,7 +12,7 @@
       <div v-if="isTitle" :class="isChild ? 'childTitle' : ''" class="title">
         {{ title }}
       </div>
-      <div v-if="isOnly" class="content flex-wrap">
+      <div v-if="isOnly" class="content flex-wrap" @keyup.enter="checkSearch">
         <el-select v-model="value" clearable placeholder="请选择" v-if="isSou">
           <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
           </el-option>

src/views/advancedQuery/views/advancedHome.vue

@@ -561,7 +561,8 @@ export default {
         // let searchData = {dataContent:[this.time[0],this.time[1],val]}
         const az = /^[a-zA-Z]+$/
         const azNum = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]*$/
-        const top2 = /^[a-zA-Z]{2}\w*$/
+        // const top2 = /^[a-zA-Z]{2}\w*$/
+        const top2 = /^([a-zA-Z][0-9])|([0-9][a-zA-Z])|([a-zA-Z]{2})/
         const num = /^[0-9]+$/
         // 纯字母则为旅客姓名
         if (az.test(val)) {

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: zk
  * @Date: 2022-01-17 10:39:22
- * @LastEditTime: 2022-05-12 17:05:09
+ * @LastEditTime: 2022-05-12 17:36:10
  * @LastEditors: your name
  * @Description: 离港01
 -->
@@ -85,7 +85,10 @@
           </div>
         </el-form-item>
         <div style="float: right">
-          <el-form-item prop="search">
+          <el-form-item
+            prop="search"
+            @keyup.enter="onSubmit(1)"
+          >
             <el-input
               v-model="formData.search"
               style="width: 240px; margin-left: 105px"
@@ -94,7 +97,6 @@
               prefix-icon="el-icon-search"
               clearable
               @clear="inputClear"
-              @keyup.enter="onSubmit(1)"
             />
           </el-form-item>
           <el-form-item>
@@ -449,7 +451,7 @@ export default {
       })
       tableData.forEach(item => {
         Object.keys(tempSets).forEach(key => {
-          (item[key] ?? '') !== '' && tempSets[key].add(item[key])
+          ;(item[key] ?? '') !== '' && tempSets[key].add(item[key])
         })
       })
       Object.keys(tempSets).forEach(key => {

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: zk
  * @Date: 2022-01-17 10:39:22
- * @LastEditTime: 2022-05-12 17:05:36
+ * @LastEditTime: 2022-05-12 17:35:52
  * @LastEditors: your name
  * @Description: 离港01
 -->
@@ -84,7 +84,10 @@
             </li>
           </div>
         </el-form-item>
-        <div style="float:right">
+        <div
+          style="float:right"
+          @keyup.enter="onSubmit(0)"
+        >
           <el-form-item prop="search">
             <el-input
               v-model="formData.search"
@@ -94,7 +97,6 @@
               prefix-icon="el-icon-search"
               clearable
               @clear="inputClear"
-              @keyup.enter="onSubmit(0)"
             />
           </el-form-item>
           <el-form-item>
@@ -448,7 +450,7 @@ export default {
       })
       tableData.forEach(item => {
         Object.keys(tempSets).forEach(key => {
-          (item[key] ?? '') !== '' && tempSets[key].add(item[key])
+          ;(item[key] ?? '') !== '' && tempSets[key].add(item[key])
         })
       })
       Object.keys(tempSets).forEach(key => {

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: zk
  * @Date: 2022-01-17 10:39:22
- * @LastEditTime: 2022-05-11 17:49:01
+ * @LastEditTime: 2022-05-12 17:36:43
  * @LastEditors: your name
  * @Description: 离港01
 -->
@@ -110,7 +110,10 @@
             </li>
           </div>
         </el-form-item> -->
-        <div style="float: right">
+        <div
+          style="float: right"
+          @keyup.enter="onSubmit(1)"
+        >
           <el-form-item prop="search">
             <el-input
               v-model="formData.search"
@@ -120,18 +123,21 @@
               prefix-icon="el-icon-search"
               clearable
               @clear="inputClear"
-              @keyup.enter="onSubmit(1)"
             />
           </el-form-item>
           <el-form-item>
-            <el-button size="small" type="primary" @click="onSubmit(1)"
-              >搜索</el-button
-            >
+            <el-button
+              size="small"
+              type="primary"
+              @click="onSubmit(1)"
+            >搜索</el-button>
           </el-form-item>
           <el-form-item v-is="['ti_showTransit']">
-            <el-button size="small" type="primary" @click="changeView"
-              >切换视角</el-button
-            >
+            <el-button
+              size="small"
+              type="primary"
+              @click="changeView"
+            >切换视角</el-button>
           </el-form-item>
           <!-- <el-form-item>
             <el-switch
@@ -146,7 +152,10 @@
                 class="checkTime msgImg"
                 src="../../../../assets/departure/ic_time.png"
               />
-              <el-dropdown-menu slot="dropdown" class="time-zone">
+              <el-dropdown-menu
+                slot="dropdown"
+                class="time-zone"
+              >
                 <el-dropdown-item>国内Local/国际UTC</el-dropdown-item>
                 <el-dropdown-item>Local</el-dropdown-item>
                 <el-dropdown-item>UTC</el-dropdown-item>
@@ -211,7 +220,10 @@
       </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">
@@ -230,10 +242,16 @@
           />
         </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>
@@ -241,137 +259,137 @@
 </template>
 
 <script>
-import Dialog from "@/layout/components/Dialog";
-import terminalMixin from "../../mixins/terminal";
-import formMixin from "../../mixins/form";
-import tableColsMixin from "../../mixins/tableCols";
-import { getQuery } from "@/api/flight";
+import Dialog from '@/layout/components/Dialog'
+import terminalMixin from '../../mixins/terminal'
+import formMixin from '../../mixins/form'
+import tableColsMixin from '../../mixins/tableCols'
+import { getQuery } from '@/api/flight'
 
 export default {
-  name: "DepartureTerminalView",
+  name: 'DepartureTerminalView',
   components: { Dialog },
   mixins: [terminalMixin, formMixin, tableColsMixin],
   data() {
     return {
       optionProps: {
-        value: "inAicompanyCode2",
-        label: "inAicompanyCode2",
+        value: 'inAicompanyCode2',
+        label: 'inAicompanyCode2'
       },
       optionPropser: {
-        value: "outAicompanyCode2",
-        label: "outAicompanyCode2",
+        value: 'outAicompanyCode2',
+        label: 'outAicompanyCode2'
       },
 
-      orderNum: ["0", "0", "0", "0"], // 默认总数
+      orderNum: ['0', '0', '0', '0'], // 默认总数
       // 初始表头
       tableCols: [
         {
-          statCode: "arrivalInfo",
-          statName: "进港航班",
+          statCode: 'arrivalInfo',
+          statName: '进港航班',
           children: [
             {
-              statCode: "PreFlightNO",
-              statName: "航班号",
-              width: 122,
+              statCode: 'PreFlightNO',
+              statName: '航班号',
+              width: 122
             },
             {
-              statCode: "PreFlightDate",
-              statName: "航班日期",
-              width: 83,
+              statCode: 'PreFlightDate',
+              statName: '航班日期',
+              width: 83
             },
             {
-              statCode: "PreAirport",
-              statName: "起飞机场",
-              width: 79,
+              statCode: 'PreAirport',
+              statName: '起飞机场',
+              width: 79
             },
             {
-              statCode: "ActualLandingTime",
-              statName: "降落时间",
-              width: 79,
+              statCode: 'ActualLandingTime',
+              statName: '降落时间',
+              width: 79
             },
             {
-              statCode: "LandingBuild",
-              statName: "降落航站楼",
-              width: 79,
+              statCode: 'LandingBuild',
+              statName: '降落航站楼',
+              width: 79
             },
             {
-              statCode: "Carousel",
-              statName: "行李转盘",
-              width: 79,
+              statCode: 'Carousel',
+              statName: '行李转盘',
+              width: 79
             },
             {
-              statCode: "StandForLanding",
-              statName: "降落停机位",
-              width: 79,
+              statCode: 'StandForLanding',
+              statName: '降落停机位',
+              width: 79
             },
             {
-              statCode: "inTransferBaggageCount",
-              statName: "中转行李数",
-              width: 58,
+              statCode: 'inTransferBaggageCount',
+              statName: '中转行李数',
+              width: 58
             },
             {
-              statCode: "inTransferredBaggageCount",
-              statName: "已中转行李数",
-              width: 63,
-            },
-          ],
+              statCode: 'inTransferredBaggageCount',
+              statName: '已中转行李数',
+              width: 63
+            }
+          ]
         },
         {
-          statCode: "departureInfo",
-          statName: "离港航班",
+          statCode: 'departureInfo',
+          statName: '离港航班',
           children: [
             {
-              statCode: "FlightNO",
-              statName: "航班号",
-              width: 81,
+              statCode: 'FlightNO',
+              statName: '航班号',
+              width: 81
             },
             {
-              statCode: "FlightDate",
-              statName: "航班日期",
-              width: 100,
+              statCode: 'FlightDate',
+              statName: '航班日期',
+              width: 100
             },
             {
-              statCode: "ActualDepartureTime",
-              statName: "起飞时间",
-              width: 100,
+              statCode: 'ActualDepartureTime',
+              statName: '起飞时间',
+              width: 100
             },
             {
-              statCode: "TargetAirport",
-              statName: "目的站",
-              width: 93,
+              statCode: 'TargetAirport',
+              statName: '目的站',
+              width: 93
             },
             {
-              statCode: "DepartureBuild",
-              statName: "起飞航站楼",
-              width: 81,
+              statCode: 'DepartureBuild',
+              statName: '起飞航站楼',
+              width: 81
             },
             {
-              statCode: "BordingGate",
-              statName: "起飞登机口",
-              width: 81,
+              statCode: 'BordingGate',
+              statName: '起飞登机口',
+              width: 81
             },
             {
-              statCode: "StandForDepartrue",
-              statName: "起飞停机位",
-              width: 81,
+              statCode: 'StandForDepartrue',
+              statName: '起飞停机位',
+              width: 81
             },
             {
-              statCode: "outTransferBaggageCount",
-              statName: "中转进行李数",
-              width: 93,
+              statCode: 'outTransferBaggageCount',
+              statName: '中转进行李数',
+              width: 93
             },
             {
-              statCode: "outTransferredBaggageCount",
-              statName: "已中转进行李数",
-              width: 120,
+              statCode: 'outTransferredBaggageCount',
+              statName: '已中转进行李数',
+              width: 120
             },
             {
-              statCode: "timeDifference",
-              statName: "转运时间",
-              width: 93,
-            },
-          ],
-        },
+              statCode: 'timeDifference',
+              statName: '转运时间',
+              width: 93
+            }
+          ]
+        }
       ],
       AirportList: [],
       carrierProps: [],
@@ -383,7 +401,7 @@ export default {
         TargetAirport: [],
         BordingGate: [],
         StandForDepartrue: [],
-        DepartureBuild: [],
+        DepartureBuild: []
       },
       loopEvent: null,
       leaveCount: 0,
@@ -391,13 +409,13 @@ export default {
       spanArr: [],
       contactDot: 0,
       flag: 0,
-      position: 0,
-    };
+      position: 0
+    }
   },
   created() {
     // this.getAviationData();
     // this.upAviationData();
-    this.getAirPortData();
+    this.getAirPortData()
   },
   // watch: {
   //   formData() {
@@ -406,29 +424,29 @@ export default {
   //   },
   // },
   methods: {
-    cellClass(row, column, rowIndex, columnIndex){
-      if (row.column.property == "FlightNO"||row.column.property == "PreFlightNO") {
-        return "clickCell"
+    cellClass(row, column, rowIndex, columnIndex) {
+      if (row.column.property == 'FlightNO' || row.column.property == 'PreFlightNO') {
+        return 'clickCell'
       }
     },
     cellClick(row, column, cell, event) {
-      if (column.property == "FlightNO") {
-        this.$router.push({ path: "/transfer/arrival/flightView", query: row });
+      if (column.property == 'FlightNO') {
+        this.$router.push({ path: '/transfer/arrival/flightView', query: row })
       }
-      if (column.property == "PreFlightNO") {
-        let row2 = this._.cloneDeep(row);
+      if (column.property == 'PreFlightNO') {
+        let row2 = this._.cloneDeep(row)
         row2.FlightNO = row2.PreFlightNO
-        this.$router.push({ path: "/transfer/arrival/flightView", query: row2 });
+        this.$router.push({ path: '/transfer/arrival/flightView', query: row2 })
       }
     },
     changeView() {
       this.$router.replace({
-        path: "/transfer/departure",
-      });
+        path: '/transfer/departure'
+      })
     },
     airPortChange() {
-      this.getAviationData();
-      this.upAviationData();
+      this.getAviationData()
+      this.upAviationData()
       // this.getTableData();
     },
     //选择机场
@@ -436,19 +454,19 @@ export default {
       try {
         const res = await getQuery({
           id: 72,
-          dataContent: [],
-        });
+          dataContent: []
+        })
         if (res.code == 0) {
-          this.AirportList = res.returnData;
-          this.formData.currentAirport = "PEK";
-          this.getAviationData();
-          this.upAviationData();
-          this.getTableData();
+          this.AirportList = res.returnData
+          this.formData.currentAirport = 'PEK'
+          this.getAviationData()
+          this.upAviationData()
+          this.getTableData()
         } else {
-          this.$message.error(res.message);
+          this.$message.error(res.message)
         }
       } catch (error) {
-        console.log("出错了", error);
+        console.log('出错了', error)
       }
     },
     //选择航司
@@ -456,16 +474,16 @@ export default {
       try {
         const res = await getQuery({
           id: 71,
-          dataContent: [this.formData.currentAirport],
-        });
+          dataContent: [this.formData.currentAirport]
+        })
         if (res.code == 0) {
-          this.carrierProps = res.returnData;
+          this.carrierProps = res.returnData
           // this.getTableData();
         } else {
-          this.$message.error(res.message);
+          this.$message.error(res.message)
         }
       } catch (error) {
-        console.log("出错了", error);
+        console.log('出错了', error)
       }
     },
     //选择航司
@@ -473,34 +491,34 @@ export default {
       try {
         const res = await getQuery({
           id: 74,
-          dataContent: [this.formData.currentAirport],
-        });
+          dataContent: [this.formData.currentAirport]
+        })
         if (res.code == 0) {
-          this.carrierPropsop = res.returnData;
+          this.carrierPropsop = res.returnData
           // this.getTableData();
         } else {
-          this.$message.error(res.message);
+          this.$message.error(res.message)
         }
       } catch (error) {
-        console.log("出错了", error);
+        console.log('出错了', error)
       }
     },
     tableRowClassName({ row, rowIndex }) {
       if (row.hasTakenOff == 0) {
         if (rowIndex == this.leaveCount - 1) {
-          return "bgl-hui redBorder";
+          return 'bgl-hui redBorder'
         } else {
-          return "bgl-hui";
+          return 'bgl-hui'
         }
       }
     },
     tableCellClassName({ row, column }) {
       if (
-        column.property === "transfer_all" ||
-        column.property === "departureAnomaly" ||
-        column.property === "riskWarning"
+        column.property === 'transfer_all' ||
+        column.property === 'departureAnomaly' ||
+        column.property === 'riskWarning'
       ) {
-        return "bgl-huang";
+        return 'bgl-huang'
       }
     },
     // 获取表单下拉框数据
@@ -515,16 +533,8 @@ export default {
     // },
     // 获取表格数据
     async getTableData() {
-      let arrs1 = [
-        this.formData.inboundCarrier.length == 0
-          ? ""
-          : this.formData.inboundCarrier[0],
-      ];
-      let arrs2 = [
-        this.formData.outgoingAirline.length == 0
-          ? ""
-          : this.formData.outgoingAirline[0],
-      ];
+      let arrs1 = [this.formData.inboundCarrier.length == 0 ? '' : this.formData.inboundCarrier[0]]
+      let arrs2 = [this.formData.outgoingAirline.length == 0 ? '' : this.formData.outgoingAirline[0]]
       let arr = [
         this.formData.currentAirport,
         this.formData.startDate,
@@ -534,62 +544,59 @@ export default {
         ...arrs1,
         ...arrs2,
         ...arrs2,
-        ...arrs2,
+        ...arrs2
         // this.formData.inboundCarrier,
         // this.formData.outgoingAirline,
         // JSON.stringify(this.formData.inboundCarrier),
         // JSON.stringify(this.formData.outgoingAirline),
-      ];
+      ]
       try {
         const res = await getQuery({
           id: 69,
-          dataContent: [...arr],
-        });
+          dataContent: [...arr]
+        })
         if (res.code == 0) {
           // this.tableData = this._.sortBy(res.returnData, [
           //   "FlightDate",
           //   "PlanDepartureTime",
           // ]);
-          this.tableData = res.returnData;
-          let contactDot = this.contactDot;
+          this.tableData = res.returnData
+          let contactDot = this.contactDot
           this.spanArr = []
           this.tableData.forEach((item, index) => {
-            item.index = index;
+            item.index = index
             if (index === 0) {
-              this.spanArr.push(1);
+              this.spanArr.push(1)
             } else {
               if (item.PreFlightNO === this.tableData[index - 1].PreFlightNO) {
-                this.spanArr[contactDot] += 1;
-                this.spanArr.push(0);
+                this.spanArr[contactDot] += 1
+                this.spanArr.push(0)
               } else {
-                this.spanArr.push(1);
-                contactDot = index;
+                this.spanArr.push(1)
+                contactDot = index
               }
             }
-          });
+          })
           //this.initTableData(res.returnData);
         } else {
-          console.log(res.message);
+          console.log(res.message)
         }
       } catch (error) {
-        clearInterval(this.loopEvent);
-        console.log("出错了", error);
+        clearInterval(this.loopEvent)
+        console.log('出错了', error)
       }
     },
     initTableData(tableData) {
-      this.leaveCount = 0;
-      this.baggageCount = 0;
-      tableData.forEach((item) => {
+      this.leaveCount = 0
+      this.baggageCount = 0
+      tableData.forEach(item => {
         if (item.hasTakenOff == 0) {
-          this.leaveCount++;
+          this.leaveCount++
         }
         // item["waitfanj"] = item["noCheckInNumber"] - item["unLoad"];
-        this.baggageCount = this.baggageCount + item.preLoad;
-      });
-      this.tableData = this._.sortBy(tableData, [
-        "PreFlightNO",
-        "PreFlightDate",
-      ]);
+        this.baggageCount = this.baggageCount + item.preLoad
+      })
+      this.tableData = this._.sortBy(tableData, ['PreFlightNO', 'PreFlightDate'])
       // this.setTableFilters();
       // this.toOrderNum(this.baggageCount);
       // setInterval(() => {
@@ -605,7 +612,7 @@ export default {
       })
       tableData.forEach(item => {
         Object.keys(tempSets).forEach(key => {
-          (item[key] ?? '') !== '' && tempSets[key].add(item[key])
+          ;(item[key] ?? '') !== '' && tempSets[key].add(item[key])
         })
       })
       Object.keys(tempSets).forEach(key => {
@@ -619,75 +626,74 @@ export default {
       })
     },
     filterHandler(value, row, column) {
-      const property = column["property"];
-      return row[property] === value;
+      const property = column['property']
+      return row[property] === value
     },
     setNumberTransform() {
-      const numberItems = this.$refs.numberItem; // 拿到数字的ref，计算元素数量
-      const numberArr = this.orderNum.filter((item) => !isNaN(item));
+      const numberItems = this.$refs.numberItem // 拿到数字的ref，计算元素数量
+      const numberArr = this.orderNum.filter(item => !isNaN(item))
       // 结合CSS 对数字字符进行滚动,显示订单数量
       for (let index = 0; index < numberItems.length; index++) {
-        const elem = numberItems[index];
-        elem.style.transform = `translate(-50%, -${numberArr[index] * 10}%)`;
+        const elem = numberItems[index]
+        elem.style.transform = `translate(-50%, -${numberArr[index] * 10}%)`
       }
     },
 
     toOrderNum(num) {
-      num = num.toString();
+      num = num.toString()
       if (num.length < 4) {
-        num = "0" + num; // 如未满八位数，添加"0"补位
-        this.toOrderNum(num); // 递归添加"0"补位
+        num = '0' + num // 如未满八位数，添加"0"补位
+        this.toOrderNum(num) // 递归添加"0"补位
       } else if (num.length === 4) {
-        this.orderNum = num.split(""); // 将其便变成数据，渲染至滚动数组
+        this.orderNum = num.split('') // 将其便变成数据，渲染至滚动数组
       } else {
         // 订单总量数字超过八位显示异常
-        this.$message.warning("总量数字过大");
+        this.$message.warning('总量数字过大')
       }
-      this.setNumberTransform();
+      this.setNumberTransform()
     },
     tableSpanMethod({ row, column, rowIndex, columnIndex }) {
       if (
         [
-          "PreFlightNO",
-          "PreFlightDate",
-          "PreAirport",
-          "ActualLandingTime",
-          "LandingBuild",
-          "Carousel",
-          "StandForLanding",
-          "inTransferBaggageCount",
-          "inTransferredBaggageCount",
-          "FlightNO",
-          "FlightDate",
-          "ActualDepartureTime",
-          "TargetAirport",
-          "DepartureBuild",
-          "BordingGate",
-          "StandForDepartrue",
-          "outTransferBaggageCount",
-          "outTransferredBaggageCount",
-          "timeDifference",
-        ].includes(column["property"])
+          'PreFlightNO',
+          'PreFlightDate',
+          'PreAirport',
+          'ActualLandingTime',
+          'LandingBuild',
+          'Carousel',
+          'StandForLanding',
+          'inTransferBaggageCount',
+          'inTransferredBaggageCount',
+          'FlightNO',
+          'FlightDate',
+          'ActualDepartureTime',
+          'TargetAirport',
+          'DepartureBuild',
+          'BordingGate',
+          'StandForDepartrue',
+          'outTransferBaggageCount',
+          'outTransferredBaggageCount',
+          'timeDifference'
+        ].includes(column['property'])
       ) {
-        const _row = this.spanArr[rowIndex];
-        const _col = _row > 0 ? 1 : 0;
+        const _row = this.spanArr[rowIndex]
+        const _col = _row > 0 ? 1 : 0
         return {
           rowspan: _row,
-          colspan: _col,
-        };
+          colspan: _col
+        }
       }
     },
     arraySpanMethod({ row, column, rowIndex, columnIndex }) {
       for (let i = 0; i < 5; i++) {
         if (columnIndex === i) {
-          const _row = this.spanArr[rowIndex];
-          const _col = _row > 0 ? 1 : 0;
+          const _row = this.spanArr[rowIndex]
+          const _col = _row > 0 ? 1 : 0
           return {
             rowspan: _row,
-            colspan: _col,
-          };
+            colspan: _col
+          }
         }
-
       }
       // if (columnIndex === 0) {
       //   if (rowIndex == 0) {
@@ -704,20 +710,20 @@ export default {
       //     return [0, 0];
       //   }
       // }
-    },
+    }
   },
   mounted() {
     // this.arraySpanMethod();
-    let that = this;
+    let that = this
     this.loopEvent = setInterval(function () {
-      console.log(this.contactDot);
-      that.getTableData();
-    }, 3000);
+      console.log(this.contactDot)
+      that.getTableData()
+    }, 3000)
   },
   beforeDestroy() {
-    clearInterval(this.loopEvent);
-  },
-};
+    clearInterval(this.loopEvent)
+  }
+}
 </script>
 
 <style lang="scss" scoped>
@@ -733,7 +739,7 @@ export default {
       optgroup,
       select,
       textarea {
-        font-family: Helvetica, "Microsoft YaHei";
+        font-family: Helvetica, 'Microsoft YaHei';
         font-size: 14px;
       }
       .el-switch__label {
@@ -853,13 +859,13 @@ export default {
       padding: 0;
       text-align: center;
       font-size: 14px;
-      font-family: Helvetica, "Microsoft YaHei";
+      font-family: Helvetica, 'Microsoft YaHei';
       letter-spacing: 0;
     }
-    .clickCell{
-        cursor: pointer;
-        color: #2d7cff;
-      }
+    .clickCell {
+      cursor: pointer;
+      color: #2d7cff;
+    }
     .el-table__header-wrapper {
       .cell {
         font-weight: bold;
@@ -882,7 +888,7 @@ export default {
         &.redBorder {
           position: relative;
           &::after {
-            content: "";
+            content: '';
             position: absolute;
             left: 0;
             bottom: 0;

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: zk
  * @Date: 2022-01-17 10:39:22
- * @LastEditTime: 2022-05-11 17:49:47
+ * @LastEditTime: 2022-05-12 17:37:04
  * @LastEditors: your name
  * @Description: 离港01
 -->
@@ -111,7 +111,10 @@
           </div>
         </el-form-item> -->
         <div style="float: right">
-          <el-form-item prop="search">
+          <el-form-item
+            prop="search"
+            @keyup.enter="onSubmit(0)"
+          >
             <el-input
               v-model="formData.search"
               style="width: 240px; margin-left: 105px"
@@ -120,13 +123,14 @@
               prefix-icon="el-icon-search"
               clearable
               @clear="inputClear"
-              @keyup.enter="onSubmit(0)"
             />
           </el-form-item>
           <el-form-item>
-            <el-button size="small" type="primary" @click="onSubmit(0)"
-              >搜索</el-button
-            >
+            <el-button
+              size="small"
+              type="primary"
+              @click="onSubmit(0)"
+            >搜索</el-button>
           </el-form-item>
           <!-- <el-form-item>
             <el-switch
@@ -149,9 +153,11 @@
             </el-dropdown>
           </el-form-item> -->
           <el-form-item v-is="['ti_showTransit']">
-            <el-button size="small" type="primary" @click="changeView"
-              >切换视角</el-button
-            >
+            <el-button
+              size="small"
+              type="primary"
+              @click="changeView"
+            >切换视角</el-button>
           </el-form-item>
           <el-form-item v-is="['i_timeIcon']">
             <el-dropdown>
@@ -159,7 +165,10 @@
                 class="checkTime msgImg"
                 src="../../../../assets/departure/ic_time.png"
               />
-              <el-dropdown-menu slot="dropdown" class="time-zone">
+              <el-dropdown-menu
+                slot="dropdown"
+                class="time-zone"
+              >
                 <el-dropdown-item>国内Local/国际UTC</el-dropdown-item>
                 <el-dropdown-item>Local</el-dropdown-item>
                 <el-dropdown-item>UTC</el-dropdown-item>
@@ -224,7 +233,10 @@
       </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">
@@ -243,10 +255,16 @@
           />
         </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>
@@ -254,136 +272,136 @@
 </template>
 
 <script>
-import Dialog from "@/layout/components/Dialog";
-import terminalMixin from "../../mixins/terminal";
-import formMixin from "../../mixins/form";
-import tableColsMixin from "../../mixins/tableCols";
-import { getQuery } from "@/api/flight";
+import Dialog from '@/layout/components/Dialog'
+import terminalMixin from '../../mixins/terminal'
+import formMixin from '../../mixins/form'
+import tableColsMixin from '../../mixins/tableCols'
+import { getQuery } from '@/api/flight'
 
 export default {
-  name: "DepartureTerminalView",
+  name: 'DepartureTerminalView',
   components: { Dialog },
   mixins: [terminalMixin, formMixin, tableColsMixin],
   data() {
     return {
       optionProps: {
-        value: "inAicompanyCode2",
-        label: "inAicompanyCode2",
+        value: 'inAicompanyCode2',
+        label: 'inAicompanyCode2'
       },
       optionPropser: {
-        value: "outAicompanyCode2",
-        label: "outAicompanyCode2",
+        value: 'outAicompanyCode2',
+        label: 'outAicompanyCode2'
       },
-      orderNum: ["0", "0", "0", "0"], // 默认总数
+      orderNum: ['0', '0', '0', '0'], // 默认总数
       // 初始表头
       tableCols: [
         {
-          statCode: "departureInfo",
-          statName: "离港航班",
+          statCode: 'departureInfo',
+          statName: '离港航班',
           children: [
             {
-              statCode: "FlightNO",
-              statName: "航班号",
-              width: 81,
+              statCode: 'FlightNO',
+              statName: '航班号',
+              width: 81
             },
             {
-              statCode: "FlightDate",
-              statName: "航班日期",
-              width: 100,
+              statCode: 'FlightDate',
+              statName: '航班日期',
+              width: 100
             },
             {
-              statCode: "ActualDepartureTime",
-              statName: "起飞时间",
-              width: 100,
+              statCode: 'ActualDepartureTime',
+              statName: '起飞时间',
+              width: 100
             },
             {
-              statCode: "TargetAirport",
-              statName: "目的站",
-              width: 93,
+              statCode: 'TargetAirport',
+              statName: '目的站',
+              width: 93
             },
             {
-              statCode: "DepartureBuild",
-              statName: "起飞航站楼",
-              width: 81,
+              statCode: 'DepartureBuild',
+              statName: '起飞航站楼',
+              width: 81
             },
             {
-              statCode: "BordingGate",
-              statName: "起飞登机口",
-              width: 81,
+              statCode: 'BordingGate',
+              statName: '起飞登机口',
+              width: 81
             },
             {
-              statCode: "StandForDepartrue",
-              statName: "起飞停机位",
-              width: 81,
+              statCode: 'StandForDepartrue',
+              statName: '起飞停机位',
+              width: 81
             },
             {
-              statCode: "outTransferBaggageCount",
-              statName: "中转进行李数",
-              width: 93,
+              statCode: 'outTransferBaggageCount',
+              statName: '中转进行李数',
+              width: 93
             },
             {
-              statCode: "outTransferredBaggageCount",
-              statName: "已中转进行李数",
-              width: 120,
+              statCode: 'outTransferredBaggageCount',
+              statName: '已中转进行李数',
+              width: 120
             },
             {
-              statCode: "timeDifference",
-              statName: "转运时间",
-              width: 93,
-            },
-          ],
+              statCode: 'timeDifference',
+              statName: '转运时间',
+              width: 93
+            }
+          ]
         },
         {
-          statCode: "arrivalInfo",
-          statName: "进港航班",
+          statCode: 'arrivalInfo',
+          statName: '进港航班',
           children: [
             {
-              statCode: "PreFlightNO",
-              statName: "航班号",
-              width: 122,
+              statCode: 'PreFlightNO',
+              statName: '航班号',
+              width: 122
             },
             {
-              statCode: "PreFlightDate",
-              statName: "航班日期",
-              width: 83,
+              statCode: 'PreFlightDate',
+              statName: '航班日期',
+              width: 83
             },
             {
-              statCode: "PreAirport",
-              statName: "起飞机场",
-              width: 79,
+              statCode: 'PreAirport',
+              statName: '起飞机场',
+              width: 79
             },
             {
-              statCode: "ActualLandingTime",
-              statName: "降落时间",
-              width: 79,
+              statCode: 'ActualLandingTime',
+              statName: '降落时间',
+              width: 79
             },
             {
-              statCode: "LandingBuild",
-              statName: "降落航站楼",
-              width: 79,
+              statCode: 'LandingBuild',
+              statName: '降落航站楼',
+              width: 79
             },
             {
-              statCode: "Carousel",
-              statName: "行李转盘",
-              width: 79,
+              statCode: 'Carousel',
+              statName: '行李转盘',
+              width: 79
             },
             {
-              statCode: "StandForLanding",
-              statName: "降落停机位",
-              width: 79,
+              statCode: 'StandForLanding',
+              statName: '降落停机位',
+              width: 79
             },
             {
-              statCode: "inTransferBaggageCount",
-              statName: "中转行李数",
-              width: 58,
+              statCode: 'inTransferBaggageCount',
+              statName: '中转行李数',
+              width: 58
             },
             {
-              statCode: "inTransferredBaggageCount",
-              statName: "已中转行李数",
-              width: 63,
-            },
-          ],
-        },
+              statCode: 'inTransferredBaggageCount',
+              statName: '已中转行李数',
+              width: 63
+            }
+          ]
+        }
       ],
       AirportList: [],
       carrierProps: [],
@@ -395,43 +413,43 @@ export default {
         TargetAirport: [],
         BordingGate: [],
         StandForDepartrue: [],
-        DepartureBuild: [],
+        DepartureBuild: []
       },
       loopEvent: null,
       leaveCount: 0,
       baggageCount: 0,
       spanArr: [],
       contactDot: 0,
-      flag: 0,
-    };
+      flag: 0
+    }
   },
   created() {
-    this.getAirPortData();
+    this.getAirPortData()
   },
   methods: {
-    cellClass(row, column, rowIndex, columnIndex){
-      if (row.column.property == "FlightNO"||row.column.property == "PreFlightNO") {
-        return "clickCell"
+    cellClass(row, column, rowIndex, columnIndex) {
+      if (row.column.property == 'FlightNO' || row.column.property == 'PreFlightNO') {
+        return 'clickCell'
       }
     },
     cellClick(row, column, cell, event) {
-      if (column.property == "FlightNO") {
-        this.$router.push({ path: "/transfer/departure/flightView", query: row });
+      if (column.property == 'FlightNO') {
+        this.$router.push({ path: '/transfer/departure/flightView', query: row })
       }
-      if (column.property == "PreFlightNO") {
-        let row2 = this._.cloneDeep(row);
+      if (column.property == 'PreFlightNO') {
+        let row2 = this._.cloneDeep(row)
         row2.FlightNO = row2.PreFlightNO
-        this.$router.push({ path: "/transfer/departure/flightView", query: row2 });
+        this.$router.push({ path: '/transfer/departure/flightView', query: row2 })
       }
     },
     changeView() {
       this.$router.replace({
-        path: "/transfer/arrival",
-      });
+        path: '/transfer/arrival'
+      })
     },
     airPortChange() {
-      this.getAviationData();
-      this.upAviationData();
+      this.getAviationData()
+      this.upAviationData()
       // this.getTableData();
     },
     //选择机场
@@ -439,19 +457,19 @@ export default {
       try {
         const res = await getQuery({
           id: 72,
-          dataContent: [],
-        });
+          dataContent: []
+        })
         if (res.code == 0) {
-          this.AirportList = res.returnData;
-          this.formData.currentAirport = "PEK";
-          this.getAviationData();
-          this.upAviationData();
-          this.getTableData();
+          this.AirportList = res.returnData
+          this.formData.currentAirport = 'PEK'
+          this.getAviationData()
+          this.upAviationData()
+          this.getTableData()
         } else {
-          this.$message.error(res.message);
+          this.$message.error(res.message)
         }
       } catch (error) {
-        console.log("出错了", error);
+        console.log('出错了', error)
       }
     },
     //选择航司
@@ -459,16 +477,16 @@ export default {
       try {
         const res = await getQuery({
           id: 71,
-          dataContent: [this.formData.currentAirport],
-        });
+          dataContent: [this.formData.currentAirport]
+        })
         if (res.code == 0) {
-          this.carrierProps = res.returnData;
+          this.carrierProps = res.returnData
           // this.getTableData();
         } else {
-          this.$message.error(res.message);
+          this.$message.error(res.message)
         }
       } catch (error) {
-        console.log("出错了", error);
+        console.log('出错了', error)
       }
     },
     //选择航司
@@ -476,34 +494,34 @@ export default {
       try {
         const res = await getQuery({
           id: 74,
-          dataContent: [this.formData.currentAirport],
-        });
+          dataContent: [this.formData.currentAirport]
+        })
         if (res.code == 0) {
-          this.carrierPropsop = res.returnData;
+          this.carrierPropsop = res.returnData
           // this.getTableData();
         } else {
-          this.$message.error(res.message);
+          this.$message.error(res.message)
         }
       } catch (error) {
-        console.log("出错了", error);
+        console.log('出错了', error)
       }
     },
     tableRowClassName({ row, rowIndex }) {
       if (row.hasTakenOff == 0) {
         if (rowIndex == this.leaveCount - 1) {
-          return "bgl-hui redBorder";
+          return 'bgl-hui redBorder'
         } else {
-          return "bgl-hui";
+          return 'bgl-hui'
         }
       }
     },
     tableCellClassName({ row, column }) {
       if (
-        column.property === "transfer_all" ||
-        column.property === "departureAnomaly" ||
-        column.property === "riskWarning"
+        column.property === 'transfer_all' ||
+        column.property === 'departureAnomaly' ||
+        column.property === 'riskWarning'
       ) {
-        return "bgl-huang";
+        return 'bgl-huang'
       }
     },
     // 获取表单下拉框数据
@@ -525,16 +543,8 @@ export default {
       //   this.formData.inboundCarrier,
       //   this.formData.outgoingAirline,
       // ];
-      let arrs1 = [
-        this.formData.inboundCarrier.length == 0
-          ? ""
-          : this.formData.inboundCarrier[0]
-      ];
-      let arrs2 = [
-        this.formData.outgoingAirline.length == 0
-          ? ""
-          : this.formData.outgoingAirline[0]
-      ];
+      let arrs1 = [this.formData.inboundCarrier.length == 0 ? '' : this.formData.inboundCarrier[0]]
+      let arrs2 = [this.formData.outgoingAirline.length == 0 ? '' : this.formData.outgoingAirline[0]]
       let arr = [
         this.formData.currentAirport,
         this.formData.startDate,
@@ -544,58 +554,55 @@ export default {
         ...arrs1,
         ...arrs2,
         ...arrs2,
-        ...arrs2,
+        ...arrs2
         // this.formData.inboundCarrier,
         // this.formData.outgoingAirline,
         // JSON.stringify(this.formData.inboundCarrier),
         // JSON.stringify(this.formData.outgoingAirline),
-      ];
+      ]
       try {
         const res = await getQuery({
           id: 68,
-          dataContent: [...arr],
-        });
+          dataContent: [...arr]
+        })
         if (res.code == 0) {
-          this.tableData = res.returnData;
-          let contactDot = this.contactDot;
+          this.tableData = res.returnData
+          let contactDot = this.contactDot
           this.spanArr = []
           this.tableData.forEach((item, index) => {
-            item.index = index;
+            item.index = index
             if (index === 0) {
-              this.spanArr.push(1);
+              this.spanArr.push(1)
             } else {
               if (item.FlightNO === this.tableData[index - 1].FlightNO) {
-                this.spanArr[contactDot] += 1;
-                this.spanArr.push(0);
+                this.spanArr[contactDot] += 1
+                this.spanArr.push(0)
               } else {
-                this.spanArr.push(1);
-                contactDot = index;
+                this.spanArr.push(1)
+                contactDot = index
               }
             }
-          });
+          })
           //this.initTableData(res.returnData);
         } else {
-          console.log(res.message);
+          console.log(res.message)
         }
       } catch (error) {
-        clearInterval(this.loopEvent);
-        console.log("出错了", error);
+        clearInterval(this.loopEvent)
+        console.log('出错了', error)
       }
     },
     initTableData(tableData) {
-      this.leaveCount = 0;
-      this.baggageCount = 0;
-      tableData.forEach((item) => {
+      this.leaveCount = 0
+      this.baggageCount = 0
+      tableData.forEach(item => {
         if (item.hasTakenOff == 0) {
-          this.leaveCount++;
+          this.leaveCount++
         }
         // item["waitfanj"] = item["noCheckInNumber"] - item["unLoad"];
-        this.baggageCount = this.baggageCount + item.preLoad;
-      });
-      this.tableData = this._.sortBy(tableData, [
-        "FlightDate",
-        "PlanDepartureTime",
-      ]);
+        this.baggageCount = this.baggageCount + item.preLoad
+      })
+      this.tableData = this._.sortBy(tableData, ['FlightDate', 'PlanDepartureTime'])
       // this.setTableFilters();
       // this.toOrderNum(this.baggageCount);
       // setInterval(() => {
@@ -611,7 +618,7 @@ export default {
       })
       tableData.forEach(item => {
         Object.keys(tempSets).forEach(key => {
-          (item[key] ?? '') !== '' && tempSets[key].add(item[key])
+          ;(item[key] ?? '') !== '' && tempSets[key].add(item[key])
         })
       })
       Object.keys(tempSets).forEach(key => {
@@ -625,78 +632,78 @@ export default {
       })
     },
     filterHandler(value, row, column) {
-      const property = column["property"];
-      return row[property] === value;
+      const property = column['property']
+      return row[property] === value
     },
     setNumberTransform() {
-      const numberItems = this.$refs.numberItem; // 拿到数字的ref，计算元素数量
-      const numberArr = this.orderNum.filter((item) => !isNaN(item));
+      const numberItems = this.$refs.numberItem // 拿到数字的ref，计算元素数量
+      const numberArr = this.orderNum.filter(item => !isNaN(item))
       // 结合CSS 对数字字符进行滚动,显示订单数量
       for (let index = 0; index < numberItems.length; index++) {
-        const elem = numberItems[index];
-        elem.style.transform = `translate(-50%, -${numberArr[index] * 10}%)`;
+        const elem = numberItems[index]
+        elem.style.transform = `translate(-50%, -${numberArr[index] * 10}%)`
       }
     },
 
     toOrderNum(num) {
-      num = num.toString();
+      num = num.toString()
       if (num.length < 4) {
-        num = "0" + num; // 如未满八位数，添加"0"补位
-        this.toOrderNum(num); // 递归添加"0"补位
+        num = '0' + num // 如未满八位数，添加"0"补位
+        this.toOrderNum(num) // 递归添加"0"补位
       } else if (num.length === 4) {
-        this.orderNum = num.split(""); // 将其便变成数据，渲染至滚动数组
+        this.orderNum = num.split('') // 将其便变成数据，渲染至滚动数组
       } else {
         // 订单总量数字超过八位显示异常
-        this.$message.warning("总量数字过大");
+        this.$message.warning('总量数字过大')
       }
-      this.setNumberTransform();
+      this.setNumberTransform()
     },
     tableSpanMethod({ row, column, rowIndex, columnIndex }) {
       if (
         [
-          "FlightNO",
-          "FlightDate",
-          "PlanLandingTime",
-          "PlanDepartureApt",
-          "LandingBuild",
-          "Carousel",
-          "StandForLanding",
-          "positionDistribution",
-          "expect_load",
-          "loadflight",
-        ].includes(column["property"])
+          'FlightNO',
+          'FlightDate',
+          'PlanLandingTime',
+          'PlanDepartureApt',
+          'LandingBuild',
+          'Carousel',
+          'StandForLanding',
+          'positionDistribution',
+          'expect_load',
+          'loadflight'
+        ].includes(column['property'])
       ) {
-        const _row = this.spanArr[rowIndex];
-        const _col = _row > 0 ? 1 : 0;
+        const _row = this.spanArr[rowIndex]
+        const _col = _row > 0 ? 1 : 0
         return {
           rowspan: _row,
-          colspan: _col,
-        };
+          colspan: _col
+        }
       }
     },
     arraySpanMethod({ row, column, rowIndex, columnIndex }) {
       for (let i = 0; i < 7; i++) {
         if (columnIndex === i) {
-          const _row = this.spanArr[rowIndex];
-          const _col = _row > 0 ? 1 : 0;
+          const _row = this.spanArr[rowIndex]
+          const _col = _row > 0 ? 1 : 0
           return {
             rowspan: _row,
-            colspan: _col,
-          };
+            colspan: _col
+          }
         }
       }
-    },
+    }
   },
   mounted() {
-    let that = this;
+    let that = this
     this.loopEvent = setInterval(function () {
-      that.getTableData();
-    }, 3000);
+      that.getTableData()
+    }, 3000)
   },
   beforeDestroy() {
-    clearInterval(this.loopEvent);
-  },
-};
+    clearInterval(this.loopEvent)
+  }
+}
 </script>
 
 <style lang="scss" scoped>
@@ -712,7 +719,7 @@ export default {
       optgroup,
       select,
       textarea {
-        font-family: Helvetica, "Microsoft YaHei";
+        font-family: Helvetica, 'Microsoft YaHei';
         font-size: 14px;
       }
       .el-switch__label {
@@ -832,13 +839,13 @@ export default {
       padding: 0;
       text-align: center;
       font-size: 14px;
-      font-family: Helvetica, "Microsoft YaHei";
+      font-family: Helvetica, 'Microsoft YaHei';
       letter-spacing: 0;
     }
-    .clickCell{
-        cursor: pointer;
-        color: #2d7cff;
-      }
+    .clickCell {
+      cursor: pointer;
+      color: #2d7cff;
+    }
     .el-table__header-wrapper {
       .cell {
         font-weight: bold;
@@ -863,7 +870,7 @@ export default {
         &.redBorder {
           position: relative;
           &::after {
-            content: "";
+            content: '';
             position: absolute;
             left: 0;
             bottom: 0;

src/views/baggageManagement/mixins/form.js

@@ -1,7 +1,7 @@
 /*
  * @Author: Badguy
  * @Date: 2022-03-04 14:45:03
- * @LastEditTime: 2022-05-05 17:42:06
+ * @LastEditTime: 2022-05-12 17:30:46
  * @LastEditors: your name
  * @Description: 航站视图通用表单部分
  * have a nice day!
@@ -205,31 +205,28 @@ export default {
     onSubmit(data) {
       this.$refs['form'].validate(valid => {
         if (valid) {
-          let az = /^[a-zA-Z]+$/
-          let azNum = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]*$/
-          let top2 = /^[a-zA-Z]{2}\w*$/
-          let num = /^[0-9]+$/
-          let queryData = {
+          const az = /^[a-zA-Z]+$/
+          const azNum = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]*$/
+          // const top2 = /^[a-zA-Z]{2}\w*$/
+          const top2 = /^([a-zA-Z][0-9])|([0-9][a-zA-Z])|([a-zA-Z]{2})/
+          const num = /^[0-9]+$/
+          const queryData = {
             startDate: this.formData.startDate,
-            endDate: this.formData.endDate,
+            endDate: this.formData.endDate
           }
-          if(data==1){
+          if (Number(data) === 1) {
             queryData['destination'] = this.formData.currentAirport
-          }
-          else{
+          } else {
             queryData['station'] = this.formData.currentAirport
           }
-          // 纯字母则为旅客姓名
           if (az.test(this.formData.search)) {
+            // 纯字母则为旅客姓名
             queryData['name'] = this.formData.search
-
-          }
-          // 字母加数字且前两位为字母则为航班号
-          else if (azNum.test(this.formData.search) && top2.test(this.formData.search)) {
+          } else if (azNum.test(this.formData.search) && top2.test(this.formData.search)) {
+            // 字母加数字且前两位为字母则为航班号
             queryData['FlightNO'] = this.formData.search
-          }
-          // 纯数字且位数等于10则为行李牌号
-          else if (num.test(this.formData.search) && this.formData.search.length == 10) {
+          } else if (num.test(this.formData.search) && this.formData.search.length === 10) {
+            // 纯数字且位数等于10则为行李牌号
             queryData['grade'] = this.formData.search
           } else {
             // this.$message.error('请输入有效查询信息如航班号、旅客姓名首字母、行李牌号')