Merge branch 'master' of http://120.26.64.82:10880/BFFE/dz2.1

public/config.js

@@ -1,789 +1,15 @@
 window.SERVICE_ID = {
-  sysMenuId: 1, //权限菜单
-  sysAuthId: 2, //根据用户ID或用户组ID获取权限
-  sysAllMenuId: 3, //获取全部权限
-  serTableDataId: 4, //服务设置-算法配置-获取数据源名称
-  sysUserAuthId: 5, //用户数据权限获取
-  getUserTableId: 9, //根据账号组获取账号
-  getAirpotId: 14, //获取机场三字码
-  getJqId: 10023, //获取机器维护列表
-  getTableColumnId: 18122, //获取表头
-  authTreeId: 18126, //获取表头
-  getAppId: 18133, //获取应用列表
-  roleListId: 10024, //角色列表
-  userListId: 10026, //用户管理列表
-  userAuthorizationId: 200228, //用户授权
-  userGroupAuthorizationId: 10027, //用户组授权
-  depTableId: 185, //机器维护-表头
-  serTableId: 203, //服务设置-表头
-  bagTableId: 20030, //行李详情-表头
-  bagDetailId: 20027, //行李详情-表格
-  bagViewId: 20036, //航班视图-基础信息
-  changePwd: 20045, // 修改密码
-  userColAuthId: 200227, //用户授权-列设置
-  containerId: 200238, //容器历史记录-容器历史
-
-  /***-----高级查询------***/
-  baggageTypeId: 86, //高级查询-特殊行李类型下拉选项查询-id
-  advancedQueryId: 30, //高级查询-数据查询-id
-  advancedQueryNew: 93, //高级查询-数据查询-id
-
-  /***-----进港管理------***/
-  arrivalAirId: 67, //进港管理-机场选择
-  arrivalTableId: 38, //进港管理-表格
-
-  /***-----离港管理------***/
-  departureAirMainId: 65, //离港管理-机场选择
-  departureTableMainId: 66, //离港管理-表格
-  departureWarningId: 18040, //离港管理-报警策略
-
-  /***-----中转进港------***/
-  departureAirId: 72, // 中转进港-机场选择
-  departureAviJoinId: 71, // 中转进港-进港承运航司
-  departureAviLeaveId: 74, // 中转进港-离港承运航司
-  departureTableId: 69, // 中转进港-表格
-
-  /***-----中转离港------***/
-  departureAirLtId: 72, // 中转离港-机场选择
-  departureAviJoinLtId: 71, // 中转离港-进港承运航司
-  departureAviLeaveLtId: 74, // 中转离港-离港承运航司
-  departureTableLtId: 68, // 中转离港-表格
-
-  /***-----航班视图------***/
-  flightAirline: 1141, // 航班-航段
-  flightInfo: 1142, // 航班-基础信息
-  flightContainer: 41, // 航班-容器
-  flightBaggage: 1144, // 航班-行李列表
-  abnormalBaggageInfo: 1145,
-
   /***-----行李视图------***/
-  baggageBasicInfo: 255, // 行李-基础信息
-  baggageTrack: 18010, // 行李-追踪节点
-  baggageAirline: 18009, // 行李-航段
-  baggageDetails: 44, // 行李-详情列表
-  baggageMessage: 3066, // 行李-原始报文
-  baggageAirlineNew: 18008, // 行李-航段
-  baggageDetailsNew: 441, // 行李-详情列表
-  baggageMessageNew: 3068, // 行李-原始报文
-  baggageTime: 20039, //行李-起飞降落日期
+  baggageBasicInfo: 115, // 行李-基础信息
+  baggageTrack: 116, // 行李-追踪节点
+  baggageAirline: 117, // 行李-航段
+  baggageDetails: 126, // 行李-基础信息-行李号
+  baggageMessage: 120, // 行李-原始报文
+  baggageDetailsImg: 127, // 行李-基础信息-行李号-照片
+  baggageInfoTable: 119, // 行李-基础信息-列表
 
   /***-----容器视图------***/
   containerHistory: 18026,
   containerBaggage: 18027,
-
-  /***-----统计分析------***/
-  stOrderId: 18012,
-  stOrderChartId: 18013,
-  stCalId: 18014,
-  stFigntsId: 18015,
-  stSpeedId: 18016,
-  stBaggageId: 18017,
-  stMapId: 18018,
-  stCountryId: 18019,
-  stTerminalId: 18020,
-  stBrsId: 1803429,
-
-  /***-----统计图表------***/
-  airlineOptions: 1806, // 航线下拉
-  twoCharacterOptions: 1803426, // 二字码下拉
-  termSeleid: 1156, //航站选择下拉
-  areaOptions: 1807, // 大区/基地分公司下拉
-  AirportId: 1808, // 航站下拉
-  TerminalId: 1809, // 航站楼下拉
-  byOther: 1810, // 大区/分公司以外航班统计（全部）
-  byArea: 1811, // 根据大区/分公司航班统计（全部）
-  withBaggageByOther: 1812, // 大区/分公司以外航班统计（有行李）
-  withBaggageByArea: 1814, // 根据大区/分公司航班统计（有行李）
-  baggageByOther: 1815, // 行李统计（全部）
-  baggageByArea: 1816, // 行李统计-分公司（全部）
-  notDelByOther: 1817, // 行李统计（不包含DEL）
-  notDelByArea: 1818, // 行李统计-分公司（不包含DEL）
-  baggagePassengerByOther: 1819, // 行李旅客统计
-  baggagePassengerByArea: 1820, // 行李旅客统计-分公司
-  specialBaggageByOther: 1821, // 特殊行李统计
-  specialBaggageByArea: 1822, // 特殊行李统计-分公司
-  abnormalBaggageByOther: 1823, // 异常行李统计
-  abnormalBaggageByArea: 1824, // 异常行李统计-分公司
-  complaintBaggageByOther: 1825, // 投诉行李统计
-  complaintBaggageByArea: 1826, // 投诉行李统计-分公司
-  compensationBaggageByOther: 1827, // 赔偿行李统计
-  compensationBaggageByArea: 1828, // 赔偿行李统计-分公司
-  compensationByOther: 1829, // 赔偿金额统计
-  compensationByArea: 1830, // 赔偿金额统计-分公司
-  baggageAverageByOther: 1831, // 平均行李统计
-  baggageAverageByArea: 1832, // 平均行李统计-分公司
-  specialBaggageClassificationByOther: 1193, // 特殊行李分类统计
-  specialBaggageClassificationByArea: 1194, // 特殊行李分类统计-分公司
-  flightClassificationByOther: 1195, // 航班分类统计
-  flightClassificationByArea: 1196, // 航班分类统计-分公司
-  compensationClassificationByOther: 1197, // 赔偿分类统计
-  compensationClassificationByArea: 1198, // 赔偿分类统计-分公司
-  passengerNormalClassificationByOther: 1199, // 旅客分类常客统计
-  passengerNormalClassificationByArea: 1200, // 旅客分类常客统计-分公司
-  passengerImportantClassificationByOther: 1201, // 旅客分类要客统计
-  passengerImportantClassificationByArea: 1202, // 旅客分类要客统计-分公司
-  abnormalBaggageClassificationByOther: 1205, // 异常行李分类统计
-  abnormalBaggageClassificationByArea: 1206, // 异常行李分类统计-分公司
-  compensationClassificationAll: 1834, // 赔偿金额分类统计-全部
-  compensationClassificationByAirline: 1835, // 赔偿金额分类统计-航线
-  compensationBaggageClassificationAll: 1836, // 赔偿行李分类统计-全部
-  compensationBaggageClassificationByAirline: 1837, // 赔偿行李分类统计-航线
-  abnormalBaggageClassificationAll: 1838, // 异常行李分类统计-全部
-  abnormalBaggageClassificationByAirline: 1839, // 异常行李分类统计-航线
-  nodeRange: 1801, // 节点查询范围
-  nodeAirline: 1802, // 节点航线下拉
-  nodeAirport: 1803, // 节点航站下拉
-  nodeAll: 1804, // 节点统计雷达图-全部
-  nodeIn: 1804, // 节点统计雷达图-进港
-  nodeOut: 1804, // 节点统计雷达图-离港
-  nodeExportAirline: 1805, // 节点统计导出-航线
-  nodeExportAirport: 1805, // 节点统计导出-航站
-  nodeAxisDesc: 90, // 节点统计指示器名称解释
-
-  /***-----统计图表-新版------***/
-  areaOptionsNew: 200305, // 基地分公司下拉
-  terminalOptionsNew: 200306, // 航站楼下拉
-  airlineCompanyOptionsNew: 200307, // 航司下拉
-  airlineOptionsNew: 200308, // 航线下拉
-  airportOptionsNew: 200309, //航站下拉
-
-  airlineCompanyAll: 200301, // 航司行李相关统计-全部
-  airlineCompanyByAirline: 200302, // 航司行李相关统计-航线
-  airlineCompanyByAirport: 200303, // 航司行李相关统计-航站
-  airlineCompanyByTerminal: 200304, // 航司行李相关统计-航站楼
-
-  flightClassificationAll: 200310, // 航班分类统计-全部
-  flightClassificationByAirline: 200311, // 航班分类统计-航线
-  flightClassificationByAirport: 200312, // 航班分类统计-航站
-  flightClassificationByTerminal: 200313, // 航班分类统计-航站楼
-
-  /***-----统计表格------***/
-  transferBaggageProption: 1848, //中转行李比例明细
-  transferBaggageFactor: 1849, // 中转行李因素分析
-  transferBaggageDetails: 1850, // 中转行李明细
-  transferBaggageDirection: 1851, // 中转行李四个流向
-  transferBaggageDirectionDetails: 1852, // 中转行李流向明细
-  baggageServicePercentage: 1853, // 行李全流程服务水平百分比
-
-  /***-----速运行李------***/
-  expressTransportationUpload: 20034, // 速运行李数据上传
-  expressTransportation: 1803435, // 速运行李数据查询
-  expressTransportationNum: 1803436, // 速运行李次数查询
-  expressTransportationFail: 1803437 // 速运行李数据查询-失败
 }
 
