修改冲突

public/config.js

@@ -1,5 +1,14 @@
+/*
+ * @Author: Badguy
+ * @Date: 2022-04-25 14:05:21
+ * @LastEditTime: 2022-05-06 09:40:40
+ * @LastEditors: your name
+ * @Description: 
+ * have a nice day!
+ */
 var PLATFROM_CONFIG = {};
 PLATFROM_CONFIG.baseUrl = "http://106.14.243.117:9111"; // http请求地址
 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:9114";
+PLATFROM_CONFIG.baseURLCA = "http://192.168.3.17:8080";

src/api/dataIntegration.js

@@ -1,7 +1,7 @@
 /*
  * @Author: Badguy
  * @Date: 2022-04-13 14:35:17
- * @LastEditTime: 2022-05-05 11:32:18
+ * @LastEditTime: 2022-05-06 09:34:36
  * @LastEditors: your name
  * @Description: 数据整合接口
  * have a nice day!
@@ -59,16 +59,16 @@ export const queryMap = {
   landingAirportBydepartureAirPort: 34,
   carrier: 35,
   craftType: 36,
-  airLine: 37,
+  flightAttr: 37,
   landingFlight: 38,
   departureFlight: 39,
   transferFlight: 40,
   container: 41,
   trasferOutBaggage: 42,
   trasferInBaggage: 43,
-  baggageBasicInfoByID: 60,
-  baggageTrackByID: 61,
-  baggageDetailsByID: 62
+  baggageDetailsByID: 44,
+  baggageBasicInfoByID: 45,
+  baggageTrackByID: 61
 }
 
 export async function myQuery(id, ...dataContent) {

src/layout/components/Dialog/index.vue

@@ -8,12 +8,25 @@
 -->
 <template>
   <div class="dialog">
-    <el-dialog :visible.sync="flag" ref="dialogTk" :top="top" :custom-class="customClass" :lock-scroll="false" :modal="modal" :before-close="close" :width="width" :show-close="showFlag">
-      <div :style="{
+    <el-dialog
+      :visible.sync="flag"
+      ref="dialogTk"
+      :top="top"
+      :custom-class="customClass"
+      :lock-scroll="false"
+      :modal="modal"
+      :before-close="close"
+      :width="width"
+      :show-close="showFlag"
+    >
+      <div
+        :style="{
           height: child
             ? this.$store.state.settings.dialogHeight - 96 + 'px'
             : '',
-        }" class="dialog-content">
+        }"
+        class="dialog-content"
+      >
         <slot />
       </div>
     </el-dialog>
@@ -62,7 +75,7 @@ export default {
   // 监听弹框开关
   watch: {
     flag: {
-      handler (val) {
+      handler(val) {
         if (val) {
           this.$nextTick(() => {
             // 获取弹框高度
@@ -81,7 +94,7 @@ export default {
   },
   methods: {
     // 弹框关闭
-    close () {
+    close() {
       this.$emit("closeDialog", false);
     },
   },
@@ -105,10 +118,10 @@ export default {
       padding: 0;
       .title {
         padding: 10px 0px 10px 20px;
-        font-size: 24px;
+        font-size: 16px;
         font-family: Microsoft YaHei;
         font-weight: bold;
-        height: 50px;
+        height: 36px;
         background: #2d67e3;
         color: #ffffff;
         margin-bottom: 24px;

src/router/routes/routes-file-four.js

@@ -1,254 +1,232 @@
 /*
  * @Author: Badguy
  * @Date: 2022-04-25 16:01:34
- * @LastEditTime: 2022-04-25 16:06:24
+ * @LastEditTime: 2022-05-06 09:23:45
  * @LastEditors: your name
  * @Description: 账号管理
  * have a nice day!
  */
 
