fix

public/config.js

@@ -18,6 +18,7 @@ window.SERVICE_ID = {
   bagTableId: 20030, //行李详情-表头
   bagDetailId: 20027, //行李详情-表格
   bagViewId: 20036, //航班视图-基础信息
+  
   /***-----高级查询------***/
   baggageTypeId: 86, //高级查询-特殊行李类型下拉选项查询-id
   advancedQueryId: 30, //高级查询-数据查询-id

public/staticConfig.js

@@ -1,21 +1,58 @@
 /* url配置 */
 window.PLATFROM_CONFIG = {
-  baseNewUrl: "http://10.211.66.23:8082", //登录前的http请求地址
-  baseUrl: "http://10.211.67.163:16300", // 4A-http请求地址
-  appKeyString: "9inu7zpllz1folzsljm498dcpi0lsog1", //appSecret
-  appId: "q7kdjmmaf0kerwpf", //appid
-  baseURLCA: "http://10.211.66.23:8082", // 登录后的http请求地址-测试
-  baggageMessageURL: "/openApi/query",
+  baseNewUrl: '', //登录前的http请求地址
+  baseURLCA: '', // 登录后的http请求地址
+  appKeyString: '9inu7zpllz1folzsljm498dcpi0lsog1', //appSecret
+  appId: 'q7kdjmmaf0kerwpf', //appid
+  baggageMessageURL: '/openApi/query',
   getBase64: 'http://10.211.67.163:8083/getBase64',
+}
 
-  fileUrl: 'http://10.211.66.23:8082',
-  expressUrl: 'http://10.211.67.177:8043',
-  
-  tempUrl: "http://10.211.67.163:16300", // 1.0临时地址
-  tempToken: 'bb1bcfcb336b40e9b8602e808b053c3b', // 1.0临时token
-  tempUserId: '1656481036109',
-  tempAppToken: '2ecbda35d72c4ae89294464629f29f35'
-};
+const baseNewUrl = window.location.hostname
+switch (baseNewUrl) {
+  case '10.211.66.23':
+    PLATFROM_CONFIG = {
+      ...PLATFROM_CONFIG,
+      baseNewUrl: 'http://10.211.66.23:8082',
+      baseURLCA: 'http://10.211.66.23:8082',
+      fileUrl: 'http://10.211.66.23:8082',
+      expressUrl: 'http://10.211.67.177:8043',
+      tempUrl: 'http://10.211.67.163:16300', // 1.0临时地址
+      tempToken: 'bb1bcfcb336b40e9b8602e808b053c3b', // 1.0临时token
+      tempUserId: '1656481036109',
+      tempAppToken: '2ecbda35d72c4ae89294464629f29f35',
+      hasStaticRoutes: true,
+    }
+    break
+  case '10.199.7.20':
+    PLATFROM_CONFIG = {
+      ...PLATFROM_CONFIG,
+      baseNewUrl: 'http://10.199.7.20:8083',
+      baseURLCA: 'http://10.199.7.20:8083',
+    }
+    break
+  case 'localhost':
+    PLATFROM_CONFIG = {
+      ...PLATFROM_CONFIG,
+      baseNewUrl: 'http://10.211.66.23:8082',
+      baseURLCA: 'http://10.211.66.23:8082',
+      fileUrl: 'http://10.211.66.23:8082',
+      expressUrl: 'http://10.211.67.177:8043',
+      tempUrl: 'http://10.211.67.163:16300', // 1.0临时地址
+      tempToken: 'bb1bcfcb336b40e9b8602e808b053c3b', // 1.0临时token
+      tempUserId: '1656481036109',
+      tempAppToken: '2ecbda35d72c4ae89294464629f29f35',
+      hasStaticRoutes: true,
+    }
+    break
+  default:
+    PLATFROM_CONFIG = {
+      ...PLATFROM_CONFIG,
+      baseNewUrl: 'http://10.211.66.23:8082',
+      baseURLCA: 'http://10.211.66.23:8082',
+    }
+    break
+}
 
 /* 轮询间隔 */
 window.LOOP_INTERVAL = {
@@ -26,5 +63,4 @@ window.LOOP_INTERVAL = {
   baggageTrack: 30 * 1000, // 行李跟踪节点信息
   baggageDetails: 30 * 1000, // 行李详情表格
   baggageMessage: 30 * 1000, // 行李原始报文
-};
-
+}

src/components/Table/index.vue

@@ -8,7 +8,7 @@
       <template v-if="tableData.length">
         <div>
           <el-table v-el-table-infinite-scroll="load" :data="filteredTableData" :summary-method="getSummaries" :span-method="tableSpanMethod" :tree-props="treeProps" :row-key="rowKeyTree" stripe :show-summary="showSummary" border ref="table" :height="tableHeight ? tableHeight : minHeight - 8 + 'vh'" class="table infinite-list" style="width: 100%; overflow: auto" @select="selectHandler">
-            <el-table-column v-for="(item, index) in tableColsCopy" :sortable="item.needSort ? true : false" :key="index" :prop="item.columnName" :label="item.columnLabel" :show-overflow-tooltip="showOverflowTooltip">
+            <el-table-column v-for="(item, index) in tableColsCopy" :sortable="item.needSort ? true : false" :key="index" :prop="item.columnName" :label="item.columnLabel" :show-overflow-tooltip="showOverflowTooltip" :formtter="formtter">
               <template #header>
                 <span class="colTips">
                   <el-tooltip :content="item.columnDescribe" placement="top">
@@ -257,6 +257,13 @@ export default {
         return flag;
       });
     },
+    fromDataType () {
+      return function (type) {
+        if (type) {
+          return type.replace(/\([^\)]*\)/g, "");
+        }
+      }
+    },
   },
   mounted () {
     console.log(this.$route)
@@ -687,6 +694,13 @@ export default {
     handlePreview (row) {
       this.$emit("preview", row);
     },
+    formatter(row, column, cellValue, index) {
+      const sameColumn = this.tableCols.find(col => col.columnName === column.property)
+      if (sameColumn && this.fromDataType(sameColumn.dataType) === 'datetime') {
+        return (cellValue ?? '').replace('T', ' ')
+      }
+      return cellValue
+    }
   },
 };
 </script>

src/getMenu.js

@@ -1,66 +1,76 @@
-import router from "./router";
-import store from "./store";
-import { Message } from "element-ui";
-import NProgress from "nprogress"; // progress bar
-import "nprogress/nprogress.css"; // progress bar style
-import { getToken } from "@/utils/auth"; // get token from cookie
-import getPageTitle from "@/utils/get-page-title";
+import router from './router'
+import store from './store'
+import { Message } from 'element-ui'
+import NProgress from 'nprogress' // progress bar
+import 'nprogress/nprogress.css' // progress bar style
+import { getToken } from '@/utils/auth' // get token from cookie
+import getPageTitle from '@/utils/get-page-title'
 import Layout from '@/layout'
 import { setTree } from '@/utils/validate'
 import * as _ from 'lodash'
-import staticRoutes from '@/router/routes/routes-file-temp'
 
-NProgress.configure({ showSpinner: false }); // NProgress Configuration
+NProgress.configure({ showSpinner: false }) // NProgress Configuration
 
