表格

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

@@ -66,7 +66,7 @@ const statisticsChartsRoutes = {
                   '@/views/statisticsCharts/views/airlineCompany/flightStatisticsCharts'
                 ),
               meta: {
-                title: '航班量统计',
+                title: '行李进港数量统计',
                 roles: ['flight_volume_statistics'],
               },
             },
@@ -78,18 +78,18 @@ const statisticsChartsRoutes = {
                 import(
                   '@/views/statisticsCharts/views/airlineCompany/baggageStatisticsCharts'
                 ),
-              meta: { title: '行李量统计', roles: ['baggage_statistics'] },
-            },
-            {
-              path: 'specialBaggage',
-              name: 'SpecialBaggageStatisticsCharts',
-              hidden: true,
-              component: () =>
-                import(
-                  '@/views/statisticsCharts/views/airlineCompany/specialBaggageStatisticsCharts'
-                ),
-              meta: { title: '特殊行李量统计' },
-            },
+              meta: { title: '航司行李量统计', roles: ['baggage_statistics'] },
+            },
+            // {
+            //   path: 'specialBaggage',
+            //   name: 'SpecialBaggageStatisticsCharts',
+            //   hidden: true,
+            //   component: () =>
+            //     import(
+            //       '@/views/statisticsCharts/views/airlineCompany/specialBaggageStatisticsCharts'
+            //     ),
+            //   meta: { title: '航线行李量统计' },
+            // },
             {
               path: 'baggagePassenger',
               name: 'BaggagePassengerStatisticsCharts',
@@ -98,7 +98,7 @@ const statisticsChartsRoutes = {
                 import(
                   '@/views/statisticsCharts/views/airlineCompany/baggagePassengerStatisticsCharts'
                 ),
-              meta: { title: '行李旅客量统计' },
+              meta: { title: '航线行李量统计' },
             },
             {
               path: 'baggageAverage',

src/views/statisticsCharts/components/commonBarStatisticsCharts.vue

@@ -7,6 +7,7 @@
       <StatisticsHeader
         :title="`${chartsTitle}统计`"
         :custom-items="customFormItems"
+        :items="formItems"
         @getFormData="getFormData"
         @export="exportHandler"
       />
@@ -44,7 +45,10 @@ export default {
     customFormItems: {
       type: Array,
       default: () => []
-    }
+    },
+    formItems: {
+      type: Array,
+    },
   },
   data() {
     return {

src/views/statisticsCharts/components/statisticsTabs.vue

@@ -71,178 +71,154 @@ export default {
       activeIcon: require('@/assets/nav/ic_statistical_top_check.png'),
       tabList: [
         {
-          title: '航司行李相关统计',
+          title: '行李量相关统计',
           path: '/statisticsCharts/airlineCompany',
           roles: ['airline_baggage_statistics'],
           children: [
             {
               path: 'flight',
-              title: '航班量统计',
+              title: '行李进港数量统计',
             },
             {
               path: 'baggage',
-              title: '行李量统计',
+              title: '航司行李量统计',
             },
             {
               path: 'baggagePassenger',
-              title: '行李旅客量统计',
-            },
-            {
-              path: 'specialBaggage',
-              title: '特殊行李量统计',
-            },
-            {
-              path: 'baggageAverage',
-              title: '平均行李量统计',
-            },
-            {
-              path: 'abnormalBaggage',
-              title: '异常行李量统计',
-            },
-            {
-              path: 'complaintBaggage',
-              title: '投诉行李量统计',
-            },
-            {
-              path: 'compensationBaggage',
-              title: '赔偿行李量统计',
-            },
-            {
-              path: 'compensation',
-              title: '赔偿金额统计',
-            },
-          ],
-        },
-        {
-          path: '/statisticsCharts/passengerClassification',
-          title: '旅客分类统计',
-          roles: ['passenger_luggage_classification_statistics'],
-          children: [
-            {
-              path: 'baggage',
-              title: '行李量统计',
-            },
-            {
-              path: 'baggagePassenger',
-              title: '行李旅客量统计',
-            },
-            {
-              path: 'specialBaggage',
-              title: '特殊行李量统计',
-            },
-            {
-              path: 'abnormalBaggage',
-              title: '异常行李量统计',
-            },
-            {
-              path: 'complaintBaggage',
-              title: '投诉行李量统计',
-            },
-            {
-              path: 'compensationBaggage',
-              title: '赔偿行李量统计',
-            },
-            {
-              path: 'compensation',
-              title: '赔偿金额统计',
-            },
-          ],
-        },
-        {
-          path: '/statisticsCharts/flightClassification',
-          title: '航班分类相关统计',
-          roles: ['statistics_related_to_flight_classification'],
-          children: [
-            {
-              path: 'flight',
-              title: '航班量统计',
-            },
-            {
-              path: 'baggage',
-              title: '行李量统计',
-            },
-            {
-              path: 'passenger',
-              title: '行李旅客量统计',
+              title: '航线行李量统计',
             },
           ],
         },
+        // {
+        //   path: '/statisticsCharts/passengerClassification',
+        //   title: '旅客分类统计',
+        //   roles: ['passenger_luggage_classification_statistics'],
+        //   children: [
+        //     {
+        //       path: 'baggage',
+        //       title: '行李量统计',
+        //     },
+        //     {
+        //       path: 'baggagePassenger',
+        //       title: '行李旅客量统计',
+        //     },
+        //     {
+        //       path: 'specialBaggage',
+        //       title: '特殊行李量统计',
+        //     },
+        //     {
+        //       path: 'abnormalBaggage',
+        //       title: '异常行李量统计',
+        //     },
+        //     {
+        //       path: 'complaintBaggage',
+        //       title: '投诉行李量统计',
+        //     },
+        //     {
+        //       path: 'compensationBaggage',
+        //       title: '赔偿行李量统计',
+        //     },
+        //     {
+        //       path: 'compensation',
+        //       title: '赔偿金额统计',
+        //     },
+        //   ],
+        // },
+        // {
+        //   path: '/statisticsCharts/flightClassification',
+        //   title: '航班分类相关统计',
+        //   roles: ['statistics_related_to_flight_classification'],
+        //   children: [
+        //     {
+        //       path: 'flight',
+        //       title: '航班量统计',
+        //     },
+        //     {
+        //       path: 'baggage',
+        //       title: '行李量统计',
+        //     },
+        //     {
+        //       path: 'passenger',
+        //       title: '行李旅客量统计',
+        //     },
+        //   ],
+        // },
         {
           path: '/statisticsCharts/node',
           title: '扫描节点与位置分析',
           roles: ['scanning_node_and_location_analysis'],
         },
-        {
-          title: '报表统计',
-          path: '/statisticsCharts/report',
-          roles: ['report_statistics'],
-          children: [
-            {
-              path: 'reportStatistics',
-              title: '运送效率报表统计',
-            },
-            {
-              path: 'transitTables',
-              title: '中转四个流向统计',
-            },
-            {
-              path: 'transferDirectionTable',
-              title: '中转流向明细统计',
-            },
-            {
-              path: 'transferBaggageTable',
-              title: '中转行李因素分析统计',
-            },
-            {
-              path: 'baggageProportionTable',
-              title: '中转行李比例明细统计',
-            },
-            {
-              path: 'ScanningStatistics',
-              title: '航站BRS扫描统计',
-            },
-            {
-              path: 'scanDataTable',
-              title: 'Mannual Load扫描数据统计表',
-            },
-            {
-              path: 'rfldTable',
-              title: '航易行RFID扫描数据统计表',
-            },
-            {
-              path: 'Percentageofbaggage',
-              title: '行李全流程服务水平百分比',
-            },
-          ],
-        },
-        {
-          title: '特殊赔偿异常分类统计',
-          path: '/statisticsCharts/specialClassification',
-          roles: ['special_compensation_exception_classification_statistics'],
-          children: [
-            {
-              path: 'special',
-              title: '特殊行李分类统计',
-            },
-            {
-              path: 'abnormal',
-              title: '异常行李分类统计',
-            },
-            {
-              path: 'compensationBaggage',
-              title: '赔偿行李分类统计',
-            },
-            {
-              path: 'compensation',
-              title: '赔偿金额分类统计',
-            },
-          ],
-        },
-        {
-          path: '/statisticsCharts/statisticalAnalysis',
-          title: '统计分析',
-          roles: ['statistical_analysis'],
-        },
+        // {
+        //   title: '报表统计',
+        //   path: '/statisticsCharts/report',
+        //   roles: ['report_statistics'],
+        //   children: [
+        //     {
+        //       path: 'reportStatistics',
+        //       title: '运送效率报表统计',
+        //     },
+        //     {
+        //       path: 'transitTables',
+        //       title: '中转四个流向统计',
+        //     },
+        //     {
+        //       path: 'transferDirectionTable',
+        //       title: '中转流向明细统计',
+        //     },
+        //     {
+        //       path: 'transferBaggageTable',
+        //       title: '中转行李因素分析统计',
+        //     },
+        //     {
+        //       path: 'baggageProportionTable',
+        //       title: '中转行李比例明细统计',
+        //     },
+        //     {
+        //       path: 'ScanningStatistics',
+        //       title: '航站BRS扫描统计',
+        //     },
+        //     {
+        //       path: 'scanDataTable',
+        //       title: 'Mannual Load扫描数据统计表',
+        //     },
+        //     {
+        //       path: 'rfldTable',
+        //       title: '航易行RFID扫描数据统计表',
+        //     },
+        //     {
+        //       path: 'Percentageofbaggage',
+        //       title: '行李全流程服务水平百分比',
+        //     },
+        //   ],
+        // },
+        // {
+        //   title: '特殊赔偿异常分类统计',
+        //   path: '/statisticsCharts/specialClassification',
+        //   roles: ['special_compensation_exception_classification_statistics'],
+        //   children: [
+        //     {
+        //       path: 'special',
+        //       title: '特殊行李分类统计',
+        //     },
+        //     {
+        //       path: 'abnormal',
+        //       title: '异常行李分类统计',
+        //     },
+        //     {
+        //       path: 'compensationBaggage',
+        //       title: '赔偿行李分类统计',
+        //     },
+        //     {
+        //       path: 'compensation',
+        //       title: '赔偿金额分类统计',
+        //     },
+        //   ],
+        // },
+        // {
+        //   path: '/statisticsCharts/statisticalAnalysis',
+        //   title: '统计分析',
+        //   roles: ['statistical_analysis'],
+        // },
       ],
       activeIndex: null,
     }

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

@@ -1,7 +1,8 @@
 <template>
   <CommonBarStatisticsCharts
-    charts-title="行李旅客量"
+    charts-title="航线行李量"
     :query-settings="querySettings"
+    :formItems="formItems"
   />
 </template>
 
@@ -15,7 +16,42 @@ export default {
       querySettings: {
         byArea: SERVICE_ID.baggagePassengerByArea,
         byOther: SERVICE_ID.baggagePassengerByOther
-      }
+      },
+      formItems: [
+        {
+          prop: 'airline',
+          inputType: 'select',
+          placeholder: '航线',
+          width: '180px',
+          queryId: SERVICE_ID.airlineOptions,
+          setKey: 'a2',
+          options: []
+        },
+        {
+          prop: 'timedim',
+          inputType: 'select',
+          placeholder: '行李类型',
+          requiredWarning: '请先选择行李类型',
+          clearable: true,
+          options: [
+            {
+              value: '正常',
+              label: '正常',
+            },
+            {
+              value: '异常',
+              label: '异常',
+            },
+          ],
+        },
+        {
+          prop: 'dateTime',
+          inputType: 'datePicker',
+          clearable: true,
+          width: '240px',
+          options: [],
+        },
+      ],
     }
   }
 }

