浏览代码

Merge branch 'master' of http://120.26.64.82:3000/BFFE/CABaggageData2.0

chenjun 2 年之前
父节点
当前提交
113d47f4d5

+ 23 - 33
public/config.js

@@ -1,19 +1,16 @@
-var PLATFROM_CONFIG = {}
-// PLATFROM_CONFIG.baseNewUrl = "http://192.168.3.74:9006"; //登录前的http请求地址
-// PLATFROM_CONFIG.baseUrl = "http://106.14.243.117:9111"; // 4A-http请求地址
-PLATFROM_CONFIG.baseNewUrl = 'http://10.211.67.177:8043' //登录前的http请求地址
-PLATFROM_CONFIG.baseUrl = 'http://10.211.67.177:8043' // 4A-http请求地址
+var PLATFROM_CONFIG = {};
+PLATFROM_CONFIG.baseNewUrl = "http://192.168.3.74:9006"; //登录前的http请求地址
+PLATFROM_CONFIG.baseUrl = "http://192.168.3.74:18064"; // 4A-http请求地址
 // PLATFROM_CONFIG.baseUrl = "http://10.211.66.25:8074"; // http请求地址
-PLATFROM_CONFIG.appSecret = '9inu7zpllz1folzsljm498dcpi0lsog1' //appSecret
-PLATFROM_CONFIG.appId = 'q7kdjmmaf0kerwpf' //appid
+PLATFROM_CONFIG.appSecret = "9inu7zpllz1folzsljm498dcpi0lsog1"; //appSecret
+PLATFROM_CONFIG.appId = "q7kdjmmaf0kerwpf"; //appid
 // PLATFROM_CONFIG.baseURLCA = "http://106.14.243.117:9114";
 // PLATFROM_CONFIG.baseURLCA = "http://106.14.243.117:8093";
 // PLATFROM_CONFIG.baseURLCA = "http://cssc.free.idcfengye.com";
 // PLATFROM_CONFIG.baseURLCA = "http://192.168.3.17:8080";
 // PLATFROM_CONFIG.baseURLCA = "http://192.168.3.243:8093";
 // PLATFROM_CONFIG.baseURLCA = "http://ts.free.idcfengye.com";