-window.AIRPORT_ID = {
-  EN: '101',
-  EW: '104',
-  AY: '105',
-  BW: '106',
-  FI: '108',
-  '7Q': '110',
-  U1: '111',
-  CK: '112',
-  GW: '113',
-  LY: '114',
-  JU: '115',
-  SK: '117',
-  DT: '118',
-  '8K': '119',
-  JS: '120',
-  ON: '123',
-  AH: '124',
-  BA: '125',
-  GA: '126',
-  G3: '127',
-  UO: '128',
-  MP: '129',
-  JL: '131',
-  MX: '132',
-  LR: '133',
-  AV: '134',
-  VT: '135',
-  CU: '136',
-  AM: '139',
-  LI: '140',
-  FZ: '141',
-  KF: '142',
-  AU: '143',
-  '7T': '144',
-  UC: '145',
-  XK: '146',
-  AT: '147',
-  LN: '148',
-  LG: '149',
-  UG: '150',
-  R5: '151',
-  VH: '152',
-  BU: '154',
-  ES: '155',
-  '2I': '156',
-  QR: '157',
-  CX: '160',
-  MN: '161',
-  '7L': '164',
-  JP: '165',
-  IK: '166',
-  QM: '167',
-  UM: '168',
-  HR: '169',
-  GE: '170',
-  GT: '171',
-  CV: '172',
-  HA: '173',
-  II: '175',
-  EK: '176',
-  OR: '178',
-  '7A': '179',
-  KE: '180',
-  Z6: '181',
-  MA: '182',
-  SW: '186',
-  DW: '187',
-  K6: '188',
-  JI: '189',
-  IG: '191',
-  PY: '192',
-  IE: '193',
-  FV: '195',
-  TC: '197',
-  TU: '199',
-  SD: '200',
-  JM: '201',
-  TA: '202',
-  '5J': '203',
-  NH: '205',
-  B3: '208',
-  UB: '209',
-  '4B': '210',
-  '2P': '211',
-  '5W': '212',
-  PK: '214',
-  TG: '217',
-  NF: '218',
-  YN: '219',
-  LH: '220',
-  AL: '221',
-  HN: '225',
-  KU: '229',
-  CM: '230',
-  NG: '231',
-  MH: '232',
-  TK: '235',
-  BD: '236',
-  IZ: '238',
-  MK: '239',
-  GU: '240',
-  K8: '241',
-  TN: '244',
-  '7F': '245',
-  O6: '247',
-  HY: '250',
-  FG: '255',
-  RD: '256',
-  OS: '257',
-  MD: '258',
-  FN: '259',
-  FJ: '260',
-  I5: '261',
-  U6: '262',
-  EF: '265',
-  LT: '266',
-  BE: '267',
-  EQ: '269',
-  W7: '271',
-  K4: '272',
-  GK: '274',
-  '5L': '275',
-  XF: '277',
-  B6: '279',
-  RO: '281',
-  EC: '284',
-  RA: '285',
-  PU: '286',
-  '4N': '287',
-  LD: '288',
-  OM: '289',
-  BF: '290',
-  WG: '292',
-  WM: '295',
-  CD: '296',
-  CI: '297',
-  UT: '298',
-  '5S': '301',
-  OO: '302',
-  ZW: '303',
-  C2: '304',
-  WE: '307',
-  V0: '308',
-  WZ: '309',
-  '2T': '311',
-  IP: '312',
-  '2S': '315',
-  '5N': '316',
-  '3A': '317',
-  CC: '318',
-  '8D': '319',
-  SC: '324',
-  AQ: '327',
-  DY: '328',
-  RF: '330',
-  S4: '331',
-  FL: '332',
-  MM: '334',
-  SY: '337',
-  ZD: '338',
-  KS: '339',
-  KO: '341',
-  YQ: '342',
-  L2: '344',
-  NC: '345',
-  WP: '347',
-  EE: '350',
-  A7: '352',
-  NU: '353',
-  E7: '355',
-  '3T': '359',
-  Y7: '362',
-  RP: '363',
-  TZ: '366',
-  IN: '367',
-  '0V': '368',
-  '5Y': '369',
-  RZ: '372',
-  NB: '373',
-  '3K': '375',
-  HC: '377',
-  KX: '378',
-  LZ: '379',
-  Q6: '381',
-  T9: '382',
-  RQ: '384',
-  MY: '386',
-  Z4: '389',
-  A3: '390',
-  Q3: '391',
-  '8G': '395',
-  G6: '397',
-  YR: '398',
-  HP: '401',
-  J0: '402',
-  PO: '403',
-  JW: '404',
-  '5X': '406',
-  V7: '407',
-  '4V': '408',
-  YM: '409',
-  ZR: '410',
-  '3G': '411',
-  VI: '412',
-  AX: '414',
-  N8: '416',
-  E6: '417',
-  R9: '418',
-  CF: '419',
-  GI: '420',
-  S7: '421',
-  F9: '422',
-  ER: '423',
-  YD: '425',
-  '9L': '426',
-  TX: '427',
-  '9E': '430',
-  ZA: '433',
-  L6: '434',
-  '3X': '435',
-  KJ: '436',
-  '5A': '437',
-  ZI: '439',
-  OF: '442',
-  GO: '444',
-  F5: '447',
-  '3M': '449',
-  YX: '453',
-  NA: '455',
-  I7: '456',
-  WB: '459',
-  EB: '460',
-  '7W': '461',
-  XL: '462',
-  ZP: '463',
-  KC: '465',
-  '3H': '466',
-  '4M': '469',
-  ZV: '471',
-  SE: '473',
-  UI: '475',
-  XE: '477',
-  R6: '478',
-  ZH: '479',
-  QX: '481',
-  '3W': '482',
-  '8V': '485',
-  NK: '487',
-  W8: '489',
-  WI: '490',
-  B9: '491',
-  '9H': '493',
-  EZ: '494',
-  E3: '497',
-  '7B': '499',
-  Q8: '505',
-  WC: '506',
-  QJ: '508',
-  JF: '510',
-  RJ: '512',
-  '7G': '513',
-  G9: '514',
-  '2F': '517',
-  '5T': '518',
-  FE: '519',
-  '3R': '520',
-  '1P': '523',
-  XM: '524',
-  B7: '525',
-  WN: '526',
-  A2: '529',
-  T0: '530',
-  YV: '533',
-  WQ: '534',
-  S9: '535',
-  GV: '536',
-  W5: '537',
-  TH: '539',
-  '5H': '540',
-  '5Z': '541',
-  '9Q': '543',
-  LP: '544',
-  X8: '545',
-  '8U': '546',
-  '2K': '547',
-  M3: '549',
-  BL: '550',
-  FC: '553',
-  SU: '555',
-  O8: '558',
-  H8: '560',
-  XQ: '564',
-  PS: '566',
-  CE: '567',
-  LW: '568',
-  FO: '569',
-  '9U': '572',
-  G7: '573',
-  '4W': '574',
-  '7C': '575',
-  OX: '578',
-  '4G': '579',
-  RU: '580',
-  XJ: '582',
-  '9W': '589',
-  HW: '590',
-  GX: '591',
-  ZN: '595',
-  CS: '596',
-  '4I': '597',
-  HZ: '598',
-  '8M': '599',
-  BB: '600',
-  UL: '603',
-  UY: '604',
-  H2: '605',
-  A9: '606',
-  EY: '607',
-  XR: '608',
-  KK: '610',
-  JB: '613',
-  IQ: '614',
-  QY: '615',
-  HF: '617',
-  SQ: '618',
-  BZ: '620',
-  MZ: '621',
-  MO: '622',
-  FB: '623',
-  H9: '624',
-  D6: '625',
-  CG: '626',
-  QV: '627',
-  B2: '628',
-  MI: '629',
-  DK: '630',
-  GL: '631',
-  JV: '632',
-  IY: '635',
-  BP: '636',
-  B8: '637',
-  PJ: '638',
-  LV: '639',
-  FA: '640',
-  '5D': '642',
-  KM: '643',
-  '4S': '644',
-  '6P': '645',
-  E0: '646',
-  QI: '647',
-  TS: '649',
-  '6T': '654',
-  DV: '655',
-  PX: '656',
-  BT: '657',
-  M8: '658',
-  J4: '660',
-  '6G': '661',
-  EO: '663',
-  HQ: '668',
-  U8: '669',
-  UN: '670',
-  BI: '672',
-  NX: '675',
-  PC: '677',
-  G0: '678',
-  JK: '680',
-  CL: '683',
-  NI: '685',
-  WX: '689',
-  '8A': '691',
-  PZ: '692',
-  JX: '693',
-  YW: '694',
-  BR: '695',
-  VR: '696',
-  '5C': '700',
-  WF: '701',
-  NO: '703',
-  OL: '704',
-  S2: '705',
-  KQ: '706',
-  JO: '708',
-  K5: '710',
-  S6: '712',
-  RH: '713',
-  MB: '716',
-  F2: '720',
-  YL: '722',
-  QA: '723',
-  LX: '724',
-  W3: '725',
-  VZ: '727',
-  QT: '729',
-  MF: '731',
-  C7: '732',
-  D9: '733',
-  VO: '734',
-  SP: '737',
-  VN: '738',
-  NL: '740',
-  XN: '743',
-  '8T': '744',
-  AB: '745',
-  '3N': '746',
-  YO: '747',
-  DU: '748',
-  '4Z': '749',
-  DB: '750',
-  D4: '751',
-  JZ: '752',
-  LC: '753',
-  BY: '754',
-  '3V': '756',
-  Z3: '757',
-  UU: '760',
-  '7U': '765',
-  RC: '767',
-  EL: '768',
-  UE: '770',
-  J2: '771',
-  V6: '772',
-  FM: '774',
-  CW: '778',
-  Y9: '780',
-  MU: '781',
-  QL: '782',
-  CZ: '784',
-  RT: '785',
-  VK: '786',
-  KB: '787',
-  MG: '791',
-  VA: '795',
-  KR: '798',
-  GD: '800',
-  '8S': '802',
-  AE: '803',
-  '8Y': '804',
-  '4X': '805',
-  '7H': '808',
-  M6: '810',
-  EU: '811',
-  JN: '812',
-  EP: '815',
-  '9P': '816',
-  MJ: '817',
-  '5R': '820',
-  '6K': '821',
-  NN: '823',
-  '9M': '824',
-  F4: '825',
-  GS: '826',
-  PG: '829',
-  OU: '831',
-  GB: '832',
-  RK: '833',
-  NS: '836',
-  E2: '837',
-  WS: '838',
-  RM: '839',
-  '0P': '840',
-  C5: '841',
-  '5M': '842',
-  P5: '845',
-  ZK: '846',
-  PN: '847',
-  R3: '849',
-  HX: '851',
-  KG: '854',
-  DJ: '856',
-  LM: '857',
-  FK: '858',
-  '2M': '860',
-  HK: '861',
-  EV: '862',
-  M7: '865',
-  V8: '868',
-  VV: '870',
-  Y8: '871',
-  CH: '872',
-  '6R': '873',
-  TE: '874',
-  '3U': '876',
-  OQ: '878',
-  RV: '879',
-  HU: '880',
-  DE: '881',
-  NY: '882',
-  '8C': '883',
-  '5G': '884',
-  OH: '886',
-  ZG: '887',
-  QQ: '888',
-  GJ: '891',
-  DZ: '893',
-  BQ: '894',
-  CN: '895',
-  VF: '896',
-  '7D': '897',
-  JD: '898',
-  ZL: '899',
-  FD: '900',
-  '4D': '903',
-  E5: '906',
-  QN: '907',
-  OG: '908',
-  WY: '910',
-  QW: '912',
-  AJ: '914',
-  SS: '923',
-  GR: '924',
-  U7: '926',
-  UZ: '928',
-  VS: '932',
-  KZ: '933',
-  TL: '935',
-  '9N': '938',
-  VW: '942',
-  DI: '944',
-  WK: '945',
-  V4: '946',
-  L3: '947',
-  LS: '949',
-  '6B': '951',
-  JJ: '957',
-  '7I': '958',
-  LE: '959',
-  OV: '960',
-  U9: '966',
-  PB: '967',
-  LU: '972',
-  ZB: '974',
-  HV: '979',
-  VD: '981',
-  QK: '983',
-  VX: '984',
-  G5: '987',
-  OZ: '988',
-  IJ: '989',
-  D3: '991',
-  JA: '995',
-  UX: '996',
-  BG: '997',
-  CA: '999',
-  XH: '000',
-  AA: '001',
-  '2G': '002',
-  CP: '003',
-  BV: '004',
-  CO: '005',
-  DL: '006',
-  '1C': '007',
-  Z5: '009',
-  M9: '011',
-  NW: '012',
-  AC: '014',
-  UA: '016',
-  HO: '018',
-  FX: '023',
-  AS: '027',
-  '3Z': '029',
-  F7: '033',
-  GC: '034',
-  US: '037',
-  TQ: '038',
-  K9: '040',
-  RG: '042',
-  KA: '043',
-  AR: '044',
-  LA: '045',
-  TP: '047',
-  CY: '048',
-  OA: '050',
-  '4U': '051',
-  EI: '053',
-  WL: '054',
-  AP: '055',
-  YK: '056',
-  AF: '057',
-  IC: '058',
-  DF: '059',
-  HM: '061',
-  '5V': '062',
-  SB: '063',
-  OK: '064',
-  SV: '065',
-  '8Q': '066',
-  I9: '067',
-  TM: '068',
-  RB: '070',
-  ET: '071',
-  GF: '072',
-  IA: '073',
-  KL: '074',
-  IB: '075',
-  ME: '076',
-  MS: '077',
-  PR: '079',
-  LO: '080',
-  QF: '081',
-  SN: '082',
-  SA: '083',
-  FT: '084',
-  NZ: '086',
-  IT: '090',
-  DP: '091',
-  MT: '092',
-  KD: '093',
-  C4: '094',
-  '6A': '095',
-  IR: '096',
-  AI: '098',
-  '9S': '099'
-}

