1111111111111111111

src/config/config.js

@@ -181,7 +181,7 @@ window.SERVICE_ID = {
   passengerroute: 2003021,//行李旅客量-航线
   averagepassterminal: 2003022,//平均旅客行李量-航站
   averagepassairline: 2003023,//平均旅客行李量-航司
-  averagepassroute: 2003023,//平均旅客行李量-航线
+  averagepassroute: 2003024,//平均旅客行李量-航线
   transferBaggageDirection: 2003025,//中转4个流向
   specialbaggageanalysis: 2003026,//特殊行李分析
 }

src/views/statisticsCharts/components/newBarStatisticsCharts.vue

@@ -45,6 +45,10 @@ export default {
       type: String,
       required: true,
     },
+    rol: {
+      type: String,
+      default: () => null,
+    },
     querySettings: {
       type: Object,
       required: true,
@@ -290,7 +294,6 @@ export default {
     },
     getFormData(formData) {
       this.resetDatas()
-
       let params = {}
       params = JSON.parse(JSON.stringify(formData))
       params.fd1 = formData.dateTime[0]
@@ -376,7 +379,6 @@ export default {
         this.$message.info('未查询到对应数据')
         return
       }
-      // console.log(this.admin)
       if (this.admin.io === '进港') {
         this.seriesKey = 'in_num'
       } else if (this.admin.io === '离港') {
@@ -387,6 +389,8 @@ export default {
         this.seriesKey = 'bag_num'
       } else if (this.admin.baggageType === '异常') {
         this.seriesKey = 'exception_num'
+      }else if (this.rol){
+        this.seriesKey = this.rol
       }
       for (let i = 0; i < filteredList.length; i++) {
         xAxisData.push(filteredList[i][this.xAxisKey])

src/views/statisticsCharts/components/newPieStatisticsChartscpsy.vue

@@ -370,21 +370,23 @@ export default {
                 preValue => preValue.fdt === value.fdt
               )
               if (preValue) {
+                // console.log(value)
                 categories.forEach(key => {
-                  console.log(key)
-                  if (key === value.specialtype) {
+                  if (key == value.specialtype) {
                     preValue[key] = value.bags ?? 0
                   }
                 })
-                // console.log(preValue)
               } else {
                 const valuesObj = {
                   location: value.location,
                   fdt: value.fdt,
                 }
                 categories.forEach(key => {
-                  valuesObj[key] = value[key] ?? 0
+                  if (key == value.specialtype) {
+                    valuesObj[key] = value.bags ?? 0
+                  }
                 })
+                console.log(valuesObj)
                 preValues.push(valuesObj)
               }
               // console.log(value)

src/views/statisticsCharts/views/averagepassengers/averagepassairlineStatisticsCharts.vue

@@ -1,5 +1,5 @@
 <template>
-  <CommonBarStatisticsCharts charts-title="航司平均旅客行李量" :query-settings="querySettings" :form-data="formData" :form-items="formItems" />
+  <CommonBarStatisticsCharts charts-title="航司平均旅客行李量" :rol="rol" :query-settings="querySettings" :form-data="formData" :form-items="formItems" />
 </template>
 
 <script>
@@ -24,6 +24,7 @@ export default {
         // airport: '',
         dateTime: [],
       },
+      rol: 'avgbag',
       formItems: [
         {
           prop: 'td',

src/views/statisticsCharts/views/averagepassengers/averagepassrouteStatisticsCharts.vue

@@ -1,5 +1,5 @@
 <template>
-  <CommonBarStatisticsCharts charts-title="航线平均旅客行李量" :query-settings="querySettings" :form-data="formData" :form-items="formItems" />
+  <CommonBarStatisticsCharts charts-title="航线平均旅客行李量" :rol="rol" :query-settings="querySettings" :form-data="formData" :form-items="formItems" />
 </template>
 
 <script>
@@ -24,6 +24,7 @@ export default {
         // airport: '',
         dateTime: [],
       },
+      rol: 'avgbag',
       formItems: [
         {
           prop: 'td',

src/views/statisticsCharts/views/averagepassengers/averagepassterminalStatisticsCharts.vue

@@ -1,5 +1,5 @@
 <template>
-  <CommonBarStatisticsCharts charts-title="航站平均旅客行李量" :query-settings="querySettings" :form-data="formData" :form-items="formItems" />
+  <CommonBarStatisticsCharts charts-title="航站平均旅客行李量" :rol="rol" :query-settings="querySettings" :form-data="formData" :form-items="formItems" />
 </template>
 
 <script>
@@ -24,6 +24,7 @@ export default {
         airport: '',
         dateTime: [],
       },
+      rol: 'avgbag',
       formItems: [
         {
           prop: 'td',

src/views/statisticsCharts/views/flight/flightvolumeStatisticsCharts.vue

@@ -1,5 +1,5 @@
 <template>
-  <CommonBarStatisticsCharts charts-title="航站航班量" :query-settings="querySettings" :form-data="formData" :form-items="formItems" />
+  <CommonBarStatisticsCharts charts-title="航站航班量" :rol="rol" :query-settings="querySettings" :form-data="formData" :form-items="formItems" />
 </template>
 
 <script>
@@ -18,6 +18,7 @@ export default {
         seriesKey: 'workload',
         xAxisKey: 'fd',
       },
+      rol: 'fly',
       formData: {
         td: '日',
         // agent_number: '',
@@ -44,71 +45,71 @@ export default {
               label: '按年统计',
             },
           ],
-          changeHandler (value, oldValue) {
-            const typeMap = {
-              日: 'datePicker',
-              月: 'monthPicker',
-              年: 'yearPicker',
-            }
-            const dateTimeItem = this.formItems.find(
-              item => item.prop === 'dateTime'
-            )
-            const formData = this._.cloneDeep(this.formData)
-            if (dateTimeItem) {
-              dateTimeItem.inputType = typeMap[value]
-              const dateTime = formData.dateTime
-              if (dateTime && dateTime[0] && dateTime[1]) {
-                if (value === '年') {
-                  this.formData.dateTime[0] = dateTime[0].split('-')[0]
-                  this.formData.dateTime[1] = dateTime[1].split('-')[0]
-                }
-                if (value === '月') {
-                  if (oldValue === '年') {
-                    this.formData.dateTime[0] = `${dateTime[0].split('-')[0]
-                      }-01`
-                    this.formData.dateTime[1] = `${dateTime[1].split('-')[0]
-                      }-12`
-                  }
-                  if (oldValue === '日') {
-                    this.formData.dateTime[0] = dateTime[0]
-                      .split('-')
-                      .slice(0, 2)
-                      .join('-')
-                    this.formData.dateTime[1] = dateTime[1]
-                      .split('-')
-                      .slice(0, 2)
-                      .join('-')
-                  }
-                }
-                if (value === '日') {
-                  if (oldValue === '年') {
-                    this.formData.dateTime[0] = `${dateTime[0].split('-')[0]
-                      }-01-01`
-                    this.formData.dateTime[1] = `${dateTime[1].split('-')[0]
-                      }-12-31`
-                  }
-                  if (oldValue === '月') {
-                    this.formData.dateTime[0] = `${dateTime[0]
-                      .split('-')
-                      .slice(0, 2)
-                      .join('-')}-01`
-                    let [year, month] = dateTime[1].split('-')
-                    if (month === '12') {
-                      year = Number(year) + 1
-                      month = 1
-                    } else {
-                      month = Number(month) + 1
-                    }
-                    const day = 24 * 60 * 60 * 1000
-                    this.formData.dateTime[1] = parseTime(
-                      new Date(`${year}-${month}-01`) - day * 1,
-                      '{y}-{m}-{d}'
-                    )
-                  }
-                }
-              }
-            }
-          },
+          // changeHandler (value, oldValue) {
+          //   const typeMap = {
+          //     日: 'datePicker',
+          //     月: 'monthPicker',
+          //     年: 'yearPicker',
+          //   }
+          //   const dateTimeItem = this.formItems.find(
+          //     item => item.prop === 'dateTime'
+          //   )
+          //   const formData = this._.cloneDeep(this.formData)
+          //   if (dateTimeItem) {
+          //     dateTimeItem.inputType = typeMap[value]
+          //     const dateTime = formData.dateTime
+          //     if (dateTime && dateTime[0] && dateTime[1]) {
+          //       if (value === '年') {
+          //         this.formData.dateTime[0] = dateTime[0].split('-')[0]
+          //         this.formData.dateTime[1] = dateTime[1].split('-')[0]
+          //       }
+          //       if (value === '月') {
+          //         if (oldValue === '年') {
+          //           this.formData.dateTime[0] = `${dateTime[0].split('-')[0]
+          //             }-01`
+          //           this.formData.dateTime[1] = `${dateTime[1].split('-')[0]
+          //             }-12`
+          //         }
+          //         if (oldValue === '日') {
+          //           this.formData.dateTime[0] = dateTime[0]
+          //             .split('-')
+          //             .slice(0, 2)
+          //             .join('-')
+          //           this.formData.dateTime[1] = dateTime[1]
+          //             .split('-')
+          //             .slice(0, 2)
+          //             .join('-')
+          //         }
+          //       }
+          //       if (value === '日') {
+          //         if (oldValue === '年') {
+          //           this.formData.dateTime[0] = `${dateTime[0].split('-')[0]
+          //             }-01-01`
+          //           this.formData.dateTime[1] = `${dateTime[1].split('-')[0]
+          //             }-12-31`
+          //         }
+          //         if (oldValue === '月') {
+          //           this.formData.dateTime[0] = `${dateTime[0]
+          //             .split('-')
+          //             .slice(0, 2)
+          //             .join('-')}-01`
+          //           let [year, month] = dateTime[1].split('-')
+          //           if (month === '12') {
+          //             year = Number(year) + 1
+          //             month = 1
+          //           } else {
+          //             month = Number(month) + 1
+          //           }
+          //           const day = 24 * 60 * 60 * 1000
+          //           this.formData.dateTime[1] = parseTime(
+          //             new Date(`${year}-${month}-01`) - day * 1,
+          //             '{y}-{m}-{d}'
+          //           )
+          //         }
+          //       }
+          //     }
+          //   }
+          // },
         },
         {
           prop: 'airport',
@@ -140,7 +141,7 @@ export default {
         {
           prop: 'flightstatus',
           inputType: 'select',
-          placeholder: '全部',
+          placeholder: '航班状态',
           requiredWarning: '请先选择航班状态',
           filterable: true,
           options: [{
@@ -160,7 +161,7 @@ export default {
         {
           prop: 'crafttype',
           inputType: 'select',
-          placeholder: '全部',
+          placeholder: '机型',
           requiredWarning: '请先选择机型',
           filterable: true,
           queryId: SERVICE_ID.ModelIds,
@@ -170,7 +171,7 @@ export default {
         {
           prop: 'ditype',
           inputType: 'select',
-          placeholder: '全部',
+          placeholder: '国内国际',
           requiredWarning: '请先选择国内国际',
           filterable: true,
           options: [{
@@ -186,7 +187,7 @@ export default {
         },{
           prop: 'ishas',
           inputType: 'select',
-          placeholder: '全部',
+          placeholder: '无行李',
           requiredWarning: '请先选择有无行李',
           filterable: true,
           options: [{

src/views/statisticsCharts/views/flight/numberairStatisticsCharts.vue

@@ -1,5 +1,5 @@
 <template>
-  <CommonBarStatisticsCharts charts-title="航司航班量" :query-settings="querySettings" :form-data="formData" :form-items="formItems" />
+  <CommonBarStatisticsCharts charts-title="航司航班量" :rol="rol" :query-settings="querySettings" :form-data="formData" :form-items="formItems" />
 </template>
 
 <script>
@@ -24,6 +24,7 @@ export default {
         // airport: '',
         dateTime: [],
       },
+      rol: 'fly',
       formItems: [
         {
           prop: 'td',

src/views/statisticsCharts/views/flight/volumeofStatisticsCharts.vue

@@ -1,5 +1,5 @@
 <template>
-  <CommonBarStatisticsCharts charts-title="航线航班量" :query-settings="querySettings" :form-data="formData" :form-items="formItems" />
+  <CommonBarStatisticsCharts charts-title="航线航班量" :rol="rol" :query-settings="querySettings" :form-data="formData" :form-items="formItems" />
 </template>
 
 <script>
@@ -24,6 +24,7 @@ export default {
         // airport: '',
         dateTime: [],
       },
+      rol: 'fly',
       formItems: [
         {
           prop: 'td',

src/views/statisticsCharts/views/passenger/passengerairlineStatisticsCharts.vue

@@ -1,5 +1,5 @@
 <template>
-  <CommonBarStatisticsCharts charts-title="航司旅客量" :query-settings="querySettings" :form-data="formData" :form-items="formItems" />
+  <CommonBarStatisticsCharts charts-title="航司旅客量" :rol="rol"  :query-settings="querySettings" :form-data="formData" :form-items="formItems" />
 </template>
 
 <script>
@@ -24,6 +24,7 @@ export default {
         // airport: '',
         dateTime: [],
       },
+      rol: 'passenger',
       formItems: [
         {
           prop: 'td',

src/views/statisticsCharts/views/passenger/passengerrouteStatisticsCharts.vue

@@ -1,5 +1,5 @@
 <template>
-  <CommonBarStatisticsCharts charts-title="航线旅客量" :query-settings="querySettings" :form-data="formData" :form-items="formItems" />
+  <CommonBarStatisticsCharts charts-title="航线旅客量" :rol="rol" :query-settings="querySettings" :form-data="formData" :form-items="formItems" />
 </template>
 
 <script>
@@ -24,6 +24,7 @@ export default {
         // airport: '',
         dateTime: [],
       },
+      rol: 'passenger',
       formItems: [
         {
           prop: 'td',

src/views/statisticsCharts/views/passenger/terminalpassengersStatisticsCharts.vue

@@ -1,5 +1,5 @@
 <template>
-  <CommonBarStatisticsCharts charts-title="航站旅客量" :query-settings="querySettings" :form-data="formData" :form-items="formItems" />
+  <CommonBarStatisticsCharts charts-title="航站旅客量" :rol="rol" :query-settings="querySettings" :form-data="formData" :form-items="formItems" />
 </template>
 
 <script>
@@ -24,6 +24,7 @@ export default {
         airport: '',
         dateTime: [],
       },
+      rol: 'passenger',
       formItems: [
         {
           prop: 'td',