-// PLATFROM_CONFIG.baseURLCA = "http://192.168.3.74:18064"; // 登录后的http请求地址
-PLATFROM_CONFIG.baseURLCA = 'http://10.211.67.177:8043' // 登录后的http请求地址
+PLATFROM_CONFIG.baseURLCA = "http://192.168.3.74:18064"; // 登录后的http请求地址
 
 const DATACONTENT_ID = {
   /***-----登录------***/
@@ -24,13 +21,13 @@ const DATACONTENT_ID = {
   advacedQueryId: 30, //高级查询-数据查询-id
 
   /***-----账号管理------***/
-  accountTableId: 38, //账号管理-首页-列表
+  accountTableId: 78, //账号管理-首页-列表
   accountRoleId: 43, //账号管理-根据id查角色
   accountDetailsId: 45, //账号管理-根据id查详情
 
   /***-----角色管理------***/
-  roleTableId: 41, //角色管理-首页-列表
-  roleDetailsId: 48, //角色管理-根据id查详情
+  roleTableId: 59, //角色管理-首页-列表
+  roleDetailsId: 62, //角色管理-根据id查详情
   roleAuthId: 42, //角色管理-根据id查权限
 
   /***-----权限管理------***/
@@ -49,7 +46,7 @@ const DATACONTENT_ID = {
   sysDataTabId: 5, //系统设置-数据结构-表格-id
   sysDataChildTabId: 9, //系统设置-数据结构-数据项-表格-id
   sysLogTabId: 12, //系统设置-数据结构-数据项-表格-id
-  sysDataEditId: 30, //系统设置-数据结构-数据项-表格-编辑-id
+  sysDataEditId: 57, //系统设置-数据结构-数据项-表格-编辑-id
   sysServiceXyId: 15, //系统设置-服务管理-新增服务-新增数据来源-id
   sysServiceEditId: 23, //系统设置-服务管理-编辑服务-根据id获取服务
   sysServiceTopId: 32, //系统设置-服务管理-服务拓扑-根据id获取拓扑图
@@ -79,33 +76,26 @@ const DATACONTENT_ID = {
   deployNodeId: 54, //基础数据-节点信息维护-获取二级节点(表格)-id
   deployNodeThreeId: 64, //基础数据-节点信息维护-获取三级节点-id
   airlineTableId: 52, //基础数据-航司信息维护-表格-id
-  airportTableId: 57, //基础数据-机场信息维护-表格-id
+  airportTableId: 79, //基础数据-机场信息维护-表格-id
   airportTreeId: 58, //基础数据-机场信息维护-公司列表-id
   bagTableId: 55, //基础数据-特殊行李维护-表格-id
 
   // 数据统计
-  // inOrOutId: 246,//获取进离岗下拉ID
-  // AirlineId: 247,//获取航线下拉ID
-  // AreaId: 248,//获取大区下拉ID
-  // AirportId: 249,//获取航站下拉ID
-  // TerminalId: 250,//获取航站楼下拉ID
-  // byAreaId: 244,//根据大区统计ID
-  // byOtherId: 243,//获取大区以外统计ID
-  inOrOutId: 52, //获取进离岗下拉ID
-  AirlineId: 53, //获取航线下拉ID
-  AreaId: 54, //获取大区下拉ID
-  AirportId: 55, //获取航站下拉ID
-  TerminalId: 56, //获取航站楼下拉ID
-  byAreaId: 50, //根据大区统计ID
-  byOtherId: 63, //获取大区以外统计ID
+  inOrOutId:52,//获取进离岗下拉ID
+  AirlineId:53,//获取航线下拉ID
+  AreaId:70,//获取大区下拉ID
+  AirportId:77,//获取航站下拉ID
+  TerminalId:56,//获取航站楼下拉ID
+  byAreaId:50,//根据大区统计ID
+  byOtherId:63,//获取大区以外统计ID
   baggageStatistics: 73, // 获取行李统计
-  nodeStatistics: 252 // 获取节点统计
-}
+  nodeStatistics: 75 // 获取节点统计
+};
 
 const SERVICE_ID = {
   /***-----账号管理------***/
   accountScId: 17, //账号管理-增删改-id
-  roleScId: 16, //账号管理-角色授权-增删改-id
+  roleScId: 16, //账号管理-增删改-id
 
   /***-----角色管理------***/
   roleMsgId: 14, //角色管理-增删改-id
@@ -120,5 +110,5 @@ const SERVICE_ID = {
   sysServiceEditBoxId: 4, //系统设置-服务管理-编辑服务-部署机器-多选框-id
   sysQueryTabId: 5, //系统设置-查询模板-表格-增删改-id
   sysServiceAddXyId: 10, //系统设置-服务管理-新增服务-新增数据源-提交-id
-  sysDataTabId: 11 //系统设置-数据结构-数据项-表格-增删改-id
-}
+  sysDataTabId: 9, //系统设置-数据结构-数据项-表格-增删改-id
+};

+ 124 - 0
public/config_1.js

@@ -0,0 +1,124 @@
+var PLATFROM_CONFIG = {}
+// PLATFROM_CONFIG.baseNewUrl = "http://192.168.3.74:9006"; //登录前的http请求地址
+// PLATFROM_CONFIG.baseUrl = "http://106.14.243.117:9111"; // 4A-http请求地址
+PLATFROM_CONFIG.baseNewUrl = 'http://10.211.67.177:8043' //登录前的http请求地址
+PLATFROM_CONFIG.baseUrl = 'http://10.211.67.177:8043' // 4A-http请求地址
+// PLATFROM_CONFIG.baseUrl = "http://10.211.66.25:8074"; // http请求地址
+PLATFROM_CONFIG.appSecret = '9inu7zpllz1folzsljm498dcpi0lsog1' //appSecret
+PLATFROM_CONFIG.appId = 'q7kdjmmaf0kerwpf' //appid
+// PLATFROM_CONFIG.baseURLCA = "http://106.14.243.117:9114";
+// PLATFROM_CONFIG.baseURLCA = "http://106.14.243.117:8093";
+// PLATFROM_CONFIG.baseURLCA = "http://cssc.free.idcfengye.com";
+// PLATFROM_CONFIG.baseURLCA = "http://192.168.3.17:8080";
+// PLATFROM_CONFIG.baseURLCA = "http://192.168.3.243:8093";
+// PLATFROM_CONFIG.baseURLCA = "http://ts.free.idcfengye.com";
+PLATFROM_CONFIG.baseURLCA = "http://192.168.3.74:18064"; // 登录后的http请求地址
+// PLATFROM_CONFIG.baseURLCA = 'http://10.211.67.177:8043' // 登录后的http请求地址
+
+const DATACONTENT_ID = {
+  /***-----登录------***/
+  loginId: 36, //登录-获取权限-id
+
+  /***-----高级查询------***/
+  baggageTypeId: 86, //高级查询-特殊行李类型下拉选项查询-id
+  advacedQueryId: 30, //高级查询-数据查询-id
+
+  /***-----账号管理------***/
+  accountTableId: 38, //账号管理-首页-列表
+  accountRoleId: 43, //账号管理-根据id查角色
+  accountDetailsId: 45, //账号管理-根据id查详情
+
+  /***-----角色管理------***/
+  roleTableId: 41, //角色管理-首页-列表
+  roleDetailsId: 48, //角色管理-根据id查详情
+  roleAuthId: 42, //角色管理-根据id查权限
+
+  /***-----权限管理------***/
+  authTreeId: 40, //权限管理-权限树
+
+  /***-----系统设置------***/
+  sysSourceId: 13, //系统设置-数据源-id
+  sysProtoTabId: 1, //系统设置-协议管理-表格-id
+  sysServiceTabId: 2, //系统设置-服务管理-表格-id
+  sysServiceOutTabId: 7, //系统设置-服务管理-编辑-输出-表格-id
+  sysServiceJqTabId: 3, //系统设置-服务管理-编辑-部署机器-表格-id
+  sysQueryTabId: 4, //系统设置-查询模板-表格-id
+  sysQueryEditId: 24, //系统设置-查询模板-编辑-根据id获取服务
+  sysQueryChildTabId: 25, //系统设置-查询模板-列设置-表格-id
+  sysQueryChildEditTabId: 26, //系统设置-查询模板-列设置-表格-编辑-id
+  sysDataTabId: 5, //系统设置-数据结构-表格-id
+  sysDataChildTabId: 9, //系统设置-数据结构-数据项-表格-id
+  sysLogTabId: 12, //系统设置-数据结构-数据项-表格-id
+  sysDataEditId: 30, //系统设置-数据结构-数据项-表格-编辑-id
+  sysServiceXyId: 15, //系统设置-服务管理-新增服务-新增数据来源-id
+  sysServiceEditId: 23, //系统设置-服务管理-编辑服务-根据id获取服务
+  sysServiceTopId: 32, //系统设置-服务管理-服务拓扑-根据id获取拓扑图
+  sysServiceTopTableId: 31, //系统设置-服务管理-服务拓扑-查看日志id
+
+  /***-----进港管理------***/
+  arrivalAirId: 67, //进港管理-机场选择-id
+  arrivalTableId: 38, //进港管理-表格-id
+
+  /***-----离港管理------***/
+  departureAirMainId: 65, //离港管理-机场选择-id
+  departureTableMainId: 66, //离港管理-表格-id
+
+  /***-----离港管理===>中转进港------***/
+  departureAirId: 72, //离港管理-机场选择-id
+  departureAviJoinId: 71, //离港管理-进港承运航司-id
+  departureAviLeaveId: 74, //离港管理-离港承运航司-id
+  departureTableId: 69, //离港管理-表格-id
+
+  /***-----离港管理===>中转离港------***/
+  departureAirLtId: 72, //离港管理-机场选择-id
+  departureAviJoinLtId: 71, //离港管理-进港承运航司-id
+  departureAviLeaveLtId: 74, //离港管理-离港承运航司-id
+  departureTableLtId: 68, //离港管理-表格-id
+
+  /***-----基础数据------***/
+  deployNodeId: 54, //基础数据-节点信息维护-获取二级节点(表格)-id
+  deployNodeThreeId: 64, //基础数据-节点信息维护-获取三级节点-id
+  airlineTableId: 52, //基础数据-航司信息维护-表格-id
+  airportTableId: 57, //基础数据-机场信息维护-表格-id
+  airportTreeId: 58, //基础数据-机场信息维护-公司列表-id
+  bagTableId: 55, //基础数据-特殊行李维护-表格-id
+
+  // 数据统计
+  // inOrOutId: 246,//获取进离岗下拉ID
+  // AirlineId: 247,//获取航线下拉ID
+  // AreaId: 248,//获取大区下拉ID
+  // AirportId: 249,//获取航站下拉ID
+  // TerminalId: 250,//获取航站楼下拉ID
+  // byAreaId: 244,//根据大区统计ID
+  // byOtherId: 243,//获取大区以外统计ID
+  inOrOutId: 52, //获取进离岗下拉ID
+  AirlineId: 53, //获取航线下拉ID
+  AreaId: 54, //获取大区下拉ID
+  AirportId: 55, //获取航站下拉ID
+  TerminalId: 56, //获取航站楼下拉ID
+  byAreaId: 50, //根据大区统计ID
+  byOtherId: 63, //获取大区以外统计ID
+  baggageStatistics: 73, // 获取行李统计
+  nodeStatistics: 252 // 获取节点统计
+}
+
+const SERVICE_ID = {
+  /***-----账号管理------***/
+  accountScId: 17, //账号管理-增删改-id
+  roleScId: 16, //账号管理-角色授权-增删改-id
+
+  /***-----角色管理------***/
+  roleMsgId: 14, //角色管理-增删改-id
+  roleMsgTreeId: 15, //角色管理-权限树-增删改-id
+  roleMsgAuthId: 20, //角色管理-权限树规则-增删改-id
+
+  /***-----权限项管理------***/
+  authScId: 13, //权限项管理-增删改-id
+
+  sysProtoTabId: 1, //系统设置-协议管理-表格-增删改-id
+  sysServiceAddId: 3, //系统设置-服务管理-新增服务-提交-id/服务管理-编辑服务-保存-id
+  sysServiceEditBoxId: 4, //系统设置-服务管理-编辑服务-部署机器-多选框-id
+  sysQueryTabId: 5, //系统设置-查询模板-表格-增删改-id
+  sysServiceAddXyId: 10, //系统设置-服务管理-新增服务-新增数据源-提交-id
+  sysDataTabId: 11 //系统设置-数据结构-数据项-表格-增删改-id
+}

+ 266 - 87
src/components/Table/index.vue

@@ -1,25 +1,68 @@
 <template>
   <div class="data-table" :style="{ marginTop: marginTop }">
-    <div :style="dataTableContentStyle" v-loading="loading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.8)" class="data-table-content">
+    <div
+      :style="dataTableContentStyle"
+      v-loading="loading"
+      element-loading-text="拼命加载中"
+      element-loading-spinner="el-icon-loading"
+      element-loading-background="rgba(0, 0, 0, 0.8)"
+      class="data-table-content"
+    >
       <div :class="isStatus ? 'flex' : 'flex-end'" class="data-table-btn">
         <div v-if="isStatus" class="vStatus">
           <slot name="header" />
         </div>
-        <el-button v-if="isBtn" size="small" @click="handleAdd" plain type="primary">新增</el-button>
+        <el-button
+          v-if="isBtn"
+          size="small"
+          @click="handleAdd"
+          plain
+          type="primary"
+          >新增</el-button
+        >
       </div>
       <template v-if="tableData.length">
         <div>
-          <el-table v-el-table-infinite-scroll="load" :data="filteredTableData" :summary-method="getSummaries" :span-method="tableSpanMethod" 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-if="selectionEnable" type="selection" width="35" />
+          <el-table
+            v-el-table-infinite-scroll="load"
+            :data="filteredTableData"
+            :summary-method="getSummaries"
+            :span-method="tableSpanMethod"
+            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-if="selectionEnable"
+              type="selection"
+              width="35"
+            />
             <el-table-column v-if="isStatus" width="55">
               <template slot-scope="scope">
                 <div class="tableStatus">
-                  <div v-if="filteredTableData[scope.$index].runState == '运行'" class="status0"><span class="icon"></span></div>
+                  <div
+                    v-if="filteredTableData[scope.$index].runState == '运行'"
+                    class="status0"
+                  >
+                    <span class="icon"></span>
+                  </div>
                   <div v-else class="status1"><span class="icon"></span></div>
                 </div>
               </template>
             </el-table-column>
-            <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"
+            >
               <template #header>
                 <span class="colTips">
                   <el-tooltip :content="item.columnDescribe" placement="top">
@@ -27,18 +70,38 @@
                   </el-tooltip>
                 </span>
                 <span v-if="item.needFilters">
-                  <el-popover placement="bottom" trigger="click" @show="popoverShowHandler(item.columnName)" @hide="popoverHideHandler">
-                    <i slot="reference" :class="[
+                  <el-popover
+                    placement="bottom"
+                    trigger="click"
+                    @show="popoverShowHandler(item.columnName)"
+                    @hide="popoverHideHandler"
+                  >
+                    <i
+                      slot="reference"
+                      :class="[
                         'filter-arrow',
                         'el-icon-arrow-down',
                         arrowClass(item.columnName),
-                      ]" />
+                      ]"
+                    />
                     <el-form>
                       <el-form-item :label="item.columnLabel">
