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

public/config.js

@@ -1,16 +1,19 @@
-var PLATFROM_CONFIG = {};
-PLATFROM_CONFIG.baseNewUrl = "http://192.168.3.74:9006"; //登录前的http请求地址
-PLATFROM_CONFIG.baseUrl = "http://192.168.3.74:18064"; // 4A-http请求地址
+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.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://192.168.3.74:18064"; // 登录后的http请求地址
+PLATFROM_CONFIG.baseURLCA = 'http://10.211.67.177:8043' // 登录后的http请求地址
 
 const DATACONTENT_ID = {
   /***-----登录------***/
@@ -82,21 +85,26 @@ const DATACONTENT_ID = {
   bagTableId: 55, //基础数据-特殊行李维护-表格-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: 75 // 获取节点统计
-};
+  AirlineId: 1153, //获取航线下拉ID
+  TerminalId: 1154, //获取航站楼下拉ID
+  AreaId: 1155, //获取大区下拉ID
+  AirportId: 1156, //获取航站下拉ID
+  byOtherId: 1157, //获取大区以外统计ID
+  byAreaId: 1158, //根据大区统计ID
+  baggageByOtherId: 1167, // 获取行李统计
+  baggageByAreaId: 1168, // 获取行李统计-分公司
+  nodeRangeId: 1171, // 节点获取查询范围
+  nodeAirlineId: 1172, // 节点获取航线下拉
+  nodeAirportId: 1173,  // 节点获取航站下拉
+  nodeAllId: 1175, // 获取节点统计雷达图-全部
+  nodeInId: 1176, // 获取节点统计雷达图-进港
+  nodeOutId: 1177, // 获取节点统计雷达图-离港
+}
 
 const SERVICE_ID = {
   /***-----账号管理------***/
   accountScId: 17, //账号管理-增删改-id
-  roleScId: 16, //账号管理-增删改-id
+  roleScId: 16, //账号管理-角色授权-增删改-id
 
   /***-----角色管理------***/
   roleMsgId: 14, //角色管理-增删改-id
@@ -111,5 +119,5 @@ const SERVICE_ID = {
   sysServiceEditBoxId: 4, //系统设置-服务管理-编辑服务-部署机器-多选框-id
   sysQueryTabId: 5, //系统设置-查询模板-表格-增删改-id
   sysServiceAddXyId: 10, //系统设置-服务管理-新增服务-新增数据源-提交-id
-  sysDataTabId: 9, //系统设置-数据结构-数据项-表格-增删改-id
-};
+  sysDataTabId: 9 //系统设置-数据结构-数据项-表格-增删改-id
+}

src/api/flight.js

