统计分析修改

public/config.js

@@ -13,7 +13,8 @@ PLATFROM_CONFIG.appId = 'q7kdjmmaf0kerwpf' //appid
 // 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://10.211.67.177:8043' // 登录后的http请求地址
+PLATFROM_CONFIG.baseURLCA = 'http://10.211.67.163:16300' // 登录后的http请求地址-测试
 
 PLATFROM_CONFIG.baggageMessageURL = '/openApi/luggage/search/source'
 
@@ -100,27 +101,31 @@ const DATACONTENT_ID = {
   bagTableId: 55, //基础数据-特殊行李维护-表格-id
 
   // 数据统计
-  AirlineId: 1153, //获取航线下拉ID
-  TerminalId: 1154, //获取航站楼下拉ID
-  AreaId: 1155, //获取大区下拉ID
-  AirportId: 1156, //获取航站下拉ID
-  byOtherId: 1157, //获取大区以外统计ID
-  byAreaId: 1158, //根据大区统计ID
-  baggageByOtherId: 1167, // 获取行李统计
-  baggageByAreaId: 1168, // 获取行李统计-分公司
-  passengerByOtherId: 1181, // 获取旅客统计
-  passengerByAreaId: 1182, // 获取旅客统计-分公司
-  specialBaggageByOtherId: 1191, // 获取特殊行李统计
-  specialBaggageByAreaId: 1192, // 获取特殊行李统计-分公司
-  nodeRangeId: 1171, // 节点获取查询范围
-  nodeAirlineId: 1172, // 节点获取航线下拉
-  nodeAirportId: 1173, // 节点获取航站下拉
-  nodeAllId: 1175, // 获取节点统计雷达图-全部
-  nodeInId: 1176, // 获取节点统计雷达图-进港
-  nodeOutId: 1177, // 获取节点统计雷达图-离港
-  nodeExportAirline: 1174, // 节点统计导出-航线
-  nodeExportAirport: 1178, // 节点统计导出-航站
-  nodeAxisNameId: 90
+  airlineOptions: 1806, // 获取航线下拉
+  areaOptions: 1807, // 获取大区/基地分公司下拉
+  AirportId: 1808, // 获取航站下拉
+  TerminalId: 1809, // 获取航站楼下拉
+  byOther: 1810, // 获取大区/分公司以外航班统计（全部）
+  byArea: 1811, // 根据大区/分公司航班统计（全部）
+  withBaggageByOther: 1812, // 获取大区/分公司以外航班统计（有行李）
+  withBaggageByArea: 1814, // 根据大区/分公司航班统计（有行李）
+  baggageByOther: 1815, // 获取行李统计（全部）
+  baggageByArea: 1816, // 获取行李统计-分公司（全部）
+  notDelByOther: 1817, // 获取行李统计（不包含DEL）
+  notDelByArea: 1818, // 获取行李统计-分公司（不包含DEL）
+  passengerByOther: 1819, // 获取旅客统计
+  passengerByArea: 1820, // 获取旅客统计-分公司
+  specialBaggageByOther: 1821, // 获取特殊行李统计
+  specialBaggageByArea: 1822, // 获取特殊行李统计-分公司
+  nodeRange: 1801, // 节点获取查询范围
+  nodeAirline: 1802, // 节点获取航线下拉
+  nodeAirport: 1803, // 节点获取航站下拉
+  nodeAll: 1804, // 获取节点统计雷达图-全部
+  nodeIn: 1804, // 获取节点统计雷达图-进港
+  nodeOut: 1804, // 获取节点统计雷达图-离港
+  nodeExportAirline: 1805, // 节点统计导出-航线
+  nodeExportAirport: 1805, // 节点统计导出-航站
+  nodeAxisDesc: 90 // 节点统计指示器名称解释
 }
 
 const SERVICE_ID = {

src/views/statisticsCharts/components/commonStatisticsCharts.vue

@@ -6,6 +6,7 @@
     >
       <StatisticsHeader
         :title="`${chartsTitle}量统计`"
+        :extra-items="extraItems"
         @getFormData="getFormData"
         @export="exportHandler"
       />
@@ -36,6 +37,10 @@ export default {
     querySettings: {
       type: Object,
       required: true
+    },
+    extraItems: {
+      type: Array,
+      default: () => []
     }
   },
   data() {
@@ -211,7 +216,7 @@ export default {
       deep: true
     },
     'sidebar.expand'() {
-      this.resizeHandler()
+      this.setChartHeight()
     }
   },
   mounted() {
@@ -219,81 +224,98 @@ export default {
     this.myChart = this.$echarts.init(document.getElementById('chart'))
     this.myChart.setOption(this.options)
     // 监听页面缩放
-    window.addEventListener('resize', this.setChartHeight)
-    window.addEventListener('resize', this._.debounce(this.resizeHandler, this.debounceTime))
-    this.$nextTick(() => {
-      this.resizeHandler()
-    })
+    this.debouncedChartHeightSetter = this._.debounce(this.setChartHeight, this.debounceTime)
+    window.addEventListener('resize', this.debouncedChartHeightSetter)
   },
   beforeDestroy() {
     // 销毁实例和移除监听
-    window.removeEventListener('resize', this.setChartHeight)
+    window.removeEventListener('resize', this.debouncedChartHeightSetter)
     if (this.myChart) {
       this.myChart.dispose()
-      window.removeEventListener('resize', this.resizeHandler)
       this.myChart = null
     }
   },
   methods: {
-    getFormData(data) {
-      this.getData(data)
-    },
-    async getData(data) {
+    getFormData(formData) {
       let id
       let params = []
-      if (data.range === '') {
+      if (formData.range === '') {
         this.$message.warning('请先选择统计范围')
         return
-      } else if (data.range === '航线' && !data.airline) {
+      } else if (formData.range === '航线' && !formData.airline) {
         this.$message.warning('请先选择航线')
         return
-      } else if (data.range === '航站' && !data.airport) {
+      } else if (formData.range === '航站' && !formData.airport) {
         this.$message.warning('请先选择航站')
         return
-      } else if (data.range === '基地分公司' && !data.company) {
+      } else if (formData.range === '基地分公司' && !formData.company) {
         this.$message.warning('请先选择基地分公司')
         return
       }
-      if (data.inOrOut === '') {
+      if (formData.inOrOut === '') {
         this.$message.warning('请先选择进离港')
         return
       }
-      if (data.interval === '') {
+      if (formData.interval === '') {
         this.$message.warning('请先选择统计时间维度')
         return
       }
-      if (data.dateTime === '') {
+      if (formData.dateTime === '') {
         this.$message.warning('请先选择统计时间范围')
         return
       }
-      if (data.range === '基地分公司') {
-        // id = DATACONTENT_ID.byAreaId
-        id = this.querySettings.byAreaId
-        params = [data.interval, data.company, data.inOrOut, data.dateTime[0], data.dateTime[1]]
-      } else if (data.range !== '基地分公司' && data.range !== '') {
-        // id = DATACONTENT_ID.byOtherId
-        id = this.querySettings.byOtherId
-        params = [data.interval, data.range, data.inOrOut, data.dateTime[0], data.dateTime[1]]
-        if (data.airline === '' && data.airport === '' && data.terminal === '') {
+      const requiredMissing = this.extraItems.some(item => {
+        if (item.requiredWarning && !formData[item.prop]) {
+          this.$message.warning(item.requiredWarning)
+          return true
+        } else {
+          return false
+        }
+      })
+      if (requiredMissing) {
+        return
+      }
+      if (formData.range === '基地分公司') {
+        if (formData.flightType === 'withBaggage') {
+          id = this.querySettings.withBaggageByArea
+        } else if (formData.baggageType === 'notDEL') {
+          id = this.querySettings.notDelByArea
+        } else {
+          id = this.querySettings.byArea
+        }
+        params = [formData.interval, formData.company, formData.inOrOut, formData.dateTime[0], formData.dateTime[1]]
+      } else if (formData.range !== '基地分公司' && formData.range !== '') {
+        if (formData.flightType === 'withBaggage') {
+          id = this.querySettings.withBaggageByOther
+        } else if (formData.baggageType === 'notDEL') {
+          id = this.querySettings.notDelByOther
+        } else {
+          id = this.querySettings.byOther
+        }
+        params = [formData.interval, formData.range, formData.inOrOut, formData.dateTime[0], formData.dateTime[1]]
+        if (formData.airline === '' && formData.airport === '' && formData.terminal === '') {
           params.splice(2, 0, '全部')
         }
-        if (data.airline !== '') {
-          params.splice(2, 0, data.airline)
+        if (formData.airline !== '') {
+          params.splice(2, 0, formData.airline)
         }
-        if (data.airport !== '') {
-          params.splice(2, 0, data.airport)
+        if (formData.airport !== '') {
+          params.splice(2, 0, formData.airport)
         }
-        if (data.terminal !== '') {
-          params.splice(2, 0, data.terminal)
+        if (formData.terminal !== '') {
+          params.splice(2, 0, formData.terminal)
         }
       }
+      this.getChartsData(id, params)
+    },
+    async getChartsData(id, params) {
       try {
         const {
           code,
           returnData: { listValues },
           message
         } = await Query({
-          id: id,
+          id,
           dataContent: params
         })
         if (Number(code) === 0) {
@@ -302,13 +324,10 @@ export default {
           const seriesData = []
           for (let i = 0; i < listValues.length; i++) {
             xAxisData.push(listValues[i].A)
-            seriesData.push(listValues[i][this.querySettings.seriesKey])
+            seriesData.push(listValues[i].seriesData)
             if (i > 0) {
-              if (listValues[i - 1][this.querySettings.seriesKey] > 0) {
-                yAxisData.push(
-                  (listValues[i][this.querySettings.seriesKey] - listValues[i - 1][this.querySettings.seriesKey]) /
-                    listValues[i - 1][this.querySettings.seriesKey]
-                )
+              if (listValues[i - 1].seriesData > 0) {
+                yAxisData.push((listValues[i].seriesData - listValues[i - 1].seriesData) / listValues[i - 1].seriesData)
               } else {
                 yAxisData.push(0)
               }
@@ -324,7 +343,7 @@ export default {
           this.options.yAxis[1].max = (Math.max(...yAxisData) + 0.1).toFixed(2)
           this.hasChartData = true
         } else {
-          this.$message.error(message)
+          this.$message.error(message || '失败')
         }
       } catch (error) {
         console.log('出错了', error.message || error)
@@ -339,6 +358,9 @@ export default {
       this.chartHeight = `calc(100vh - ${
         topBarHeight + headerBlankHeight + tabsWrapperHeight + headerHeight + footerBlankHeight
       }px)`
+      this.$nextTick(() => {
+        this.resizeHandler()
+      })
     },
     resizeHandler() {
       if (this.myChart) {

src/views/statisticsCharts/components/statisticsHeader.vue

@@ -110,6 +110,10 @@ export default {
       type: Array,
       default: undefined
     },
+    extraItems: {
+      type: Array,
+      default: () => []
+    },
     data: {
       type: Object,
       default: undefined
@@ -137,7 +141,9 @@ export default {
         company: '',
         airport: '',
         terminal: '',
-        dateTime: ''
+        dateTime: '',
+        flightType: '',
+        baggageType: ''
       },
       formItems: [
         {
@@ -241,7 +247,7 @@ export default {
           filterable: true,
           clearable: true,
           disabled: true,
-          queryId: DATACONTENT_ID.AirlineId,
+          queryId: DATACONTENT_ID.airlineOptions,
           setKey: 'a2',
           options: []
         },
@@ -252,7 +258,7 @@ export default {
           filterable: true,
           clearable: true,
           disabled: true,
-          queryId: DATACONTENT_ID.AreaId,
+          queryId: DATACONTENT_ID.areaOptions,
           setKey: 'a5',
           options: []
         },
@@ -302,6 +308,13 @@ export default {
     }
   },
   created() {
+    this.extraItems.forEach(item => {
+      if (item.itemIndex) {
+        this.formItems.splice(item.itemIndex, 0, item)
+      } else {
+        this.formItems.push(item)
+      }
+    })
     this.formItems.forEach(item => {
       if (item.queryId && item.setKey) {
         this.getOptions(item.queryId, item.setKey, item.prop)
@@ -382,121 +395,6 @@ export default {
         console.log('出错了', error.message || error)
       }
     }
-    // async getInOrOut(data) {
-    //   try {
-    //     const res = await Query({
-    //       id: DATACONTENT_ID.inOrOutId,
-    //       dataContent: [data]
-    //     })
-    //     if (res.code === '0') {
-    //       const arr = []
-    //       for (let i = 0; i < res.returnData.listValues.length; i++) {
-    //         arr.push({
-    //           label: res.returnData.listValues[i].a5,
-    //           value: res.returnData.listValues[i].a5
-    //         })
-    //       }
-    //       const theItem = this.formItems.find(item => item.prop === 'inOrOut')
-    //       theItem && (theItem.options = arr)
-    //     } else {
-    //       this.$message.error(res.message)
-    //     }
-    //   } catch (error) {
-    //     console.log('出错了', error.message || error)
-    //   }
-    // },
-    // async getAirline() {
-    //   try {
-    //     const res = await Query({
-    //       id: DATACONTENT_ID.AirlineId,
-    //       dataContent: []
-    //     })
-    //     if (res.code === '0') {
-    //       const arr = []
-    //       for (let i = 0; i < res.returnData.listValues.length; i++) {
-    //         arr.push({
-    //           label: res.returnData.listValues[i].a2,
-    //           value: res.returnData.listValues[i].a2
-    //         })
-    //       }
-    //       const theItem = this.formItems.find(item => item.prop === 'airline')
-    //       theItem && (theItem.options = arr)
-    //     } else {
-    //       this.$message.error(res.message)
-    //     }
-    //   } catch (error) {
-    //     console.log('出错了', error.message || error)
-    //   }
-    // },
-    // async getCompany() {
-    //   try {
-    //     const res = await Query({
-    //       id: DATACONTENT_ID.AreaId,
-    //       dataContent: []
-    //     })
-    //     if (res.code === '0') {
-    //       const arr = []
-    //       for (let i = 0; i < res.returnData.listValues.length; i++) {
-    //         arr.push({
-    //           label: res.returnData.listValues[i].a4,
-    //           value: res.returnData.listValues[i].a4
-    //         })
-    //       }
-    //       const theItem = this.formItems.find(item => item.prop === 'company')
-    //       theItem && (theItem.options = arr)
-    //     } else {
-    //       this.$message.error(res.message)
-    //     }
-    //   } catch (error) {
-    //     console.log('出错了', error.message || error)
-    //   }
-    // },
-    // async getAirport() {
-    //   try {
-    //     const res = await Query({
-    //       id: DATACONTENT_ID.AirportId,
-    //       dataContent: []
-    //     })
-    //     if (res.code === '0') {
-    //       const arr = []
-    //       for (let i = 0; i < res.returnData.listValues.length; i++) {
-    //         arr.push({
-    //           label: res.returnData.listValues[i].a2,
-    //           value: res.returnData.listValues[i].a2
-    //         })
-    //       }
-    //       const theItem = this.formItems.find(item => item.prop === 'airport')
-    //       theItem && (theItem.options = arr)
-    //     } else {
-    //       this.$message.error(res.message)
-    //     }
-    //   } catch (error) {
-    //     console.log('出错了', error.message || error)
-    //   }
-    // },
-    // async getTerminal() {
-    //   try {
-    //     const res = await Query({
-    //       id: DATACONTENT_ID.TerminalId,
-    //       dataContent: []
-    //     })
-    //     if (res.code === '0') {
-    //       const arr = []
-    //       for (let i = 0; i < res.returnData.listValues.length; i++) {
-    //         arr.push({
-    //           label: res.returnData.listValues[i].a2,
-    //           value: res.returnData.listValues[i].a2
-    //         })
-    //       }
-    //       const theItem = this.formItems.find(item => item.prop === 'terminal')
-    //       theItem && (theItem.options = arr)
-    //     } else {
-    //       this.$message.error(res.message)
-    //     }
-    //   } catch (error) {
-    //     console.log('出错了', error.message || error)
-    //   }
-    // }
   }
 }
 </script>

src/views/statisticsCharts/views/baggageStatisticsCharts.vue

@@ -2,6 +2,7 @@
   <CommonStatisticsCharts
     charts-title="行李"
     :query-settings="querySettings"
+    :extra-items="extraItems"
   />
 </template>
 
@@ -13,10 +14,30 @@ export default {
   data() {
     return {
       querySettings: {
-        byAreaId: DATACONTENT_ID.baggageByAreaId,
-        byOtherId: DATACONTENT_ID.baggageByOtherId,
-        seriesKey: 'sum(a12)'
-      }
+        byArea: DATACONTENT_ID.baggageByArea,
+        byOther: DATACONTENT_ID.baggageByOther,
+        notDelByArea: DATACONTENT_ID.notDelByArea,
+        notDelByOther: DATACONTENT_ID.notDelByOther
+      },
+      extraItems: [
+        {
+          prop: 'baggageType',
+          inputType: 'select',
+          placeholder: '请选择行李类型',
+          requiredWarning: '请先选择行李类型',
+          clearable: true,
+          options: [
+            {
+              value: 'all',
+              label: '全部'
+            },
+            {
+              value: 'notDEL',
+              label: '不包含DEL'
+            }
+          ]
+        }
+      ]
     }
   }
 }

src/views/statisticsCharts/views/flightStatisticsCharts.vue

@@ -2,6 +2,7 @@
   <CommonStatisticsCharts
     charts-title="航班"
     :query-settings="querySettings"
+    :extra-items="extraItems"
   />
 </template>
 
@@ -13,10 +14,30 @@ export default {
   data() {
     return {
       querySettings: {
-        byAreaId: DATACONTENT_ID.byAreaId,
-        byOtherId: DATACONTENT_ID.byOtherId,
-        seriesKey: 'sum(a9)'
-      }
+        byArea: DATACONTENT_ID.byArea,
+        byOther: DATACONTENT_ID.byOther,
+        withBaggageByArea: DATACONTENT_ID.withBaggageByArea,
+        withBaggageByOther: DATACONTENT_ID.withBaggageByOther
+      },
+      extraItems: [
+        {
+          prop: 'flightType',
+          inputType: 'select',
+          placeholder: '请选择航班类型',
+          requiredWarning: '请先选择航班类型',
+          clearable: true,
+          options: [
+            {
+              value: 'all',
+              label: '全部'
+            },
+            {
+              value: 'withBaggage',
+              label: '有行李'
+            }
+          ]
+        }
+      ]
     }
   }
 }

src/views/statisticsCharts/views/nodeStatisticsCharts.vue

@@ -93,7 +93,7 @@ export default {
           inputType: 'select',
           placeholder: '请选择统计范围',
           options: [],
-          queryId: DATACONTENT_ID.nodeRangeId,
+          queryId: DATACONTENT_ID.nodeRange,
           setKey: 'a1',
           changeHandler(value) {
             this.formData.airline = ''
@@ -121,7 +121,7 @@ export default {
           filterable: true,
           clearable: true,
           disabled: true,
-          queryId: DATACONTENT_ID.nodeAirlineId,
+          queryId: DATACONTENT_ID.nodeAirline,
           setKey: 'a2',
           options: []
         },
@@ -133,7 +133,7 @@ export default {
           clearable: true,
           // multiple: true,
           disabled: true,
-          queryId: DATACONTENT_ID.nodeAirportId,
+          queryId: DATACONTENT_ID.nodeAirport,
           setKey: 'a2',
           options: []
         },
@@ -291,7 +291,7 @@ export default {
       deep: true
     },
     'sidebar.expand'() {
-      this.resizeHandler()
+      this.setChartHeight()
     }
   },
   created() {
@@ -333,11 +333,8 @@ export default {
     this.myChart.setOption(this.echartsOptions)
 
     // 监听页面缩放
-    window.addEventListener('resize', this.setChartHeight)
-    window.addEventListener('resize', this._.debounce(this.resizeHandler, this.debounceTime))
-    this.$nextTick(() => {
-      this.resizeHandler()
-    })
+    this.debouncedChartHeightSetter = this._.debounce(this.setChartHeight, this.debounceTime)
+    window.addEventListener('resize', this.debouncedChartHeightSetter)
 
     // 防止修改标签造成的闪烁
     this.myChart.on('mousedown', this.hideTips)
@@ -349,10 +346,9 @@ export default {
   },
   beforeDestroy() {
     // 销毁实例和移除监听
-    window.removeEventListener('resize', this.setChartHeight)
+    window.removeEventListener('resize', this.debouncedChartHeightSetter)
     if (this.myChart) {
       this.myChart.dispose()
-      window.removeEventListener('resize', this.resizeHandler)
       this.myChart = null
     }
   },
@@ -411,7 +407,7 @@ export default {
           returnData: { listValues },
           message
         } = await Query({
-          id: DATACONTENT_ID.nodeAxisNameId,
+          id: DATACONTENT_ID.nodeAxisDesc,
           dataContent: []
         })
         if (Number(code) === 0 && listValues?.length) {
@@ -440,13 +436,13 @@ export default {
       }
       switch (data.inOrOut) {
         case '全部':
-          queryId = DATACONTENT_ID.nodeAllId
+          queryId = DATACONTENT_ID.nodeAll
           break
         case '进港':
-          queryId = DATACONTENT_ID.nodeInId
+          queryId = DATACONTENT_ID.nodeIn
           break
         case '离港':
-          queryId = DATACONTENT_ID.nodeOutId
+          queryId = DATACONTENT_ID.nodeOut
           break
         default:
           this.$message.warning('请先选择进离港')
@@ -518,6 +514,9 @@ export default {
       this.chartHeight = `calc(100vh - ${
         topBarHeight + headerBlankHeight + tabsWrapperHeight + headerHeight + footerBlankHeight
       }px)`
+      this.$nextTick(() => {
+        this.resizeHandler()
+      })
     },
     resizeHandler() {
       if (this.myChart) {

src/views/statisticsCharts/views/passengerStatisticsCharts.vue

@@ -13,9 +13,8 @@ export default {
   data() {
     return {
       querySettings: {
-        byAreaId: DATACONTENT_ID.passengerByAreaId,
-        byOtherId: DATACONTENT_ID.passengerByOtherId,
-        seriesKey: 'sum(a11)'
+        byArea: DATACONTENT_ID.passengerByArea,
+        byOther: DATACONTENT_ID.passengerByOther
       }
     }
   }

src/views/statisticsCharts/views/specialBaggageStatisticsCharts.vue

@@ -13,9 +13,8 @@ export default {
   data() {
     return {
       querySettings: {
-        byAreaId: DATACONTENT_ID.specialBaggageByAreaId,
-        byOtherId: DATACONTENT_ID.specialBaggageByOtherId,
-        seriesKey: 'sum(a15)'
+        byArea: DATACONTENT_ID.specialBaggageByArea,
+        byOther: DATACONTENT_ID.specialBaggageByOther
       }
     }
   }