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

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

@@ -23,6 +23,8 @@ export default {
           prop: 'air_line',
           inputType: 'select',
           placeholder: '航线',
+          filterable: true,
+          clearable: true,
           width: '180px',
           queryId: SERVICE_ID.AirlineIds,
           setKey: 'air_line',

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

@@ -24,8 +24,8 @@ export default {
           inputType: 'select',
           placeholder: '航司',
           width: '150px',
-          // filterable: true,
-          // clearable: true,
+          filterable: true,
+          clearable: true,
           // multiple: true,
           // disabled: true,
           queryId: SERVICE_ID.AirlinportId,

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

@@ -9,10 +9,9 @@ export default {
   components: { CommonBarStatisticsCharts },
   data () {
     return {
-      querySettings: {
-        byArea: SERVICE_ID.baggagePassengerByArea,
-        byOther: SERVICE_ID.baggagePassengerByOther
-      },
+      // querySettings: {
+      //   serviceId: SERVICE_ID.LuggagecId
+      // },
       formData: {
         airport: '',
         dateTime: [],
@@ -23,6 +22,8 @@ export default {
           prop: 'airline',
           inputType: 'select',
           placeholder: '航站',
+          filterable: true,
+          clearable: true,
           width: '180px',
           queryId: SERVICE_ID.AirportIds,
           setKey: 'code3',

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

@@ -1,10 +1,5 @@
 <template>
-  <CommonBarStatisticsCharts
-    charts-title="行李进港数量"
-    :query-settings="querySettings"
-    :formItems="formItems"
-    :formData="formData"
-  />
+  <CommonBarStatisticsCharts charts-title="行李进港数量" :query-settings="querySettings" :formItems="formItems" :formData="formData" />
 </template>
 
 <script>
@@ -12,7 +7,7 @@ import CommonBarStatisticsCharts from '../../components/commonBarStatisticsChart
 export default {
   name: 'FlightStatisticsCharts',
   components: { CommonBarStatisticsCharts },
-  data() {
+  data () {
     return {
       querySettings: {
         serviceId: SERVICE_ID.LuggageInId
@@ -28,8 +23,8 @@ export default {
           inputType: 'select',
           placeholder: '航站',
           width: '150px',
-          // filterable: true,
-          // clearable: true,
+          filterable: true,
+          clearable: true,
           // multiple: true,
           // disabled: true,
           queryId: SERVICE_ID.AirportIds,

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

@@ -23,8 +23,8 @@ export default {
           inputType: 'select',
           placeholder: '航站',
           width: '150px',
-          // filterable: true,
-          // clearable: true,
+          filterable: true,
+          clearable: true,
           // multiple: true,
           // disabled: true,
           queryId: SERVICE_ID.AirportIds,

src/views/statisticsCharts/views/nodeStatisticsCharts.vue

@@ -80,8 +80,8 @@ export default {
           prop: 'airline',
           inputType: 'select',
           placeholder: '航线',
-          // filterable: true,
-          // clearable: true,
+          filterable: true,
+          clearable: true,
           // disabled: true,
           queryId: SERVICE_ID.AirlineIds,
           setKey: 'air_line',
@@ -91,8 +91,8 @@ export default {
           prop: 'airport',
           inputType: 'select',
           placeholder: '航站',
-          // filterable: true,
-          // clearable: true,
+          filterable: true,
+          clearable: true,
           // multiple: true,
           // disabled: true,
           queryId: SERVICE_ID.AirportIds,