-                        <el-select v-model="filterValues[item.columnName]" size="small" placeholder="筛选" default-first-option filterable clearable>
-                          <el-option v-for="(option, optionIndex) in tableDataFilters[
+                        <el-select
+                          v-model="filterValues[item.columnName]"
+                          size="small"
+                          placeholder="筛选"
+                          default-first-option
+                          filterable
+                          clearable
+                        >
+                          <el-option
+                            v-for="(option, optionIndex) in tableDataFilters[
                               item.columnName
-                            ]" :key="option.value + optionIndex" :value="option.value" :label="option.text" />
+                            ]"
+                            :key="option.value + optionIndex"
+                            :value="option.value"
+                            :label="option.text"
+                          />
                         </el-select>
                       </el-form-item>
                     </el-form>
@@ -51,17 +114,77 @@
                 <div class="hd-td">
                   <div class="hd-tr">
                     <template v-if="isStatus">
-                      <el-button type="text" @click="handleLook(scope.row)" size="small" class="rmScs">查看</el-button>
-                      <el-button type="text" v-if="scope.row.runState == '停止'" @click="chanheState(scope.row)" size="small" class="rmScs">启动</el-button>
-                      <el-button type="text" v-if="scope.row.runState == '运行'" @click="chanheState(scope.row)" size="small" class="rmScs">停止</el-button>
+                      <el-button
+                        type="text"
+                        @click="handleLook(scope.row)"
+                        size="small"
+                        class="rmScs"
+                        >查看</el-button
+                      >
+                      <el-button
+                        type="text"
+                        v-if="scope.row.runState == '停止'"
+                        @click="chanheState(scope.row)"
+                        size="small"
+                        class="rmScs"
+                        >启动</el-button
+                      >
+                      <el-button
+                        type="text"
+                        v-if="scope.row.runState == '运行'"
+                        @click="chanheState(scope.row)"
+                        size="small"
+                        class="rmScs"
+                        >停止</el-button
+                      >
                     </template>
                     <!-- <el-button class="hrefBtn" type="text" @click="handleHerf(scope.row)" size="small">跳转</el-button> -->
-                    <el-button type="text" @click="handleEdit(scope.row)" size="small" class="rmScs">编辑</el-button>
-                    <el-button class="rmSc" type="text" @click="handleRemove(scope.row)" size="small">删除</el-button>
-                    <el-button class="rmScs" v-if="withColumnSet" type="text" size="small" @click="handleColumnSet(scope.row)">列设置</el-button>
-                    <el-button class="rmScs" v-if="withItemSet" type="text" size="small" @click="handleItemSet(scope.row)">数据项</el-button>
-                    <el-button class="rmScser" v-if="withlodSet" type="text" size="small" @click="handlelodSet(scope.row)">航站设置</el-button>
-                    <el-button class="rmScser" v-if="withnodeSet" type="text" size="small" @click="handlenodeSet(scope.row)">节点设置</el-button>
+                    <el-button
+                      type="text"
+                      @click="handleEdit(scope.row)"
+                      size="small"
+                      class="rmScs"
+                      >编辑</el-button
+                    >
+                    <el-button
+                      class="rmSc"
+                      type="text"
+                      @click="handleRemove(scope.row)"
+                      size="small"
+                      >删除</el-button
+                    >
+                    <el-button
+                      class="rmScs"
+                      v-if="withColumnSet"
+                      type="text"
+                      size="small"
+                      @click="handleColumnSet(scope.row)"
+                      >列设置</el-button
+                    >
+                    <el-button
+                      class="rmScs"
+                      v-if="withItemSet"
+                      type="text"
+                      size="small"
+                      @click="handleItemSet(scope.row)"
+                      >数据项</el-button
+                    >
+                    <el-button
+                      class="rmScser"
+                      v-if="withlodSet"
+                      type="text"
+                      size="small"
+                      @click="handlelodSet(scope.row)"
+                      >航站设置</el-button
+                    >
+                    <el-button
+                      class="rmScser"
+                      v-if="withnodeSet"
+                      type="text"
+                      size="small"
+                      @click="handlenodeSet(scope.row)"
+                      >节点设置</el-button
+                    >
                   </div>
                 </div>
               </template>
@@ -80,16 +203,38 @@
         <div class="dialog-content">
           <div class="title">{{ tableTitle }}</div>
           <div class="content">
-            <el-form ref="ruleForm" :model="tableForm" :label-width="labelWidth">
+            <el-form
+              ref="ruleForm"
+              :model="tableForm"
+              :label-width="labelWidth"
+            >
               <el-row :gutter="20">
-                <el-col v-for="(item, index) in tableColsCopy" :key="index" :span="rows">
+                <el-col
+                  v-for="(item, index) in tableColsCopy"
+                  :key="index"
+                  :span="rows"
+                >
                   <el-form-item :label="item.columnLabel">
-                    <template v-if="
+                    <template
+                      v-if="
                         item.listqueryTemplateID ||
                         item.listqueryTemplateID == 0
-                      ">
-                      <el-select size="small" clearable style="width: 100%" v-model="tableForm[item.columnName]" @change="changeSelect(item.columnName)" placeholder="请选择">
-                        <el-option v-for="item in tableOptions[item.columnName]" :key="item.v" :label="item.k" :value="item.v">
+                      "
+                    >
+                      <el-select
+                        size="small"
+                        clearable
+                        style="width: 100%"
+                        v-model="tableForm[item.columnName]"
+                        @change="changeSelect(item.columnName)"
+                        placeholder="请选择"
+                      >
+                        <el-option
+                          v-for="item in tableOptions[item.columnName]"
+                          :key="item.v"
+                          :label="item.k"
+                          :value="item.v"
+                        >
                         </el-option>
                       </el-select>
                     </template>
@@ -97,7 +242,11 @@
                       <el-input size="small" :rows="1" type="textarea" v-model="tableForm[item.columnName]"></el-input>
                     </template> -->
                     <template v-else>
-                      <el-input size="small" v-model="tableForm[item.columnName]" @change="inputChangeHandler(item.columnName)"></el-input>
+                      <el-input
+                        size="small"
+                        v-model="tableForm[item.columnName]"
+                        @change="inputChangeHandler(item.columnName)"
+                      ></el-input>
                     </template>
                   </el-form-item>
                 </el-col>
