修改航线下拉分页参数

src/views/statisticsCharts/components/newBarStatisticsCharts.vue

@@ -393,10 +393,10 @@ export default {
           dataContent,
           event: '0',
         }
-        if (typeName && (typeName === '航线' || typeName === '航站')) {
-          params['page'] = 1
-          params['pageSize'] = 9999
-        }
+        // if (typeName && (typeName === '航线' || typeName === '航站')) {
+        //   params['page'] = 1
+        //   params['pageSize'] = 9999
+        // }
         const { code, returnData, message } = await Query(params)
         if (String(code) === '0') {
           return returnData

src/views/statisticsCharts/components/newStatisticsHeader.vue

@@ -3,94 +3,33 @@
     <template v-if="title">
       <div class="title">{{ title }}</div>
     </template>
-    <el-form
-      ref="form"
-      class="form"
-      :model="formData"
-    >
-      <el-form-item
-        v-for="item in formItems"
-        :key="item.prop"
-        :prop="item.prop"
-        :label="item.label"
-        :style="{
+    <el-form ref="form" class="form" :model="formData">
+      <el-form-item v-for="item in formItems" :key="item.prop" :prop="item.prop" :label="item.label" :style="{
           width: item.width || '120px',
-        }"
-      >
+        }">
         <template v-if="item.inputType === 'input'">
-          <el-input
-            v-model="formData[item.prop]"
-            :size="item.size || 'small'"
-            :placeholder="item.placeholder || '请输入'"
-            :clearable="item.clearable"
-          />
+          <el-input v-model="formData[item.prop]" :size="item.size || 'small'" :placeholder="item.placeholder || '请输入'" :clearable="item.clearable" />
         </template>
         <template v-if="item.inputType === 'select'">
-          <el-select
-            v-model="formData[item.prop]"
-            :filterable="item.filterable"
-            :default-first-option="item.filterable"
-            :size="item.size || 'small'"
-            :placeholder="item.placeholder || '请选择'"
-            :multiple="item.multiple"
-            :collapse-tags="item.multiple"
-            :clearable="item.clearable"
-            :disabled="item.disabled"
-          >
-            <el-option
-              v-for="option in item.options"
-              :key="option.value"
-              :value="option.value"
-              :label="option.label"
-            />
+          <el-select v-model="formData[item.prop]" :filterable="item.filterable" :default-first-option="item.filterable" :size="item.size || 'small'" :placeholder="item.placeholder || '请选择'" :multiple="item.multiple" :collapse-tags="item.multiple" :clearable="item.clearable" :disabled="item.disabled">
+            <el-option v-for="option in item.options" :key="option.value" :value="option.value" :label="option.label" />
           </el-select>
         </template>
         <template v-if="item.inputType === 'datePicker'">
-          <el-date-picker
-            v-model="formData[item.prop]"
-            :size="item.size || 'small'"
-            type="daterange"
-            value-format="yyyy-MM-dd"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-          />
+          <el-date-picker v-model="formData[item.prop]" :size="item.size || 'small'" type="daterange" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
         </template>
         <template v-if="item.inputType === 'cascader'">
-          <el-cascader
-            v-model="formData[item.prop]"
-            :size="item.size || 'small'"
-            :placeholder="item.placeholder || '请选择'"
-            :options="item.options"
-            :props="item.props"
-            :clearable="item.clearable"
-            :disabled="item.disabled"
-          />
+          <el-cascader v-model="formData[item.prop]" :size="item.size || 'small'" :placeholder="item.placeholder || '请选择'" :options="item.options" :props="item.props" :clearable="item.clearable" :disabled="item.disabled" />
         </template>
       </el-form-item>
       <el-form-item v-if="formItems.length">
-        <el-button
-          type="primary"
-          size="small"
-          @click="getData"
-          >{{ buttonText }}</el-button
-        >
+        <el-button type="primary" size="small" @click="getData">{{ buttonText }}</el-button>
       </el-form-item>
       <el-form-item v-if="withExport">
-        <img
-          src="../../../assets/nav/ic_export.png"
-          title="导出"
-          class="btn-icon-only"
-          @click="exportClickHandler"
-        />
+        <img src="../../../assets/nav/ic_export.png" title="导出" class="btn-icon-only" @click="exportClickHandler" />
       </el-form-item>
       <el-form-item v-if="withSetting">
-        <img
-          src="../../../assets/nav/ic_setting.png"
-          title="节点设置"
-          class="btn-icon-only"
-          @click="settingClickHandler"
-        />
+        <img src="../../../assets/nav/ic_setting.png" title="节点设置" class="btn-icon-only" @click="settingClickHandler" />
       </el-form-item>
     </el-form>
   </div>
@@ -132,7 +71,7 @@ export default {
       default: false,
     },
   },