@@ -120,7 +120,7 @@ export function fulltrackinfoAndNodeInfoList (params) {
 // 行李信息原始报文查询
 export function BaggageMessageQuery (params) {
   return request({
-    url: '/baggageDC/openApi/es/list',
+    url: '/openApi/luggage/search/source',
     method: 'post',
     data: params
   })

src/views/advancedQuery/views/advancedHome.vue

@@ -741,7 +741,11 @@ export default {
     let queryFlag = false
     const query = this.$route.query
     const { startDate, endDate, singleJump } = query
-    Object.entries(query).forEach(([key, value]) => {
+    const queryEntries = Object.entries(query)
+    if (queryEntries.length) {
+      this.clearForm()
+    }
+    queryEntries.forEach(([key, value]) => {
       if (!['startDate', 'endDate', 'singleJump'].includes(key) && (value ?? '') !== '') {
         queryFlag = true
         this.form[key] = ['unLoad', 'checkIn', 'active', 'transferIn', 'canceled'].includes(key) ? Number(value) : value

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

@@ -266,6 +266,7 @@
 <script>
 import Dialog from '@/layout/components/Dialog/index.vue'
 import { queryMap, myQuery } from '@/api/dataIntegration'
+import { BaggageMessageQuery } from '@/api/flight'
 import tableColsMixin from '../../mixins/tableCols'
 
 export default {
@@ -660,8 +661,20 @@ export default {
       return myQuery(queryMap.baggageDetailsByID, ...dataContent)
     },
     // 原始报文
-    queryMessage(dataContent) {
-      return myQuery(queryMap.message, ...dataContent)
+    async queryMessage(dataContent) {
+      try {
+        const { code, returnData, message } = await BaggageMessageQuery({
+          id: 75,
+          dataContent
+        })
+        if (Number(code) === 0) {
+          return returnData.listValues
+        } else {
+          this.$message.error(message ?? '失败')
+        }
+      } catch (error) {
+        console.log('出错了', error)
+      }
     },
     async queryBaggageAll(queryData = this.queryData) {
       const { flightNO, flightDate, bagSN } = queryData
@@ -693,8 +706,12 @@ export default {
           if (item['dealTime']) {
             item['dealTime'] = item['dealTime'].replace('T', ' ')
           }
-          item['departureAirport'] = `${item['departureAirport']}\n${item['departureTime'] ? item['departureTime'].replace('T', '\n') : ''}`
-          item['landingAirport'] = `${item['landingAirport']}\n${item['landingTime'] ? item['landingTime'].replace('T', '\n') : ''}`
+          item['departureAirport'] = `${item['departureAirport']}\n${
+            item['departureTime'] ? item['departureTime'].replace('T', '\n') : ''
+          }`
+          item['landingAirport'] = `${item['landingAirport']}\n${
+            item['landingTime'] ? item['landingTime'].replace('T', '\n') : ''
+          }`
           return item
         })
         this.initTableData(this.baggageTableData)
@@ -708,7 +725,8 @@ export default {
       try {
         const result = await this.queryMessage(dataContent)
         this.messageList = result.map(message => {
-          message.dataContent = JSON.parse(message.dataContent).dataContent
+          message.dataContent = message.dataContent
+          // message.dataContent = JSON.parse(message.dataContent).dataContent
           return message
         })
       } catch (error) {

src/views/baggageManagement/mixins/form.js

@@ -240,7 +240,7 @@ export default {
           if (Number(data) === 1) {
             queryData['destination'] = this.formData.currentAirport
           } else {
-            queryData['station'] = this.formData.currentAirport
+            queryData['departureStation'] = this.formData.currentAirport
           }
           if (az.test(this.formData.search)) {
             // 纯字母则为旅客姓名

src/views/baggageManagement/mixins/terminal.js

@@ -285,7 +285,8 @@ export default {
               flightNO: row.preFlightNO,
               transferDeparture: row.flightNO,
               startDate: row.preFlightDate,
-              endDate: row.preFlightDate
+              endDate: row.preFlightDate,
+              destination: this.formData.currentAirport
             }
           })
           break
@@ -296,7 +297,8 @@ export default {
               flightNO: row.flightNO,
               transferArrival: row.preFlightNO,
               startDate: row.flightDate,
-              endDate: row.flightDate
+              endDate: row.flightDate,
+              departureStation: this.formData.currentAirport
             }
           })
           break
@@ -307,6 +309,7 @@ export default {
               flightNO: row.flightNO,
               startDate: row.flightDate,
               endDate: row.flightDate,
+              departureStation: this.formData.currentAirport,
               unLoad: 0
             }
           })
@@ -318,6 +321,7 @@ export default {
               flightNO: row.flightNO,
               startDate: row.flightDate,
               endDate: row.flightDate,
+              departureStation: this.formData.currentAirport,
               unLoad: 1
             }
           })
@@ -329,6 +333,7 @@ export default {
               flightNO: row.flightNO,
               startDate: row.flightDate,
               endDate: row.flightDate,
+              departureStation: this.formData.currentAirport,
               checkIn: 1
             }
           })
@@ -340,6 +345,7 @@ export default {
               flightNO: row.flightNO,
               startDate: row.flightDate,
               endDate: row.flightDate,
+              departureStation: this.formData.currentAirport,
               active: 0
             }
           })
@@ -351,6 +357,7 @@ export default {
               flightNO: row.flightNO,
               startDate: row.flightDate,
               endDate: row.flightDate,
+              departureStation: this.formData.currentAirport,
               transferIn: 1
             }
           })
@@ -362,6 +369,7 @@ export default {
               flightNO: row.flightNO,
               startDate: row.flightDate,
               endDate: row.flightDate,
+              departureStation: this.formData.currentAirport,
               canceled: 1
             }
           })