public/staticConfig.js

@@ -40,6 +40,14 @@ switch (baseNewUrl) {
       hasStaticRoutes: true,
     }
     break
+  case '10.199.1.152':
+    PLATFROM_CONFIG = {
+      ...PLATFROM_CONFIG,
+      baseNewUrl: 'http://10.199.1.152:18083',
+      baseURLCA: 'http://10.199.1.152:18083',
+      hasStaticRoutes: true,
+    }
+    break
   case '10.199.7.20':
     PLATFROM_CONFIG = {
       ...PLATFROM_CONFIG,

src/components/SimpleQuery/index.vue

@@ -102,7 +102,8 @@ export default {
       tableForm: {},
       tableOptions: {},
       queryContent: {},
-      formItemArr: []
+      formItemArr: [],
+      formItemVal: []
     }
   },
   computed: {
@@ -190,7 +191,6 @@ export default {
     //获取表单下拉数据
     changeSelect (code, data) {
       this.$emit('changeSelect', data)
-      if (code == 'passparameters') return
       const datas = this.$store.state.auth.authMsg
       if (!datas?.length) return
       const ndata = datas.filter(item => item.labelcode && item.pagecode == code)
@@ -231,10 +231,10 @@ export default {
           resultsKey.push(pagecode)
         }
         if (defaultvalue) {
-          this.tableForm[pagecode] = defaultvalue
+          this.formItemVal.push({ column: pagecode, value: defaultvalue, type: datatype })
         }
         if (datatype == 'date' || datatype == 'DATE') {
-          this.tableForm[pagecode] = parseTime(new Date(), '{y}-{m}-{d}')
+          this.formItemVal.push({ column: pagecode, value: defaultvalue, type: datatype })
         }
       })
       if (results?.length) {
@@ -242,6 +242,7 @@ export default {
       } else {
         this.formItemArr = formItemCopy
       }
+      this.formatForm(this.formItemVal)
     },
     //获取异步数据
     async getAnscyData (allResultKey, allResult, formItem) {
@@ -265,9 +266,11 @@ export default {
       const ndatas = [...array]
       const tableForm = {}
       ndatas.forEach(item => {
-        const { column, value } = item
+        const { column, value, type } = item
         if (value) {
           tableForm[column] = value
+        } else if (type == 'date' || type == 'DATE') {
+          tableForm[column] = parseTime(new Date(), '{y}-{m}-{d}')
         }
       })
       this.tableForm = tableForm

src/views/bagDetailsPage/components/baggageMessage.vue

@@ -65,7 +65,7 @@ export default {
         const { PNRNO = null, luggageNum = null, carrierFlights = null, carrierFlightsDate = null } = bagQueryParams
         const parmas = {
           page: 1,
-          serviceid: 120,
+          serviceid: SERVICE_ID.baggageMessage,
           datacontent: {
             filter: formatBagParmas({
               carrierFlights,

src/views/bagDetailsPage/components/baggageView.vue

@@ -167,13 +167,22 @@ export default {
     getViewData () {
       const bagQueryParams = JSON.parse(sessionStorage.getItem('bagQueryParams')) || ''
       if (bagQueryParams) {
-        this.dataContent = bagQueryParams
-        this.restTable()
-        this.load()
+        const { luggageNum } = this.$route.query
+        if (luggageNum) {
+          if (luggageNum == bagQueryParams.luggageNum) {
+            this.dataContent = bagQueryParams
+            this.restTable()
+            this.load()
+          }
+        } else {
+          this.dataContent = bagQueryParams
+          this.restTable()
+          this.load()
+        }
       }
     },
     //获取行李信息
-    async getLuggageList (serviceid = 116, datacontent = { filter: formatBagParmas(this.dataContent) }, page = ++this.page, size = this.pageSize) {
+    async getLuggageList (serviceid = SERVICE_ID.baggageTrack, datacontent = { filter: formatBagParmas(this.dataContent) }, page = ++this.page, size = this.pageSize) {
       try {
         this.loading = true
         const parmas = {
@@ -241,7 +250,7 @@ export default {
         const { carrierFlights = null, carrierFlightsDate = null, luggageNum = null, PNRNO = null } = item
         const parmas = {
           page: 1,
-          serviceid: 117,
+          serviceid: SERVICE_ID.baggageAirline,
           datacontent: {
             filter: formatBagParmas({
               carrierFlights,

src/views/bagDetailsPage/index.vue

@@ -139,8 +139,8 @@ export default {
     const pageAuthtables = pageAuthArrs.filter(item => item.pagetype == 'table')
     if (!pageAuthtables.length) return
     //获取行李信息表
-    const bagInfoTable = pageAuthtables.filter(item => item.serviceid == 115)
-    this.tableDatas = pageAuthtables.filter(item => item.serviceid == 119)
+    const bagInfoTable = pageAuthtables.filter(item => item.serviceid == SERVICE_ID.baggageBasicInfo)
+    this.tableDatas = pageAuthtables.filter(item => item.serviceid == SERVICE_ID.baggageInfoTable)
     this.query = { ...query }
     this.getPageTableSetting(bagInfoTable)
   },
@@ -193,7 +193,7 @@ export default {
             const bagInfo = [...returnData][0]
             this.passengerName = bagInfo['passengerName'] || ''
             this.PNRNO = bagInfo['PNRNO'] || ''
-            nItem['PNRNO'] = bagInfo['PNRNO'] || ''
+            nItem['PNRNO'] = bagInfo['PNRNO'] || null
             const bagInfoArr = Object.entries(bagInfo)
             this.tableCols.map(({ pagecode, pagename }) => {
               bagInfoArr.map(item => {
@@ -242,7 +242,7 @@ export default {
         const datacontent = { filter: parmObj }
         const parmas = {
           page: 1,
-          serviceid: 126,
+          serviceid: SERVICE_ID.baggageDetails,
           datacontent,
           size: 9999,
           event: '0'
@@ -266,7 +266,7 @@ export default {
       this.activeIndex = index
       this.setTableLocalData('bagQueryParams', this.tagObj)
       this.queryItem = Math.random()
-      this.queryTableData(115, this.tagObj, true)
+      this.queryTableData(SERVICE_ID.baggageBasicInfo, this.tagObj, true)
     },
     tabClick (item, index) {
       this.tabIndex = index
@@ -277,7 +277,7 @@ export default {
       const datacontent = { filter: { luggageNum, carrierFlightsDate } }
       const parmas = {
         page: 1,
-        serviceid: 127,
+        serviceid: SERVICE_ID.baggageDetailsImg,
         datacontent,
         size: 9999,
         event: '0'

src/views/flightPage/components/flightTable.vue

@@ -101,6 +101,58 @@ export default {
       ],
     }
   },
+  created () {
+    const query = this.$route.query;
+    const np = [
+      {
+        k1: "inflightNo",
+        k2: "inflightDate",
+      },
+      {
+        k1: "transferFlightNO",
+        k2: "outflightDate",
+      },
+      {
+        k1: "Inbound_flight_number",
+        k2: "Inbound_flight_date",
+      },
+      {
+        k1: "departure_flights_number",
+        k2: "departure_flights_date",
+      },
+    ];
+    const nq = this.formatParams(np, { ...query });
+    const filterMap = {
+      Inbound_flight_number: "inflightNo",
+      departure_flights_number: "transferFlightNO",
+    };
+    Object.entries(nq).forEach(([key, value]) => {
+      if (
+        ![
+          "carrierFlights",
+          "carrierFlightsDate",
+          "outAirport",
+          "landAirport",
+        ].includes(key)
+      ) {
+        if (filterMap[key]) {
+          this.selectedFilter = [filterMap[key], value];
+        }
+        delete nq[key];
+      }
+    });
+    let tableKey = null;
+    Object.keys({ ...query }).forEach((key) => {
+      const findKey = this.viewClassName.filter((item) => item.value === key);
+      if (findKey?.length) {
+        tableKey = [...findKey];
+      }
+    });
+    if (tableKey?.length) {
+      const { value } = tableKey[0];
+      this.selectedFilter = [value];
+    }
+  },
   computed: {
     fastFilter () {
       const [key, value] = this.selectedFilter;
@@ -151,6 +203,21 @@ export default {
     },
   },
   methods: {
+    //格式化参数-航班号
+    formatParams (arr = [], query = {}) {
+      if (arr && arr.length) {
+        for (let index = 0; index < arr.length; index++) {
+          const { k1, k2 } = arr[index];
+          if (query[k2]) {
+            query.carrierFlights = query[k1];
+            query.carrierFlightsDate = query[k2];
+            delete query[k1];
+            delete query[k2];
+          }
+        }
+      }
+      return query;
+    },
     // 获取行李列表后设置快捷筛选
     tableLoad (tableData) {
       this.setFastFilterOptions(tableData);