src/views/statisticsCharts/views/airlineCompany/baggageStatisticsCharts.vue

@@ -1,8 +1,8 @@
 <template>
   <CommonBarStatisticsCharts
-    charts-title="行李量"
+    charts-title="航司行李量"
     :query-settings="querySettings"
-    :custom-form-items="customFormItems"
+    :formItems="formItems"
   />
 </template>
 
@@ -19,25 +19,57 @@ export default {
         notDelByArea: SERVICE_ID.notDelByArea,
         notDelByOther: SERVICE_ID.notDelByOther
       },
-      customFormItems: [
+      formItems: [
         {
-          prop: 'baggageType',
+          prop: 'company',
+          inputType: 'select',
+          placeholder: '航站',
+          requiredWarning: '请先选择航站',
+          clearable: true,
+          options: [
+            {
+              value: '国航',
+              label: '国航',
+            },
+            {
+              value: '代理国内',
+              label: '代理国内',
+            },
+            {
+              value: '代理国际',
+              label: '代理国际',
+            },
+            {
+              value: '非代理',
+              label: '非代理',
+            },
+          ],
+        },
+        {
+          prop: 'timedim',
           inputType: 'select',
           placeholder: '行李类型',
           requiredWarning: '请先选择行李类型',
           clearable: true,
           options: [
             {
-              value: '全部',
-              label: '全部'
+              value: '正常',
+              label: '正常',
             },
             {
-              value: '不包含DEL',
-              label: '不包含DEL'
-            }
-          ]
-        }
-      ]
+              value: '异常',
+              label: '异常',
+            },
+          ],
+        },
+        {
+          prop: 'dateTime',
+          inputType: 'datePicker',
+          clearable: true,
+          width: '240px',
+          options: [],
+        },
+      ],
     }
   }
 }

