7.12问题修改

src/views/advancedQuery/views/advancedHome.vue

@@ -5,7 +5,7 @@
         <div class="manageTitle">高级查询</div>
         <!-- <div class="interfaceLog_head_time_start mr10">
           <el-date-picker
-            v-model="FlightDate[0]"
+            v-model="flightDate[0]"
             class="input-shadow"
             size="small"
             type="date"
@@ -16,7 +16,7 @@
         </div>
         <div class="interfaceLog_head_time_end">
           <el-date-picker
-            v-model="FlightDate[1]"
+            v-model="flightDate[1]"
             class="input-shadow"
             size="small"
             type="date"
@@ -25,7 +25,7 @@
             @change="endDateChangeHandler"
           />
         </div> -->
-        <el-date-picker v-model="FlightDate" size="small" type="daterange" value-format="yyyy-MM-dd" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="dateRangePickerOptions" />
+        <el-date-picker v-model="flightDate" size="small" type="daterange" value-format="yyyy-MM-dd" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="dateRangePickerOptions" />
       </div>
       <Search ref="search" class="advanced-search" :is-title="false" :is-slot="true" :search-tooltip="'请输入航班号（示例：CA1234）或行李牌号（示例：1234567890）'" @getSearchData="getSearchData" @clearSearchData="clearSearchData">
         <div class="flex-wrap">
@@ -92,8 +92,8 @@
             <el-row :gutter="20">
               <el-col v-for="item in formItems" :key="item.prop" :span="item.span || 8">
                 <el-form-item :label="item.label" :prop="item.prop">
-                  <template v-if="item.prop === 'FlightDate'">
-                    <el-date-picker v-model="FlightDate" size="small" type="daterange" value-format="yyyy-MM-dd" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="dateRangePickerOptions" @keyup.esc.native="dialogFocus" />
+                  <template v-if="item.prop === 'flightDate'">
+                    <el-date-picker v-model="flightDate" size="small" type="daterange" value-format="yyyy-MM-dd" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="dateRangePickerOptions" @keyup.esc.native="dialogFocus" />
                   </template>
                   <template v-else-if="item.prop === 'status'">
                     <el-select v-model="form.status" size="small" filterable default-first-option clearable @keyup.esc.native="dialogFocus">