@@ -382,6 +390,7 @@ export default {
               flightNO: row.flightNO,
               startDate: row.flightDate,
               endDate: row.flightDate,
+              departureStation: this.formData.currentAirport,
               status: reflect[column.property]
             }
           })
@@ -394,6 +403,7 @@ export default {
               flightNO: row.flightNO,
               startDate: row.flightDate,
               endDate: row.flightDate,
+              destination: this.formData.currentAirport,
               checkIn: 1
             }
           })

src/views/statisticsCharts/views/baggageStatisticsCharts.vue

@@ -51,9 +51,9 @@ export default {
           itemHeight: 14,
           itemGap: 30,
           data: [
-            '航班量数量',
-            // '航班量同比',
-            '航班量环比'
+            '行李数量',
+            // '行李量同比',
+            '行李量环比'
           ],
           textStyle: {
             fontFamily: 'Helvetica, "Microsoft YaHei"',
@@ -126,7 +126,7 @@ export default {
         ],
         series: [
           {
-            name: '航班量数量',
+            name: '行李数量',
             type: 'bar',
             z: 2,
             itemStyle: {
@@ -140,7 +140,7 @@ export default {
             data: []
           },
           {
-            name: '航班量同比',
+            name: '行李量同比',
             type: 'line',
             z: 4,
             yAxisIndex: 1,
@@ -161,7 +161,7 @@ export default {
             data: []
           },
           {
-            name: '航班量环比',
+            name: '行李量环比',
             type: 'line',
             z: 3,
             yAxisIndex: 1,
@@ -253,10 +253,10 @@ export default {
         return
       }
       if (data.range === '基地分公司') {
-        id = DATACONTENT_ID.byAreaId
+        id = DATACONTENT_ID.baggageByAreaId
         params = [data.interval, data.company, data.inOrOut, data.dateTime[0], data.dateTime[1]]
       } else if (data.range !== '基地分公司' && data.range !== '') {
-        id = DATACONTENT_ID.byOtherId
+        id = DATACONTENT_ID.baggageByOtherId
         params = [data.interval, data.range, data.inOrOut, data.dateTime[0], data.dateTime[1]]
         if (data.airline === '' && data.airport === '' && data.terminal === '') {
           params.splice(2, 0, '全部')
@@ -282,12 +282,12 @@ export default {
           const chainArr = [0]
           for (let i = 0; i < res.returnData.listValues.length; i++) {
             dateArr.push(res.returnData.listValues[i].A)
-            dataArr.push(res.returnData.listValues[i]['sum(a9)'])
+            dataArr.push(res.returnData.listValues[i]['sum(a12)'])
             if (i > 0) {
-              if (res.returnData.listValues[i - 1]['sum(a9)'] > 0) {
+              if (res.returnData.listValues[i - 1]['sum(a12)'] > 0) {
                 chainArr.push(
-                  (res.returnData.listValues[i]['sum(a9)'] - res.returnData.listValues[i - 1]['sum(a9)']) /
-                    res.returnData.listValues[i - 1]['sum(a9)']
+                  (res.returnData.listValues[i]['sum(a12)'] - res.returnData.listValues[i - 1]['sum(a12)']) /
+                    res.returnData.listValues[i - 1]['sum(a12)']
                 )
               } else {
                 chainArr.push(0)

src/views/statisticsCharts/views/flightStatisticsCharts.vue

@@ -51,7 +51,7 @@ export default {
           itemHeight: 14,
           itemGap: 30,
           data: [
-            '航班量数量',
+            '航班数量',
             // '航班量同比',
             '航班量环比'
           ],
@@ -126,7 +126,7 @@ export default {
         ],
         series: [
           {
-            name: '航班量数量',
+            name: '航班数量',
             type: 'bar',
             z: 2,
             itemStyle: {

src/views/statisticsCharts/views/nodeStatisticsCharts.vue

@@ -379,7 +379,7 @@ export default {
                 ...pre,
                 {
                   label: curr.slice(0, 2),
-                  ratio: (datas[index] / max).toFixed(4) * 100 + '%'
+                  ratio: (datas[index] / max * 100).toFixed(2) + '%'
                 }
               ]
             } else {