src/views/statisticsCharts/views/airlineCompany/flightStatisticsCharts.vue

@@ -1,8 +1,8 @@
 <template>
   <CommonBarStatisticsCharts
-    charts-title="航班量"
+    charts-title="行李进港数量"
     :query-settings="querySettings"
-    :custom-form-items="customFormItems"
+    :formItems="formItems"
   />
 </template>
 
@@ -19,25 +19,49 @@ export default {
         withBaggageByArea: SERVICE_ID.withBaggageByArea,
         withBaggageByOther: SERVICE_ID.withBaggageByOther
       },
-      customFormItems: [
+      formItems: [
         {
-          prop: 'flightType',
+          prop: 'airport',
           inputType: 'select',
-          placeholder: '航班属性',
-          requiredWarning: '请先选择航班属性',
+          placeholder: '航站',
+          width: '150px',
+          // filterable: true,
+          // clearable: true,
+          // multiple: true,
+          // disabled: true,
+          queryId: SERVICE_ID.AirportId,
+          setKey: 'a2',
+          options: []
+        },
+        {
+          prop: 'timedim',
+          inputType: 'select',
+          placeholder: '进出港',
+          requiredWarning: '请先选择进出港',
           clearable: true,
           options: [
             {
-              value: '全部',
-              label: '全部'
+              value: '离岗',
+              label: '离岗',
+            },
+            {
+              value: '进港',
+              label: '进港',
             },
             {
-              value: '有行李',
-              label: '有行李'
-            }
-          ]
-        }
-      ]
+              value: '中转',
+              label: '中转',
+            },
+          ],
+        },
+        {
+          prop: 'dateTime',
+          inputType: 'datePicker',
+          clearable: true,
+          width: '240px',
+          options: [],
+        },
+      ],
     }
   }
 }