@@ -174,33 +174,33 @@ export default {
       gjFlag: false,
       tableData: [
         // {
-        //   FlightNO: '',
-        //   FlightDate: '',
-        //   SourceAirport: '',
-        //   TargetAirport: '',
-        //   PassengerNameUpcase: '',
-        //   BagSN: '',
-        //   SpecialType: '',
+        //   flightNO: '',
+        //   flightDate: '',
+        //   sourceAirport: '',
+        //   targetAirport: '',
+        //   passengerNameUpcase: '',
+        //   bagSN: '',
+        //   specialType: '',
         //   checkIn: '',
         //   deleted: '',
         //   activated: '',
-        //   BagWeight: '',
+        //   bagWeight: '',
         //   latestStatus: '',
         //   bagLocation: '',
-        //   TransferFlightNO: ''
+        //   transferFlightNO: ''
         // }
       ],
       checkList: [],
       tableCols: [
         {
-          prop: 'FlightNO',
+          prop: 'flightNO',
           label: '航班号',
           fixed: 'left',
           filterable: true,
           sortable: true
         },
         {
-          prop: 'FlightDate',
+          prop: 'flightDate',
           label: '航班日期',
           fixed: 'left',
           width: 110,
@@ -208,38 +208,38 @@ export default {
           sortable: true
         },
         {
-          prop: 'DepartureTime',
+          prop: 'departureTime',
           label: '起飞时间',
           width: 150
         },
         {
-          prop: 'SourceAirport',
+          prop: 'sourceAirport',
           label: '起飞站',
           filterable: true,
           sortable: true
         },
         {
-          prop: 'TargetAirport',
+          prop: 'targetAirport',
           label: '目的地',
           filterable: true,
           sortable: true
         },
         {
-          prop: 'PassengerNameUpcase',
+          prop: 'passengerNameUpcase',
           label: '旅客姓名',
           width: 150,
           filterable: true,
           sortable: true
         },
         {
-          prop: 'BagSN',
+          prop: 'bagSN',
           label: '行李牌号',
           width: 110,
           filterable: true,
           sortable: true
         },
         {
-          prop: 'SpecialType',
+          prop: 'specialType',
           label: '特殊行李类型',
           width: 115,
           filterable: true,
@@ -258,7 +258,7 @@ export default {
           sortable: true
         },
         {
-          prop: 'BagWeight',
+          prop: 'bagWeight',
           label: '重量'
         },
         {
@@ -283,27 +283,27 @@ export default {
           sortable: true
         },
         {
-          prop: 'PreFlightNO',
+          prop: 'preFlightNO',
           label: '中转进航班',
           width: 110,
           filterable: true,
           sortable: true
         },
         {
-          prop: 'TransferFlightNO',
+          prop: 'transferFlightNO',
           label: '中转出航班',
           width: 110,
           filterable: true,
           sortable: true
         }
       ],
-      FlightDate: [parseTime(new Date(), '{y}-{m}-{d}'), parseTime(new Date(), '{y}-{m}-{d}')],
+      flightDate: [parseTime(new Date(), '{y}-{m}-{d}'), parseTime(new Date(), '{y}-{m}-{d}')],
       dateRangePickerOptions: {
         onPick: this.dateRangePickHandler,
         disabledDate: this.dateRangeDisabled
       },
       form: {
-        FlightNO: '',
+        flightNO: '',
         destination: '',
         departureStation: '',
         baggageNO: '',
@@ -323,7 +323,7 @@ export default {
       },
       formItems: [
         {
-          prop: 'FlightDate',
+          prop: 'flightDate',
           label: '航班日期',
           span: 16
         },
@@ -332,7 +332,7 @@ export default {
           label: '当前状态'
         },
         {
-          prop: 'FlightNO',
+          prop: 'flightNO',
           label: '航班号',
           hintText: '示例：CA1111',
           hintVisible: false
@@ -447,7 +447,7 @@ export default {
       dataContent: [],
       rules: {
         // 机器信息表单验证
-        // FlightNO: [
+        // flightNO: [
         //   { required: true, message: "请输入有效航班号", trigger: "blur" },
         // ],
       },
@@ -485,10 +485,10 @@ export default {
     }
   },
   watch: {
-    FlightDate: {
+    flightDate: {
       handler (val) {
         if (val === null) {
-          this.FlightDate = ['', '']
+          this.flightDate = ['', '']
         }
       },
       deep: true
@@ -502,11 +502,11 @@ export default {
             this.spanArr.push(1)
           } else {
             if (
-              item['FlightNO'] === arr[index - 1]['FlightNO'] &&
-              item['FlightDate'] === arr[index - 1]['FlightDate'] &&
-              item['PassengerNameUpcase'] === arr[index - 1]['PassengerNameUpcase'] &&
-              item['CheckInNO'] === arr[index - 1]['CheckInNO'] &&
-              item['BagWeight'] === arr[index - 1]['BagWeight']
+              item['flightNO'] === arr[index - 1]['flightNO'] &&
+              item['flightDate'] === arr[index - 1]['flightDate'] &&
+              item['passengerNameUpcase'] === arr[index - 1]['passengerNameUpcase'] &&
+              item['checkInNO'] === arr[index - 1]['checkInNO'] &&
+              item['bagWeight'] === arr[index - 1]['bagWeight']
             ) {
               this.spanArr[contactDot] += 1
               this.spanArr.push(0)
@@ -557,15 +557,15 @@ export default {
         this.form[key] = ['unLoad', 'checkIn', 'active', 'transferIn', 'canceled'].includes(key) ? Number(value) : value
       }
     })
-    startDate && (this.FlightDate[0] = startDate)
-    endDate && (this.FlightDate[1] = endDate)
+    startDate && (this.flightDate[0] = startDate)
+    endDate && (this.flightDate[1] = endDate)
     if (flag) {
       this.onCheckGj(singleJump)
     } else if (this.queryForm) {
       Object.keys(this.form).forEach(key => {
         this.form[key] = this.queryForm[key]
       })
-      this.FlightDate = this.queryForm.FlightDate
+      this.flightDate = this.queryForm.flightDate
       this.onCheckGj()
     }
   },
@@ -580,7 +580,7 @@ export default {
     if (this.$route.matched.filter(item => item.name && item.meta.title).length > 1) {
       this.$store.dispatch('app/setQueryForm', {
         ...this.form,
-        FlightDate: this.FlightDate
+        flightDate: this.flightDate
       })
     } else {
       this.$store.dispatch('app/setQueryForm', null)
@@ -597,32 +597,32 @@ export default {
       this.$refs['dialog'].focus()
     },
     // startDateChangeHandler(val) {
-    //   this.FlightDate[0] = val ?? ''
-    //   if (!val || !this.FlightDate[1]) {
+    //   this.flightDate[0] = val ?? ''
+    //   if (!val || !this.flightDate[1]) {
     //     return
     //   }
     //   const startDate = new Date(val)
-    //   const endDate = new Date(this.FlightDate[1])
+    //   const endDate = new Date(this.flightDate[1])
     //   if (startDate > endDate) {
-    //     this.FlightDate.splice(1, 1, '')
+    //     this.flightDate.splice(1, 1, '')
     //     this.$message.info('结束时间不能早于开始时间，请重新选择')
     //   } else if (endDate - startDate > 2 * 24 * 60 * 60 * 1000) {
-    //     this.FlightDate.splice(1, 1, '')
+    //     this.flightDate.splice(1, 1, '')
     //     this.$message.info('时间跨度不能超过三天，请重新选择')
     //   }
     // },
     // endDateChangeHandler(val) {
-    //   this.FlightDate[1] = val ?? ''
-    //   if (!val || !this.FlightDate[0]) {
+    //   this.flightDate[1] = val ?? ''
+    //   if (!val || !this.flightDate[0]) {
     //     return
     //   }
-    //   const startDate = new Date(this.FlightDate[0])
+    //   const startDate = new Date(this.flightDate[0])
     //   const endDate = new Date(val)
     //   if (startDate > endDate) {
-    //     this.FlightDate.splice(0, 1, '')
+    //     this.flightDate.splice(0, 1, '')
     //     this.$message.info('开始时间不能晚于结束时间，请重新选择')
     //   } else if (endDate - startDate > 2 * 24 * 60 * 60 * 1000) {
-    //     this.FlightDate.splice(0, 1, '')
+    //     this.flightDate.splice(0, 1, '')
     //     this.$message.info('时间跨度不能超过三天，请重新选择')
     //   }
     // },
@@ -637,7 +637,7 @@ export default {
       return this.pickedDate ? Math.abs(date - this.pickedDate) > 2 * 24 * 60 * 60 * 1000 : false
     },
     objectSpanMethod ({ row, column, rowIndex, columnIndex }) {
-      if (['PassengerNameUpcase', 'BagWeight'].includes(column.property)) {
+      if (['passengerNameUpcase', 'bagWeight'].includes(column.property)) {
         const _row = this.spanArr[rowIndex]
         const _col = _row > 0 ? 1 : 0
         return {
@@ -664,7 +664,7 @@ export default {
     },
     cellClass ({ row, column, rowIndex, columnIndex }) {
       const classes = []
-      if (['FlightNO', 'TransferFlightNO', 'BagSN'].includes(column.property)) {
+      if (['flightNO', 'transferFlightNO', 'bagSN'].includes(column.property)) {
         classes.push('cell-click')
         if (
           this.clickedCells.some(
@@ -680,7 +680,7 @@ export default {
       return classes.join(' ')
     },
     cellClickHandler (row, column, cell, event) {
-      if (['FlightNO', 'TransferFlightNO', 'BagSN'].includes(column.property)) {
+      if (['flightNO', 'transferFlightNO', 'bagSN'].includes(column.property)) {
         this.$store.dispatch('keepAlive/addClickedCell', {
           row,
           columnProp: column.property,
@@ -688,31 +688,31 @@ export default {
         })
       }
       switch (column.property) {
-        case 'FlightNO':
+        case 'flightNO':
           this.$router.push({
             path: '/advance/flightView',
             query: {
-              flightNO: row.FlightNO,
-              flightDate: row.FlightDate
+              flightNO: row.flightNO,
+              flightDate: row.flightDate
             }
           })
           break
-        case 'TransferFlightNO':
+        case 'transferFlightNO':
           this.$router.push({
             path: '/advance/flightView',
             query: {
-              flightNO: row.TransferFlightNO,
-              flightDate: row.FlightDate
+              flightNO: row.transferFlightNO,
+              flightDate: row.flightDate
             }
           })
           break
-        case 'BagSN':
+        case 'bagSN':
           this.$router.push({
             path: '/advance/baggageView',
             query: {
-              flightNO: row.FlightNO,
-              flightDate: row.FlightDate,
-              bagSN: row.BagSN
+              flightNO: row.flightNO,
+              flightDate: row.flightDate,
+              bagSN: row.bagSN
             }
           })
           break
@@ -723,7 +723,7 @@ export default {
     // 查询
     getSearchData (val) {
       this.clearForm()
-      if (this.FlightDate[0] === '' || this.FlightDate[1] === '' || val === '') {
+      if (this.flightDate[0] === '' || this.flightDate[1] === '' || val === '') {
         this.$message.error('请先输入完整查询信息')
       } else {
         // 点击搜索后清除跳转携带的查询信息
@@ -742,7 +742,7 @@ export default {
           this.onCheckGj(true)
         } else if (azNum.test(val) && top2.test(val)) {
           // 字母加数字且前两位为字母则为航班号
-          this.form['FlightNO'] = val
+          this.form['flightNO'] = val
           this.onCheckGj(true)
         } else if ((num.test(val) && val.length === 10) || bagNo.test(val)) {
           // 纯数字且位数等于10则为行李牌号
@@ -773,15 +773,15 @@ export default {
       是否已翻减（null/OFF/其他），是否已翻减（null/OFF/其他），是否值机（null/0/1），是否值机（null/0/1），
       是否激活（null/0/1），是否激活（null/0/1），是否中转（null/0/1），是否中转（null/0/1），是否取消行李（null/0/1)，是否取消行李（null/0/1)】 */
       this.dataContent = []
-      const FlightDate = this.FlightDate
-      if (FlightDate && FlightDate.length) {
-        this.dataContent.push(FlightDate[0])
-        this.dataContent.push(FlightDate[1])
+      const flightDate = this.flightDate
+      if (flightDate && flightDate.length) {
+        this.dataContent.push(flightDate[0])
+        this.dataContent.push(flightDate[1])
         if (Object.values(this.form).every(value => value === '')) {
           this.$message.error('请先输入查询信息')
         } else {
           const {
-            FlightNO,
+            flightNO,
             baggageNO,
             departureStation,
             destination,
@@ -800,7 +800,7 @@ export default {
             status
           } = this.form
           this.setDataContent(
-            FlightNO,
+            flightNO,
             baggageNO,
             departureStation,
             destination,
@@ -850,23 +850,23 @@ export default {
               this.$router.push({
                 path: '/advance/baggageView',
                 query: {
-                  bagSN: result[0].BagSN,
-                  flightNO: result[0].FlightNO,
-                  flightDate: result[0].FlightDate
+                  bagSN: result[0].bagSN,
+                  flightNO: result[0].flightNO,
+                  flightDate: result[0].flightDate
                 }
               })
             } else {
               const onlyFlight = result.reduce((pre, curr) => {
                 if (
                   pre === null ||
-                  (curr.FlightNO &&
-                    curr.FlightDate &&
-                    curr.FlightNO === pre.flightNO &&
-                    curr.FlightDate === pre.flightDate)
+                  (curr.flightNO &&
+                    curr.flightDate &&
+                    curr.flightNO === pre.flightNO &&
+                    curr.flightDate === pre.flightDate)
                 ) {
                   return {
-                    flightNO: curr.FlightNO,
-                    flightDate: curr.FlightDate
+                    flightNO: curr.flightNO,
+                    flightDate: curr.flightDate
                   }
                 } else {
                   return {}
@@ -880,7 +880,7 @@ export default {
               }
             }
           }
-          const tableData = this._.sortBy(result, ['FlightDate', 'DepartureTime', 'PassengerNameUpcase', 'BagSN'])
+          const tableData = this._.sortBy(result, ['flightDate', 'departureTime', 'passengerNameUpcase', 'bagSN'])
           this.tableData = tableData.map((item, index, arr) => {
             item['deleted'] === 'DEL' || (item['deleted'] = '')
             item['activated'] = item['activated'] === 'I' ? '未激活' : '激活'

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

@@ -473,6 +473,36 @@ export default {
       flag: 0
     }
   },
+  computed: {
+    singleDay() {
+      return this.startDate === this.endDate
+    }
+  },
+  watch: {
+    dealedTableData: {
+      handler(val) {
+        this.spanArr = []
+        let contactDot = this.contactDot
+        val.forEach((item, index, arr) => {
+          if (index === 0) {
+            this.spanArr.push(1)
+          } else {
+            if (
+              item['preFlightNO'] === arr[index - 1]['preFlightNO'] &&
+              item['preFlightDate'] === arr[index - 1]['preFlightDate']
+            ) {
+              this.spanArr[contactDot] += 1
+              this.spanArr.push(0)
+            } else {
+              this.spanArr.push(1)
+              contactDot = index
+            }
+          }
+        })
+      },
+      deep: true
+    }
+  },
   created() {
     // this.getAirPortData()
     const { startDate, endDate } = this.$route.query
@@ -498,11 +528,6 @@ export default {
       this.loopEvent = null
     }
   },
-  computed: {
-    singleDay() {
-      return this.startDate === this.endDate
-    }
-  },
   methods: {
     resetLoopEvent() {
       this.loading = true
@@ -669,12 +694,7 @@ export default {
         }
         // this.baggageCount = this.baggageCount + item.preLoad
       })
-      this.tableData = this._.sortBy(tableData, [
-        'preFlightDate',
-        'actualLandingTime',
-        'flightDate',
-        'actualDepartureTime'
-      ])
+      this.tableData = this._.sortBy(tableData, ['actualLandingTime', 'preFlightNO', 'actualDepartureTime', 'flightNO'])
       setTableFilters(this.tableData, this.tableDataFilters)
       // this.toOrderNum(this.baggageCount);
       // setInterval(() => {
@@ -708,7 +728,6 @@ export default {
       setTimeout(() => {
         const scrollMid = lastRow.offsetTop + lastRow.offsetHeight - scrollParent.offsetHeight / 2
         const scrollMax = scrollParent.scrollHeight - scrollParent.offsetHeight
-        console.log(scrollMid, scrollMax)
         if (scrollMid > 0) {
           const scrollHeight = Math.min(scrollMid, scrollMax)
           scrollParent.scrollTo(0, scrollHeight)

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

@@ -657,12 +657,7 @@ export default {
         }
         // this.baggageCount = this.baggageCount + item.preLoad
       })
-      this.tableData = this._.sortBy(tableData, [
-        'flightDate',
-        'actualDepartureTime',
-        'preFlightDate',
-        'actualLandingTime'
-      ])
+      this.tableData = this._.sortBy(tableData, ['actualDepartureTime', 'flightNO', 'actualLandingTime', 'preFlightNO'])
       setTableFilters(this.tableData, this.tableDataFilters)
       // this.toOrderNum(this.baggageCount);
       // setInterval(() => {

src/views/statisticsCharts/components/statisticsHeader.vue

@@ -32,7 +32,7 @@
             :disabled="item.disabled"
             @change="
               (value) => {
-                item.changeHandler && item.changeHandler(value);
+                item.changeHandler && call(item.changeHandler, value)
               }
             "
           >
@@ -97,14 +97,13 @@ export default {
     }
   },
   data() {
-    const that = this
     return {
       formData: {
         range: '',
         inOrOut: '',
         interval: '',
         airline: '',
-        area: '',
+        company: '',
         airport: '',
         terminal: '',
         dateTime: ''
@@ -137,29 +136,29 @@ export default {
             }
           ],
           changeHandler(value) {
-            that.getInOrOut(value)
-            that.formData.airline = ''
-            that.formData.area = ''
-            that.formData.airport = ''
-            that.formData.terminal = ''
-            that.formData.interval = ''
-            that.formData.inOrOut = ''
-            that.formItems[4].disabled = true
-            that.formItems[5].disabled = true
-            that.formItems[6].disabled = true
-            that.formItems[7].disabled = true
+            this.getInOrOut(value)
+            this.formData.airline = ''
+            this.formData.company = ''
+            this.formData.airport = ''
+            this.formData.terminal = ''
+            this.formData.interval = ''
+            this.formData.inOrOut = ''
+            this.formItems[4].disabled = true
+            this.formItems[5].disabled = true
+            this.formItems[6].disabled = true
+            this.formItems[7].disabled = true
             switch (value) {
               case '航线':
-                that.formItems[4].disabled = false
+                this.formItems[4].disabled = false
                 break
               case '基地分公司':
-                that.formItems[5].disabled = false
+                this.formItems[5].disabled = false
                 break
               case '航站':
-                that.formItems[6].disabled = false
+                this.formItems[6].disabled = false
                 break
               case '航站楼':
-                that.formItems[7].disabled = false
+                this.formItems[7].disabled = false
                 break
               default:
                 break
@@ -213,9 +212,9 @@ export default {
           options: []
         },
         {
-          prop: 'area',
+          prop: 'company',
           inputType: 'select',
-          placeholder: '大区选择',
+          placeholder: '基地分公司选择',
           filterable: true,
           clearable: true,
           disabled: true,
@@ -263,16 +262,29 @@ export default {
     }
   },
   created() {
-    if (this.formItems.length) {
-      // this.getInOrOut()
-      // this.getInOrOut('全部')
-      this.getAirline()
-      this.getArea()
-      this.getAirport()
-      this.getTerminal()
-    }
+    this.formItems.forEach(item => {
+      switch (item.prop) {
+        case 'airline':
+          this.getAirline()
+          break
+        case 'company':
+          this.getCompany()
+          break
+        case 'airport':
+          this.getAirport()
+          break
+        case 'terminal':
+          this.getTerminal()
+          break
+        default:
+          break
+      }
+    })
   },
   methods: {
+    call(func, ...args) {
+      func.call(this, ...args)
+    },
     getData() {
       // console.log(this.formData)
       this.$emit('getFormData', this.formData)
@@ -323,7 +335,7 @@ export default {
         console.log('出错了', error)
       }
     },
-    async getArea() {
+    async getCompany() {
       try {
         const res = await Query({
           id: DATACONTENT_ID.AreaId,
@@ -337,7 +349,7 @@ export default {
               value: res.returnData.listValues[i].a4
             })
           }
-          const theItem = this.formItems.find(item => item.prop === 'area')
+          const theItem = this.formItems.find(item => item.prop === 'company')
           theItem && (theItem.options = arr)
         } else {
           this.$message.error(res.message)

src/views/statisticsCharts/views/baggageStatisticsCharts.vue

@@ -53,8 +53,8 @@ export default {
           itemGap: 30,
           data: [
             '航班量数量',
-            '航班量同比'
-            // '航班量环比'
+            // '航班量同比',
+            '航班量环比'
           ],
           textStyle: {
             fontFamily: 'Helvetica, "Microsoft YaHei"',
@@ -229,7 +229,7 @@ export default {
       this.getData(data)
     },
     // 243 时间类型 查询范围 开始时间  结束时间  进离岗  航线/航站/航站楼
-    // 244 时间类型 开始时间  结束时间  进离岗  大区
+    // 244 时间类型 开始时间  结束时间  进离岗  基地分公司
     async getData(data) {
       // let id
       // let params = []
@@ -249,10 +249,10 @@ export default {
       //   this.$message.warning('请先选择统计时间范围')
       //   return
       // }
-      // if (data.range === '大区') {
+      // if (data.range === '基地分公司') {
       //   id = DATACONTENT_ID.byAreaId
-      //   params = [data.interval, data.dateTime[0], data.dateTime[1], data.inOrOut, data.area]
-      // } else if (data.range !== '大区' && data.range !== '') {
+      //   params = [data.interval, data.dateTime[0], data.dateTime[1], data.inOrOut, data.company]
+      // } else if (data.range !== '基地分公司' && data.range !== '') {
       //   id = DATACONTENT_ID.byOtherId
       //   params = [data.interval, data.range, data.dateTime[0], data.dateTime[1], data.inOrOut]
       //   if (data.airline === '' && data.airport === '' && data.terminal === '') {
@@ -291,7 +291,7 @@ export default {
           this.options.yAxis[0].max = max
           this.options.xAxis.data = dateArr
           this.options.series[0].data = dataArr
-          this.options.series[1].data = chainArr
+          this.options.series[2].data = chainArr
           this.options.yAxis[1].min = (Math.min(...chainArr) - 0.2).toFixed(2)
           this.options.yAxis[1].max = (Math.max(...chainArr) + 0.2).toFixed(2)
           this.resizeHandler()

src/views/statisticsCharts/views/flightStatisticsCharts.vue

@@ -52,8 +52,8 @@ export default {
           itemGap: 30,
           data: [
             '航班量数量',
-            '航班量同比'
-            // '航班量环比'
+            // '航班量同比',
+            '航班量环比',
           ],
           textStyle: {
             fontFamily: 'Helvetica, "Microsoft YaHei"',
@@ -228,7 +228,7 @@ export default {
       this.getData(data)
     },
     // 243 时间类型 查询范围 开始时间  结束时间  进离岗  航线/航站/航站楼
-    // 244 时间类型 开始时间  结束时间  进离岗  大区
+    // 244 时间类型 开始时间  结束时间  进离岗  基地分公司
     async getData(data) {
       let id
       let params = []
@@ -248,10 +248,10 @@ export default {
         this.$message.warning('请先选择统计时间范围')
         return
       }
-      if (data.range === '大区') {
+      if (data.range === '基地分公司') {
         id = DATACONTENT_ID.byAreaId
-        params = [data.interval, data.dateTime[0], data.dateTime[1], data.inOrOut, data.area]
-      } else if (data.range !== '大区' && data.range !== '') {
+        params = [data.interval, data.dateTime[0], data.dateTime[1], data.inOrOut, data.company]
+      } else if (data.range !== '基地分公司' && data.range !== '') {
         id = DATACONTENT_ID.byOtherId
         params = [data.interval, data.range, data.dateTime[0], data.dateTime[1], data.inOrOut]
         if (data.airline === '' && data.airport === '' && data.terminal === '') {
@@ -290,7 +290,7 @@ export default {
           this.options.yAxis[0].max = max
           this.options.xAxis.data = dateArr
           this.options.series[0].data = dataArr
-          this.options.series[1].data = chainArr
+          this.options.series[2].data = chainArr
           this.options.yAxis[1].min = (Math.min(...chainArr) - 0.2).toFixed(2)
           this.options.yAxis[1].max = (Math.max(...chainArr) + 0.2).toFixed(2)
           this.resizeHandler()

src/views/statisticsCharts/views/nodeStatisticsCharts.vue

@@ -6,7 +6,8 @@
     >
       <StatisticsHeader
         title="扫描节点与位置分析"
-        :items="items"
+        :items="formItems"
+        :data="formData"
         @getFormData="getFormData"
       />
     </div>
@@ -29,24 +30,68 @@ export default {
   components: { StatisticsHeader },
   data() {
     return {
-      items: [
+      formData: {
+        range: '',
+        airline: '',
+        airport: '',
+        inOrOut: '',
+        dateTime: ''
+      },
+      formItems: [
         {
-          prop: 'airport',
+          prop: 'range',
           inputType: 'select',
-          placeholder: '航站选择',
+          placeholder: '请选择统计范围',
+          options: [
+            {
+              value: '全部',
+              label: '全部'
+            },
+            {
+              value: '航线',
+              label: '航线'
+            },
+            {
+              value: '航站',
+              label: '航站'
+            }
+          ],
+          changeHandler(value) {
+            this.getInOrOut(value)
+            this.formData.airline = ''
+            this.formData.airport = ''
+            this.formData.inOrOut = ''
+            this.formItems[1].disabled = true
+            this.formItems[2].disabled = true
+            switch (value) {
+              case '航线':
+                this.formItems[1].disabled = false
+                break
+              case '航站':
+                this.formItems[2].disabled = false
+                break
+              default:
+                break
+            }
+          }
+        },
+        {
+          prop: 'airline',
+          inputType: 'select',
+          placeholder: '航线选择',
           filterable: true,
           clearable: true,
-          // multiple: true,
-          // disabled: true,
+          disabled: true,
           options: []
         },
         {
-          prop: 'airline',
+          prop: 'airport',
           inputType: 'select',
-          placeholder: '航线选择',
+          placeholder: '航站选择',
           filterable: true,
           clearable: true,
-          // disabled: true,
+          // multiple: true,
+          disabled: true,
           options: []
         },
         {
@@ -62,10 +107,6 @@ export default {
             {
               label: '进港',
               value: 'X'
-            },
-            {
-              label: '中转',
-              value: 'T'
             }
           ]
         },
@@ -83,7 +124,7 @@ export default {
         legend: {
           top: 32,
           right: 32,
-          data: ['离港', '进港', '中转']
+          data: ['离港', '进港']
         },
         label: {
           show: true,
@@ -162,9 +203,8 @@ export default {
       this.getData(data)
     },
     // 243 时间类型 查询范围 开始时间  结束时间  进离岗  航线/航站/航站楼
-    // 244 时间类型 开始时间  结束时间  进离岗  大区
+    // 244 时间类型 开始时间  结束时间  进离岗  基地分公司
     async getData(data) {
-      let id
       let params = []
       if (data.airport === '') {
         this.$message.warning('请先选择航站')
@@ -178,7 +218,7 @@ export default {
         this.$message.warning('请先选择统计时间范围')
         return
       }
-      id = DATACONTENT_ID.nodeStatistics
+      const id = DATACONTENT_ID.nodeStatistics
       params = [data.airport, data.inOrOut, data.dateTime[0], data.dateTime[1]]
       try {
         const res = await Query({
@@ -193,7 +233,7 @@ export default {
           }
           const labels = Object.keys(res.returnData.listValues[0])
           const datas = Object.values(res.returnData.listValues[0])
-          const max = Math.max(...datas) + 100
+          const max = Math.max(...datas)
           this.options.legend.data = [map[data.inOrOut]]
           this.options.radar.indicator = labels.map(item => {
             return {