-const whiteList = ["/login"]; // no redirect whitelist
+const whiteList = ['/login'] // no redirect whitelist
+
+function setStaticRoutes(menus, staticRoutes) {
+  staticRoutes.forEach(route => {
+    const routeIndex = menus.findIndex(
+      permissionRoute => permissionRoute.name === route.name
+    )
+    if (routeIndex > -1) {
+      menus[routeIndex] = {
+        ...menus[routeIndex],
+        component: route.component,
+        children: route.children,
+      }
+    }
+  })
+}
 
 router.beforeEach(async (to, from, next) => {
   // start progress bar
-  NProgress.start();
+  NProgress.start()
 
   // set page title
-  document.title = getPageTitle(to.meta.title);
+  document.title = getPageTitle(to.meta.title)
 
   // determine whether the user has logged in
-  const hasToken = getToken();
+  const hasToken = getToken()
 
   if (hasToken) {
-    if (to.path === "/login") {
+    if (to.path === '/login') {
       // if is logged in, redirect to the home page
-      next({ path: "/" });
-      NProgress.done();
+      next({ path: '/' })
+      NProgress.done()
     } else {
-      const hasRoles = store.getters.roles && store.getters.roles.length > 0;
+      const hasRoles = store.getters.roles && store.getters.roles.length > 0
       if (hasRoles) {
-        next();
+        next()
       } else {
         try {
-          const treeData = await store.dispatch("user/getMenuInfo");
-          store.dispatch("auth/changeAuthArrs", treeData)
+          const treeData = await store.dispatch('user/getMenuInfo')
+          store.dispatch('auth/changeAuthArrs', treeData)
           // const typeData = setType(treeData, 'up_auth_id', 'auth_id')
           const menusArray = parseMenuItem(treeData)
           const treeMenu = setTree(menusArray, 'up_auth_id', 'auth_id')
           const dataMenu = _.unionBy(treeMenu, 'auth_id')
           const menus = parseMenu(dataMenu)
-          staticRoutes.forEach(route => {
-            const routeIndex = menus.findIndex(permissionRoute => permissionRoute.name === route.name)
-            if (routeIndex > -1) {
-              menus[routeIndex] = {
-                ...menus[routeIndex],
-                component: route.component,
-                children: route.children
-              }
-            }
-          })
-          store.dispatch("permission/setRoutes", menus)
+
+          if (PLATFROM_CONFIG.hasStaticRoutes) {
+            const staticRoutes = await (await import('@/router/routes/routes-file-temp')).default
+            setStaticRoutes(menus, staticRoutes)
+          }
+
+          store.dispatch('permission/setRoutes', menus)
           router.addRoutes(menus)
           next({ ...to, replace: true })
         } catch (error) {
           // remove token and go to login page to re-login
-          await store.dispatch("user/resetToken");
-          Message.error(error || "Has Error");
-          next(`/login?redirect=${to.path}`);
-          NProgress.done();
+          await store.dispatch('user/resetToken')
+          Message.error(error || 'Has Error')
+          next(`/login?redirect=${to.path}`)
+          NProgress.done()
         }
       }
     }
@@ -69,18 +79,18 @@ router.beforeEach(async (to, from, next) => {
 
     if (whiteList.indexOf(to.path) !== -1) {
       // in the free login whitelist, go directly
-      next();
+      next()
     } else {
       // other pages that do not have permission to access are redirected to the login page.
-      next(`/login?redirect=${to.path}`);
-      NProgress.done();
+      next(`/login?redirect=${to.path}`)
+      NProgress.done()
     }
   }
-});
+})
 
-function parseMenuItem (data) {
+function parseMenuItem(data) {
   const menus = []
-  data.map((item) => {
+  data.map(item => {
     if (item.auth_type == 1) {
       menus.push({
         auth_id: item.auth_id,
@@ -110,7 +120,7 @@ function parseMenuItem (data) {
           auth_id: item.auth_id,
           up_auth_id: item.up_auth_id,
         },
-        component: (resolve) => require(['@/views' + item.file_link], resolve),
+        component: resolve => require(['@/views' + item.file_link], resolve),
         // component: () => import('./views/table/index.vue'),
         hidden: !item.is_show,
       })
@@ -120,7 +130,7 @@ function parseMenuItem (data) {
   return menus
 }
 
-function setType (arr, parentKey, key) {
+function setType(arr, parentKey, key) {
   const datas = []
   for (let i = 0; i < arr.length; i++) {
     for (let j = 0; j < arr.length; j++) {
@@ -135,7 +145,7 @@ function setType (arr, parentKey, key) {
   return arr
 }
 
-function parseMenu (arr) {
+function parseMenu(arr) {
   const menus = arr
   const newMenus = menus.flat()
   const allMenus = newMenus.length
@@ -161,5 +171,5 @@ function parseMenu (arr) {
 
 router.afterEach(() => {
   // finish progress bar
-  NProgress.done();
-});
+  NProgress.done()
+})

src/layout/components/Sidebar/SidebarItem.vue

@@ -3,7 +3,7 @@
     <template v-if="hasOneShowingChild(item.children, item)">
       <app-link v-if="onlyOneChild.meta" :to="resolvePath(onlyOneChild.path)">
         <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{ 'submenu-title-noDropdown': !isNest }">
-          <item :icon="onlyOneChild.meta.elSvgIcon||(item.meta&&item.meta.elSvgIcon)" :title="onlyOneChild.meta.title" />
+          <item :icon="onlyOneChild.meta.elSvgIcon||(item.meta&&item.meta.elSvgIcon)" :title="item.meta.title" />
         </el-menu-item>
       </app-link>
     </template>

src/router/index.js

@@ -31,12 +31,12 @@ Vue.use(Router)
   }
  */
 
-const routesPush = (arr, routes) => {
-  if (!Array.isArray(arr)) return '请传入数组格式路由表'
-  for (let i = 0; i < arr.length; i++) {
-    routes.unshift(arr[i])
-  }
-}
+// const routesPush = (arr, routes) => {
+//   if (!Array.isArray(arr)) return '请传入数组格式路由表'
+//   for (let i = 0; i < arr.length; i++) {
+//     routes.unshift(arr[i])
+//   }
+// }
 
 /**
  * constantRoutes

src/utils/request-4a.js

@@ -1,125 +0,0 @@
-import axios from 'axios'
-import { MessageBox, Message } from 'element-ui'
-import { getToken, getUserId, getCodeToken } from '@/utils/auth'
-import store from '@/store'
-// create an axios instance
-const service = axios.create({
-  //baseURL: baseURL, // url = base url + request url
-  // baseURL: 'http://106.14.243.117:9112',
-  //baseURL: 'http://106.14.243.117:9111',
-  baseURL: `${PLATFROM_CONFIG.baseUrl}`,
-  // withCredentials: true, // send cookies when cross-domain requests
-  timeout: 30000, // request timeout
-  headers: {
-    'Content-Type': 'application/json'
-  },
-})
-// request interceptor
-service.interceptors.request.use(
-  config => {
-    // config.headers.common["content-type"] = "application/json"
-    if (config.istoken) {
-      config.headers['appSecret'] = PLATFROM_CONFIG.appKeyString
-    }
-    if (config.data) {
-      config.data['OperatorId'] = getUserId()
-      config.data["token"] = getCodeToken()
-    }
-    // do something before request is sent
-    // config.headers['Content-Type'] = 'text/plain'
-    if (getCodeToken() && !config.istoken) {
-      config.headers['code'] = getCodeToken()
-    }
-    if (store.getters.token) {
-      // let each request carry token
-      // ['X-Token'] is a custom headers key
-      // please modify it according to the actual situation
-      config.headers['Token'] = getToken()
-    }
-    return config
-  },
-  error => {
-    // do something with request error
-
-    return Promise.reject(error)
-  }
-)
-
-// response interceptor
-service.interceptors.response.use(
-  /**
-   * If you want to get http information such as headers or status
-   * Please return  response => response
-  */
-
-  /**
-   * Determine the request status by custom code
-   * Here is just an example
-   * You can also judge the status by HTTP Status Code
-   */
-  response => {
-    const res = response.data
-
-    // if the custom code is not 20000, it is judged as an error.
-    if (res.code !== 0) {
-      Message({
-        message: res.message || 'Error',
-        type: 'error',
-        duration: 5 * 1000
-      })
-
-      // 50008: Illegal token; 50012: Other clients logged in; 50014: Token expired;
-      if (res.code === 500) {
-        // to re-login
-        Message({
-          message: '身份令牌过期或失效，即将重新登录',
-          type: 'error',
-          duration: 5 * 1000,
-          onClose: () => {
-            store.dispatch('user/resetToken').then(() => {
-              location.reload()
-            })
-          }
-        })
-      }
-      return Promise.reject(new Error(res.message || 'Error'))
-    } else {
-      return res
-    }
-  },
-  error => {
-
-    // const des = `${error}`.split(" ").includes('500')
-    // if (des) {
-    //   Message({
-    //     message: '身份令牌过期或失效，即将重新登录',
-    //     type: 'error',
-    //     duration: 5 * 1000,
-    //     onClose: () => {
-    //       store.dispatch('user/resetToken').then(() => {
-    //         location.reload()
-    //       })
-    //     }
-    //   })
-    //   // MessageBox.confirm('You have been logged out, you can cancel to stay on this page, or log in again', 'Confirm logout', {
-    //   //   confirmButtonText: 'Re-Login',
-    //   //   cancelButtonText: 'Cancel',
-    //   //   type: 'warning'
-    //   // }).then(() => {
-    //   //   store.dispatch('user/resetToken').then(() => {
-    //   //     location.reload()
-    //   //   })
-    //   // })
-    // } else {
-    //   Message({
-    //     message: error.message,
-    //     type: 'error',
-    //     duration: 5 * 1000
-    //   })
-    // }
-    //loadingInstance.close()
-    return Promise.reject(error)
-  }
-)
-
-export default service

src/views/newArrival/index.vue

@@ -17,7 +17,7 @@
             </el-select>
           </el-form-item>
           <el-form-item prop="flightDate" label="航班日期">
-            <el-date-picker v-model="formData.flightDate" :clearable="false" size="small" style="width: 300px" type="daterange" value-format="yyyy-MM-dd" start-placeholder="开始日期" end-placeholder="结束日期" @change="dateChange" :picker-options="dateRangePickerOptions" />
+            <el-date-picker v-model="formData.flightDate" :clearable="false" size="small" style="width: 300px" type="daterange" value-format="yyyy-MM-dd" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="dateRangePickerOptions" @change="dateChange" />
           </el-form-item>
           <el-form-item>
             <div class="box-item">

src/views/newDeparture/mixins/form.js

@@ -253,7 +253,7 @@ export default {
           this.$router.push({
             path: '/newQuery',
             query: {
-              ...queryData
+              ...queryData,
             }
           })
         } else {

src/views/newQuery/components/table.vue

@@ -2,8 +2,8 @@
   <div v-loading="loading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.8)" class="newQueryTable">
     <template v-if="istableChild">
       <el-table v-el-table-infinite-scroll="load" :data="dealedTableData" :summary-method="getSummaries" :span-method="tableSpanMethod" stripe :show-summary="showSummary" border @cell-click="cellClick" :cell-class-name="cellClass" ref="table" height="100%" class="table infinite-list">
-        <el-table-column v-for="col in tableColsCopy" :key="col.columnName" :prop="col.columnName" :label="col.groupName">
-          <el-table-column v-for="childCol in col.children" :key="childCol.columnName" :prop="childCol.columnName" :label="childCol.columnLabel">
+        <el-table-column v-for="col in tableColsCopy" :key="col.columnName" :prop="col.columnName" :label="col.groupName" align="center">
+          <el-table-column v-for="childCol in col.children" :key="childCol.columnName" :prop="childCol.columnName" :label="childCol.columnLabel" :formatter="formatter">
             <template #header>
               <el-tooltip :content="childCol.columnDescribe || childCol.columnLabel" placement="top">
                 <template v-if="childCol.needFilters">
@@ -155,7 +155,14 @@ export default {
     },
     tableHeight () {
       return 100
-    }
+    },
+    fromDataType () {
+      return function (type) {
+        if (type) {
+          return type.replace(/\([^\)]*\)/g, "");
+        }
+      }
+    },
   },
   watch: {
     tableTag: {
@@ -479,6 +486,13 @@ export default {
       const fileName = `高级查询.xlsx`
       throttledExportToExcel(table, '高级查询', fileName)
     },
+    formatter(row, column, cellValue, index) {
+      const sameColumn = this.tableCols.find(col => col.columnName === column.property)
+      if (sameColumn && this.fromDataType(sameColumn.dataType) === 'datetime') {
+        return (cellValue ?? '').replace('T', ' ')
+      }
+      return cellValue
+    }
   }
 }
 </script>
@@ -499,11 +513,12 @@ export default {
       color: #000;
       text-align: center;
       white-space: nowrap;
-      display: flex;
+      // display: flex;
       .el-tooltip {
         white-space: nowrap;
         text-overflow: ellipsis;
         overflow: hidden;
+        line-height: 34px;
       }
     }
   }
@@ -514,4 +529,4 @@ export default {
     z-index: 10;
   }
 }
-</style>
+</style>

src/views/newQuery/index.vue

@@ -24,8 +24,8 @@
       </div>
       <div class="newQuery-tab">
         <div @click="flag = !flag " class="msg">
-          <span v-if="flag" class="el-icon-caret-bottom"></span>
-          <span v-else class="el-icon-caret-top"></span>
+          <span v-if="flag" class="el-icon-caret-top"></span>
+          <span v-else class="el-icon-caret-bottom"></span>
         </div>
       </div>
       <div v-if="flag" class="newQuery-search">

src/views/newRole/index copy.vue

@@ -153,7 +153,7 @@ export default {
       loading: false,
       treeData: [
         {
-          auth_name: '中小型机场系统',
+          auth_name: '所有权限',
           auth_id: 0,
           children: [],
           up_auth_id: -1

src/views/newRole/index.vue

@@ -139,7 +139,7 @@ export default {
       loading: false,
       treeData: [
         {
-          auth_name: '中小型机场系统',
+          auth_name: '所有权限',
           auth_id: 0,
           children: [],
           up_auth_id: -1

src/views/newTransfer/index.vue

@@ -0,0 +1,308 @@
+<!--
+ * @Author: zk
+ * @Date: 2022-01-17 10:39:22
+ * @LastEditTime: 2022-06-22 17:39:49
+ * @LastEditors: your name
+ * @Description: 离港01
+-->
+<template>
+  <div class="departure-one">
+    <!--功能区-表单-->
+    <div ref="formWrap" class="terminal-form-wrap">
+      <el-form ref="form" :inline="true" :model="formData" :rules="rules" class="form">
+        <div class="form-left">
+          <el-form-item prop="currentAirport">
+            <el-select v-model="formData.currentAirport" class="input-shadow" size="small" style="width: 150px" filterable default-first-option placeholder="请选择机场" @change="airPortChange">
+              <el-option v-for="(item, index) in AirportList" :key="index" :label="item.IATACode" :value="item.IATACode" />
+            </el-select>
+          </el-form-item>
+          <el-form-item prop="flightDate" label="航班日期">
+            <el-date-picker v-model="formData.flightDate" :clearable="false" size="small" style="width: 300px" type="daterange" value-format="yyyy-MM-dd" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="dateRangePickerOptions" @change="dateChange" />
+          </el-form-item>
+          <el-form-item>
+            <div class="box-item">
+              <p>预计装载总数：</p>
+              <li v-for="(item, index) in orderNum" :key="index" :class="{ 'number-item': !isNaN(item), 'mark-item': isNaN(item) }">
+                <span v-if="!isNaN(item)">
+                  <i ref="numberItem">0123456789</i>
+                </span>
+                <span v-else class="comma">{{ item }}</span>
+              </li>
+            </div>
+          </el-form-item>
+        </div>
+        <div class="form-right" @keyup.enter="onSubmit(0)">
+          <el-form-item prop="search">
+            <el-popover :value="popoverVisible" placement="bottom" trigger="manual">
+              <span>请输入航班号（示例：CA1234）或行李牌号（示例：1234567890）</span>
+              <el-input slot="reference" v-model="formData.search" class="input-shadow" style="width: 240px; margin-left: 105px" size="small" placeholder="请输入内容" prefix-icon="el-icon-search" clearable @focus="popoverVisible = true" @blur="popoverVisible = false" />
+            </el-popover>
+          </el-form-item>
+          <el-form-item>
+            <el-button class="btn-shadow" size="mini" type="primary" @click="onSubmit(0)">搜索</el-button>
+          </el-form-item>
+          <el-form-item>
+            <el-button class="btn-shadow" size="mini" type="primary" @click="changeView">切换视角</el-button>
+          </el-form-item>
+          <el-form-item>
+            <TimeZoneSelector />
+          </el-form-item>
+          <el-form-item>
+            <img class="btn-img btn-shadow" src="@/assets/baggage/ic_export.png" title="导出" @click="exportHandler('table', '航站离港列表')" />
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+    <!--表格-->
+    <div class="terminal-table">
+      <Table :istableChild="true" style="height:100%" :btnStyle="{ 'top':'-43px','right':'8px' }" :istableCol="true" :tableTag="tableTag" ref="table" />
+    </div>
+  </div>
+</template>
+
+<script>
+import Dialog from "@/layout/components/Dialog";
+import TimeZoneSelector from "@/components/TimeZoneSelector";
+import { throttledExportToExcel } from "@/utils/table";
+import pf from '@/layout/mixin/publicFunc'
+import { mapGetters } from "vuex";
+import formMixin from "./mixins/form";
+import Table from '@/views/newQuery/components/table.vue'
+export default {
+  name: "DepartureTerminalView",
+  components: { Dialog, TimeZoneSelector, Table },
+  mixins: [formMixin, pf],
+  data () {
+    return {
+      orderNum: ["0", "0", "0", "0", "0", "0"], // 默认总数
+      popoverVisible: false,
+      // 初始表头
+      tableCols: [],
+      tableDataSortRules: {
+        flightCanceled: "ascending",
+      },
+      loading: false,
+      AirportList: [],
+      tableTag: {}
+    };
+  },
+  computed: {
+    singleDay () {
+      return this.startDate === this.endDate;
+    },
+    ...mapGetters(["timeZone"]),
+  },
+  created () {
+    this.getAirPortData()
+  },
+  methods: {
+    airPortChange (val) {
+      this.formData.currentAirport = val
+      this.getAirPortData(0)
+    },
+    dateChange () {
+      this.getAirPortData(0)
+    },
+    changeView () {
+      const path = this.$route.path
+      const newPath = path.endsWith('/in') ? path.replace('/in', '/out') : path.replace('/out', '/in')
+      this.$router.push(newPath)
+    },
+    formatParams () {
+      const datas = []
+      const queryData = {
+        startDate: this.startDate,
+        endDate: this.endDate
+      }
+      queryData['current_airport'] = this.formData.currentAirport
+      for (const key in queryData) {
+        if (Object.hasOwnProperty.call(queryData, key)) {
+          const val = queryData[key]
+          const comparator = key == 'startDate' ? '>=' : key == 'endDate' ? '<=' : '='
+          const column = key == 'startDate' ? 'flightDate' : key == 'endDate' ? 'flightDate' : key
+          const r = {
+            left: '(',
+            column: column,
+            comparator,
+            value: val,
+            right: ')',
+            connector: 'and'
+          }
+          datas.push(r)
+        }
+      }
+      return datas
+    },
+    async getAirPortData (type = 1) {
+      try {
+        const res = await this.getQueryList(SERVICE_ID.getAirpotId)
+        if (Number(res.code) === 0) {
+          this.AirportList = res.returnData;
+          if (type) {
+            this.formData.currentAirport = "PEK";
+          }
+          this.tableTag = {
+            filter: this.formatParams()
+          }
+        } else {
+          this.$message.error(res.message);
+        }
+      } catch (error) {
+        this.$message.error("失败");
+      }
+    },
+    toOrderNum (num) {
+      num = num.toString();
+      if (num.length < 6) {
+        num = "0" + num; // 如未满八位数，添加"0"补位
+        this.toOrderNum(num); // 递归添加"0"补位
+      } else if (num.length >= 6) {
+        this.orderNum = num.split(""); // 将其便变成数据，渲染至滚动数组
+      } else {
+        // 订单总量数字超过八位显示异常
+        this.$message.warning("总量数字过大");
+      }
+      this.setNumberTransform();
+    },
+    exportHandler (refName, tableName) {
+      if (this.loading) {
+        return;
+      }
+      const table = this.$refs[refName].$el.cloneNode(true);
+      const fileName = `${tableName}-${this.currentAirport}-${this.startDate}-${this.endDate}.xlsx`;
+      throttledExportToExcel(table, tableName, fileName);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.departure-one {
+  height: calc(100vh - 80px);
+}
+.terminal-form-wrap {
+  padding-top: 11px;
+  padding-left: 5px;
+  ::v-deep .form {
+    display: flex;
+    justify-content: space-between;
+    .form-left {
+      flex: 1;
+    }
+    .form-right {
+      flex: 0 1 auto;
+    }
+    .el-form-item {
+      margin-bottom: 0px;
+      margin-right: 8px;
+      button,
+      input,
+      optgroup,
+      select,
+      textarea {
+        font-family: Helvetica, "Microsoft YaHei";
+        font-size: 14px;
+      }
+      .el-switch__label {
+        color: #303133;
+      }
+      .el-form-item__error {
+        z-index: 10;
+      }
+      &:last-child {
+        margin-right: 45px;
+      }
+    }
+    .btn-img {
+      position: relative;
+      top: 6px;
+    }
+  }
+  .box-item {
+    position: relative;
+    height: 50px;
+    font-size: 18px;
+    line-height: 32px;
+    text-align: center;
+    list-style: none;
+    color: #2d7cff;
+    writing-mode: vertical-lr;
+    text-orientation: upright;
+    /*文字禁止编辑*/
+    -moz-user-select: none; /*火狐*/
+    -webkit-user-select: none; /*webkit浏览器*/
+    -ms-user-select: none; /*IE10*/
+    -khtml-user-select: none; /*早期浏览器*/
+    user-select: none;
+    /* overflow: hidden; */
+    p {
+      line-height: 32px;
+      writing-mode: horizontal-tb !important;
+      text-orientation: none !important;
+      /*文字禁止编辑*/
+      -moz-user-select: none; /*火狐*/
+      -webkit-user-select: none; /*webkit浏览器*/
+      -ms-user-select: none; /*IE10*/
+      -khtml-user-select: none; /*早期浏览器*/
+      user-select: none;
+      margin-top: 5px;
+    }
+  }
+  /* 默认逗号设置 */
+  .mark-item {
+    width: 10px;
+    height: 32px;
+    margin-right: 5px;
+    line-height: 10px;
+    font-size: 18px;
+    position: relative;
+    & > span {
+      position: absolute;
+      width: 100%;
+      bottom: 0;
+      writing-mode: vertical-rl;
+      text-orientation: upright;
+    }
+  }
+  /*滚动数字设置*/
+  .number-item {
+    width: 41px;
+    height: 42px;
+    /* 背景图片 */
+    // background: url(/images/text-bg-blue.png) no-repeat center center;
+    // background-size: 100% 100%;
+    // background: #ccc;
+    list-style: none;
+    margin-right: 5px;
+    // background:rgba(250,250,250,1);
+    border-radius: 4px;
+    border: 3px solid rgb(221, 221, 221);
+    & > span {
+      position: relative;
+      display: inline-block;
+      margin-right: 10px;
+      width: 100%;
+      height: 100%;
+      writing-mode: vertical-rl;
+      text-orientation: upright;
+      overflow: hidden;
+      & > i {
+        font-style: normal;
+        position: absolute;
+        top: 11px;
+        left: 50%;
+        transform: translate(-50%, -1%);
+        transition: transform 1s ease-in-out;
+        letter-spacing: 10px;
+      }
+    }
+  }
+  .number-item:last-child {
+    margin-right: 0;
+  }
+}
+.terminal-table {
+  width: 100%;
+  height: calc(100% - 61px);
+}
+</style>

src/views/newTransfer/mixins/form.js

@@ -0,0 +1,265 @@
+/*
+ * @Author: Badguy
+ * @Date: 2022-03-04 14:45:03
+ * @LastEditTime: 2022-06-16 10:51:52
+ * @LastEditors: your name
+ * @Description: 航站视图通用表单部分
+ * have a nice day!
+ */
+
+import { parseTime } from '@/utils'
+// const defaultStartTime = new Date(new Date(new Date().toLocaleDateString()).getTime())
+// const defaultEndTime = new Date(new Date(new Date().toLocaleDateString()).getTime() + 24 * 60 * 60 * 1000 - 1)
+const defaultDate = parseTime(new Date(), '{y}-{m}-{d}')
+const dateValidator = (rule, value, callback) => {
+  if (value && value[0] && value[1]) {
+    callback()
+  } else {
+    callback(new Error('请选择航班日期'))
+  }
+}
+
+export default {
+  data () {
+    return {
+      formData: {
+        // 搜索表单数据
+        currentAirport: [],
+        relatedAirport: [],
+        inboundCarrier: [],
+        outgoingAirline: [],
+        craftType: [],
+        flightAttr: [],
+        flightDate: [defaultDate, defaultDate],
+        // startDate: defaultDate,
+        // endDate: defaultDate,
+        search: ''
+      },
+      dateRangePickerOptions: {
+        onPick: this.dateRangePickHandler,
+        disabledDate: this.dateRangeDisabled
+      },
+      currentAirportList: [],
+      relatedAirportList: [],
+      carrierList: [],
+      craftTypeList: [],
+      flightAttrList: [],
+      currentAirportProps: {
+        // multiple: true,
+        checkStrictly: true,
+        expandTrigger: 'hover',
+        value: 'code3',
+        label: 'name',
+        children: 'builds'
+      },
+      relatedAirportProps: {
+        multiple: true,
+        value: 'code3',
+        label: 'name'
+      },
+      carrierProps: {
+        multiple: true,
+        value: 'code2',
+        label: 'name'
+      },
+      craftTypeProps: {
+        multiple: true,
+        value: 'code3',
+        label: 'name'
+      },
+      flightAttrProps: {
+        multiple: true,
+        value: 'code',
+        label: 'name'
+      },
+      // 表单规则
+      rules: {
+        currentAirport: [{ required: true, message: '请选择当前机场', trigger: ['change', 'blur'] }],
+        // startDate: [{ required: true, message: '请选择开始时间', trigger: 'change' }],
+        // endDate: [{ required: true, message: '请选择结束时间', trigger: 'change' }]
+        flightDate: [{ validator: dateValidator, trigger: ['change', 'blur'] }]
+      }
+    }
+  },
+  computed: {
+    currentAirport () {
+      return this.getSingleData(this.formData.currentAirport)
+    },
+    relatedAirport () {
+      return this.formData.relatedAirport.map(item => item[0])
+    },
+    inboundCarrier () {
+      return this.formData.inboundCarrier.map(item => item[0])
+    },
+    outgoingAirline () {
+      return this.formData.outgoingAirline.map(item => item[0])
+    },
+    craftType () {
+      return this.formData.craftType.map(item => item[0])
+    },
+    flightAttr () {
+      return this.formData.flightAttr.map(item => item[0])
+    },
+    startDate () {
+      // return parseTime(this.formData.startDate).split(' ')[0]
+      // return this.formData.startDate
+      return this.formData.flightDate[0]
+    },
+    endDate () {
+      // return parseTime(this.formData.endDate).split(' ')[0]
+      // return this.formData.endDate
+      return this.formData.flightDate[1]
+    }
+  },
+  watch: {
+    'formData.flightDate': {
+      handler (val) {
+
+        if (val === null) {
+          this.formData.flightDate = ['', '']
+        }
+      },
+      deep: true
+    }
+  },
+  methods: {
+    dateRangePickHandler ({ maxDate, minDate }) {
+      if (!maxDate) {
+        this.pickedDate = minDate
+      } else {
+        this.pickedDate = null
+      }
+    },
+    dateRangeDisabled (date) {
+      return this.pickedDate ? Math.abs(date - this.pickedDate) > 2 * 24 * 60 * 60 * 1000 : false
+    },
+    // 机场数据处理（多选）
+    getMultipleData (arr) {
+      const newArr = []
+      arr.length &&
+        arr.forEach(airport => {
+          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)
+            if (item) {
+              item.builds.push(...temp.builds)
+            } else {
+              newArr.push(temp)
+            }
+          }
+        })
+      return newArr
+    },
+    // 机场数据处理（单选）
+    getSingleData (arr) {
+      const newArr = []
+      if (arr.length > 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)
+        }
+      }
+      return newArr
+    },
+    // 清除表单数据
+    formClear (range) {
+      if (range === 'all') {
+        this.formData.currentAirport = []
+        this.currentAirportList = []
+      }
+      this.formData.relatedAirport = []
+      this.relatedAirportList = []
+      this.formData.inboundCarrier = []
+      this.formData.outgoingAirline = []
+      this.carrierList = []
+      this.formData.craftType = []
+      this.craftTypeList = []
+      this.formData.flightAttr = []
+      this.flightAttrList = []
+    },
+    // 当前机场变更
+    setCurrentAirport (data) {
+      this.formClear()
+      if (data.length === 0) {
+        return
+      }
+      const params = {
+        currentAirport: this.currentAirport,
+        startDate: this.startDate,
+        endDate: this.endDate
+      }
+      this.getFormData(params)
+    },
+    // 日期限制
+    // startDateChangeHandler(val) {
+    //   if (!val || !this.endDate) {
+    //     return
+    //   }
+    //   const startDate = new Date(val)
+    //   const endDate = new Date(this.endDate)
+    //   if (startDate > endDate) {
+    //     this.formData.endDate = ''
+    //     this.$message.info('结束时间不能早于开始时间，请重新选择')
+    //   } else if (endDate - startDate > 2 * 24 * 60 * 60 * 1000) {
+    //     this.formData.endDate = ''
+    //     this.$message.info('时间跨度不能超过三天，请重新选择')
+    //   } else {
+    //     this.getTableData()
+    //   }
+    // },
+    // endDateChangeHandler(val) {
+    //   if (!val || !this.startDate) {
+    //     return
+    //   }
+    //   const startDate = new Date(this.startDate)
+    //   const endDate = new Date(val)
+    //   if (startDate > endDate) {
+    //     this.formData.startDate = ''
+    //     this.$message.info('开始时间不能晚于结束时间，请重新选择')
+    //   } else if (endDate - startDate > 2 * 24 * 60 * 60 * 1000) {
+    //     this.formData.startDate = ''
+    //     this.$message.info('时间跨度不能超过三天，请重新选择')
+    //   } else {
+    //     this.getTableData()
+    //   }
+    // },
+    // 搜索
+    onSubmit () {
+      this.$refs['form'].validate(valid => {
+        if (valid) {
+          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 bagNo = /^[a-zA-Z]{2}[0-9]{6}$/
+          const queryData = {
+            startDate: this.startDate,
+            endDate: this.endDate
+          }
+          queryData['outAirport'] = this.formData.currentAirport
+          if (azNum.test(this.formData.search) && top2.test(this.formData.search) && this.formData.search.length < 8) {
+            // 字母加数字且前两位为字母则为航班号
+            queryData['carrierFlights'] = this.formData.search
+          } else if ((num.test(this.formData.search) && this.formData.search.length === 10) || ((bagNo.test(this.formData.search) && this.formData.search.length > 7))) {
+            // 纯数字且位数等于10则为行李牌号
+            queryData['luggageNum'] = this.formData.search
+          } else {
+            // this.$message.error('请输入有效查询信息如航班号、行李牌号')
+            // return
+          }
+          this.$router.push({
+            path: '/newQuery',
+            query: {
+              ...queryData,
+            }
+          })
+        } else {
+          return false
+        }
+      })
+    }
+  }
+}

src/views/newTransfer/mixins/tableCols.js

@@ -0,0 +1,98 @@
+/*
+ * @Author: Badguy
+ * @Date: 2022-03-04 11:50:22
+ * @LastEditTime: 2022-03-15 17:56:34
+ * @LastEditors: your name
+ * @Description: 航站视图表格通用部分
+ * have a nice day!
+ */
+
+export default {
+  data() {
+    return {
+      // 筛选后表头
+      tableColsCopy: [],
+      // 列设置弹框选中
+      checkedKeys: [],
+      checkedKeysTemp: [],
+      halfCheckedKeys: [],
+      // 列设置弹框开关
+      dialogFlag: false
+    }
+  },
+  created() {
+    this.initTableCols()
+  },
+  updated() {
+    // table数据更新
+    this.$nextTick(() => {
+      this.$refs.table?.doLayout()
+    })
+  },
+  computed: {
+    colsCheckClass() {
+      return this.tableCols.some(col => col.children?.length) ? 'has-children' : 'no-children'
+    }
+  },
+  methods: {
+    // 列设置-初始化
+    initTableCols() {
+      const that = this
+      function setTableCols(cols) {
+        for (const col of cols) {
+          col.index = that.checkedKeys.length
+          that.checkedKeys.push(that.checkedKeys.length)
+          if (col.children?.length) {
+            setTableCols(col.children)
+          }
+        }
+      }
+      setTableCols(this.tableCols)
+      this.tableColsCopy = this._.cloneDeep(this.tableCols)
+      this.checkedKeysTemp = [...this.checkedKeys]
+    },
+    // 列设置-确定
+    handleCheck(data, checked) {
+      this.checkedKeysTemp = [...checked.checkedKeys]
+      this.halfCheckedKeys = [...checked.halfCheckedKeys]
+    },
+    onCheck(tableDataName = 'tableData') {
+      if (this.dialogFlag === false) {
+        return
+      }
+      this.loading = true
+      const tableDataTemp = this._.cloneDeep(this[tableDataName])
+      this[tableDataName] = []
+      this.dialogFlag = false
+      this.checkedKeys = [...this.checkedKeysTemp]
+      this.tableColsCopy = this.colsFilter(this._.cloneDeep(this.tableCols))
+      setTimeout(() => {
+        if (!this[tableDataName].length) {
+          this[tableDataName] = tableDataTemp
+        }
+        this.loading = false
+      }, 500)
+    },
+    colsFilter(cols) {
+      const temp = cols.filter(col => {
+        if (this.halfCheckedKeys.includes(col.index)) {
+          col.children = this.colsFilter(col.children)
+          return true
+        } else if (this.checkedKeys.includes(col.index)) {
+          return true
+        }
+        return false
+      })
+      return temp
+    },
+    // 弹框展开
+    show() {
+      this.dialogFlag = true
+    },
+    // 弹框关闭
+    hide() {
+      this.dialogFlag = false
+      this.checkedKeysTemp = [...this.checkedKeys]
+    }
+  }
+}

src/views/newTransfer/mixins/terminal.js

@@ -0,0 +1,420 @@
+/*
+ * @Author: Badguy
+ * @Date: 2022-03-04 11:41:55
+ * @LastEditTime: 2022-08-26 15:32:54
+ * @LastEditors: your name
+ * @Description: 航站视图通用部分
+ * have a nice day!
+ */
+
+import { mapGetters } from 'vuex'
+import { commonTableCellClass } from '@/utils/table'
+
+export default {
+  data() {
+    return {
+      // 表格数据
+      tableData: [],
+      tableDataFilters: {},
+      filterValues: {},
+      tableDataSortRules: {},
+      spanArr: [],
+      pos: 0,
+      loading: false,
+      computedTableHeight: undefined,
+      debounceTime: 300
+    }
+  },
+  created() {
+    this.setFilterAndSort(this.tableCols)
+  },
+  updated() {
+    this.resizeHandler()
+  },
+  activated() {
+    this.resizeHandler()
+    this.debouncedResizeHandler = this._.debounce(this.resizeHandler, this.debounceTime)
+    window.addEventListener('resize', this.debouncedResizeHandler)
+  },
+  deactivated() {
+    window.removeEventListener('resize', this.debouncedResizeHandler)
+  },
+  computed: {
+    ...mapGetters(['clickedCells']),
+    dealedTableData() {
+      const filtered = this.tableData.filter(item => {
+        let flag = true
+        Object.entries(this.filterValues).forEach(([key, arr]) => {
+          if (arr.length && !arr.includes(String(item[key]))) {
+            flag = false
+          }
+        })
+        return flag
+      })
+      const sortRules = Object.entries(this.tableDataSortRules).reduce(
+        (pre, [key, value]) => {
+          if (value) {
+            pre[0].push(key)
+            value = value === 'ascending' ? 'asc' : 'desc'
+            pre[1].push(value)
+          }
+          return pre
+        },
+        [[], []]
+      )
+      return this._.orderBy(filtered, sortRules[0], sortRules[1])
+    }
+  },
+  watch: {
+    dealedTableData: {
+      handler(val) {
+        this.spanArr = []
+        let contactDot = this.contactDot
+        val.forEach((item, index, arr) => {
+          if (index === 0) {
+            this.spanArr.push(1)
+          } else {
+            if (
+              item['flightNO'] === arr[index - 1]['flightNO'] &&
+              item['flightDate'] === arr[index - 1]['flightDate']
+            ) {
+              this.spanArr[contactDot] += 1
+              this.spanArr.push(0)
+            } else {
+              this.spanArr.push(1)
+              contactDot = index
+            }
+          }
+        })
+      },
+      deep: true
+    }
+  },
+  methods: {
+    // 设置表格高度
+    resizeHandler() {
+      const headerHeight = 80
+      const bottomBlankHeight = 41
+      const formWrapHeight = this.$refs['formWrap'].offsetHeight
+      this.computedTableHeight = `calc(100vh - ${headerHeight + bottomBlankHeight + formWrapHeight}px)`
+      this.$refs.table?.doLayout()
+    },
+    // 设置筛选和排序
+    setFilterAndSort(tableCols) {
+      const self = this
+      Object.values(tableCols).forEach(({ prop, filterable, sortable, children }) => {
+        if (children) {
+          self.setFilterAndSort(children)
+        } else {
+          if (filterable) {
+            self.$set(self.tableDataFilters, prop, [])
+            self.$set(self.filterValues, prop, [])
+          }
+          if (sortable) {
+            self.$set(self.tableDataSortRules, prop, '')
+          }
+        }
+      })
+    },
+    // 合计行
+    summaryMethod({ columns, data }) {
+      const sums = []
+      if (columns.length > 0) {
+        columns.forEach((column, index) => {
+          if (index === 0) {
+            sums[index] = '合计'
+          } else if (index === 1) {
+            sums[index] = '航班数：' + this.tableData.length
+          } else if (
+            // 需要计算的列
+            [
+              'passagernum',
+              'checkNumber',
+              'not_actived',
+              'expect_load',
+              'security_all',
+              'sortNumber',
+              'loadNumber',
+              'boardID',
+              'toUnload',
+              'OFFCount',
+              'delbag',
+              'noBSM',
+              'reach',
+              'did_not_arrive',
+              'special',
+              'claim',
+              'uninstalled',
+              'terminateArrive',
+              'terminatedNotArrived',
+              'delivered',
+              'not_shipped',
+              'container',
+              'bulk',
+              'checkInTravellerNumber',
+              'checkInNumber',
+              'unActive',
+              'preLoad',
+              'noCheckInNumber',
+              'midIn',
+              'checkIns',
+              'projectedLoad',
+              'loadedQuantity',
+              'numberOfDestinationArrivals',
+              'endPointNotReached',
+              'specialQuantity',
+              'numberOfClaims',
+              'numberToBeUninstalled',
+              'terminateArrivalQuantity',
+              'terminateUnreachedQuantity',
+              'quantityShipped',
+              'undeliveredQuantity',
+              'numberOfContainers',
+              'numberOfBulk',
+              'inTransferBaggageCount',
+              'inTransferredBaggageCount',
+              'outTransferBaggageCount',
+              'outTransferredBaggageCount',
+              'exceptions',
+              'warning'
+            ].includes(column.property)
+          ) {
+            const values = data.map(item => Number(item[column.property]))
+            if (values.some(value => !isNaN(value))) {
+              sums[index] = values.reduce((prev, curr) => {
+                const value = Number(curr)
+                if (!isNaN(value)) {
+                  return Number(prev) + Number(curr)
+                } else {
+                  return Number(prev)
+                }
+              }, 0)
+            } else {
+              sums[index] = 0
+            }
+          } else {
+            // 过滤某些字段不参与计算
+            sums[index] = '-'
+          }
+        })
+      }
+      return sums
+    },
+    cellClass({ row, column, rowIndex, columnIndex }) {
+      const classes = commonTableCellClass({
+        row,
+        column,
+        rowIndex,
+        columnIndex
+      })
+      if (
+        [
+          'flightNO',
+          'preFlightNO',
+          'inTransferBaggageCount',
+          'inTransferredBaggageCount',
+          'outTransferBaggageCount',
+          'outTransferredBaggageCount',
+          'toUnload',
+          'OFFCount',
+          'checkInNumber',
+          'unActive',
+          'preLoad',
+          'warning',
+          'midIn',
+          'noCheckInNumber',
+          'checkNumber',
+          'sortNumber',
+          'loadNumber',
+          'boardID',
+          'checkIns',
+          'terminateArrivalQuantity',
+          'projectedLoad',
+          'loadedQuantity',
+          'numberOfDestinationArrivals',
+          'uninstalled',
+          'numberOfContainers',
+          'numberOfBulk',
+          'noBSM'
+        ].includes(column.property) &&
+        row[column.property]
+      ) {
+        classes.push('cell-click')
+        if (
+          this.clickedCells.some(
+            cell =>
+              cell.pageName === this.$route.name &&
+              Object.entries(cell.row).every(([key, value]) => row[key] === value) &&
+              cell.columnProp === column.property
+          )
+        ) {
+          classes.push('cell-clicked')
+        }
+      }
+      if (column.property === 'toUnload' && row[column.property]) {
+        classes.push('cell-toUnload')
+      }
+      if (column.property === 'warning' && row['warningState'] && row['warningState'] == 2) {
+        classes.push('cell-toUnload')
+      }
+      if (column.property === 'warning' && row['warningState'] && row['warningState'] == 1) {
+        classes.push('cell-toUnloadNew')
+      }
+      if (column.property === 'outTransferredBaggageCount' && row['warningState'] && row['warningState'] == 2) {
+        classes.push('cell-toUnload')
+      }
+      if (column.property === 'outTransferredBaggageCount' && row['warningState'] && row['warningState'] == 1) {
+        classes.push('cell-toUnloadNew')
+      }
+      if (column.property === 'outTransferBaggageCount' && row['sharpSign']) {
+        classes.push('cell-toUnloadNew')
+      }
+      if (column.property === 'inTransferredBaggageCount' && row['warningState'] && row['warningState'] == 2) {
+        classes.push('cell-toUnload')
+      }
+      if (column.property === 'inTransferredBaggageCount' && row['warningState'] && row['warningState'] == 1) {
+        classes.push('cell-toUnloadNew')
+      }
+      if (column.property === 'inTransferBaggageCount' && row['sharpSign']) {
+        classes.push('cell-toUnloadNew')
+      }
+      return classes.join(' ')
+    },
+    cellClickHandler(row, column, cell, event) {
+      if (
+        [
+          'flightNO',
+          'preFlightNO',
+          'inTransferBaggageCount',
+          'inTransferredBaggageCount',
+          'outTransferBaggageCount',
+          'outTransferredBaggageCount',
+          'toUnload',
+          'OFFCount',
+          'checkInNumber',
+          'unActive',
+          'preLoad',
+          'warning',
+          'midIn',
+          'noCheckInNumber',
+          'checkNumber',
+          'sortNumber',
+          'loadNumber',
+          'boardID',
+          'checkIns',
+          'terminateArrivalQuantity',
+          'projectedLoad',
+          'loadedQuantity',
+          'numberOfDestinationArrivals',
+          'uninstalled',
+          'numberOfContainers',
+          'numberOfBulk',
+          'noBSM'
+        ].includes(column.property) &&
+        row[column.property]
+      ) {
+        this.$store.dispatch('keepAlive/addClickedCell', {
+          row,
+          columnProp: column.property,
+          pageName: this.$route.name
+        })
+        const path = `${this.$route.path}/flightView`
+        const query = {}
+        switch (column.property) {
+          case 'flightNO':
+            Object.assign(query, {
+              flightNO: row.flightNO,
+              flightDate: row.flightDate
+            })
+            break
+          case 'preFlightNO':
+            Object.assign(query, {
+              flightNO: row.preFlightNO,
+              flightDate: row.preFlightDate
+            })
+            break
+          case 'inTransferBaggageCount':
+          case 'outTransferBaggageCount':
+            Object.assign(query, {
+              flightNO: row.preFlightNO,
+              flightDate: row.preFlightDate,
+              fastFilter: `transferFlightNO,${row.flightNO}`
+            })
+            break
+          case 'inTransferredBaggageCount':
+          case 'outTransferredBaggageCount':
+            Object.assign(query, {
+              flightNO: row.flightNO,
+              flightDate: row.flightDate,
+              fastFilter: `inFlightNO,${row.preFlightNO}`
+            })
+            break
+          case 'warning':
+            Object.assign(query, {
+              flightNO: row.flightNO,
+              flightDate: row.flightDate,
+              fastFilter: row['warningState'] === 1 ? 'warning' : 'alarm'
+            })
+            break
+          default: {
+            const reflect = {
+              toUnload: 'toUnload', // 装车或装机后，isDEL为'DEL'，waitOFF为1
+              OFFCount: 'unloaded', // 装车或装机后，isDEL为'DEL'，waitOFF为0
+              unActive: 'unActive', // STATUS为'I'
+              preLoad: 'preLoad', // STATUS不为'I'，isDEL不为'del'
+              projectedLoad: 'preLoad',
+              midIn: 'inFlightNO',
+              noCheckInNumber: 'canceled', // isDEL为'DEL'
+              noBSM: 'NOBSM', // 1/0
+              checkInNumber: 'checkInTime',
+              checkNumber: 'securityTime',
+              sortNumber: 'sortTime',
+              loadNumber: 'loadTime',
+              boardID: 'inflTime',
+              checkIns: 'checkInTime',
+              numberOfDestinationArrivals: 'arrivedID', // 1/0
+              uninstalled: 'unloadID', // 1/0
+              loadedQuantity: 'loaded', // 'loadTime'不为空，isDEL不为'DEL'
+              terminateArrivalQuantity: 'destination', // 'arrivedID'为1，transferFlightNO为null
+              numberOfContainers: 'inContainer', // 有容器ID
+              numberOfBulk: 'FBULK' // 容器ID为'FBULK'
+            }
+            Object.assign(query, {
+              flightNO: row.flightNO,
+              flightDate: row.flightDate,
+              fastFilter: reflect[column.property]
+            })
+            break
+          }
+        }
+        switch (this.$route.path.split('/').at(-1)) {
+          case 'departure':
+            Object.assign(query, {
+              departureAirport: this.formData.currentAirport ?? '',
+              landingAirport: row.targetAirport ?? ''
+            })
+            break
+          case 'arrival':
+            Object.assign(query, {
+              departureAirport: row.departureAirport ?? '',
+              landingAirport: this.formData.currentAirport ?? ''
+            })
+            break
+          case 'transferDeparture':
+          case 'transferArrival':
+            Object.assign(query, {
+              departureAirport: row.preAirport ?? '',
+              landingAirport: row.targetAirport ?? ''
+            })
+            break
+          default:
+            break
+        }
+        this.$router.push({
+          path,
+          query
+        })
+      }
+    }
+  }
+}

src/views/newTransfer/mixins/timeZone.js

@@ -0,0 +1,48 @@
+/*
+ * @Author: Badguy
+ * @Date: 2022-05-17 17:04:32
+ * @LastEditTime: 2022-05-27 15:04:44
+ * @LastEditors: your name
+ * @Description: 时区相关
+ * have a nice day!
+ */
+import { timeInZone } from '@/utils/table'
+import { mapGetters } from 'vuex'
+
+export default {
+  computed: {
+    ...mapGetters(['timeZone'])
+  },
+  methods: {
+    // 表格数据格式化
+    tableFormat(row, column, cellValue) {
+      switch (column.property) {
+        case 'arrivalTime':
+        case 'planDepartureTime':
+          return timeInZone((cellValue ?? '').replace('T', ' '), this.timeZone)
+        case 'actualDepartureTime':
+        case 'actualLandingTime':
+          return timeInZone((cellValue ?? '').replace('T', ' '), this.timeZone).replace(' ', '\n')
+        case 'checkInTime':
+        case 'securityTime':
+        case 'sortTime':
+        case 'loadTime':
+        case 'inflTime':
+          return cellValue ? `${timeInZone(cellValue.split(',')[0], this.timeZone)}\n${cellValue.split(',')[1]}` : ''
+        // return `${cellValue ?? ''}\n${getTimeInZone(row['checkInTime'], this.timeZone)}`
+        // case 'DealInfo':
+        //   return `${cellValue ?? ''}\n${getTimeInZone(row['DealTime'], this.timeZone)}`
+        // case 'sortLocationMark':
+        //   return `${cellValue ?? ''}\n${getTimeInZone(row['sortDealTime'], this.timeZone)}`
+        // case 'loadLocationMark':
+        //   return `${cellValue ?? ''}\n${getTimeInZone(row['loadDealTime'], this.timeZone)}`
+        // case 'inflLocationMark':
+        //   return `${cellValue ?? ''}\n${getTimeInZone(row['inflLoadDealTime'], this.timeZone)}`
+        case 'timeDifference':
+          return cellValue <= -120 ? '-2h+' : cellValue >= 120 ? '2h+' : cellValue
+        default:
+          return cellValue ?? ''
+      }
+    }
+  }
+}

src/views/systemSettings/views/newAuth/index.vue

@@ -104,7 +104,7 @@ export default {
       filterText: '',
       treeData: [
         {
-          auth_name: '中小型机场系统',
+          auth_name: '所有权限',
           auth_id: 0,
           children: [],
           up_auth_id: -1
@@ -165,6 +165,7 @@ export default {
         }
       }
       this.$refs['form'].resetFields()
+      this.$refs['dataChild'].clearForm()
     },
     //获取tree数据
     async setTreeData () {
@@ -404,7 +405,7 @@ export default {
       this.$refs['form'].validate(async (valid) => {
         if (valid) {
           const child = this.$refs['dataChild'].form
-          console.log(child)
+          // console.log(child)
           const data = _.merge(child, this.form)
           if (Array.isArray(data.pass_parameters)) {
             data.pass_parameters = data.pass_parameters.join(',')

src/views/systemSettings/views/newMachine/components/table.vue

@@ -245,7 +245,6 @@ export default {
         return type.replace(/\([^\)]*\)/g, "");
       }
     },
-
     //设置表头-下拉-选中数据
     filteredTableData () {
       if (this.isTree) {

src/views/table/index.vue

@@ -11,7 +11,7 @@
       <template v-if="tableData.length || tableCols.length">
         <div style="height: calc(100% - 40px);">
           <el-table v-el-table-infinite-scroll="load" :data="filteredTableData" :summary-method="getSummaries" :span-method="tableSpanMethod" stripe :show-summary="showSummary" border @cell-click="cellClick" :cell-class-name="cellClass" ref="table" :height="tableHeight ? tableHeight : minHeight - 8 + 'vh'" class="table infinite-list" style=" overflow: auto" :style="{width: tableWidth ? tableWidth : '100%'}" @select="selectHandler">
-            <el-table-column v-for="(item, index) in tableColsCopy" :sortable="item.needSort ? true : false" :key="index" :prop="item.columnName" :label="item.columnLabel" :show-overflow-tooltip="showOverflowTooltip">
+            <el-table-column v-for="(item, index) in tableColsCopy" :sortable="item.needSort ? true : false" :key="index" :prop="item.columnName" :label="item.columnLabel" :show-overflow-tooltip="showOverflowTooltip" :formatter="formatter">
               <template #header>
                 <span class="colTips">
                   <el-tooltip :content="item.columnDescribe" placement="top">
@@ -80,8 +80,12 @@
                     <template v-else-if="fromDataType(item.dataType) == 'text'">
                       <el-input size="small" :rows="1" type="textarea" @change="inputChangeHandler(item.columnName)" v-model="tableForm[item.columnName]"></el-input>
                     </template>
+                    <template v-else-if="fromDataType(item.dataType) == 'date'">
+                      <el-date-picker class="datetimes" value-format="yyyy-MM-dd" v-model="tableForm[item.columnName]" type="date" placeholder="选择日期" @change="inputChangeHandler(item.columnName)">
+                      </el-date-picker>
+                    </template>
                     <template v-else-if="fromDataType(item.dataType) == 'datetime'">
-                      <el-date-picker class="datetimes" value-format="yyyy-MM-dd HH:mm:ss" v-model="tableForm[item.columnName]" :rows="1" type="datetime" placeholder="选择日期时间" @change="inputChangeHandler(item.columnName)">
+                      <el-date-picker class="datetimes" value-format="yyyy-MM-dd HH:mm:ss" v-model="tableForm[item.columnName]" type="datetime" placeholder="选择日期时间" @change="inputChangeHandler(item.columnName)">
                       </el-date-picker>
                     </template>
                     <template v-else-if="fromDataType(item.dataType) == 'int' || fromDataType(item.dataType) == 'tinyint'">
@@ -925,6 +929,13 @@ export default {
       if (this.authBtnColName.includes(column.property)) {
         return 'is-click-btn'
       }
+    },
+    formatter(row, column, cellValue, index) {
+      const sameColumn = this.tableCols.find(col => col.columnName === column.property)
+      if (sameColumn && this.fromDataType(sameColumn.dataType) === 'datetime') {
+        return (cellValue ?? '').replace('T', ' ')
+      }
+      return cellValue
     }
   },
 };