src/views/statisticsCharts/views/airlineCompany/specialBaggageStatisticsCharts.vue

@@ -1,7 +1,8 @@
 <template>
   <CommonBarStatisticsCharts
-    charts-title="特殊行李量"
+    charts-title="航线行李量"
     :query-settings="querySettings"
+    :formItems="formItems"
   />
 </template>
 
@@ -15,7 +16,62 @@ export default {
       querySettings: {
         byArea: SERVICE_ID.specialBaggageByArea,
         byOther: SERVICE_ID.specialBaggageByOther
-      }
+      },
+      formItems: [
+        {
+          prop: 'company',
+          inputType: 'select',
+          placeholder: '航站',
+          requiredWarning: '请先选择航站',
+          clearable: true,
+          options: [
+            {
+              value: '国航',
+              label: '国航',
+            },
+            {
+              value: '代理国内',
+              label: '代理国内',
+            },
+            {
+              value: '代理国际',
+              label: '代理国际',
+            },
+            {
+              value: '非代理',
+              label: '非代理',
+            },
+          ],
+        },
+        {
+          prop: 'timedim',
+          inputType: 'select',
+          placeholder: '进出港',
+          requiredWarning: '请先选择进出港',
+          clearable: true,
+          options: [
+            {
+              value: '日',
+              label: '按日统计',
+            },
+            {
+              value: '月',
+              label: '按月统计',
+            },
+            {
+              value: '年',
+              label: '按年统计',
+            },
+          ],
+        },
+        {
+          prop: 'dateTime',
+          inputType: 'datePicker',
+          clearable: true,
+          width: '240px',
+          options: [],
+        },
+      ],
     }
   }
 }