-import Layout from "@/layout";
+import Layout from '@/layout'
 
 // 权限管理
 const authorityRoutes = {
-  path: "/authority",
+  path: '/authority',
   component: Layout,
-  meta: { roles: ["authority_menu"] },
+  meta: { roles: ['authority_menu'] },
   children: [
     {
-      path: "/authority",
-      component: () => import("@/views/authorityManagement/index"),
+      path: '/authority',
+      component: () => import('@/views/authorityManagement/index'),
       meta: {
-        title: "权限管理",
-        icon: "authority",
-        imgstyle: "ic_list_nav_permissions_default.png",
-        imgstyleup: "ic_list_nav_permissions_check.png",
+        title: '权限管理',
+        icon: 'authority',
+        imgstyle: 'ic_list_nav_permissions_default.png',
+        imgstyleup: 'ic_list_nav_permissions_check.png'
       },
       children: [
         {
-          path: "/",
-          name: "AuthorityHome",
+          path: '/',
+          name: 'AuthorityHome',
           component: {
             render(c) {
-              return c("router-view");
-            },
+              return c('router-view')
+            }
           },
-          redirect: "/",
-          meta: { title: "权限项管理", isPage: "authority_page" },
+          redirect: '/',
+          meta: { title: '权限项管理', isPage: 'authority_page' },
           children: [
             {
-              path: "/",
-              component: () =>
-                import("@/views/authorityManagement/components/authorityHome"),
+              path: '/',
+              component: () => import('@/views/authorityManagement/components/authorityHome')
             },
             {
-              path: "appAdd",
-              name: "AuthorityAppAdd",
-              component: () =>
-                import(
-                  "@/views/authorityManagement/components/authorityAppAdd"
-                ),
-              meta: { title: "新增应用" },
+              path: 'appAdd',
+              name: 'AuthorityAppAdd',
+              component: () => import('@/views/authorityManagement/components/authorityAppAdd'),
+              meta: { title: '新增应用' }
             },
             {
-              path: "appEdit",
-              name: "AuthorityAppEdit",
-              component: () =>
-                import(
-                  "@/views/authorityManagement/components/authorityAppEdit"
-                ),
-              meta: { title: "编辑应用" },
+              path: 'appEdit',
+              name: 'AuthorityAppEdit',
+              component: () => import('@/views/authorityManagement/components/authorityAppEdit'),
+              meta: { title: '编辑应用' }
             },
             {
-              path: "addPower",
-              name: "AuthorityPowerAdd",
-              component: () =>
-                import(
-                  "@/views/authorityManagement/components/authorityPowerAdd"
-                ),
-              meta: { title: "新增权限项" },
+              path: 'addPower',
+              name: 'AuthorityPowerAdd',
+              component: () => import('@/views/authorityManagement/components/authorityPowerAdd'),
+              meta: { title: '新增权限项' }
             },
             {
-              path: "editPower",
-              name: "AuthorityPowerEdit",
-              component: () =>
-                import(
-                  "@/views/authorityManagement/components/authorityPowerEdit"
-                ),
-              meta: { title: "编辑权限项" },
-            },
-          ],
-        },
-      ],
-    },
-  ],
-};
+              path: 'editPower',
+              name: 'AuthorityPowerEdit',
+              component: () => import('@/views/authorityManagement/components/authorityPowerEdit'),
+              meta: { title: '编辑权限项' }
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
 
 // 角色管理
 const roleRoutes = {
-  path: "/role",
+  path: '/role',
   component: Layout,
-  meta: { roles: ["role_menu"] },
+  meta: { roles: ['role_menu'] },
   children: [
     {
-      path: "/role",
-      component: () =>
-        import("@/views/authorityManagement/components/authorityRole"),
+      path: '/role',
+      component: () => import('@/views/authorityManagement/components/authorityRole'),
       meta: {
-        title: "角色管理",
-        icon: "role",
-        imgstyle: "ic_list_nav_character_default.png",
-        imgstyleup: "ic_list_nav_character_check.png",
+        title: '角色管理',
+        icon: 'role',
+        imgstyle: 'ic_list_nav_character_default.png',
+        imgstyleup: 'ic_list_nav_character_check.png'
       },
       children: [
         {
-          path: "/",
-          name: "AuthorityRoleHome",
+          path: '/',
+          name: 'AuthorityRoleHome',
           component: {
             render(c) {
-              return c("router-view");
-            },
+              return c('router-view')
+            }
           },
-          redirect: "/",
-          meta: { title: "角色管理", isPage: "role_page" },
+          redirect: '/',
+          meta: { title: '角色管理', isPage: 'role_page' },
           children: [
             {
-              path: "/",
-              component: () =>
-                import(
-                  "@/views/authorityManagement/components/authorityRoleHome"
-                ),
+              path: '/',
+              component: () => import('@/views/authorityManagement/components/authorityRoleHome')
             },
             {
-              path: "addRole",
-              name: "AuthorityRoleAdd",
-              component: () =>
-                import(
-                  "@/views/authorityManagement/components/authorityRoleAdd"
-                ),
-              meta: { title: "新增角色" },
+              path: 'addRole',
+              name: 'AuthorityRoleAdd',
+              component: () => import('@/views/authorityManagement/components/authorityRoleAdd'),
+              meta: { title: '新增角色' }
             },
             {
-              path: "editRole",
-              name: "AuthorityRoleEdit",
-              component: () =>
-                import(
-                  "@/views/authorityManagement/components/authorityRoleEdit"
-                ),
-              meta: { title: "编辑角色" },
-            },
-          ],
-        },
-      ],
-    },
-  ],
-};
+              path: 'editRole',
+              name: 'AuthorityRoleEdit',
+              component: () => import('@/views/authorityManagement/components/authorityRoleEdit'),
+              meta: { title: '编辑角色' }
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
 
 // 账号管理
 const accountRoutes = {
-  path: "/account",
+  path: '/account',
   component: Layout,
-  meta: { roles: ["account_menu"] },
+  meta: { roles: ['account_menu'] },
   children: [
     {
-      path: "/account",
-      name: "accountManagement",
-      component: () => import("@/views/accountManagement"),
+      path: '/account',
+      name: 'accountManagement',
+      component: () => import('@/views/accountManagement'),
       meta: {
-        title: "账号管理",
-        icon: "account",
-        imgstyle: "ic_list_nav_account_default.png",
-        imgstyleup: "ic_list_nav_account_check.png",
+        title: '账号管理',
+        icon: 'account',
+        imgstyle: 'ic_list_nav_account_default.png',
+        imgstyleup: 'ic_list_nav_account_check.png'
       },
       children: [
         {
-          path: "/account",
-          name: "accountHome",
+          path: '/account',
+          name: 'accountHome',
           component: {
             render(c) {
-              return c("router-view");
-            },
+              return c('router-view')
+            }
           },
-          redirect: "/account",
+          redirect: '/account',
           meta: {
-            title: "账号管理",
-            roles: ["account_page"],
+            title: '账号管理',
+            roles: ['account_page']
           },
           children: [
             {
-              path: "/account",
-              component: () =>
-                import("@/views/accountManagement/components/accountHome"),
+              path: '/account',
+              component: () => import('@/views/accountManagement/components/accountHome')
             },
             {
-              path: "accountAdd",
-              name: "accountAdd",
-              component: () =>
-                import("@/views/accountManagement/components/accountEdit"),
+              path: 'accountAdd',
+              name: 'accountAdd',
+              component: () => import('@/views/accountManagement/components/accountEdit'),
               meta: {
-                title: "新增账号",
-              },
+                title: '新增账号'
+              }
             },
             {
-              path: "accountEdit",
-              name: "accountEdit",
-              component: () =>
-                import("@/views/accountManagement/components/accountEdit"),
+              path: 'accountEdit',
+              name: 'accountEdit',
+              component: () => import('@/views/accountManagement/components/accountEdit'),
               meta: {
-                title: "编辑账号",
-                doesAccountExist: true,
-              },
-            },
-          ],
-        },
-      ],
-    },
-  ],
-};
+                title: '编辑账号',
+                doesAccountExist: true
+              }
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
 
 //高级查询
 const advanceRoutes = {
-  path: "/advance",
+  path: '/advance',
   component: Layout,
   children: [
     {
-      path: "/advance",
-      component: () => import("@/views/advancedQuery/index.vue"),
+      path: '/advance',
+      component: () => import('@/views/advancedQuery/index.vue'),
       meta: {
-        title: "高级查询",
-        icon: "dataParser",
-        imgstyle: "ic_list_nav_search_default.png",
-        imgstyleup: "ic_list_nav_search_check.png",
+        title: '高级查询',
+        icon: 'dataParser',
+        imgstyle: 'ic_list_nav_search_default.png',
+        imgstyleup: 'ic_list_nav_search_check.png'
       },
       children: [
         {
-          path: "/",
-          name: "advanceHome",
+          path: '/',
+          name: 'advanceHome',
           component: {
             render(c) {
-              return c("router-view");
-            },
+              return c('router-view')
+            }
           },
-          redirect: "/",
-          meta: { title: "高级查询", isPage: "advance_page" },
+          redirect: '/',
+          meta: { title: '高级查询', isPage: 'advance_page' },
           children: [
             {
-              path: "/",
-              component: () =>
-                import("@/views/advancedQuery/views/advancedHome.vue"),
+              path: '/',
+              component: () => import('@/views/advancedQuery/views/advancedHome.vue')
             },
             {
-              path: "bag",
-              name: "advancedBag",
-              component: () =>
-                import("@/views/advancedQuery/views/advancedBag.vue"),
-              meta: { title: "行李视图" },
+              path: 'flight',
+              name: 'advancedFlight',
+              component: () => import('@/views/advancedQuery/views/advancedFlight.vue'),
+              meta: { title: '航班视图' }
             },
-          ],
-        },
-      ],
-    },
-  ],
-};
+            {
+              path: 'bag',
+              name: 'advancedBag',
+              component: () => import('@/views/advancedQuery/views/advancedBag.vue'),
+              meta: { title: '行李视图' }
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
 
-export default [authorityRoutes, roleRoutes, accountRoutes, advanceRoutes];
+export default [authorityRoutes, roleRoutes, accountRoutes, advanceRoutes]

src/styles/index.scss

@@ -270,6 +270,7 @@ li {
     font-weight: bold;
     color: #303133;
   }
+  
 
   .cl-hui {
     font-size: 14px;

src/views/BasicsData/views/deployNode/deployNodeHome.vue

@@ -48,9 +48,9 @@
 </template>
 
 <script>
-import orgTree from '@/layout/components/OrgTree';
-import Dialog from '@/layout/components/Dialog/index.vue';
-import { getQuery, generalDataReception } from '@/api/flight'
+import orgTree from "@/layout/components/OrgTree";
+import Dialog from "@/layout/components/Dialog/index.vue";
+import { getQuery, generalDataReception } from "@/api/flight";
 export default {
   name: "NodeLnformation",
   components: { orgTree, Dialog },
@@ -58,54 +58,31 @@ export default {
     return {
       dataList: {
         id: 0,
-        nodeCode: 'BSM',
+        nodeCode: "BSM",
         Type: 0,
-        locationCode: '行李源报文',
-        children: [
-          {
-            AuthName: 'BSM',
-            Type: 1,
-            id: 1,
-            Desc: '行李源报文',
-            children: [
-              {
-                AuthName: 'BSM',
-                Type: 2,
-                id: 3,
-                Desc: '行李源报文',
-              },
-              {
-                AuthName: 'BSM',
-                Type: 2,
-                id: 4,
-                Desc: '行李源报文',
-              }
-            ]
-          },
-          {
-            AuthName: 'BSM',
-            Type: 1,
-            id: 2,
-            Desc: '行李源报文',
-          }
-        ]
+        locationCode: "行李源报文",
+        children: []
       },
       removeDialogVisible: false,
       editDialogVisible: false,
       rmObj: {
-        protocolName: ''
+        protocolName: "",
       },
-      editDialogTitle: '新增节点信息',
+      editDialogTitle: "新增节点信息",
       ruleForm: {
         // 协议信息表单
-        locationCode: '',
-        nodeCode: '',
-        locationCodeDescribe: ''
+        locationCode: "",
+        nodeCode: "",
+        locationCodeDescribe: "",
       },
       rules: {
         // 协议信息表单验证
-        locationCode: [{ required: true, message: '请输入节点名称', trigger: 'blur' }],
-        nodeCode: [{ required: true, message: '请输入跟踪节点标识符', trigger: 'blur' }]
+        locationCode: [
+          { required: true, message: "请输入节点名称", trigger: "blur" },
+        ],
+        nodeCode: [
+          { required: true, message: "请输入跟踪节点标识符", trigger: "blur" },
+        ],
       },
       type: '',
       disFlag: false,
@@ -119,13 +96,20 @@ export default {
     //渲染节点
     renderContent (h, data) {
       return (
-        <div onClick={() => this.renderSub(data)} class="account-left-content-teams">
+        <div
+          onClick={() => this.renderSub(data)}
+          class="account-left-content-teams"
+        >
           <div class="team">
             <div class="list">
               <div class="flex info">
                 <div class="name">
                   <span>{data.locationCode}</span>
-                  <span v-show={data.Type === 1 || data.Type === 2} onClick={(e) => this.onNodeEdit(data, e)} class="cap cap-edit icon"></span>
+                  <span
+                    v-show={data.Type === 1 || data.Type === 2}
+                    onClick={(e) => this.onNodeEdit(data, e)}
+                    class="cap cap-edit icon"
+                  ></span>
                 </div>
                 <div class="icon">
                   <span
@@ -136,9 +120,7 @@ export default {
                 </div>
               </div>
               <div class="details">
-                <div class="details-msg">
-                  {data.nodeCode}
-                </div>
+                <div class="details-msg">{data.nodeCode}</div>
               </div>
             </div>
           </div>
@@ -164,7 +146,7 @@ export default {
       this.removeDialogVisible = true;
     },
     renderSub (data) {
-      console.log(data, 'click');
+      console.log(data, "click");
     },
     onNodeSub (data, e) {
       e.stopPropagation();
@@ -194,7 +176,7 @@ export default {
     },
     // 新增/编辑-确认
     submitClickHandler () {
-      this.$refs['ruleForm'].validate(valid => {
+      this.$refs["ruleForm"].validate((valid) => {
         if (valid) {
           const { Type } = this.typeObj
           if (this.ruleForm.operate) {
@@ -204,19 +186,20 @@ export default {
           delete this.ruleForm.children
           if (this.type == 'add') {
             if (Type == 0) {
-              this.nodeTreeData(20, this.ruleForm)
+              this.nodeTreeData(20, this.ruleForm);
             } else {
-              this.nodeTreeData(21, this.ruleForm)
+              this.nodeTreeData(21, this.ruleForm);
             }
           } else {
             this.ruleForm.operate = "2"
             this.nodeTreeData(21, this.ruleForm)
+
           }
           setTimeout(() => {
-            this.resetForm('ruleForm')
+            this.resetForm("ruleForm");
           }, 100);
         }
-      })
+      });
     },
     // 重置
     resetForm (formName) {
@@ -228,8 +211,8 @@ export default {
     },
     // 删除-弹框
     showRemoveDialog (item) {
-      this.rmObj = item
-      this.removeDialogVisible = true
+      this.rmObj = item;
+      this.removeDialogVisible = true;
     },
     // 确认删除
     removeSubmit () {
@@ -244,8 +227,8 @@ export default {
       try {
         const { returnData, message } = await getQuery({
           id: 63,
-          dataContent: []
-        })
+          dataContent: [],
+        });
         if (returnData && returnData.length) {
           returnData.forEach(item => {
             item['Type'] = 1
@@ -253,10 +236,10 @@ export default {
           })
           this.dataList.children = returnData
         } else {
-          this.$message.error(message)
+          this.$message.error(message ?? '获取节点信息数据失败');
         }
       } catch (error) {
-        console.log(error)
+        console.log(error);
       }
     },
     //节点操作
@@ -267,13 +250,13 @@ export default {
           "dataContent": JSON.stringify(dataContent)
         })
         if (code == 0) {
-          this.$message.success(message)
+          this.$message.success(message ?? '操作成功')
           this.getTreeData()
         } else {
-          this.$message.error(message)
+          this.$message.error(message ?? '操作失败');
         }
       } catch (error) {
-        console.log(error)
+        console.log(error);
       }
     },
     //三级展开获取数据
@@ -281,8 +264,8 @@ export default {
       try {
         const { returnData, message } = await getQuery({
           id: 64,
-          dataContent: [data.nodeCode]
-        })
+          dataContent: [data.nodeCode],
+        });
         if (returnData && returnData.length) {
           const datas = this.dataList.children
           returnData.forEach(item => {
@@ -290,18 +273,18 @@ export default {
           })
           datas.forEach(item => {
             if (item.nodeCode == data.nodeCode) {
-              item.children = returnData
+              item.children = returnData;
             }
-          })
+          });
         } else {
-          this.$message.error(message)
+          this.$message.error(message);
         }
       } catch (error) {
-        console.log(error)
+        console.log(error);
       }
-    }
-  }
-}
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>

src/views/advancedQuery/views/advancedFlight.vue

@@ -0,0 +1,19 @@
+<!--
+ * @Author: Badguy
+ * @Date: 2022-05-06 09:20:53
+ * @LastEditTime: 2022-05-06 09:23:07
+ * @LastEditors: your name
+ * @Description: 航班视图
+ * have a nice day!
+-->
+<template>
+  <FlightView />
+</template>
+
+<script>
+import FlightView from '@/views/baggageManagement/components/flight'
+export default {
+  name: 'AdvacedFlight',
+  components: { FlightView }
+}
+</script>

src/views/advancedQuery/views/advancedHome.vue

@@ -4,50 +4,163 @@
       <div class="flex-wrap interfaceLog_head_time">
         <div class="manageTitle">高级查询</div>
         <div class="interfaceLog_head_time_start mr10">
-          <el-date-picker v-model="timeStart" size="small" type="date" placeholder="选择开始日期时间">
+          <el-date-picker
+            v-model="timeStart"
+            size="small"
+            type="date"
+            placeholder="选择开始日期时间"
+          >
           </el-date-picker>
         </div>
         <div class="interfaceLog_head_time_end">
-          <el-date-picker v-model="timeEnd" size="small" type="date" placeholder="选择结束日期时间">
-          </el-date-picker>
+          <el-date-picker
+            v-model="timeEnd"
+            size="small"
+            type="date"
+            placeholder="选择结束日期时间"
+          />
         </div>
       </div>
-      <Search @getSearchData="getSearchData" @clearSearchData="clearSearchData" :isTitle="false" :isSlot="true">
+      <Search
+        :isTitle="false"
+        :isSlot="true"
+        @getSearchData="getSearchData"
+        @clearSearchData="clearSearchData"
+      >
         <div class="flex-wrap">
-          <button @click="gjFlag = true" class="btnAn">高级查询</button>
-          <div @click="show" class="setting"></div>
+          <button
+            class="btnAn"
+            @click="gjFlag = true"
+          >高级查询</button>
+          <div
+            class="setting"
+            @click="show"
+          ></div>
         </div>
       </Search>
     </div>
     <!--表格-->
-    <div v-loading="loading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.8)" class="advance__table">
+    <div
+      v-loading="loading"
+      element-loading-text="拼命加载中"
+      element-loading-spinner="el-icon-loading"
+      element-loading-background="rgba(0, 0, 0, 0.8)"
+      class="advance__table"
+    >
       <!-- <el-table ref="table" max-height="100%" show-summary class="table" :data="tableData" border stripe height="calc(100vh - 155px)" style="width: 100%">
         <el-table-column v-for="(item, index) in tableColsCopy" :prop="item.statCode" :label="item.statName" :key="index">
         </el-table-column>
       </el-table> -->
-      <el-table ref="table" max-height="100%" show-summary class="table" :data="tableData" border stripe height="calc(100vh - 155px)" style="width: 100%" @row-click="rowClickHandler">
-        <el-table-column prop="FlightNO" label="航班号"></el-table-column>
-        <el-table-column prop="FlightDate" label="航班日期"></el-table-column>
-        <el-table-column prop="SourceAirport" label="起飞站"></el-table-column>
-        <el-table-column prop="TargetAirport" label="目的地"></el-table-column>
-        <el-table-column prop="PassengerNameUpcase" label="旅客姓名"></el-table-column>
-        <el-table-column prop="BagSN" label="行李牌号"></el-table-column>
-        <el-table-column prop="SpecialType" label="特殊行李类型"></el-table-column>
-        <el-table-column prop="checkIn" label="值机"></el-table-column>
-        <el-table-column label="删除">
+      <el-table
+        ref="table"
+        max-height="100%"
+        class="table"
+        :data="tableData"
+        border
+        stripe
+        height="calc(100vh - 155px)"
+        style="width: 100%"
+      >
+        <el-table-column
+          prop="FlightNO"
+          label="航班号"
+          :filters="FlightNOItem"
+          :filter-method="filterHandler"
+        >
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              @click="flightClickHandler(scope.row)"
+            >{{ scope.row.FlightNO }}</el-button>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="FlightDate"
+          label="航班日期"
+          :filters="FlightDateItem"
+          :filter-method="filterHandler"
+        />
+        <el-table-column
+          prop="SourceAirport"
+          label="起飞站"
+          :filters="SourceAirportItem"
+          :filter-method="filterHandler"
+        />
+        <el-table-column
+          prop="TargetAirport"
+          label="目的地"
+          :filters="TargetAirportItem"
+          :filter-method="filterHandler"
+        />
+        <el-table-column
+          prop="PassengerNameUpcase"
+          label="旅客姓名"
+          :filters="PassengerNameUpcaseItem"
+          :filter-method="filterHandler"
+        />
+        <el-table-column
+          prop="BagSN"
+          label="行李牌号"
+        >
           <template slot-scope="scope">
-            <div>{{scope.row.deleted == 'DEL' ? 1: 0}}</div>
+            <el-button
+              size="mini"
+              @click="baggageClickHandler(scope.row)"
+            >{{ scope.row.BagSN }}</el-button>
           </template>
         </el-table-column>
-        <el-table-column label="激活">
+        <el-table-column
+          prop="SpecialType"
+          label="特殊行李类型"
+          :filters="SpecialTypeItem"
+          :filter-method="filterHandler"
+        />
+        <el-table-column
+          prop="checkIn"
+          label="值机"
+          :filters="checkInItem"
+          :filter-method="filterHandler"
+        />
+        <el-table-column
+          label="删除"
+          :filters="deletedItem"
+          :filter-method="filterHandler"
+        >
           <template slot-scope="scope">
-            <div>{{scope.row.activated == 'I' ? 0 : 1}}</div>
+            <div>{{ scope.row.deleted == "DEL" ? 1 : 0 }}</div>
           </template>
         </el-table-column>
-        <el-table-column prop="BagWeight" label="重量"></el-table-column>
-        <el-table-column prop="latestStatus" label="最新状态"></el-table-column>
-        <el-table-column prop="bagLocation" label="最新位置"></el-table-column>
-        <el-table-column prop="TransferFlightNO" label="中转进航班"></el-table-column>
+        <el-table-column
+          label="激活"
+          :filters="activatedItem"
+          :filter-method="filterHandler"
+        >
+          <template slot-scope="scope">
+            <div>{{ scope.row.activated == "I" ? 0 : 1 }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="BagWeight"
+          label="重量"
+        />
+        <el-table-column
+          prop="latestStatus"
+          label="最新状态"
+          :filters="latestStatusItem"
+          :filter-method="filterHandler"
+        />
+        <el-table-column
+          prop="bagLocation"
+          label="最新位置"
+          :filters="bagLocationItem"
+          :filter-method="filterHandler"
+        />
+        <el-table-column
+          prop="TransferFlightNO"
+          label="中转进航班"
+          :filters="TransferFlightNOItem"
+          :filter-method="filterHandler"
+        />
       </el-table>
     </div>
     <!--列设置-->
@@ -57,93 +170,165 @@
         <div class="content">
           <el-checkbox-group v-model="checkList">
             <el-row :gutter="20">
-              <el-col v-for="(item, index) in tableCols" :key="index" class="ck" :span="6">
+              <el-col
+                v-for="(item, index) in tableCols"
+                :key="index"
+                class="ck"
+                :span="6"
+              >
                 <el-checkbox :label="item">{{ item.statName }}</el-checkbox>
               </el-col>
             </el-row>
           </el-checkbox-group>
         </div>
         <div class="foot right t30">
-          <el-button size="medium" class="r24" @click="onCheck" type="primary">确定</el-button>
-          <el-button size="medium" @click="close">取消</el-button>
+          <el-button
+            size="medium"
+            class="r24"
+            type="primary"
+            @click="onCheck"
+          >确定</el-button>
+          <el-button
+            size="medium"
+            @click="close"
+          >取消</el-button>
         </div>
       </div>
     </Dialog>
     <!--高级查询-->
-    <Dialog width="852px" :flag="gjFlag">
+    <Dialog
+      width="852px"
+      :flag="gjFlag"
+    >
       <div class="rowDialog">
         <div class="title">高级查询</div>
         <div class="content">
-          <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+          <el-form
+            ref="form"
+            :model="form"
+            :rules="rules"
+            label-width="100px"
+          >
             <el-row :gutter="20">
               <el-col :span="16">
-                <el-form-item label="航班日期" prop="time">
-                  <el-date-picker v-model="form.time" size="small" type="daterange" value-format="yyyy-MM-dd" start-placeholder="开始日期" end-placeholder="结束日期">
-                  </el-date-picker>
+                <el-form-item
+                  label="航班日期"
+                  prop="time"
+                >
+                  <el-date-picker
+                    v-model="form.time"
+                    size="small"
+                    type="daterange"
+                    value-format="yyyy-MM-dd"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期"
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="当前状态">
-                  <el-input size="small" v-model="form.status"></el-input>
+                  <el-input
+                    size="small"
+                    v-model="form.status"
+                  ></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="20">
               <el-col :span="8">
-                <el-form-item label="航班号" prop="flightNumber">
-                  <el-input size="small" v-model="form.flightNumber"></el-input>
+                <el-form-item
+                  label="航班号"
+                  prop="flightNumber"
+                >
+                  <el-input
+                    size="small"
+                    v-model="form.flightNumber"
+                  ></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="起飞站">
-                  <el-input size="small" v-model="form.station"></el-input>
+                  <el-input
+                    size="small"
+                    v-model="form.station"
+                  ></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="目的地">
-                  <el-input size="small" v-model="form.destination"></el-input>
+                  <el-input
+                    size="small"
+                    v-model="form.destination"
+                  ></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="20">
               <el-col :span="8">
                 <el-form-item label="行李牌号">
-                  <el-input size="small" v-model="form.grade"></el-input>
+                  <el-input
+                    size="small"
+                    v-model="form.grade"
+                  ></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="特殊行李类型">
-                  <el-input size="small" v-model="form.type"></el-input>
+                  <el-input
+                    size="small"
+                    v-model="form.type"
+                  ></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="容器编号">
-                  <el-input disabled size="small" v-model="form.container"></el-input>
+                  <el-input
+                    disabled
+                    size="small"
+                    v-model="form.container"
+                  ></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="20">
               <el-col :span="8">
                 <el-form-item label="旅客姓名">
-                  <el-input size="small" v-model="form.name"></el-input>
+                  <el-input
+                    size="small"
+                    v-model="form.name"
+                  ></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="PNR">
-                  <el-input size="small" v-model="form.pnr"></el-input>
+                  <el-input
+                    size="small"
+                    v-model="form.pnr"
+                  ></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="值机序号">
-                  <el-input size="small" v-model="form.check"></el-input>
+                  <el-input
+                    size="small"
+                    v-model="form.check"
+                  ></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
           </el-form>
         </div>
         <div class="foot right t30">
-          <el-button size="medium" class="r24" @click="onCheckGj" type="primary">确定</el-button>
-          <el-button size="medium" @click="closeCheckGj">取消</el-button>
+          <el-button
+            size="medium"
+            class="r24"
+            @click="onCheckGj"
+            type="primary"
+          >确定</el-button>
+          <el-button
+            size="medium"
+            @click="closeCheckGj"
+          >取消</el-button>
         </div>
       </div>
     </Dialog>
@@ -151,14 +336,14 @@
 </template>
 
 <script>
-import Search from '@/layout/components/Search';
-import Dialog from "@/layout/components/Dialog";
-import { advancedInquiry, getQuery } from '@/api/flight';
-import { parseTime } from '@/utils/index';
+import Search from '@/layout/components/Search'
+import Dialog from '@/layout/components/Dialog'
+import { advancedInquiry, getQuery } from '@/api/flight'
+import { parseTime } from '@/utils/index'
 export default {
   name: 'Advance',
   components: { Search, Dialog },
-  data () {
+  data() {
     return {
       loading: false,
       rowFlag: false,
@@ -206,32 +391,44 @@ export default {
         //   { required: true, message: "请输入有效航班号", trigger: "blur" },
         // ],
       },
+      PassengerNameUpcaseItem: [],
+      FlightNOItem: [],
+      FlightDateItem: [],
+      SourceAirportItem: [],
+      TargetAirportItem: [],
+      SpecialTypeItem: [],
+      checkInItem: [],
+      deletedItem: [],
+      activatedItem: [],
+      latestStatusItem: [],
+      bagLocationItem: [],
+      TransferFlightNOItem: []
     }
   },
-  created () {
-    //参数顺序   【航班开始日期，航班结束日期，航班号，航班号，行李牌号，行李牌号，起飞站，起飞站，目的站，目的站，特殊行李类型，特殊 行李类型，旅客姓名大写拼音，旅客姓名大写拼音，pnr,pnr,值机号，值机号】
-    const dataContent = [this.timeStart, this.timeEnd];
+  created() {
+    // 参数顺序   【航班开始日期，航班结束日期，航班号，航班号，行李牌号，行李牌号，起飞站，起飞站，目的站，目的站，特殊行李类型，特殊 行李类型，旅客姓名大写拼音，旅客姓名大写拼音，pnr,pnr,值机号，值机号】
+    const dataContent = [this.timeStart, this.timeEnd]
     // for (let i = 0; i < 18; i++) {
     //   dataContent.push(null)
     // }
     // this.integratedQuery();
     // this.statItemsQueryByStatMain(dataContent);
   },
-  mounted () {
+  mounted() {
     document.querySelector('.interfaceLog_head_time_start .el-input__prefix i').remove()
     document.querySelector('.interfaceLog_head_time_start .el-input__prefix').innerHTML = '开始：'
     document.querySelector('.interfaceLog_head_time_end .el-input__prefix i').remove()
     document.querySelector('.interfaceLog_head_time_end .el-input__prefix').innerHTML = '结束：'
   },
-  updated () {
-    //table数据更新
+  updated() {
+    // table数据更新
     this.$nextTick(() => {
-      this.$refs.table.doLayout();
-    });
+      this.$refs.table.doLayout()
+    })
   },
   methods: {
-    //查询
-    getSearchData (val) {
+    // 查询
+    getSearchData(val) {
       this.form = {
         time: '',
         status: '',
@@ -244,110 +441,120 @@ export default {
         name: '',
         pnr: '',
         check: ''
-      };
-      if(this.timeStart==""||this.timeEnd==""||val==""){
-        this.$message.error('请先输入完整查询信息');
       }
-      else{
+      if (this.timeStart == '' || this.timeEnd == '' || val == '') {
+        this.$message.error('请先输入完整查询信息')
+      } else {
         // let searchData = {dataContent:[this.timeStart,this.timeEnd,val]}
-        this.form['time'] = [this.timeStart,this.timeEnd,val]
-        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]+$/;
+        this.form['time'] = [this.timeStart, this.timeEnd, val]
+        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]+$/
         //纯字母则为旅客姓名
-        if(az.test(val)){
-          this.form['name'] = val;
-          this.onCheckGj();
+        if (az.test(val)) {
+          this.form['name'] = val
+          this.onCheckGj()
         }
         //字母加数字且前两位为字母则为航班号
-        else if(azNum.test(val)&&top2.test(val)){
-          this.form['flightNumber'] = val;
-          this.onCheckGj();
+        else if (azNum.test(val) && top2.test(val)) {
+          this.form['flightNumber'] = val
+          this.onCheckGj()
         }
         //纯数字且位数等于10则为行李牌号
-        else if(num.test(val)&&num.length==10){
-          this.form['grade'] = val;
-          this.onCheckGj();
-        }
-        else{
-          this.$message.error('请先输入有效查询信息如航班号、旅客姓名首字母、行李牌号');
+        else if (num.test(val) && num.length == 10) {
+          this.form['grade'] = val
+          this.onCheckGj()
+        } else {
+          this.$message.error('请先输入有效查询信息如航班号、旅客姓名首字母、行李牌号')
         }
         // this.sempleQueryByStatMain(searchData)
       }
     },
     //清除查询
-    clearSearchData () {
-      this.tableData=[]
+    clearSearchData() {
+      this.tableData = []
     },
     //列设置-确定
-    onCheck () {
-      this.tableColsCopy = _.cloneDeep(this.checkList);
-      const datas = _.sortBy(this.tableColsCopy, (o) => o.showOrder);
-      this.tableColsCopy = datas;
-      this.tableCopy = this.checkList;
-      this.rowFlag = false;
+    onCheck() {
+      this.tableColsCopy = _.cloneDeep(this.checkList)
+      const datas = _.sortBy(this.tableColsCopy, o => o.showOrder)
+      this.tableColsCopy = datas
+      this.tableCopy = this.checkList
+      this.rowFlag = false
     },
     //弹框展开
-    show () {
-      this.tableCopy = this.checkList;
-      this.rowFlag = true;
+    show() {
+      this.tableCopy = this.checkList
+      this.rowFlag = true
     },
     //弹框关闭
-    close () {
-      this.rowFlag = false;
-      this.checkList = this.tableCopy;
-      this.tableColsCopy = _.cloneDeep(this.checkList);
+    close() {
+      this.rowFlag = false
+      this.checkList = this.tableCopy
+      this.tableColsCopy = _.cloneDeep(this.checkList)
     },
     //高级查询-确定
-    onCheckGj () {
+    onCheckGj() {
       //参数顺序   【航班开始日期，航班结束日期，航班号，航班号，行李牌号，行李牌号，起飞站，起飞站，目的站，目的站，特殊行李类型，特殊 行李类型，旅客姓名大写拼音，旅客姓名大写拼音，pnr,pnr,值机号，值机号】
-      this.dataContent = [];
-      this.dataContent = [];
+      this.dataContent = []
+      this.dataContent = []
       const { time, status, flightNumber, destination, station, grade, type, container, name, pnr, check } = this.form
       if (time && time.length) {
-        this.dataContent.push(time[0]);
-        this.dataContent.push(time[1]);
-        if (status==""&flightNumber==""&&destination==""&&station==""&&grade==""&&type==""&&container==""&&name==""&&pnr==""&&check=="") {
-          this.$message.error('请先输入查询信息');
-        }
-        else{
-          this.setDataContent(status);
-          this.setDataContent(flightNumber);
-          this.setDataContent(grade);
-          this.setDataContent(station);
-          this.setDataContent(destination);
-          this.setDataContent(type);
-          this.setDataContent(name);
-          this.setDataContent(pnr);
-          this.setDataContent(check);
-          this.statItemsQueryByStatMain(this.dataContent);
-          this.gjFlag = false;
+        this.dataContent.push(time[0])
+        this.dataContent.push(time[1])
+        if (
+          (status == '') & (flightNumber == '') &&
+          destination == '' &&
+          station == '' &&
+          grade == '' &&
+          type == '' &&
+          container == '' &&
+          name == '' &&
+          pnr == '' &&
+          check == ''
+        ) {
+          this.$message.error('请先输入查询信息')
+        } else {
+          this.setDataContent(status)
+          this.setDataContent(flightNumber)
+          this.setDataContent(grade)
+          this.setDataContent(station)
+          this.setDataContent(destination)
+          this.setDataContent(type)
+          this.setDataContent(name)
+          this.setDataContent(pnr)
+          this.setDataContent(check)
+          this.statItemsQueryByStatMain(this.dataContent)
+          this.gjFlag = false
         }
       } else {
-        this.$message.error('请先选择要查询的时间');
+        this.$message.error('请先选择要查询的时间')
       }
     },
-    closeCheckGj(){
+    closeCheckGj() {
       this.form = {}
-      this.$refs['form'].resetFields();
-      this.gjFlag = false;
+      this.$refs['form'].resetFields()
+      this.gjFlag = false
     },
-    setDataContent (target) {
+    setDataContent(target) {
       if (target) {
-        this.dataContent.push(target);
-        this.dataContent.push(target);
+        this.dataContent.push(target)
+        this.dataContent.push(target)
       } else {
-        this.dataContent.push(null);
-        this.dataContent.push(null);
+        this.dataContent.push(null)
+        this.dataContent.push(null)
       }
     },
     // 表格行点击处理
-    rowClickHandler(row) {
+    flightClickHandler(row) {
+      this.$router.push({ path: '/advance/flight', query: row })
+    },
+    baggageClickHandler(row) {
       this.$router.push({ path: '/advance/bag', query: row })
     },
-    //综合查询
-    async integratedQuery (obj = {}) {
+    // 综合查询
+    async integratedQuery(obj = {}) {
       try {
         this.loading = true
         const res = await advancedInquiry(obj)
@@ -362,8 +569,8 @@ export default {
         this.loading = false
       }
     },
-    //表头数据查询
-    async statItemsQueryByStatMain (dataContent) {
+    // 表头数据查询
+    async statItemsQueryByStatMain(dataContent) {
       try {
         const res = await getQuery({
           id: 30,
@@ -371,6 +578,7 @@ export default {
         })
         if (res.code == 0) {
           this.tableData = res.returnData
+          this.getTableFilterItem()
         } else {
           this.$message.error(res.message)
         }
@@ -379,7 +587,7 @@ export default {
       }
     },
     //简单查询 废弃
-    async sempleQueryByStatMain (dataContent) {
+    async sempleQueryByStatMain(dataContent) {
       try {
         const res = await getQuery({
           id: 31,
@@ -393,7 +601,150 @@ export default {
       } catch (error) {
         console.log('出错了', error)
       }
+    },
+    filterHandler(value, row, column) {
+      const property = column['property']
+      return row[property] === value
+    },
+    getTableFilterItem() {
+      let PassengerNameUpcaseItemArr = [],
+        FlightNOItemArr = [],
+        FlightDateItemArr = [],
+        SourceAirportItemArr = [],
+        TargetAirportItemArr = [],
+        SpecialTypeItemArr = [],
+        checkInItemArr = [],
+        deletedItemArr = [],
+        activatedItemArr = [],
+        latestStatusItemArr = [],
+        bagLocationItemArr = [],
+        TransferFlightNOItemArr = []
+      this.tableData.forEach(item => {
+        if (PassengerNameUpcaseItemArr.indexOf(item.PassengerNameUpcase) == -1 && item.PassengerNameUpcase != '') {
+          PassengerNameUpcaseItemArr.push(item.PassengerNameUpcase)
+          this.PassengerNameUpcaseItem.push({
+            text: item.PassengerNameUpcase,
+            value: item.PassengerNameUpcase
+          })
+        }
+        if (FlightNOItemArr.indexOf(item.FlightNO) == -1 && item.FlightNO != '') {
+          FlightNOItemArr.push(item.FlightNO)
+          this.FlightNOItem.push({
+            text: item.FlightNO,
+            value: item.FlightNO
+          })
+        }
+
+        if (FlightDateItemArr.indexOf(item.FlightDate) == -1 && item.FlightDate != '') {
+          FlightDateItemArr.push(item.FlightDate)
+          this.FlightDateItem.push({
+            text: item.FlightDate,
+            value: item.FlightDate
+          })
+        }
+        if (SourceAirportItemArr.indexOf(item.SourceAirport) == -1 && item.SourceAirport != '') {
+          SourceAirportItemArr.push(item.SourceAirport)
+          this.SourceAirportItem.push({
+            text: item.SourceAirport,
+            value: item.SourceAirport
+          })
+        }
+        if (TargetAirportItemArr.indexOf(item.TargetAirport) == -1 && item.TargetAirport != '') {
+          TargetAirportItemArr.push(item.TargetAirport)
+          this.TargetAirportItem.push({
+            text: item.TargetAirport,
+            value: item.TargetAirport
+          })
+        }
+        if (SpecialTypeItemArr.indexOf(item.SpecialType) == -1 && item.SpecialType != '') {
+          SpecialTypeItemArr.push(item.SpecialType)
+          this.SpecialTypeItem.push({
+            text: item.SpecialType,
+            value: item.SpecialType
+          })
+        }
+
+        if (checkInItemArr.indexOf(item.checkIn) == -1 && item.checkIn != '') {
+          checkInItemArr.push(item.checkIn)
+          this.checkInItem.push({
+            text: item.checkIn,
+            value: item.checkIn
+          })
+        }
+        if (deletedItemArr.indexOf(item.deleted) == -1 && item.deleted != '') {
+          deletedItemArr.push(item.deleted)
+          this.deletedItem.push({
+            text: item.deleted,
+            value: item.deleted
+          })
+        }
+        if (activatedItemArr.indexOf(item.activated) == -1 && item.activated != '') {
+          activatedItemArr.push(item.activated)
+          this.activatedItem.push({
+            text: item.activated,
+            value: item.activated
+          })
+        }
+        if (latestStatusItemArr.indexOf(item.latestStatus) == -1 && item.latestStatus != '') {
+          latestStatusItemArr.push(item.latestStatus)
+          this.latestStatusItem.push({
+            text: item.latestStatus,
+            value: item.latestStatus
+          })
+        }
+        if (bagLocationItemArr.indexOf(item.bagLocation) == -1 && item.bagLocation != '') {
+          bagLocationItemArr.push(item.bagLocation)
+          this.bagLocationItem.push({
+            text: item.bagLocation,
+            value: item.bagLocation
+          })
+        }
+        if (TransferFlightNOItemArr.indexOf(item.TransferFlightNO) == -1 && item.TransferFlightNO != '') {
+          TransferFlightNOItemArr.push(item.TransferFlightNO)
+          this.TransferFlightNOItem.push({
+            text: item.TransferFlightNO,
+            value: item.TransferFlightNO
+          })
+        }
+      })
     }
+
+    //   //导航栏筛选开始
+    //   getTableFilterItem(){
+    //     console.log(this.tableData);
+    //     let arr = []
+    //     this.tableData.forEach(item=>{
+    //       if(arr.indexOf(item.PassengerNameUpcase)==-1){
+    //         arr.push(item.PassengerNameUpcase)
+    //       }
+    //     })
+    //     this.allOptionsObj.PassengerNameUpcase = arr;
+    //   },
+    //   filterData(e, type) {
+    //     this.showFilterTool = false;
+    //     this.$nextTick(() => {
+    //       this.seachType = type;
+    //       this.filterToolTop = e.pageY;
+    //       this.filterToolLeft = e.pageX;
+    //       this.showFilterTool = true;
+    //     });
+    //   },
+    //   closeTool() {
+    //     this.showFilterTool = false;
+    //   },
+    //   saveSeach(data) {
+    //     console.log(data);
+    //     this.seachData = data;
+    //     this.closeTool();
+    //   },
+    //   closeSearch() {
+    //     this.showAdd = false;
+    //   },
+    //   saveBatch(data) {
+    //     // 查询条件
+    //     console.log(data);
+    //   },
+    //   //导航栏筛选结束
   }
 }
 </script>
@@ -410,7 +761,7 @@ export default {
       width: 32px;
       cursor: pointer;
       background-size: 100% 100%;
-      background: url("../../../assets/departure/ic_setting.png") no-repeat;
+      background: url('../../../assets/departure/ic_setting.png') no-repeat;
       margin-left: 12px;
       position: relative;
       top: 2px;

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: zk
  * @Date: 2022-01-17 10:39:22
- * @LastEditTime: 2022-03-15 16:26:13
+ * @LastEditTime: 2022-05-05 17:41:26
  * @LastEditors: your name
  * @Description: 进港01
 -->
@@ -22,7 +22,7 @@
             style="width:144px;"
             placeholder="全部机场"
             size="small"
-            :options="currentAirportOptions"
+            :options="currentAirportList"
             :props="currentAirportProps"
             collapse-tags
             clearable
@@ -35,7 +35,7 @@
             v-model="formData.relatedAirport"
             style="width:136px;"
             size="small"
-            :options="relatedAirportOptions"
+            :options="relatedAirportList"
             :props="relatedAirportProps"
             placeholder="全部起飞站"
             collapse-tags
@@ -49,8 +49,8 @@
             v-model="formData.inboundCarrier"
             style="width:164px;"
             size="small"
-            :options="inboundCarrierOptions"
-            :props="inboundCarrierProps"
+            :options="carrierList"
+            :props="carrierProps"
             placeholder="全部航司"
             collapse-tags
             clearable
@@ -63,7 +63,7 @@
             v-model="formData.craftType"
             style="width:120px;"
             size="small"
-            :options="craftTypeOptions"
+            :options="craftTypeList"
             :props="craftTypeProps"
             placeholder="全部机型"
             collapse-tags
@@ -77,7 +77,7 @@
             v-model="formData.flightAttr"
             style="width:120px;"
             size="small"
-            :options="flightAttrOptions"
+            :options="flightAttrList"
             :props="flightAttrProps"
             placeholder="国际/国内"
             collapse-tags

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2022-01-17 10:39:22
- * @LastEditTime: 2022-05-05 16:29:57
+ * @LastEditTime: 2022-05-06 09:43:16
  * @LastEditors: your name
  * @Description: 行李视图
 -->
@@ -368,13 +368,13 @@ export default {
       return myQuery(queryMap.baggageDetailsByID, ...dataContent)
     },
     async queryBaggageAll(queryData = this.queryData) {
-      const { BagSN, FlightDate, FlightNO } = queryData
-      const dataContent = [BagSN, FlightDate, FlightNO]
+      const { FlightNO, FlightDate, BagSN } = queryData
+      const dataContent = [FlightNO, FlightDate, BagSN]
       try {
         const [baggageBasicInfo, baggageTrack, baggageDetails] = await Promise.all([
           this.queryBaggageBasicInfo(dataContent),
           this.queryBaggageTrack(dataContent),
-          this.queryBaggageDetails(dataContent)
+          this.queryBaggageDetails(new Array(6).fill(dataContent).flat())
         ])
         baggageBasicInfo.length && (this.baggageBasicInfo = baggageBasicInfo[0])
         baggageTrack.forEach((item, index) => {

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

@@ -22,7 +22,7 @@
             style="width:144px;"
             placeholder="全部机场"
             size="small"
-            :options="currentAirportOptions"
+            :options="currentAirportList"
             :props="currentAirportProps"
             collapse-tags
             clearable
@@ -35,7 +35,7 @@
             v-model="formData.relatedAirport"
             style="width:136px;"
             size="small"
-            :options="relatedAirportOptions"
+            :options="relatedAirportList"
             :props="relatedAirportProps"
             placeholder="全部目的地"
             collapse-tags
@@ -49,8 +49,8 @@
             v-model="formData.outgoingAirline"
             style="width:164px;"
             size="small"
-            :options="outgoingAirlineOptions"
-            :props="outgoingAirlineProps"
+            :options="carrierList"
+            :props="carrierProps"
             placeholder="全部航司"
             collapse-tags
             clearable
@@ -63,7 +63,7 @@
             v-model="formData.craftType"
             style="width:120px;"
             size="small"
-            :options="craftTypeOptions"
+            :options="craftTypeList"
             :props="craftTypeProps"
             placeholder="全部机型"
             collapse-tags
@@ -77,7 +77,7 @@
             v-model="formData.flightAttr"
             style="width:120px;"
             size="small"
-            :options="flightAttrOptions"
+            :options="flightAttrList"
             :props="flightAttrProps"
             placeholder="国际/国内"
             collapse-tags

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2022-01-17 10:39:22
- * @LastEditTime: 2022-03-10 15:30:37
+ * @LastEditTime: 2022-05-06 09:29:59
  * @LastEditors: your name
  * @Description: 航班视图
 -->
@@ -44,10 +44,10 @@
 
             <el-row>
               <el-col :span="12">
-                <span>日期：{{ infoData.PlanDepartureTime.split("T")[0] }}</span>
+                <!-- <span>日期：{{ infoData.PlanDepartureTime.split("T")[0] }}</span> -->
               </el-col>
               <el-col :span="12">
-                <span>时间：{{ infoData.PlanDepartureTime.split("T")[1] }}</span>
+                <!-- <span>时间：{{ infoData.PlanDepartureTime.split("T")[1] }}</span> -->
               </el-col>
             </el-row>
 
@@ -136,10 +136,10 @@
 
             <el-row>
               <el-col :span="12">
-                <span>日期：{{ infoData.PlanLandingTime.split("T")[0] }}</span>
+                <!-- <span>日期：{{ infoData.PlanLandingTime.split("T")[0] }}</span> -->
               </el-col>
               <el-col :span="12">
-                <span>时间：{{ infoData.PlanLandingTime.split("T")[1] }}</span>
+                <!-- <span>时间：{{ infoData.PlanLandingTime.split("T")[1] }}</span> -->
               </el-col>
             </el-row>
 
@@ -386,7 +386,7 @@ export default {
   mixins: [tableColsMixin],
   data() {
     return {
-      infoData: null,
+      infoData: {},
       keyWords: '',
       openUTC: true,
       props: { multiple: true },
@@ -429,36 +429,36 @@ export default {
     this.infoData['terminus'] = this['transfer_out_all']
       ? this.infoData['checkin'] - this['transfer_out_all']
       : this.infoData['checkin']
-    // console.log(this.infoData)
-    const dataIn = {
-      flightNO: this.infoData.FlightNO,
-      flightDate: this.infoData.FlightDate,
-      preFlightNO: true,
-      transferFlightNO: false
-    }
-    const dataOut = {
-      flightNO: this.infoData.FlightNO,
-      flightDate: this.infoData.FlightDate,
-      preFlightNO: false,
-      transferFlightNO: true
-    }
-    const containerData = {
-      flightNO: this.infoData.FlightNO,
-      flightDate: this.infoData.FlightDate,
-      preFlightNO: true,
-      transferFlightNO: true
-    }
+    console.log(this.infoData)
+    // const dataIn = {
+    //   flightNO: this.infoData.FlightNO,
+    //   flightDate: this.infoData.FlightDate,
+    //   preFlightNO: true,
+    //   transferFlightNO: false
+    // }
+    // const dataOut = {
+    //   flightNO: this.infoData.FlightNO,
+    //   flightDate: this.infoData.FlightDate,
+    //   preFlightNO: false,
+    //   transferFlightNO: true
+    // }
+    // const containerData = {
+    //   flightNO: this.infoData.FlightNO,
+    //   flightDate: this.infoData.FlightDate,
+    //   preFlightNO: true,
+    //   transferFlightNO: true
+    // }
 
-    const searchAllData = {
-      flightNO: this.infoData.FlightNO,
-      flightDate: this.infoData.FlightDate,
-      preFlightNO: true,
-      transferFlightNO: true
-    }
-    this.getbaggageSearchIn(dataIn)
-    this.getbaggageSearchOut(dataOut)
-    this.getBaggageSearchIOContainer(containerData)
-    this.getBaggageSearchIOAll(searchAllData)
+    // const searchAllData = {
+    //   flightNO: this.infoData.FlightNO,
+    //   flightDate: this.infoData.FlightDate,
+    //   preFlightNO: true,
+    //   transferFlightNO: true
+    // }
+    // this.getbaggageSearchIn(dataIn)
+    // this.getbaggageSearchOut(dataOut)
+    // this.getBaggageSearchIOContainer(containerData)
+    // this.getBaggageSearchIOAll(searchAllData)
   },
   methods: {
     async getBaggageSearchIOAll(data) {

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: Badguy
  * @Date: 2022-03-09 11:51:26
- * @LastEditTime: 2022-03-09 11:54:07
+ * @LastEditTime: 2022-05-05 16:55:10
  * @LastEditors: your name
  * @Description: 中转进港行李视图
  * have a nice day!
@@ -21,7 +21,3 @@ export default {
   }
 }
 </script>
-
-<style>
-
-</style>

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

@@ -25,7 +25,7 @@
               style="width: 144px;"
               placeholder="航站"
               size="small"
-              :options="currentAirportOptions"
+              :options="currentAirportList"
               :props="currentAirportProps"
               collapse-tags
               clearable
@@ -38,8 +38,8 @@
               v-model="formData.inboundCarrier"
               style="width: 164px;"
               size="small"
-              :options="inboundCarrierOptions"
-              :props="inboundCarrierProps"
+              :options="carrierList"
+              :props="carrierProps"
               placeholder="进港承运航司"
               collapse-tags
               clearable
@@ -52,8 +52,8 @@
               v-model="formData.outgoingAirline"
               style="width: 164px;"
               size="small"
-              :options="outgoingAirlineOptions"
-              :props="outgoingAirlineProps"
+              :options="carrierList"
+              :props="carrierProps"
               placeholder="离港承运航司"
               collapse-tags
               clearable
@@ -66,7 +66,7 @@
               v-model="formData.craftType"
               style="width: 120px;"
               size="small"
-              :options="craftTypeOptions"
+              :options="craftTypeList"
               :props="craftTypeProps"
               placeholder="选择机型"
               collapse-tags
@@ -80,7 +80,7 @@
               v-model="formData.flightAttr"
               style="width: 120px;"
               size="small"
-              :options="flightAttrOptions"
+              :options="flightAttrList"
               :props="flightAttrProps"
               placeholder="航班类型"
               collapse-tags

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: Badguy
  * @Date: 2022-02-09 16:36:40
- * @LastEditTime: 2022-03-15 18:02:46
+ * @LastEditTime: 2022-05-05 17:37:20
  * @LastEditors: your name
  * @Description: 中转01-出港
  * have a nice day!
@@ -25,7 +25,7 @@
               style="width: 144px;"
               placeholder="航站"
               size="small"
-              :options="currentAirportOptions"
+              :options="currentAirportList"
               :props="currentAirportProps"
               collapse-tags
               clearable
@@ -38,8 +38,8 @@
               v-model="formData.outgoingAirline"
               style="width: 164px;"
               size="small"
-              :options="outgoingAirlineOptions"
-              :props="outgoingAirlineProps"
+              :options="carrierList"
+              :props="carrierProps"
               placeholder="离港承运航司"
               collapse-tags
               clearable
@@ -52,8 +52,8 @@
               v-model="formData.inboundCarrier"
               style="width: 164px;"
               size="small"
-              :options="inboundCarrierOptions"
-              :props="inboundCarrierProps"
+              :options="carrierList"
+              :props="carrierProps"
               placeholder="进港承运航司"
               collapse-tags
               clearable
@@ -66,7 +66,7 @@
               v-model="formData.craftType"
               style="width: 120px;"
               size="small"
-              :options="craftTypeOptions"
+              :options="craftTypeList"
               :props="craftTypeProps"
               placeholder="选择机型"
               collapse-tags
@@ -80,7 +80,7 @@
               v-model="formData.flightAttr"
               style="width: 120px;"
               size="small"
-              :options="flightAttrOptions"
+              :options="flightAttrList"
               :props="flightAttrProps"
               placeholder="航班类型"
               collapse-tags

src/views/baggageManagement/mixins/form.js

@@ -1,7 +1,7 @@
 /*
  * @Author: Badguy
  * @Date: 2022-03-04 14:45:03
- * @LastEditTime: 2022-03-15 15:53:28
+ * @LastEditTime: 2022-05-05 17:42:06
  * @LastEditors: your name
  * @Description: 航站视图通用表单部分
  * have a nice day!
@@ -27,12 +27,11 @@ export default {
         search: '',
         switch: true
       },
-      currentAirportOptions: [],
-      relatedAirportOptions: [],
-      inboundCarrierOptions: [],
-      outgoingAirlineOptions: [],
-      craftTypeOptions: [],
-      flightAttrOptions: [],
+      currentAirportList: [],
+      relatedAirportList: [],
+      carrierList: [],
+      craftTypeList: [],
+      flightAttrList: [],
       currentAirportProps: {
         // multiple: true,
         checkStrictly: true,
@@ -46,12 +45,7 @@ export default {
         value: 'code3',
         label: 'name'
       },
-      inboundCarrierProps: {
-        multiple: true,
-        value: 'code2',
-        label: 'name'
-      },
-      outgoingAirlineProps: {
+      carrierProps: {
         multiple: true,
         value: 'code2',
         label: 'name'
@@ -118,7 +112,7 @@ export default {
       const newArr = []
       arr.length &&
         arr.forEach(airport => {
-          const temp = this._.cloneDeep(this.currentAirportOptions.find(airport1 => airport1.code3 === airport[0]))
+          const temp = this._.cloneDeep(this.currentAirportList.find(airport1 => airport1.code3 === airport[0]))
           if (temp) {
             temp.builds = airport[1] ? [{ name: airport[1] }] : []
             const item = newArr.find(item => item.code3 === temp.code3)
@@ -135,7 +129,7 @@ export default {
     getSingleData(arr) {
       const newArr = []
       if (arr.length > 0) {
-        const temp = this._.cloneDeep(this.currentAirportOptions.find(airport1 => airport1.code3 === arr[0]))
+        const temp = this._.cloneDeep(this.currentAirportList.find(airport1 => airport1.code3 === arr[0]))
         if (temp) {
           temp.builds = arr[1] ? [{ name: arr[1] }] : []
           newArr.push(temp)
@@ -147,18 +141,17 @@ export default {
     formClear(range) {
       if (range === 'all') {
         this.formData.currentAirport = []
-        this.currentAirportOptions = []
+        this.currentAirportList = []
       }
       this.formData.relatedAirport = []
-      this.relatedAirportOptions = []
+      this.relatedAirportList = []
       this.formData.inboundCarrier = []
-      this.inboundCarrierOptions = []
       this.formData.outgoingAirline = []
-      this.outgoingAirlineOptions = []
+      this.carrierList = []
       this.formData.craftType = []
-      this.craftTypeOptions = []
+      this.craftTypeList = []
       this.formData.flightAttr = []
-      this.flightAttrOptions = []
+      this.flightAttrList = []
     },
     // 文本框清除
     inputClear() {

src/views/baggageManagement/mixins/terminal.js

@@ -1,12 +1,13 @@
 /*
  * @Author: Badguy
  * @Date: 2022-03-04 11:41:55
- * @LastEditTime: 2022-05-03 15:14:10
+ * @LastEditTime: 2022-05-05 17:57:24
  * @LastEditors: your name
  * @Description: 航站视图通用部分
  * have a nice day!
  */
 
+import { queryMap, myQuery } from '@/api/dataIntegration'
 import {
   CurrentAirportQuery,
   RelatedAirportQuery,
@@ -27,8 +28,34 @@ export default {
       loading: false
     }
   },
-  created() {
-    this.currentAirportQuery()
+  // created() {
+  //   this.currentAirportQuery()
+  // },
+  mounted() {
+    this.queryDepartureAirport()
+  },
+  computed: {
+    dates() {
+      return [this.startDate, this.endDate]
+    },
+    flightQueryParams() {
+      return [
+        this.startDate,
+        this.endDate,
+        this.departureAirPort,
+        this.departureAirPort,
+        this.landingAirport,
+        this.landingAirport,
+        this.carrier,
+        this.carrier,
+        this.craftType,
+        this.craftType,
+        this.flightAttr,
+        this.flightAttr,
+        this.search,
+        this.search
+      ]
+    }
   },
   methods: {
     // 数据处理
@@ -137,7 +164,7 @@ export default {
           if (res.returnData.length) {
             const datas = this.formatData(res.returnData)
             const datasCopy = this._.cloneDeep(datas)
-            this.currentAirportOptions = datas
+            this.currentAirportList = datas
             const defaultData = datasCopy[0]
             // this.formData.currentAirport = [[defaultData.code3, defaultData.builds[0].code3]]
             // this.formData.currentAirport = [[defaultData.code3]]
@@ -162,7 +189,7 @@ export default {
         const res = await RelatedAirportQuery(params)
         if (res.code === 0) {
           const datas = this.formatData(res.returnData)
-          this.relatedAirportOptions = datas
+          this.relatedAirportList = datas
         } else {
           this.$message.error(res.message)
         }
@@ -178,7 +205,7 @@ export default {
           type: 'IN'
         })
         if (res.code === 0) {
-          this.inboundCarrierOptions = res.returnData
+          this.carrierList = res.returnData
         } else {
           this.$message.error(res.message)
         }
@@ -194,7 +221,7 @@ export default {
           type: 'OUT'
         })
         if (res.code === 0) {
-          this.outgoingAirlineOptions = res.returnData
+          this.carrierList = res.returnData
         } else {
           this.$message.error(res.message)
         }
@@ -207,7 +234,7 @@ export default {
       try {
         const res = await CraftTypeQuery(params)
         if (res.code === 0) {
-          this.craftTypeOptions = res.returnData.map(item => ({
+          this.craftTypeList = res.returnData.map(item => ({
             code3: item,
             name: item
           }))
@@ -223,7 +250,7 @@ export default {
       try {
         const res = await FlightAttrQuery(params)
         if (res.code === 0) {
-          this.flightAttrOptions = res.returnData
+          this.flightAttrList = res.returnData
         } else {
           this.$message.error(res.message)
         }
@@ -266,6 +293,46 @@ export default {
         console.log('出错了', error)
         this.loading = false
       }
+    },
+    // 查询起飞机场 id: 31
+    queryDepartureAirport() {
+      return myQuery(queryMap.departureAirPort, ...this.dates)
+    },
+    // 查询降落机场 id: 32
+    queryLandingAirport() {
+      return myQuery(queryMap.landingAirport, ...this.dates)
+    },
+    // 按照降落机场查询起飞机场 id: 33
+    queryDepartureAirportByLandingAirport() {
+      return myQuery(queryMap.departureAirPortBylandingAirport, this.currentAirport, ...this.dates)
+    },
+    // 按照起飞机场查询降落机场 id: 34
+    queryLandingAirportByDepartureAirport() {
+      return myQuery(queryMap.landingAirportBydepartureAirPort, this.currentAirport, ...this.dates)
+    },
+    // 查询航司 id: 35
+    queryCarrier() {
+      return myQuery(queryMap.carrier, ...this.dates)
+    },
+    // 查询机型 id: 36
+    queryCraftType() {
+      return myQuery(queryMap.craftType, ...this.dates)
+    },
+    // 查询航线 id: 37
+    queryAirline() {
+      return myQuery(queryMap.flightAttr, ...this.dates)
+    },
+    // 查询进港航班 id: 38
+    queryLandingFlight() {
+      return myQuery(queryMap.landingFlight, ...this.flightQueryParams)
+    },
+    // 查询离港航班 id: 39
+    queryDepartureFlight() {
+      return myQuery(queryMap.departureFlight, ...this.flightQueryParams)
+    },
+    // 查询中转航班 id: 40
+    queryTrasferFlight() {
+      return myQuery(queryMap.transferFlight, ...this.flightQueryParams)
     }
   }
 }