Merge branch 'master' of http://120.26.64.82:10880/BFFE/SMAirports

public/config.js

@@ -89,6 +89,7 @@ window.SERVICE_ID = {
   areaOptions: 1807, // 大区/基地分公司下拉
   AirportId: 1808, // 航站下拉
   AirportIds: 12004, // 航站下拉2.0
+  AirlineIds: 12005, // 航线下拉2.0
   AirlinportId: 12003, // 航司下拉
   TerminalId: 1809, // 航站楼下拉
   byOther: 1810, // 大区/分公司以外航班统计（全部）
@@ -149,8 +150,9 @@ window.SERVICE_ID = {
 
   /***-----新统计图------***/
   LuggageInId: 12001, // 行李进港数量
-  LuggagecId: 12002
-  
+  LuggagecId: 12002, // 航司行李量数量 && // 航线行李量数量
+  LuggageHourId: 200246, // 行李小时量
+  LuggageNodeId: 200245, // 节点位置
 }
 
 window.AIRPORT_ID = {

src/router/routes/routes-file-temp.js

@@ -13,7 +13,7 @@ const uploadRoutes = {
         imgstyleup: 'ic_list_nav_upload_check.png',
       },
       component: {
-        render(c) {
+        render (c) {
           return c('router-view')
         },
       },
@@ -52,7 +52,7 @@ const statisticsChartsRoutes = {
           name: 'AirlineCompanyStatistics',
           hidden: true,
           component: {
-            render(h) {
+            render (h) {
               return h('router-view')
             },
           },
@@ -100,6 +100,16 @@ const statisticsChartsRoutes = {
                 ),
               meta: { title: '航线行李量统计' },
             },
+            {
+              path: 'hourPassenger',
+              name: 'HourPassengerStatisticsCharts',
+              hidden: true,
+              component: () =>
+                import(
+                  '@/views/statisticsCharts/views/airlineCompany/hourPassengerStatisticsCharts'
+                ),
+              meta: { title: '航线行李量统计' },
+            },
             {
               path: 'baggageAverage',
               name: 'BaggageAverageStatisticsCharts',
@@ -158,7 +168,7 @@ const statisticsChartsRoutes = {
           name: 'PassengerStatistics',
           hidden: true,
           component: {
-            render(h) {
+            render (h) {
               return h('router-view')
             },
           },
@@ -241,7 +251,7 @@ const statisticsChartsRoutes = {
           name: 'FlightClassificationStatistics',
           hidden: true,
           component: {
-            render(h) {
+            render (h) {
               return h('router-view')
             },
           },
@@ -289,13 +299,24 @@ const statisticsChartsRoutes = {
             roles: ['scanning_node_and_location_analysis'],
           },
         },
+        {
+          path: 'cap',
+          name: 'capStatisticsCharts',
+          hidden: true,
+          component: () =>
+            import('@/views/statisticsCharts/views/airlineCompany/capPassengerStatisticsCharts'),
+          meta: {
+            title: '扫描节点与位置分析',
+            roles: ['scanning_node_and_location_analysis'],
+          },
+        },
         {
           path: 'report',
           redirect: 'report/reportStatistics',
           name: 'Report',
           hidden: true,
           component: {
-            render(h) {
+            render (h) {
               return h('router-view')
             },
           },
@@ -417,7 +438,7 @@ const statisticsChartsRoutes = {
           name: 'SpecialStatistics',
           hidden: true,
           component: {
-            render(h) {
+            render (h) {
               return h('router-view')
             },
           },

src/views/statisticsCharts/components/commonBarStatisticsCharts.vue

@@ -1,24 +1,10 @@
 <template>
   <div class="statstics-wrapper">
-    <div
-      ref="headerWrapper"
-      class="statstics-header"
-    >
-      <StatisticsHeader
-        :title="`${chartsTitle}统计`"
-        :custom-items="customFormItems"
-        :items="formItems"
-        :data.sync="formData"
-        @getFormData="getFormData"
-        @export="exportHandler"
-      />
+    <div ref="headerWrapper" class="statstics-header">
+      <StatisticsHeader :title="`${chartsTitle}统计`" :custom-items="customFormItems" :items="formItems" :data.sync="formData" @getFormData="getFormData" @export="exportHandler" />
     </div>
     <div class="statstics-content">
-      <div
-        id="chart"
-        class="statistics-chart"
-        :style="{ height: chartHeight }"
-      />
+      <div id="chart" class="statistics-chart" :style="{ height: chartHeight }" />
     </div>
   </div>
 </template>
@@ -55,7 +41,7 @@ export default {
       required: true
     },
   },
-  data() {
+  data () {
     return {
       myChart: null,
       debounceTime: 300,
@@ -226,17 +212,17 @@ export default {
   watch: {
     // 监听数据变化 重绘图形
     options: {
-      handler(obj) {
+      handler (obj) {
         this.myChart.setOption(obj)
         this.resizeHandler()
       },
       deep: true
     },
-    'sidebar.expand'() {
+    'sidebar.expand' () {
       this.setChartHeight()
     },
     querySettings: {
-      handler({ seriesKey, filters }) {
+      handler ({ seriesKey, filters }) {
         if (seriesKey) {
           this.seriesKey = seriesKey
         }
@@ -248,7 +234,7 @@ export default {
       immediate: true
     }
   },
-  mounted() {
+  mounted () {
     this.setChartHeight()
     this.myChart = this.$echarts.init(document.getElementById('chart'))
     this.myChart.setOption(this.options)
@@ -256,7 +242,7 @@ export default {
     this.debouncedChartHeightSetter = this._.debounce(this.setChartHeight, this.debounceTime)
     window.addEventListener('resize', this.debouncedChartHeightSetter)
   },
-  beforeDestroy() {
+  beforeDestroy () {
     // 销毁实例和移除监听
     window.removeEventListener('resize', this.debouncedChartHeightSetter)
     if (this.myChart) {
@@ -265,7 +251,7 @@ export default {
     }
   },
   methods: {
-    resetDatas() {
+    resetDatas () {
       this.hasChartData = false
       this.options.yAxis[0].max = 60000
       this.options.xAxis.data = []
@@ -274,7 +260,7 @@ export default {
       this.options.yAxis[1].min = -0.3
       this.options.yAxis[1].max = 0.5
     },
-    getFormData(formData) {
+    getFormData (formData) {
       this.resetDatas()
 
       let id
@@ -302,7 +288,7 @@ export default {
       //   this.getSingleChartsData(id, params)
       // }
     },
-    async getMultipleChartsData(id, paramsList) {
+    async getMultipleChartsData (id, paramsList) {
       try {
         const listValuesArray = await Promise.all(paramsList.map(params => this.getChartsData(id, params)))
         const listValues = listValuesArray.reduce((preValues, currentValues) => {
@@ -324,7 +310,7 @@ export default {
         this.$message.error(error.message)
       }
     },
-    async getSingleChartsData(id, params) {
+    async getSingleChartsData (id, params) {
       try {
         const listValues = await this.getChartsData(id, params)
         this.setChartsData(listValues)
@@ -332,7 +318,7 @@ export default {
         this.$message.error(error.message)
       }
     },
-    async getChartsData(serviceId, params) {
+    async getChartsData (serviceId, params) {
       try {
         const {
           code,
@@ -340,7 +326,7 @@ export default {
           message
         } = await TempQuery({
           serviceId,
-          dataContent:  [params] 
+          dataContent: [params]
         })
         if (Number(code) === 0) {
           return listValues
@@ -351,37 +337,40 @@ export default {
         return Promise.reject(error.message || '失败')
       }
     },
-    setChartsData(listValues) {
+    setChartsData (listValues) {
       const xAxisData = []
       const yAxisData = [0]
       const seriesDatas = []
-      const filteredList = listValues.filter(element =>
-        this.filters.every((key, value) => {
-          if (key && value && element[key] !== value) {
-            return false
-          } else {
-            return true
-          }
-        })
-      )
+      let filteredList = []
+      if (listValues && listValues.length) {
+        filteredList = listValues.filter(element =>
+          this.filters.every((key, value) => {
+            if (key && value && element[key] !== value) {
+              return false
+            } else {
+              return true
+            }
+          })
+        )
+      }
       if (filteredList.length === 0) {
         this.$message.info('未查询到对应数据')
         return
       }
       console.log(this.admin)
       if (this.admin.io === '进港') {
-          this.seriesKey = 'in_num'
-        }else if(this.admin.io === '离港'){
-          this.seriesKey = 'out_num'
-        } else if (this.admin.io === '中转') {
-          this.seriesKey = 'trans_num'
-        } 
-        else if (this.admin.timedim === '正常') {
-          this.seriesKey = 'bag_num'
-        } 
-        else if (this.admin.timedim === '异常') {
-          this.seriesKey = 'exception_num'
-        }
+        this.seriesKey = 'in_num'
+      } else if (this.admin.io === '离港') {
+        this.seriesKey = 'out_num'
+      } else if (this.admin.io === '中转') {
+        this.seriesKey = 'trans_num'
+      }
+      else if (this.admin.timedim === '正常') {
+        this.seriesKey = 'bag_num'
+      }
+      else if (this.admin.timedim === '异常') {
+        this.seriesKey = 'exception_num'
+      }
       for (let i = 0; i < filteredList.length; i++) {
         xAxisData.push(filteredList[i].flight_date)
         seriesDatas.push(filteredList[i][this.seriesKey])
@@ -389,7 +378,7 @@ export default {
           if (filteredList[i - 1][this.seriesKey] > 0) {
             yAxisData.push(
               (filteredList[i][this.seriesKey] - filteredList[i - 1][this.seriesKey]) /
-                filteredList[i - 1][this.seriesKey]
+              filteredList[i - 1][this.seriesKey]
             )
           } else {
             yAxisData.push(0)
@@ -407,25 +396,24 @@ export default {
       this.tableData = [xAxisData, seriesDatas, yAxisData]
       this.hasChartData = true
     },
-    setChartHeight() {
+    setChartHeight () {
       const topBarHeight = 80
       const headerBlankHeight = 24
       const tabsWrapperHeight = 62
       const headerHeight = this.$refs['headerWrapper'].offsetHeight
       const footerBlankHeight = 24
-      this.chartHeight = `calc(100vh - ${
-        topBarHeight + headerBlankHeight + tabsWrapperHeight + headerHeight + footerBlankHeight
-      }px)`
+      this.chartHeight = `calc(100vh - ${topBarHeight + headerBlankHeight + tabsWrapperHeight + headerHeight + footerBlankHeight
+        }px)`
       this.$nextTick(() => {
         this.resizeHandler()
       })
     },
-    resizeHandler() {
+    resizeHandler () {
       if (this.myChart) {
         this.myChart.resize()
       }
     },
-    exportHandler() {
+    exportHandler () {
       if (!this.hasChartData) {
         this.$message.warning('请查询后再进行导出')
         return

src/views/statisticsCharts/components/statisticsTabs.vue

@@ -1,59 +1,25 @@
 <template>
   <div class="statistics-tabs">
-    <el-row
-      :gutter="16"
-      type="flex"
-    >
-      <el-col
-        v-for="(tab, index) in newTabList"
-        :key="index"
-        :span="4"
-      >
-        <el-dropdown
-          v-if="tab.children && tab.children.length"
-          placement="bottom"
-          @command="commandHandler"
-        >
+    <el-row :gutter="16" type="flex">
+      <el-col v-for="(tab, index) in newTabList" :key="index" :span="4">
+        <el-dropdown v-if="tab.children && tab.children.length" placement="bottom" @command="commandHandler">
           <div :class="['tab-bar', { 'tab-active': activeIndex === index }]">
-            <img
-              class="tab-icon"
-              :src="activeIndex === index ? activeIcon : defaultIcon"
-              :alt="tab.title"
-            />
-            <el-tooltip
-              :content="tab.title"
-              placement="top"
-            >
+            <img class="tab-icon" :src="activeIndex === index ? activeIcon : defaultIcon" :alt="tab.title" />
+            <el-tooltip :content="tab.title" placement="top">
               <span class="tab-title">{{ tab.title }}</span>
             </el-tooltip>
             <i class="icon-arrow el-icon-caret-bottom" />
           </div>
           <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item
-              v-for="(childTab, childIndex) in tab.children"
-              :key="childIndex"
-              :command="[tab.path, childTab.path]"
-              >{{ childTab.title }}</el-dropdown-item
-            >
+            <el-dropdown-item v-for="(childTab, childIndex) in tab.children" :key="childIndex" :command="[tab.path, childTab.path]">{{ childTab.title }}</el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
-        <div
-          v-else
-          :class="[
+        <div v-else :class="[
             'tab-bar tab-bar-single',
             { 'tab-active': activeIndex === index },
-          ]"
-          @click="clickHandler(tab.path)"
-        >
-          <img
-            class="tab-icon"
-            :src="activeIndex === index ? activeIcon : defaultIcon"
-            :alt="tab.title"
-          />
-          <el-tooltip
-            :content="tab.title"
-            placement="top"
-          >
+          ]" @click="clickHandler(tab.path)">
+          <img class="tab-icon" :src="activeIndex === index ? activeIcon : defaultIcon" :alt="tab.title" />
+          <el-tooltip :content="tab.title" placement="top">
             <span class="tab-title">{{ tab.title }}</span>
           </el-tooltip>
         </div>
@@ -65,7 +31,7 @@
 <script>
 export default {
   name: 'StatisticsTabs',
-  data() {
+  data () {
     return {
       defaultIcon: require('@/assets/nav/ic_statistical_top_default.png'),
       activeIcon: require('@/assets/nav/ic_statistical_top_check.png'),
@@ -87,6 +53,10 @@ export default {
               path: 'baggagePassenger',
               title: '航线行李量统计',
             },
+            {
+              path: 'hourPassenger',
+              title: '行李小时量统计',
+            },
           ],
         },
         // {
@@ -148,6 +118,11 @@ export default {
           title: '扫描节点与位置分析',
           roles: ['scanning_node_and_location_analysis'],
         },
+        {
+          path: '/statisticsCharts/cap',
+          title: '工作量统计',
+          roles: ['scanning_node_and_location_analysis'],
+        },
         // {
         //   title: '报表统计',
         //   path: '/statisticsCharts/report',
@@ -224,7 +199,7 @@ export default {
     }
   },
   computed: {
-    newTabList() {
+    newTabList () {
       // const auths = JSON.parse(sessionStorage.getItem('userAuthList'))
       // return this.tabList.filter(
       //   tab => !tab.roles || tab.roles.every(role => auths.includes(role))
@@ -234,7 +209,7 @@ export default {
   },
   watch: {
     '$route.path': {
-      handler(path) {
+      handler (path) {
         let activeIndex = null
         this.newTabList.some((tab, index) => {
           if (path.includes(tab.path)) {
@@ -248,7 +223,7 @@ export default {
     },
   },
   methods: {
-    commandHandler(pathArray) {
+    commandHandler (pathArray) {
       if (pathArray.some(path => !path)) {
         this.$message.info('开发中')
         return
@@ -257,7 +232,7 @@ export default {
         path: pathArray.join('/'),
       })
     },
-    clickHandler(path) {
+    clickHandler (path) {
       if (!path) {
         this.$message.info('开发中')
         return
@@ -302,7 +277,7 @@ export default {
         padding-left: 12px;
         padding-right: 8px;
         font-size: 14px;
-        font-family: Helvetica, 'Microsoft YaHei';
+        font-family: Helvetica, "Microsoft YaHei";
         font-weight: bold;
         color: #101116;
         letter-spacing: 0;

src/views/statisticsCharts/views/airlineCompany/baggagePassengerStatisticsCharts.vue

@@ -1,9 +1,5 @@
 <template>
-  <CommonBarStatisticsCharts
-    charts-title="航线行李量"
-    :query-settings="querySettings"
-    :formItems="formItems"
-  />
+  <CommonBarStatisticsCharts charts-title="航线行李量" :query-settings="querySettings" :formItems="formItems" :formData="formData" />
 </template>
 
 <script>
@@ -11,20 +7,25 @@ import CommonBarStatisticsCharts from '../../components/commonBarStatisticsChart
 export default {
   name: 'BaggagePassengerStatisticsCharts',
   components: { CommonBarStatisticsCharts },
-  data() {
+  data () {
     return {
       querySettings: {
-        byArea: SERVICE_ID.baggagePassengerByArea,
-        byOther: SERVICE_ID.baggagePassengerByOther
+        serviceId: SERVICE_ID.LuggagecId
+      },
+      formData: {
+        air_line: null,
+        iata_code: '',
+        dateTime: [],
+        timedim: '',
       },
       formItems: [
         {
-          prop: 'airline',
+          prop: 'air_line',
           inputType: 'select',
           placeholder: '航线',
           width: '180px',
-          queryId: SERVICE_ID.airlineOptions,
-          setKey: 'a2',
+          queryId: SERVICE_ID.AirlineIds,
+          setKey: 'air_line',
           options: []
         },
         {

src/views/statisticsCharts/views/airlineCompany/capPassengerStatisticsCharts.vue

@@ -0,0 +1,59 @@
+<template>
+  <CommonBarStatisticsCharts charts-title="工作量" :query-settings="querySettings" :formData="formData" :formItems="formItems" />
+</template>
+
+<script>
+import CommonBarStatisticsCharts from '../../components/commonBarStatisticsCharts.vue'
+export default {
+  name: 'BaggagePassengerStatisticsCharts',
+  components: { CommonBarStatisticsCharts },
+  data () {
+    return {
+      querySettings: {
+        byArea: SERVICE_ID.baggagePassengerByArea,
+        byOther: SERVICE_ID.baggagePassengerByOther
+      },
+      formData: {
+        airport: '',
+        dateTime: [],
+        io_type: '',
+      },
+      formItems: [
+        {
+          prop: 'airline',
+          inputType: 'select',
+          placeholder: '航站',
+          width: '180px',
+          queryId: SERVICE_ID.AirportIds,
+          setKey: 'code3',
+          options: []
+        },
+        {
+          prop: 'timedim',
+          inputType: 'select',
+          placeholder: '操作人',
+          requiredWarning: '请先选择操作人',
+          clearable: true,
+          options: [
+            {
+              value: '测试1',
+              label: '测试1',
+            },
+            {
+              value: '测试2',
+              label: '测试2',
+            },
+          ],
+        },
+        {
+          prop: 'dateTime',
+          inputType: 'datePicker',
+          clearable: true,
+          width: '240px',
+          options: [],
+        },
+      ],
+    }
+  }
+}
+</script>

src/views/statisticsCharts/views/airlineCompany/hourPassengerStatisticsCharts.vue

@@ -0,0 +1,66 @@
+<template>
+  <CommonBarStatisticsCharts charts-title="行李小时量数量" :query-settings="querySettings" :formItems="formItems" :formData="formData" />
+</template>
+
+<script>
+import CommonBarStatisticsCharts from '../../components/commonBarStatisticsCharts.vue'
+export default {
+  name: 'FlightStatisticsCharts',
+  components: { CommonBarStatisticsCharts },
+  data () {
+    return {
+      querySettings: {
+        serviceId: SERVICE_ID.LuggageHourId
+      },
+      formData: {
+        airport: '',
+        dateTime: [],
+        io_type: '',
+      },
+      formItems: [
+        {
+          prop: 'airport',
+          inputType: 'select',
+          placeholder: '航站',
+          width: '150px',
+          // filterable: true,
+          // clearable: true,
+          // multiple: true,
+          // disabled: true,
+          queryId: SERVICE_ID.AirportIds,
+          setKey: 'code3',
+          options: []
+        },
+        {
+          prop: 'io_type',
+          inputType: 'select',
+          placeholder: '进出港',
+          requiredWarning: '请先选择进出港',
+          clearable: true,
+          options: [
+            {
+              value: '离港',
+              label: '离港',
+            },
+            {
+              value: '进港',
+              label: '进港',
+            },
+            {
+              value: '中转',
+              label: '中转',
+            },
+          ],
+        },
+        {
+          prop: 'dateTime',
+          inputType: 'datePicker',
+          clearable: true,
+          width: '240px',
+          options: [],
+        },
+      ],
+    }
+  }
+}
+</script>

src/views/statisticsCharts/views/nodeStatisticsCharts.vue

@@ -1,68 +1,28 @@
 <template>
   <div class="statstics-wrapper">
-    <div
-      ref="headerWrapper"
-      class="statstics-header"
-    >
-      <StatisticsHeader
-        title="扫描节点与位置分析"
-        :items="formItems"
-        :data="formData"
-        with-setting
-        @getFormData="getFormData"
-        @export="exportHandler"
-        @setting="settingHandler"
-      />
+    <div ref="headerWrapper" class="statstics-header">
+      <StatisticsHeader title="扫描节点与位置分析" :items="formItems" :data="formData" with-setting @getFormData="getFormData" @export="exportHandler" @setting="settingHandler" />
     </div>
     <div class="statstics-content">
-      <div
-        ref="myChart"
-        class="node-statistics-chart"
-        :style="{ height: chartHeight }"
-      />
-      <div
-        v-if="checkedTooltips.length"
-        class="node-tooltip"
-      >
+      <div ref="myChart" class="node-statistics-chart" :style="{ height: chartHeight }" />
+      <div v-if="checkedTooltips.length" class="node-tooltip">
         <div class="node-tooltip-title">节点扫描率</div>
-        <div
-          v-for="tooltip in checkedTooltips"
-          :key="tooltip.label"
-          class="node-tooltip-content"
-        >
+        <div v-for="tooltip in checkedTooltips" :key="tooltip.label" class="node-tooltip-content">
           <span>{{ tooltip.label }}：</span><span>{{ tooltip.ratio }}</span>
         </div>
       </div>
     </div>
-    <Dialog
-      :flag="dialogFlag"
-      class="dialog-check-group"
-    >
+    <Dialog :flag="dialogFlag" class="dialog-check-group">
       <div class="dialog-wrapper">
         <div class="title">列设置</div>
         <div class="content">
           <el-checkbox-group v-model="checkListTemp">
-            <el-checkbox
-              v-for="node in nodeList"
-              :key="node.name"
-              :label="node.name"
-              :disabled="node.disabled"
-            />
+            <el-checkbox v-for="node in nodeList" :key="node.name" :label="node.name" :disabled="node.disabled" />
           </el-checkbox-group>
         </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>
@@ -81,10 +41,9 @@ import FileSaver from 'file-saver'
 export default {
   name: 'FlightStatisticsCharts',
   components: { StatisticsHeader, Dialog },
-  data() {
+  data () {
     return {
       formData: {
-        range: '',
         airline: '',
         airport: '',
         inOrOut: '',
@@ -124,8 +83,8 @@ export default {
           // filterable: true,
           // clearable: true,
           // disabled: true,
-          queryId: SERVICE_ID.nodeAirline,
-          setKey: 'a2',
+          queryId: SERVICE_ID.AirlineIds,
+          setKey: 'air_line',
           options: [],
         },
         {
@@ -136,8 +95,8 @@ export default {
           // clearable: true,
           // multiple: true,
           // disabled: true,
-          queryId: SERVICE_ID.nodeAirport,
-          setKey: 'a2',
+          queryId: SERVICE_ID.AirportIds,
+          setKey: 'code3',
           options: [],
         },
         {
@@ -146,16 +105,12 @@ export default {
           placeholder: '进离港',
           clearable: true,
           options: [{
-            value: '离岗',
-            label: '离岗',
+            value: '离港',
+            label: '离港',
           },
           {
             value: '进港',
             label: '进港',
-          },
-          {
-            value: '中转',
-            label: '中转',
           }],
         },
         {
@@ -262,12 +217,12 @@ export default {
   },
   computed: {
     ...mapGetters(['sidebar']),
-    checkedTooltips() {
+    checkedTooltips () {
       return this.tooltips.filter(tooltip =>
         this.checkList.includes(tooltip.name)
       )
     },
-    checkedSeriesData() {
+    checkedSeriesData () {
       return this.seriesData.reduce((pre, curr) => {
         if (this.checkList.includes(curr.name)) {
           return [...pre, curr.value]
@@ -276,19 +231,19 @@ export default {
         }
       }, [])
     },
-    checkedIndicator() {
+    checkedIndicator () {
       return this.indicator.filter(node => this.checkList.includes(node.name))
     },
   },
   watch: {
     checkedIndicator: {
-      handler(arr) {
+      handler (arr) {
         this.echartsOptions.radar.indicator = arr
       },
       deep: true,
     },
     checkedSeriesData: {
-      handler(arr) {
+      handler (arr) {
         this.echartsOptions.series[0].data = [
           {
             name: this.queryData[2],
@@ -300,17 +255,17 @@ export default {
     },
     // 监听数据变化 重绘图形
     echartsOptions: {
-      handler(obj) {
+      handler (obj) {
         this.myChart && this.myChart.setOption(obj)
         this.resizeHandler()
       },
       deep: true,
     },
-    'sidebar.expand'() {
+    'sidebar.expand' () {
       this.setChartHeight()
     },
   },
-  created() {
+  created () {
     this.getTips()
 
     this.tooltips = this.nodeList.reduce((pre, curr) => {
@@ -346,7 +301,7 @@ export default {
       }
     }, [])
   },
-  mounted() {
+  mounted () {
     const that = this
 
     this.setChartHeight()
@@ -368,7 +323,7 @@ export default {
       setTimeout(that.changeTips.bind(that, params), 0)
     })
   },
-  beforeDestroy() {
+  beforeDestroy () {
     // 销毁实例和移除监听
     window.removeEventListener('resize', this.debouncedChartHeightSetter)
     if (this.myChart) {
@@ -377,21 +332,21 @@ export default {
     }
   },
   methods: {
-    hideTips(params) {
+    hideTips (params) {
       if (params.componentType === 'radar') {
         this.myChart._dom.children[1].style.opacity = 0
       }
     },
-    changeTips(params) {
+    changeTips (params) {
       const tip = this.myChart._dom.children[1]
       if (params.componentType === 'radar' && this.descriptions[params.name]) {
         tip.innerHTML = tip.textContent = this.descriptions[params.name]
       }
     },
-    getFormData(data) {
+    getFormData (data) {
       this.queryChartsData(data)
     },
-    setInOrOutOptions(range) {
+    setInOrOutOptions (range) {
       const theInOrOutItem = this.formItems.find(
         item => item.prop === 'inOrOut'
       )
@@ -426,7 +381,7 @@ export default {
           break
       }
     },
-    async getTips() {
+    async getTips () {
       try {
         const {
           code,
@@ -445,13 +400,9 @@ export default {
         this.$message.error('失败')
       }
     },
-    async queryChartsData(data) {
+    async queryChartsData (data) {
       const params = []
       let queryId
-      if (data.range === '') {
-        this.$message.warning('请先选择统计范围')
-        return
-      }
       if (data.range === '航线' && data.airline === '') {
         this.$message.warning('请先选择航线')
         return
@@ -478,15 +429,22 @@ export default {
         this.$message.warning('请先选择统计时间范围')
         return
       }
-      params.push(data.range, data.inOrOut, data.dateTime[0], data.dateTime[1])
-      if (data.range === '航线') {
-        params.splice(1, 0, data.airline)
-      } else if (data.range === '航站') {
-        params.splice(1, 0, data.airport)
-      } else {
-        params.splice(1, 0, '全部')
+      const dataObj = {
+        air_line: data.airline,
+        airport: data.airport,
+        io_type: data.inOrOut,
+        fd1: data.dateTime[0],
+        fd2: data.dateTime[1]
       }
-
+      params.push(dataObj)
+      // if (data.range === '航线') {
+      //   params.splice(1, 0, data.airline)
+      // } else if (data.range === '航站') {
+      //   params.splice(1, 0, data.airport)
+      // } else {
+      //   params.splice(1, 0, '全部')
+      // }
+      // console.log(params)
       this.queryData = params
 
       try {
@@ -495,7 +453,7 @@ export default {
         this.hasChartData = false
 
         const res = await TempQuery({
-          id: queryId,
+          serviceId: SERVICE_ID.LuggageNodeId,
           dataContent: params,
         })
         if (Number(res.code) === 0) {
@@ -533,29 +491,28 @@ export default {
         this.$message.error('失败')
       }
     },
-    setChartHeight() {
+    setChartHeight () {
       const topBarHeight = 80
       const headerBlankHeight = 24
       const tabsWrapperHeight = 62
       const headerHeight = this.$refs['headerWrapper'].offsetHeight
       const footerBlankHeight = 24
-      this.chartHeight = `calc(100vh - ${
-        topBarHeight +
+      this.chartHeight = `calc(100vh - ${topBarHeight +
         headerBlankHeight +
         tabsWrapperHeight +
         headerHeight +
         footerBlankHeight
-      }px)`
+        }px)`
       this.$nextTick(() => {
         this.resizeHandler()
       })
     },
-    resizeHandler() {
+    resizeHandler () {
       if (this.myChart) {
         this.myChart.resize()
       }
     },
-    exportHandler() {
+    exportHandler () {
       if (!this.hasChartData) {
         this.$message.warning('请查询后再进行导出')
         return
@@ -568,7 +525,7 @@ export default {
       // $a.setAttribute('download', '扫描节点与位置分析统计.png')
       // $a.click()
     },
-    async queryExportData(queryData) {
+    async queryExportData (queryData) {
       let queryId
       switch (queryData[0]) {
         case '航站':
@@ -731,11 +688,11 @@ export default {
         this.$message.error('失败')
       }
     },
-    settingHandler() {
+    settingHandler () {
       this.dialogFlag = true
       this.checkListTemp = [...this.checkList]
     },
-    onCheck() {
+    onCheck () {
       if (this.dialogFlag === false) {
         return
       }
@@ -746,7 +703,7 @@ export default {
       this.checkList = [...this.checkListTemp]
       this.dialogFlag = false
     },
-    hide() {
+    hide () {
       this.dialogFlag = false
     },
   },
@@ -765,7 +722,7 @@ export default {
       left: 64px;
       z-index: 100;
       font-size: 14px;
-      font-family: Helvetica, 'Microsoft YaHei';
+      font-family: Helvetica, "Microsoft YaHei";
       color: #303133;
       .node-tooltip-title {
         line-height: 14px;