@@ -105,7 +254,13 @@
             </el-form>
           </div>
           <div class="foot right t30">
-            <el-button size="medium" @click="handleOk" class="r24" type="primary">确定</el-button>
+            <el-button
+              size="medium"
+              @click="handleOk"
+              class="r24"
+              type="primary"
+              >确定</el-button
+            >
             <el-button @click="flag = false" size="medium">取消</el-button>
           </div>
         </div>
@@ -114,11 +269,20 @@
         <div class="airportInfoDialog">
           <div class="title del-title">删除</div>
           <div class="content del-content">
-            <span class="el-icon-error error r10"></span>您是否确认删除<span class="error l10">{{ rmTitle }}</span>
+            <span class="el-icon-error error r10"></span>您是否确认删除<span
+              class="error l10"
+              >{{ rmTitle }}</span
+            >
           </div>
           <div class="foot right Delfoot t30">
-            <el-button size="medium" class="r24" @click="tableRemove" type="danger">删除</el-button>
+            <el-button
+              size="medium"
+              class="r24"
+              @click="tableRemove"
+              type="danger"
+              >删除</el-button
+            >
             <el-button size="medium" @click="rmFlag = false">取消</el-button>
           </div>
         </div>
@@ -131,7 +295,12 @@
 import { setTableFilters } from "@/utils/table";
 import Dialog from "@/layout/components/Dialog/index.vue";
 import NoData from "@/components/nodata";