-  data() {
+  data () {
     return {
       formData: {
         range: '',
@@ -175,7 +114,7 @@ export default {
               label: '航站楼',
             },
           ],
-          changeHandler(value) {
+          changeHandler (value) {
             this.setInOrOutOptions(value)
             const rangeMap = {
               航线: 'airline',
@@ -288,27 +227,27 @@ export default {
   },
   computed: {
     ...mapGetters(['savedFormDataMap']),
-    formDataObj() {
+    formDataObj () {
       return JSON.parse(JSON.stringify(this.formData))
     },
   },
   watch: {
     items: {
-      handler(val) {
+      handler (val) {
         val && (this.formItems = val)
       },
       deep: true,
       immediate: true,
     },
     data: {
-      handler(val) {
+      handler (val) {
         val && (this.formData = val)
       },
       deep: true,
       immediate: true,
     },
     formDataObj: {
-      handler(val, oldVal) {
+      handler (val, oldVal) {
         this.formItems.forEach(item => {
           if (
             item.changeHandler &&
@@ -321,7 +260,7 @@ export default {
       deep: true,
     },
   },
-  created() {
+  created () {
     this.customItems.forEach(item => {
       if (typeof item.itemIndex === 'number') {
         if (item.prop) {
@@ -352,7 +291,7 @@ export default {
     this.$emit('update:data', this.formData)
   },
   methods: {
-    getData() {
+    getData () {
       try {
         this.formItems.forEach(item => {
           if (
@@ -381,13 +320,13 @@ export default {
         formData: this.formData,
       })
     },
-    exportClickHandler() {
+    exportClickHandler () {
       this.$emit('export')
     },
-    settingClickHandler() {
+    settingClickHandler () {
       this.$emit('setting')
     },
-    setInOrOutOptions(range) {
+    setInOrOutOptions (range) {
       const theInOrOutItem = this.formItems.find(
         item => item.prop === 'inOrOut'
       )
@@ -434,17 +373,22 @@ export default {
           break
       }
     },
-    async getOptions(prop, queryId, setKey, setLabel) {
+    async getOptions (prop, queryId, setKey, setLabel) {
+      const params = {
+        serviceId: queryId,
+        dataContent: {},
+        event: '0',
+      }
+      if (prop == 'airline' || prop == 'airport') {
+        params['page'] = 1
+        params['pageSize'] = 9999
+      }
       try {
         const {
           code,
           returnData = [],
           message,
-        } = await Query({
-          serviceId: queryId,
-          dataContent: {},
-          event: '0',
-        })
+        } = await Query(params)
         if (Number(code) === 0) {
           const arr = returnData.map(element => ({
             label: element[setLabel],
@@ -477,12 +421,12 @@ export default {
     height: 32px;
     line-height: 32px;
     font-size: 18px;
-    font-family: Helvetica, 'Microsoft YaHei';
+    font-family: Helvetica, "Microsoft YaHei";
     font-weight: bold;
     white-space: nowrap;
     position: relative;
     &::before {
-      content: '';
+      content: "";
       width: 4px;
       height: 20px;
       background: #2d67e3;
@@ -515,7 +459,7 @@ export default {
           }
           .el-input__inner {
             border-radius: 4px;
-            font-family: Helvetica, 'Microsoft YaHei';
+            font-family: Helvetica, "Microsoft YaHei";
             color: #303133;
             border-color: #ffffff;
             &:hover {
@@ -534,7 +478,7 @@ export default {
           border-radius: 4px;
           border-color: #ffffff;
           color: #303133;
-          font-family: Helvetica, 'Microsoft YaHei';
+          font-family: Helvetica, "Microsoft YaHei";
           &:hover {
             border-color: #c0c4cc;
           }
@@ -552,10 +496,10 @@ export default {
         .el-cascader {
           .el-input {
             .el-icon-arrow-up::before {
-              content: '\e78f';
+              content: "\e78f";
             }
             .el-icon-arrow-down::before {
-              content: '\e790';
+              content: "\e790";
             }
             &:not(.is-disabled) {
               .el-input__icon,
@@ -567,7 +511,7 @@ export default {
         }
         .el-button {
           border-radius: 4px;
-          font-family: Helvetica, 'Microsoft YaHei';
+          font-family: Helvetica, "Microsoft YaHei";
         }
         .btn-icon-only {
           width: 32px;

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

@@ -1,9 +1,5 @@
 <template>
-  <CommonBarStatisticsCharts
-    charts-title="航班量"
-    :query-settings="querySettings"
-    :custom-form-items="customFormItems"
-  />
+  <CommonBarStatisticsCharts charts-title="航班量" :query-settings="querySettings" :custom-form-items="customFormItems" />
 </template>
 
 <script>
@@ -12,7 +8,7 @@ import CommonBarStatisticsCharts from '../../components/newBarStatisticsCharts.v
 export default {
   name: 'FlightStatisticsCharts',
   components: { CommonBarStatisticsCharts },
-  data() {
+  data () {
     return {
       querySettings: {
         seriesKey: 'flight_num',