src/views/statisticsCharts/views/nodeStatisticsCharts.vue

@@ -91,39 +91,39 @@ export default {
         dateTime: '',
       },
       formItems: [
-        {
-          prop: 'range',
-          inputType: 'select',
-          placeholder: '统计范围',
-          options: [],
-          queryId: SERVICE_ID.nodeRange,
-          setKey: 'a1',
-          changeHandler(value) {
-            this.setInOrOutOptions(value)
-            const rangeMap = {
-              航线: 'airline',
-              基地分公司: 'area',
-              航站: 'airport',
-              航站楼: 'terminal',
-            }
-            Object.entries(rangeMap).forEach(([k, v]) => {
-              const theItem = this.formItems.find(item => item.prop === v)
-              if (value === k) {
-                theItem && (theItem.disabled = false)
-              } else {
-                this.formData[v] = ''
-                theItem && (theItem.disabled = true)
-              }
-            })
-          },
-        },
+        // {
+        //   prop: 'range',
+        //   inputType: 'select',
+        //   placeholder: '统计范围',
+        //   options: [],
+        //   queryId: SERVICE_ID.nodeRange,
+        //   setKey: 'a1',
+        //   changeHandler(value) {
+        //     this.setInOrOutOptions(value)
+        //     const rangeMap = {
+        //       航线: 'airline',
+        //       基地分公司: 'area',
+        //       航站: 'airport',
+        //       航站楼: 'terminal',
+        //     }
+        //     Object.entries(rangeMap).forEach(([k, v]) => {
+        //       const theItem = this.formItems.find(item => item.prop === v)
+        //       if (value === k) {
+        //         theItem && (theItem.disabled = false)
+        //       } else {
+        //         this.formData[v] = ''
+        //         theItem && (theItem.disabled = true)
+        //       }
+        //     })
+        //   },
+        // },
         {
           prop: 'airline',
           inputType: 'select',
           placeholder: '航线',
-          filterable: true,
-          clearable: true,
-          disabled: true,
+          // filterable: true,
+          // clearable: true,
+          // disabled: true,
           queryId: SERVICE_ID.nodeAirline,
           setKey: 'a2',
           options: [],
@@ -132,10 +132,10 @@ export default {
           prop: 'airport',
           inputType: 'select',
           placeholder: '航站',
-          filterable: true,
-          clearable: true,
+          // filterable: true,
+          // clearable: true,
           // multiple: true,
-          disabled: true,
+          // disabled: true,
           queryId: SERVICE_ID.nodeAirport,
           setKey: 'a2',
           options: [],
@@ -145,7 +145,18 @@ export default {
           inputType: 'select',
           placeholder: '进离港',
           clearable: true,
-          options: [],
+          options: [{
+            value: '离岗',
+            label: '离岗',
+          },
+          {
+            value: '进港',
+            label: '进港',
+          },
+          {
+            value: '中转',
+            label: '中转',
+          }],
         },
         {
           prop: 'dateTime',