-import { Query, GeneralDataReception, Start, Stop } from "@/api/dataIntegration";
+import {
+  Query,
+  GeneralDataReception,
+  Start,
+  Stop,
+} from "@/api/dataIntegration";
 export default {
   name: "DataTable",
   props: {
@@ -234,10 +403,10 @@ export default {
     fixedWidth: {
       type: String,
       default: "180px",
-    }
+    },
   },
   components: { Dialog, NoData },
-  data () {
+  data() {
     return {
       loading: false,
       flag: false,
@@ -267,7 +436,7 @@ export default {
     };
   },
   computed: {
-    dataTableContentStyle () {
+    dataTableContentStyle() {
       const style = {};
       if (this.minHeight) {
         style["min-height"] = this.minHeight;
@@ -278,7 +447,7 @@ export default {
       return style;
     },
     //设置表头-下拉-箭头样式
-    arrowClass () {
+    arrowClass() {
       return function (prop) {
         let classString = "";
         if (this.colShowFilter === prop) {
@@ -295,7 +464,7 @@ export default {
       };
     },
     //设置表头-下拉-选中数据
-    filteredTableData () {
+    filteredTableData() {
       return this.tableData.filter((item) => {
         let flag = true;
         Object.entries(this.filterValues).forEach(([key, value]) => {
@@ -309,7 +478,7 @@ export default {
   },
   watch: {
     dataContent: {
-      handler (val) {
+      handler(val) {
         if (val) {
           console.log(val);
           if (val.companyID) {
@@ -320,27 +489,37 @@ export default {
       },
       deep: true,
     },
+    //监听机场变更的id  不可删除
+    dataId: {
+      if(val) {
+        console.log(val);
+        if (val.companyID) {
+          this.resetTable();
+          this.getQuery();
+        }
+      },
+    },
   },
-  mounted () {
+  mounted() {
     this.getQuery();
   },
-  updated () {
+  updated() {
     this.$refs["table"]?.doLayout();
   },
   methods: {
-    load () {
+    load() {
       // console.log("分页");
       if (this.noMore || this.loading) {
         return;
       }
       this.getQuery();
     },
-    resetTable () {
+    resetTable() {
       this.page = 0;
       this.noMore = false;
       this.tableData = [];
     },
-    changeSelect (data) {
+    changeSelect(data) {
       if (this.tableForm[data] === "") {
         this.tableForm[data] = null;
       }
@@ -348,13 +527,13 @@ export default {
         this.tableForm[data];
       // console.log(this.tableForm)
     },
-    inputChangeHandler (data) {
+    inputChangeHandler(data) {
       if (this.tableForm[data] === "") {
         this.tableForm[data] = null;
       }
     },
     //获取表格数据
-    async getQuery () {
+    async getQuery() {
       try {
         this.loading = true;
         const { code, returnData } = await Query({
@@ -393,7 +572,7 @@ export default {
       }
     },
     //表格-增/删/改
-    async generalDataReception (data) {
+    async generalDataReception(data) {
       try {
         data = {
           ...data,
@@ -427,17 +606,17 @@ export default {
       }
     },
     // 表格勾选
-    toggleRowSelection (row, isSelected) {
+    toggleRowSelection(row, isSelected) {
       this.$refs["table"].toggleRowSelection(row, isSelected);
     },
     // 表格初始勾选
-    selectTableRows (tableData, selectFlagName) {
+    selectTableRows(tableData, selectFlagName) {
       tableData.forEach((row) => {
         this.$refs["table"].toggleRowSelection(row, !!row[selectFlagName]);
       });
     },
     //初始化表格
-    initTableData () {
+    initTableData() {
       this.tableColsCopy = this.tableCols.filter((item) => item.needShow);
       // console.log(this.tableColsCopy);
       // debugger;
@@ -466,7 +645,7 @@ export default {
       // this.getSelectDataAll(reqUts)
     },
     //获取所有获取弹框-下拉数据-请求状态
-    getSelectDataAll (reqUts) {
+    getSelectDataAll(reqUts) {
       Promise.all(reqUts)
         .then((res) => {
           this.proAll = true;
@@ -476,7 +655,7 @@ export default {
         });
     },
     //获取弹框-下拉数据
-    async getSelectData (id) {
+    async getSelectData(id) {
       const { code, returnData } = await Query({
         id,
         dataContent: [],
@@ -488,7 +667,7 @@ export default {
       }
     },
     //重组table-显示名称
-    setTable () {
+    setTable() {
       this.tableArrs.forEach((item) => {
         this.tableOptions[item].forEach((p) => {
           this.tableDataCopy.forEach((msg) => {
@@ -507,7 +686,7 @@ export default {
       this.tableData = this.tableDataCopy;
     },
     //分组
-    tableGroup (tableData) {
+    tableGroup(tableData) {
       const spanArr = [];
       let pos = 0;
       let ifYj = this.tableGroups[0];
@@ -527,14 +706,14 @@ export default {
       this.spanArr = spanArr;
       this.pos = pos;
     },
-    popoverShowHandler (prop) {
+    popoverShowHandler(prop) {
       this.colShowFilter = prop;
     },
-    popoverHideHandler () {
+    popoverHideHandler() {
       this.colShowFilter = "";
     },
     //分组
-    tableSpanMethod ({ row, column, rowIndex, columnIndex }) {
+    tableSpanMethod({ row, column, rowIndex, columnIndex }) {
       if (this.tableGroups.includes(column["property"])) {
         const _row = this.spanArr[rowIndex];
         const _col = _row > 0 ? 1 : 0;
@@ -545,7 +724,7 @@ export default {
       }
     },
     //合计
-    getSummaries (param) {
+    getSummaries(param) {
       const { columns, data } = param;
       const sums = [];
       columns.forEach((column, index) => {
@@ -569,15 +748,15 @@ export default {
       return sums;
     },
     //弹框-确定
-    handleOk () {
+    handleOk() {
       this.submitClickHandler();
     },
     //滚动
-    tableLoad () {
+    tableLoad() {
       console.log("d");
     },
     //表格-新增
-    handleAdd () {
+    handleAdd() {
       // this.flag = true;
       //   this.tableType = "add";
       //   this.tableTitle = "新增";
@@ -613,7 +792,7 @@ export default {
       // console.log(this.tableOptions);
     },
     //表格-编辑
-    async handleEdit (row) {
+    async handleEdit(row) {
       if (this.isDialog) {
         if (this.editId) {
           let data = await this.queryOriginRow(
@@ -653,7 +832,7 @@ export default {
         this.$emit("handleEdit", row);
       }
     },
-    async queryOriginRow (editId, queryTemplateColumnSetID) {
+    async queryOriginRow(editId, queryTemplateColumnSetID) {
       try {
         const { code, returnData } = await Query({
           id: editId,
@@ -669,11 +848,11 @@ export default {
       }
     },
     //表格-跳转
-    handleHerf (row) {
+    handleHerf(row) {
       alert("跳转");
     },
     // 新增/编辑-确认
-    submitClickHandler () {
+    submitClickHandler() {
       this.$refs["ruleForm"].validate((valid) => {
         if (valid) {
           if (this.tableType == "add") {
@@ -688,19 +867,19 @@ export default {
       });
     },
     //表格-删除
-    handleRemove (row) {
+    handleRemove(row) {
       this.rmFlag = true;
       // this.rmTitle = row.className || row.username || row.serviceName || row.queryTemplateName;
       this.rmTitle = row[this.rowTitle];
       this.tableObj = row;
     },
     //表格-删除-确认
-    tableRemove () {
+    tableRemove() {
       this.tableObj.event = 3;
       this.generalDataReception(this.tableObj);
     },
     // 表格-跳转列设置页
-    handleColumnSet (row) {
+    handleColumnSet(row) {
       this.$router.push({
         path: "/systemSettings/queryTemplateChild",
         query: {
@@ -709,7 +888,7 @@ export default {
       });
     },
     // 表格-跳转数据项设置页
-    handleItemSet (row) {
+    handleItemSet(row) {
       this.$router.push({
         path: "/systemSettings/datastructureChild",
         query: {
@@ -718,7 +897,7 @@ export default {
       });
     },
     // 表格-跳转航站设置页
-    handlelodSet (row) {
+    handlelodSet(row) {
       this.$router.push({
         path: "/BasicsData/airportInfoChild",
         query: {
@@ -727,7 +906,7 @@ export default {
       });
     },
     // 表格-节点置页
-    handlenodeSet (row) {
+    handlenodeSet(row) {
       this.$router.push({
         path: "/BasicsData/deployNodeChild",
         query: {
@@ -736,48 +915,48 @@ export default {
       });
     },
     // 表格-查看
-    handleLook (row) {
+    handleLook(row) {
       this.$router.push({
-        name: 'serviceTopology',
+        name: "serviceTopology",
         params: {
           serviceID: row.serviceID,
-          serviceName: row.serviceName
+          serviceName: row.serviceName,
         },
       });
     },
     // 表格-启动/停止
-    async chanheState (row) {
-      const runState = row.runState == '运行' ? 0 : 1
-      const serviceID = row.serviceID
-      this.changeBtn(runState, serviceID)
+    async chanheState(row) {
+      const runState = row.runState == "运行" ? 0 : 1;
+      const serviceID = row.serviceID;
+      this.changeBtn(runState, serviceID);
     },
     // 表格-选中行
-    selectHandler (selection, row) {
+    selectHandler(selection, row) {
       this.$emit("selection-change", selection, row);
     },
-    async changeBtn (state, id) {
-      let res = null
+    async changeBtn(state, id) {
+      let res = null;
       // const { code, message } = await GeneralDataReception({
       //   serviceId: 61,
       //   dataContent: JSON.stringify(obj)
       // })
       if (state) {
         res = await Start({
-          serviceId: id
-        })
+          serviceId: id,
+        });
       } else {
         res = await Stop({
-          serviceId: id
-        })
+          serviceId: id,
+        });
       }
       if (res.code == 0) {
-        this.$message.success(res.message)
+        this.$message.success(res.message);
         this.resetTable();
         this.getQuery();
       } else {
-        this.$message.error(res.message)
+        this.$message.error(res.message);
       }
-    }
+    },
   },
 };
 </script>

+ 6 - 6
src/components/permissiontree/index.vue

@@ -3,26 +3,26 @@
     <!-- 权限树 -->
     <div class="cont">
       <div class="paren_header">
-        <p>{{ title }}</p>
+        <p class="manageTitle">{{ title }}</p>
       </div>
       <div class="paren_type">
         <ul>
-          <li>
+          <!-- <li>
             <div class="log"></div>
             <p>时效规则有</p>
-          </li>
-          <li>
+          </li> -->
+          <li class="icon-gz">
             <div class="log"></div>
             <p>数据规则有</p>
           </li>
-          <li>
+          <!-- <li>
             <div class="log"></div>
             <p>显示及编辑权限</p>
           </li>
           <li>
             <div class="log"></div>
             <p>显示权限</p>
-          </li>
+          </li> -->
         </ul>
       </div>
       <!-- <div class="paren_list">

+ 8 - 8
src/components/permissiontree/index3.vue → src/components/permissiontree/index2.vue

@@ -3,26 +3,26 @@
     <!-- 权限树 -->
     <div class="cont">
       <div class="paren_header">
-        <p>{{ title }}</p>
+        <p class="manageTitle">{{ title }}</p>
       </div>
       <div class="paren_type">
         <ul>
-          <li>
+          <!-- <li>
             <div class="log"></div>
             <p>时效规则有</p>
-          </li>
-          <li>
+          </li> -->
+          <li class="icon-gz">
             <div class="log"></div>
             <p>数据规则有</p>
           </li>
-          <li>
+          <!-- <li>
             <div class="log"></div>
             <p>显示及编辑权限</p>
           </li>
           <li>
             <div class="log"></div>
             <p>显示权限</p>
-          </li>
+          </li> -->
         </ul>
       </div>
       <div class="paren_cont">
@@ -184,8 +184,8 @@ export default {
       const arr = this.$store.getters.authArrs;
       arr.push(data);
       const datas = _.unionBy(arr, "auth_id");
-      // const newDatas = _.cloneDeep(datas);
-      // this.$store.dispatch("auth/changeAuthMsg", newDatas);
+      const newDatas = _.cloneDeep(datas);
+      this.$store.dispatch("auth/changeAuthMsg", newDatas);
       this.$store.dispatch("auth/changeAuthArrs", datas);
       this.$store.dispatch("auth/changeAuthId", data.auth_id);
     }

+ 27 - 20
src/components/permissiontree/permissiontree.scss

@@ -34,6 +34,7 @@
         margin-top: 0;
         margin-bottom: 0;
         padding-left: 0;
+        line-height: 16px;
         > li {
           display: flex;
           align-items: center;
@@ -52,30 +53,36 @@
             margin-top: 0;
           }
         }
-        > li:nth-child(1) {
-          > .log {
-            background: url('../../assets/index/ic_time.png') no-repeat;
-            background-size: 100% 100%;
-          }
-        }
-        > li:nth-child(2) {
-          > .log {
+        .icon-gz {
+          .log {
             background: url('../../assets/index/ic_date.png') no-repeat;
             background-size: 100% 100%;
           }
         }
-        > li:nth-child(3) {
-          > .log {
-            background: url('../../assets/index/ic_display_edit.png') no-repeat;
-            background-size: 100% 100%;
-          }
-        }
-        > li:nth-child(4) {
-          > .log {
-            background: url('../../assets/index/ic_display.png') no-repeat;
-            background-size: 100% 100%;
-          }
-        }
+        // > li:nth-child(1) {
+        //   > .log {
+        //     background: url('../../assets/index/ic_time.png') no-repeat;
+        //     background-size: 100% 100%;
+        //   }
+        // }
+        // > li:nth-child(2) {
+        //   > .log {
+        //     background: url('../../assets/index/ic_date.png') no-repeat;
+        //     background-size: 100% 100%;
+        //   }
+        // }
+        // > li:nth-child(3) {
+        //   > .log {
+        //     background: url('../../assets/index/ic_display_edit.png') no-repeat;
+        //     background-size: 100% 100%;
+        //   }
+        // }
+        // > li:nth-child(4) {
+        //   > .log {
+        //     background: url('../../assets/index/ic_display.png') no-repeat;
+        //     background-size: 100% 100%;
+        //   }
+        // }
       }
     }
     > .paren_list {

+ 0 - 1
src/components/rulesofcompetency/index.vue

@@ -138,7 +138,6 @@ export default {
     },
     form: {
       handler () {
-        console.log('ddd')
         this.getData();
       },
       deep: true,

+ 8 - 15
src/components/rulesofcompetency/index2.vue

@@ -64,7 +64,8 @@ export default {
         QueryCol: null,
         QueryRow: null,
       },
-      newForm: {}
+      newForm: {},
+      formDatas: []
     };
   },
   watch: {
@@ -73,12 +74,10 @@ export default {
         const id = this.$store.getters.authId
         const arr = this.$store.getters.authMsg
         const obj = arr.filter((item) => item.auth_id === id)[0]
-        // console.log(obj)
         if (obj) {
           console.log(obj)
-          // this.setFormData(obj)
         } else {
-          console.log('ddd')
+          console.log('清除输入框')
           this.clearFormData()
         }
       },
@@ -119,18 +118,12 @@ export default {
       this.form = data
     },
     getForm () {
-      console.log('xxx')
       const id = this.$store.getters.authId
-      if (id) {
-        const arr = this.$store.getters.authMsg
-        this.form.auth_id = id
-        arr.push(this.form)
-        const datas = _.unionBy(arr, "auth_id")
-        console.log(arr)
-        this.$store.dispatch("auth/changeAuthMsg", datas)
-      } else {
-        this.$message.error('请选中要授权的数据后再添加规则')
-      }
+      const arr = this.$store.getters.authMsg
+      this.form.auth_id = id
+      this.formDatas.push(this.form)
+      console.log(arr)
+      console.log(this.formDatas[this.formDatas.length - 1])
     }
   },
 };

+ 2 - 2
src/layout/index.vue

@@ -152,9 +152,9 @@ export default {
       try {
         const res = await changePassword({
           username: this.name,
-          originPassword: this.dataForm.old,
+          originPassword: MD5(this.dataForm.old),
           // passwd: MD5(this.dataForm.again),
-          newPassword: this.dataForm.again,
+          newPassword: MD5(this.dataForm.again),
         });
         if (res.code == 0) {
           this.$message.success(res.message);

+ 2 - 1
src/router/routes/routes-file-one.js

@@ -10,11 +10,12 @@ const BasicsDataRoutes = {
       component: () => import('@/views/BasicsData/index'),
       meta: { title: '基础数据', icon: 'BasicsData', imgstyle: 'ic_setting_nav_default.png', imgstyleup: 'ic_setting_nav_check.png' },
       children: [
+        // 权限airline_information_page导致航司信息维护不显示
         {
           path: '/BasicsData',
           name: 'airlineCompanyInfo',
           component: () => import('@/views/BasicsData/views/airlineCompany/airlineCompanyInfo'),
-          meta: { title: '航司信息维护', roles: ['airline_information_page'] },
+          meta: { title: '航司信息维护' },
           hidden: true,
           src: require('@/assets/nav/ic_data_top_default @2x.png'),
           srcer: require('@/assets/nav/ic_data_top_check@2x.png')

+ 1 - 0
src/views/accountManagement/components/accountHome.vue

@@ -200,6 +200,7 @@ export default {
     // 编辑账号
     async saveEditAccount () {
       try {
+        this.ruleForm.user_pwd = MD5(this.ruleForm.user_pwd)
         const res = await GeneralDataReception({
           serviceId: SERVICE_ID.accountScId,
           dataContent: JSON.stringify(this.ruleForm)

+ 2 - 2
src/views/advancedQuery/views/advancedHome.vue

@@ -80,7 +80,6 @@
         :row-class-name="tableRowClassName"
         :cell-class-name="cellClass"
         :span-method="objectSpanMethod"
-        :formatter="tableFormat"
         @cell-click="cellClickHandler"
       >
         <el-table-column
@@ -90,6 +89,7 @@
           :label="col.label"
           :width="col.width"
           :fixed="col.fixed"
+          :formatter="tableFormat"
         >
           <template #header>
             <TableHeaderCell
@@ -926,7 +926,7 @@ export default {
         case 'deleted':
           return cellValue === 'DEL' ? cellValue : ''
         case 'activated':
-          return cellValue === 'I' ? '未激活' : '激活'
+          return cellValue === 1 ? '激活' : '未激活'
         default:
           return cellValue ?? ''
       }

+ 4 - 4
src/views/authorityManagement/components/authorityRoleEdit.vue

@@ -22,9 +22,9 @@
                 <el-radio v-model="radio" :label="0">否</el-radio>
               </span>
             </div> -->
-            <div class="btn">
+            <!-- <div class="btn">
               <el-button @click="saveBtn('form')" size="small" type="primary">保存</el-button>
-            </div>
+            </div> -->
           </div>
           <div class="addApp-form-content dialog-public-background">
             <el-form :inline="true" label-width="80px" ref="form" :rules="rules" class="form" :model="form">
@@ -205,9 +205,9 @@ export default {
             this.authTo = listValues[0];
             listValues.forEach((item) => {
               const obj = item
-              obj.auth_id = item.AuthId
+              obj.auth_id = item.auth_id
               this.checkedBoxs.push(item)
-              this.checkedKeys.push(item.AuthId)
+              this.checkedKeys.push(item.auth_id)
             });
             // this.msgArrs.push([])
           }

+ 3 - 1
src/views/baggageManagement/components/arrival/index.vue

@@ -190,6 +190,7 @@
             :prop="childCol.prop"
             :label="childCol.label"
             :width="childCol.width"
+            :formatter="tableFormat"
           >
             <template #header>
               <el-tooltip
@@ -254,6 +255,7 @@ import TimeZoneSelector from '@/components/TimeZoneSelector'
 import terminalMixin from '../../mixins/terminal'
 import formMixin from '../../mixins/form'
 import tableColsMixin from '../../mixins/tableCols'
+import timeZoneMixin from '../../mixins/timeZone'
 import { getQuery } from '@/api/flight'
 import TableHeaderCell from '@/components/TableHeaderCell'
 import { setTableFilters } from '@/utils/table'
@@ -261,7 +263,7 @@ import { setTableFilters } from '@/utils/table'
 export default {
   name: 'DepartureTerminalView',
   components: { Dialog, TimeZoneSelector, TableHeaderCell },
-  mixins: [terminalMixin, formMixin, tableColsMixin],
+  mixins: [terminalMixin, formMixin, tableColsMixin, timeZoneMixin],
   data() {
     return {
       orderNum: ['0', '0', '0', '0', '0', '0'], // 默认总数

+ 181 - 57
src/views/baggageManagement/components/departure/index.vue

@@ -8,8 +8,17 @@
 <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
+      ref="formWrap"
+      class="terminal-form-wrap"
+    >
+      <el-form
+        ref="form"
+        :inline="true"
+        :model="formData"
+        :rules="rules"
+        class="form"
+      >
         <div class="form-left">
           <el-form-item prop="currentAirport">
             <!-- <el-cascader
@@ -24,8 +33,20 @@
             filterable
             @change="setCurrentAirport"
           /> -->
-            <el-select v-model="formData.currentAirport" class="input-shadow" size="small" filterable placeholder="请选择机场" @change="airPortChange">
-              <el-option v-for="(item, index) in AirportList" :key="index" :label="item.planDepartureApt" :value="item.planDepartureApt" />
+            <el-select
+              v-model="formData.currentAirport"
+              class="input-shadow"
+              size="small"
+              filterable
+              placeholder="请选择机场"
+              @change="airPortChange"
+            >
+              <el-option
+                v-for="(item, index) in AirportList"
+                :key="index"
+                :label="item.planDepartureApt"
+                :value="item.planDepartureApt"
+              />
             </el-select>
           </el-form-item>
           <!-- <el-form-item prop="startDate">
@@ -52,65 +73,168 @@
               @change="endDateChangeHandler"
             />
           </el-form-item> -->
-          <el-form-item prop="flightDate" label="航班日期">
-            <el-date-picker v-model="formData.flightDate" size="small" type="daterange" value-format="yyyy-MM-dd" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="dateRangePickerOptions" @change="dateChangeHandler" />
+          <el-form-item
+            prop="flightDate"
+            label="航班日期"
+          >
+            <el-date-picker
+              v-model="formData.flightDate"
+              size="small"
+              type="daterange"
+              value-format="yyyy-MM-dd"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :picker-options="dateRangePickerOptions"
+              @change="dateChangeHandler"
+            />
           </el-form-item>
           <el-form-item>
             <div class="box-item">
               <p>预计装载总数:</p>
-              <li v-for="(item, index) in orderNum" :key="index" :class="{ 'number-item': !isNaN(item), 'mark-item': isNaN(item) }">
+              <li
+                v-for="(item, index) in orderNum"
+                :key="index"
+                :class="{ 'number-item': !isNaN(item), 'mark-item': isNaN(item) }"
+              >
                 <span v-if="!isNaN(item)">
                   <i ref="numberItem">0123456789</i>
                 </span>
-                <span v-else class="comma">{{ item }}</span>
+                <span
+                  v-else
+                  class="comma"
+                >{{ item }}</span>
               </li>
             </div>
           </el-form-item>
         </div>
-        <div class="form-right" @keyup.enter="onSubmit(0)">
+        <div
+          class="form-right"
+          @keyup.enter="onSubmit(0)"
+        >
           <el-form-item prop="search">
-            <el-popover :value="popoverVisible" placement="bottom" trigger="manual">
+            <el-popover
+              :value="popoverVisible"
+              placement="bottom"
+              trigger="manual"
+            >
               <span>请输入航班号(示例:CA1234)或行李牌号(示例:1234567890)</span>
-              <el-input slot="reference" v-model="formData.search" class="input-shadow" style="width: 240px; margin-left: 105px" size="small" placeholder="请输入内容" prefix-icon="el-icon-search" clearable @focus="popoverVisible = true" @blur="popoverVisible = false" />
+              <el-input
+                slot="reference"
+                v-model="formData.search"
+                class="input-shadow"
+                style="width: 240px; margin-left: 105px"
+                size="small"
+                placeholder="请输入内容"
+                prefix-icon="el-icon-search"
+                clearable
+                @focus="popoverVisible = true"
+                @blur="popoverVisible = false"
+              />
             </el-popover>
           </el-form-item>
           <el-form-item>
-            <el-button class="btn-shadow" size="mini" type="primary" @click="onSubmit(0)">搜索</el-button>
+            <el-button
+              class="btn-shadow"
+              size="mini"
+              type="primary"
+              @click="onSubmit(0)"
+            >搜索</el-button>
           </el-form-item>
           <el-form-item v-is="['i_timeIcon']">
             <TimeZoneSelector />
           </el-form-item>
           <el-form-item>
-            <img class="btn-img btn-shadow" src="../../../../assets/baggage/ic_setting.png" @click="show">
+            <img
+              class="btn-img btn-shadow"
+              src="../../../../assets/baggage/ic_setting.png"
+              @click="show"
+            >
           </el-form-item>
         </div>
       </el-form>
     </div>
     <!--表格-->
-    <div v-loading="loading" class="terminal-table" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.8)">
-      <el-table ref="table" class="table" :height="computedTableHeight" :data="dealedTableData" :header-cell-class-name="headerCellClass" :row-class-name="tableRowClassName" :cell-class-name="cellClass" show-summary :summary-method="summaryMethod" border stripe fit @cell-click="cellClickHandler">
-        <el-table-column v-for="col in tableColsCopy" :key="col.prop" :prop="col.prop" :label="col.label" :width="col.width" :fixed="col.fixed" :formatter="tableFormat">
+    <div
+      v-loading="loading"
+      class="terminal-table"
+      element-loading-text="拼命加载中"
+      element-loading-spinner="el-icon-loading"
+      element-loading-background="rgba(0, 0, 0, 0.8)"
+    >
+      <el-table
+        ref="table"
+        class="table"
+        :height="computedTableHeight"
+        :data="dealedTableData"
+        :header-cell-class-name="headerCellClass"
+        :row-class-name="tableRowClassName"
+        :cell-class-name="cellClass"
+        show-summary
+        :summary-method="summaryMethod"
+        border
+        stripe
+        fit
+        @cell-click="cellClickHandler"
+      >
+        <el-table-column
+          v-for="col in tableColsCopy"
+          :key="col.prop"
+          :prop="col.prop"
+          :label="col.label"
+          :width="col.width"
+          :fixed="col.fixed"
+          :formatter="tableFormat"
+        >
           <template #header>
-            <el-tooltip :content="col.disc" placement="top">
-              <TableHeaderCell :label="col.label" :filter-options="tableDataFilters[col.prop]" :filter-values.sync="filterValues[col.prop]" :sortable="col.sortable" :sort-rule.sync="tableDataSortRules[col.prop]" />
+            <el-tooltip
+              :content="col.disc"
+              placement="top"
+            >
+              <TableHeaderCell
+                :label="col.label"
+                :filter-options="tableDataFilters[col.prop]"
+                :filter-values.sync="filterValues[col.prop]"
+                :sortable="col.sortable"
+                :sort-rule.sync="tableDataSortRules[col.prop]"
+              />
             </el-tooltip>
           </template>
         </el-table-column>
       </el-table>
     </div>
     <!--列设置-->
-    <Dialog :flag="dialogFlag" class="dialog-check-cols">
+    <Dialog
+      :flag="dialogFlag"
+      class="dialog-check-cols"
+    >
       <div class="col-dialog">
         <div class="title">列设置</div>
         <div class="content">
-          <el-tree :data="tableCols" :class="colsCheckClass" show-checkbox node-key="index" :default-expand-all="true" :props="{
+          <el-tree
+            :data="tableCols"
+            :class="colsCheckClass"
+            show-checkbox
+            node-key="index"
+            :default-expand-all="true"
+            :props="{
               label: 'label',
               children: 'children'
-            }" :default-checked-keys="checkedKeysTemp" @check="handleCheck" />
+            }"
+            :default-checked-keys="checkedKeysTemp"
+            @check="handleCheck"
+          />
         </div>
         <div class="foot right t30">
-          <el-button size="medium" class="r24" type="primary" @click="onCheck">确定</el-button>
-          <el-button size="medium" @click="hide">取消</el-button>
+          <el-button
+            size="medium"
+            class="r24"
+            type="primary"
+            @click="onCheck"
+          >确定</el-button>
+          <el-button
+            size="medium"
+            @click="hide"
+          >取消</el-button>
         </div>
       </div>
     </Dialog>
@@ -132,7 +256,7 @@ export default {
   name: 'DepartureTerminalView',
   components: { Dialog, TimeZoneSelector, TableHeaderCell },
   mixins: [terminalMixin, formMixin, tableColsMixin, timeZoneMixin],
-  data () {
+  data() {
     return {
       orderNum: ['0', '0', '0', '0', '0', '0'], // 默认总数
       popoverVisible: false,
@@ -195,77 +319,77 @@ export default {
         {
           prop: 'checkInTravellerNumber',
           label: '托运旅客',
-          disc: '指航班已办理行李托运业务的旅客人数,含取消托运的旅客人数',
+          disc: '指航班已办理行李托运业务的旅客人数,含取消托运的旅客人数'
         },
         {
           prop: 'checkInNumber',
           label: '值机数',
-          disc: '指已办理值机托运的行李数量,含取消托运的行李数量,含未激活',
+          disc: '指已办理值机托运的行李数量,含取消托运的行李数量,含未激活'
         },
         {
           prop: 'unActive',
           label: '未激活',
-          disc: '指最后的 BSM 报文“.S”中行李状态为“I”的行李数量,含取消托运的行李数量',
+          disc: '指最后的 BSM 报文“.S”中行李状态为“I”的行李数量,含取消托运的行李数量'
         },
         {
           prop: 'preLoad',
           label: '预计装载',
-          disc: '指已办理值机托运的行李数量,不含取消托运的行李数量,不包含未激活',
+          disc: '指已办理值机托运的行李数量,不含取消托运的行李数量,不包含未激活'
         },
         {
           prop: 'checkNumber',
           label: '安检',
-          disc: '指进行安检的行李数量,含取消托运的行李数量',
+          disc: '指进行安检的行李数量,含取消托运的行李数量'
         },
         {
           prop: 'sortNumber',
           label: '分拣',
-          disc: '指已分拣完成的行李数量,含取消托运的行李数量',
+          disc: '指已分拣完成的行李数量,含取消托运的行李数量'
         },
         {
           prop: 'loadNumber',
           label: '装车',
-          disc: '指已在分拣口装车完成的行李数量,含取消托运的行李数量',
+          disc: '指已在分拣口装车完成的行李数量,含取消托运的行李数量'
         },
         {
           prop: 'landingNumber',
           label: '装机',
-          disc: '指装机完成的行李数量,不含取消托运的行李数量',
+          disc: '指装机完成的行李数量,不含取消托运的行李数量'
         },
         {
           prop: 'tounLoad',
           label: '待翻减',
-          disc: '指旅客在办理行李托运后,旅客取消该行李的托运并且行李此时已经过装车节点,而没有完成翻减的行李数量(须翻减总数减去已翻减数)',
+          disc: '指旅客在办理行李托运后,旅客取消该行李的托运并且行李此时已经过装车节点,而没有完成翻减的行李数量(须翻减总数减去已翻减数)'
         },
         {
           prop: 'unLoad',
           label: '已翻减',
-          disc: '指旅客在办理行李托运后,旅客取消该行李的托运并且行李此时已经过装车节点,且已完成翻减的行李数量',
+          disc: '指旅客在办理行李托运后,旅客取消该行李的托运并且行李此时已经过装车节点,且已完成翻减的行李数量'
         },
         {
           prop: 'noCheckInNumber',
           label: '取消托运',
-          disc: '指旅客在办理行李托运后,又取消托运的行李总数量',
+          disc: '指旅客在办理行李托运后,又取消托运的行李总数量'
         },
         {
           prop: 'noBSM',
           label: '无BSM',
-          disc: '行李有处理信息(BPM)但无值机信息(BSM)的行李数量',
+          disc: '行李有处理信息(BPM)但无值机信息(BSM)的行李数量'
         },
         {
           prop: 'warning',
           label: '风险预警',
-          disc: '指依据航班信息中预计起飞时间和当前时间差,与根据分拣到停机位设置的报警阈值对比,超过阈值的为风险行李,本项显示风险预警行李数量',
+          disc: '指依据航班信息中预计起飞时间和当前时间差,与根据分拣到停机位设置的报警阈值对比,超过阈值的为风险行李,本项显示风险预警行李数量'
         },
         {
           prop: 'exceptions',
           label: '离港异常',
-          disc: '指航班关闭货仓门后,应装而未装的行李数量',
+          disc: '指航班关闭货仓门后,应装而未装的行李数量'
         },
         {
           prop: 'midIn',
           label: '中转进行李',
-          disc: '指从其他航班中转到当前航班的行李数量',
+          disc: '指从其他航班中转到当前航班的行李数量'
         }
       ],
       tableDataSortRules: {
@@ -279,22 +403,22 @@ export default {
       hasSetTableScroll: false
     }
   },
-  mounted () {
+  mounted() {
     this.getAirPortData()
   },
-  beforeDestroy () {
+  beforeDestroy() {
     if (this.loopEvent) {
       clearInterval(this.loopEvent)
       this.loopEvent = null
     }
   },
   computed: {
-    singleDay () {
+    singleDay() {
       return this.startDate === this.endDate
     }
   },
   methods: {
-    resetLoopEvent () {
+    resetLoopEvent() {
       this.loading = true
       this.hasSetTableScroll = false
       if (this.loopEvent) {
@@ -306,13 +430,13 @@ export default {
         that.getTableData()
       }, 3000)
     },
-    airPortChange () {
+    airPortChange() {
       this.resetLoopEvent()
     },
-    dateChangeHandler () {
+    dateChangeHandler() {
       this.resetLoopEvent()
     },
-    async getAirPortData () {
+    async getAirPortData() {
       try {
         const res = await getQuery({
           id: DATACONTENT_ID.departureAirMainId,
@@ -329,7 +453,7 @@ export default {
         console.log('出错了', error)
       }
     },
-    tableRowClassName ({ row, rowIndex }) {
+    tableRowClassName({ row, rowIndex }) {
       const classes = []
       if (row.flightStatus === 'DLY') {
         classes.push('bgl-delayed')
@@ -345,7 +469,7 @@ export default {
       }
       return classes.join(' ')
     },
-    headerCellClass ({ row, column }) {
+    headerCellClass({ row, column }) {
       const classes = []
       if (['warning', 'exceptions', 'midIn'].includes(column.property)) {
         classes.push('bgl-huang')
@@ -367,7 +491,7 @@ export default {
     //   this.flightAttrQuery(params)
     // },
     // 获取表格数据
-    async getTableData () {
+    async getTableData() {
       if (!this.formData.currentAirport || !this.startDate || !this.endDate) {
         return
       }
@@ -392,7 +516,7 @@ export default {
         console.log('出错了', error)
       }
     },
-    initTableData (tableData) {
+    initTableData(tableData) {
       this.leaveCount = 0
       this.baggageCount = 0
       tableData.forEach(item => {
@@ -414,7 +538,7 @@ export default {
         this.setTableScroll()
       })
     },
-    setTableScroll () {
+    setTableScroll() {
       if (!this.singleDay || this.hasSetTableScroll || this.leaveCount === 0) {
         return
       }
@@ -434,7 +558,7 @@ export default {
       }, 0)
       this.hasSetTableScroll = true
     },
-    setNumberTransform () {
+    setNumberTransform() {
       const numberItems = this.$refs.numberItem // 拿到数字的ref,计算元素数量
       const numberArr = this.orderNum.filter(item => !isNaN(item))
       // 结合CSS 对数字字符进行滚动,显示订单数量
@@ -444,7 +568,7 @@ export default {
       }
     },
 
-    toOrderNum (num) {
+    toOrderNum(num) {
       num = num.toString()
       if (num.length < 6) {
         num = '0' + num // 如未满八位数,添加"0"补位
@@ -482,7 +606,7 @@ export default {
       optgroup,
       select,
       textarea {
-        font-family: Helvetica, "Microsoft YaHei";
+        font-family: Helvetica, 'Microsoft YaHei';
         font-size: 14px;
       }
       .el-switch__label {
@@ -588,7 +712,7 @@ export default {
       padding: 0;
       text-align: center;
       font-size: 14px;
-      font-family: Helvetica, "Microsoft YaHei";
+      font-family: Helvetica, 'Microsoft YaHei';
       letter-spacing: 0;
     }
     .cell-click {
@@ -621,7 +745,7 @@ export default {
         &.redBorder {
           position: relative;
           &::after {
-            content: "";
+            content: '';
             position: absolute;
             left: 0;
             bottom: 0;
@@ -641,7 +765,7 @@ export default {
         background: lightcoral !important;
         position: relative;
         &::after {
-          content: "";
+          content: '';
           display: block;
           width: 100%;
           height: 100%;

+ 2 - 2
src/views/baggageManagement/mixins/timeZone.js

@@ -17,9 +17,9 @@ export default {
     // 表格数据格式化
     tableFormat(row, column, cellValue) {
       switch (column.property) {
-        case 'PlanLandingTime':
+        case 'arrivalTime':
         case 'planDepartureTime':
-          return timeInZone(cellValue, this.timeZone)
+          return timeInZone((cellValue ?? '').replace('T', ' '), this.timeZone)
         case 'actualDepartureTime':
         case 'actualLandingTime':
           return timeInZone((cellValue ?? '').replace('T', ' '), this.timeZone).replace(' ', '\n')