7.12问题修改

src/views/advancedQuery/views/advancedHome.vue

@@ -25,11 +25,30 @@
             @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">
+      <Search
+        ref="search"
+        class="advanced-search"
+        :is-title="false"
+        :is-slot="true"
+        :search-tooltip="'请输入航班号（示例：CA1234）或行李牌号（示例：1234567890）'"
+        @getSearchData="getSearchData"
+        @clearSearchData="clearSearchData"
+      >
         <div class="flex-wrap">
-          <button class="btnAn" @click="dialogShow">高级查询</button>
+          <button
+            class="btnAn"
+            @click="dialogShow"
+          >高级查询</button>
           <!-- <div
             class="setting"
             @click="show"
@@ -38,11 +57,48 @@
       </Search>
     </div>
     <!--表格-->
-    <div v-loading="loading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.8)" class="advance__table">
-      <el-table ref="table" max-height="100%" class="table" :data="dealedTableData" border stripe fit height="calc(100vh - 158px)" style="width: 100%" show-summary :summary-method="summaryRow(tableData.length)" :header-cell-class-name="headerCellClass" :row-class-name="tableRowClassName" :cell-class-name="cellClass" :span-method="objectSpanMethod" @cell-click="cellClickHandler">
-        <el-table-column v-for="col in tableCols" :key="col.prop" :prop="col.prop" :label="col.label" :width="col.width" :fixed="col.fixed">
+    <div
+      v-loading="loading"
+      element-loading-text="拼命加载中"
+      element-loading-spinner="el-icon-loading"
+      element-loading-background="rgba(0, 0, 0, 0.8)"
+      class="advance__table"
+    >
+      <el-table
+        ref="table"
+        max-height="100%"
+        class="table"
+        :data="dealedTableData"
+        border
+        stripe
+        fit
+        height="calc(100vh - 158px)"
+        style="width: 100%"
+        show-summary
+        :summary-method="summaryRow(tableData.length)"
+        :header-cell-class-name="headerCellClass"
+        :row-class-name="tableRowClassName"
+        :cell-class-name="cellClass"
+        :span-method="objectSpanMethod"
+        :formatter="tableFormat"
+        @cell-click="cellClickHandler"
+      >
+        <el-table-column
+          v-for="col in tableCols"
+          :key="col.prop"
+          :prop="col.prop"
+          :label="col.label"
+          :width="col.width"
+          :fixed="col.fixed"
+        >
           <template #header>
-            <TableHeaderCell :label="col.label" :filter-options="tableDataFilters[col.prop]" :filter-values.sync="filterValues[col.prop]" :sortable="col.sortable" :sort-rule.sync="tableDataSortRules[col.prop]" />
+            <TableHeaderCell
+              :label="col.label"
+              :filter-options="tableDataFilters[col.prop]"
+              :filter-values.sync="filterValues[col.prop]"
+              :sortable="col.sortable"
+              :sort-rule.sync="tableDataSortRules[col.prop]"
+            />
           </template>
         </el-table-column>
       </el-table>
@@ -84,61 +140,183 @@
       </div>
     </Dialog> -->
     <!--高级查询-->
-    <Dialog width="852px" :flag="gjFlag">
-      <div ref="dialog" class="rowDialog" :tabindex="0" @keyup.enter="onCheckGj(true)" @keyup.self.esc="gjFlag=false">
+    <Dialog
+      width="852px"
+      :flag="gjFlag"
+    >
+      <div
+        ref="dialog"
+        class="rowDialog"
+        :tabindex="0"
+        @keyup.enter="onCheckGj(true)"
+        @keyup.self.esc="gjFlag=false"
+      >
         <div class="title">高级查询</div>
         <div class="content">
-          <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+          <el-form
+            ref="form"
+            :model="form"
+            :rules="rules"
+            label-width="100px"
+          >
             <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">
+              <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" />
+                    <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">
-                      <el-option v-for="option in statusList" :key="option.ID" :label="option.StatusName" :value="option.StatusCode" />
+                    <el-select
+                      v-model="form.status"
+                      size="small"
+                      filterable
+                      default-first-option
+                      clearable
+                      @keyup.esc.native="dialogFocus"
+                    >
+                      <el-option
+                        v-for="option in statusList"
+                        :key="option.ID"
+                        :label="option.StatusName"
+                        :value="option.StatusCode"
+                      />
                     </el-select>
                   </template>
                   <template v-else-if="item.prop === 'specialType'">
-                    <el-select v-model="form.specialType" size="small" filterable allow-create default-first-option clearable @keyup.esc.native="dialogFocus">
-                      <el-option v-for="option in baggageTypeList" :key="option.specialType" :label="option.specialType" :value="option.specialType" />
+                    <el-select
+                      v-model="form.specialType"
+                      size="small"
+                      filterable
+                      allow-create
+                      default-first-option
+                      clearable
+                      @keyup.esc.native="dialogFocus"
+                    >
+                      <el-option
+                        v-for="option in baggageTypeList"
+                        :key="option.specialType"
+                        :label="option.specialType"
+                        :value="option.specialType"
+                      />
                     </el-select>
                   </template>
                   <template v-else-if="item.prop === 'unLoad'">
-                    <el-select v-model="form.unLoad" size="small" clearable @keyup.esc.native="dialogFocus">
-                      <el-option label="已翻减" :value="1" />
-                      <el-option label="待翻减" :value="0" />
+                    <el-select
+                      v-model="form.unLoad"
+                      size="small"
+                      clearable
+                      @keyup.esc.native="dialogFocus"
+                    >
+                      <el-option
+                        label="已翻减"
+                        :value="1"
+                      />
+                      <el-option
+                        label="待翻减"
+                        :value="0"
+                      />
                     </el-select>
                   </template>
                   <template v-else-if="item.prop === 'checkIn'">
-                    <el-select v-model="form.checkIn" size="small" clearable @keyup.esc.native="dialogFocus">
-                      <el-option label="是" :value="1" />
-                      <el-option label="否" :value="0" />
+                    <el-select
+                      v-model="form.checkIn"
+                      size="small"
+                      clearable
+                      @keyup.esc.native="dialogFocus"
+                    >
+                      <el-option
+                        label="是"
+                        :value="1"
+                      />
+                      <el-option
+                        label="否"
+                        :value="0"
+                      />
                     </el-select>
                   </template>
                   <template v-else-if="item.prop === 'active'">
-                    <el-select v-model="form.active" size="small" clearable @keyup.esc.native="dialogFocus">
-                      <el-option label="是" :value="1" />
-                      <el-option label="否" :value="0" />
+                    <el-select
+                      v-model="form.active"
+                      size="small"
+                      clearable
+                      @keyup.esc.native="dialogFocus"
+                    >
+                      <el-option
+                        label="是"
+                        :value="1"
+                      />
+                      <el-option
+                        label="否"
+                        :value="0"
+                      />
                     </el-select>
                   </template>
                   <template v-else-if="item.prop === 'transferIn'">
-                    <el-select v-model="form.transferIn" size="small" clearable @keyup.esc.native="dialogFocus">
-                      <el-option label="是" :value="1" />
-                      <el-option label="否" :value="0" />
+                    <el-select
+                      v-model="form.transferIn"
+                      size="small"
+                      clearable
+                      @keyup.esc.native="dialogFocus"
+                    >
+                      <el-option
+                        label="是"
+                        :value="1"
+                      />
+                      <el-option
+                        label="否"
+                        :value="0"
+                      />
                     </el-select>
                   </template>
                   <template v-else-if="item.prop === 'canceled'">
-                    <el-select v-model="form.canceled" size="small" clearable @keyup.esc.native="dialogFocus">
-                      <el-option label="是" :value="1" />
-                      <el-option label="否" :value="0" />
+                    <el-select
+                      v-model="form.canceled"
+                      size="small"
+                      clearable
+                      @keyup.esc.native="dialogFocus"
+                    >
+                      <el-option
+                        label="是"
+                        :value="1"
+                      />
+                      <el-option
+                        label="否"
+                        :value="0"
+                      />
                     </el-select>
                   </template>
                   <template v-else>
-                    <el-popover v-model="item.hintVisible" placement="right" trigger="manual">
+                    <el-popover
+                      v-model="item.hintVisible"
+                      placement="right"
+                      trigger="manual"
+                    >
                       <span>{{ item.hintText }}</span>
-                      <el-input :ref="'input-' + item.prop" slot="reference" v-model="form[item.prop]" size="small" @focus="item.hintVisible = true" @blur="item.hintVisible = false" @keyup.esc.native="dialogFocus" />
+                      <el-input
+                        :ref="'input-' + item.prop"
+                        slot="reference"
+                        v-model="form[item.prop]"
+                        size="small"
+                        @focus="item.hintVisible = true"
+                        @blur="item.hintVisible = false"
+                        @keyup.esc.native="dialogFocus"
+                      />
                     </el-popover>
                   </template>
                 </el-form-item>
@@ -147,8 +325,16 @@
           </el-form>
         </div>
         <div class="foot right t30">
-          <el-button size="medium" class="r24" type="primary" @click="onCheckGj(true)">确定</el-button>
-          <el-button size="medium" @click="closeCheckGj">取消</el-button>
+          <el-button
+            size="medium"
+            class="r24"
+            type="primary"
+            @click="onCheckGj(true)"
+          >确定</el-button>
+          <el-button
+            size="medium"
+            @click="closeCheckGj"
+          >取消</el-button>
         </div>
       </div>
     </Dialog>
@@ -159,7 +345,7 @@
 import Search from '@/components/SearchWithTooltip'
 import Dialog from '@/layout/components/Dialog'
 import { parseTime } from '@/utils/index'
-import { queryMap, myQuery } from '@/api/dataIntegration'
+import { myQuery } from '@/api/dataIntegration'
 import { mapGetters } from 'vuex'
 import TableHeaderCell from '@/components/TableHeaderCell'
 import { setTableFilters } from '@/utils/table'
@@ -167,7 +353,7 @@ import { setTableFilters } from '@/utils/table'
 export default {
   name: 'Advance',
   components: { Search, Dialog, TableHeaderCell },
-  data () {
+  data() {
     return {
       loading: false,
       colDialogFlag: false,
@@ -460,7 +646,7 @@ export default {
   },
   computed: {
     ...mapGetters(['clickedCells', 'queryForm']),
-    dealedTableData () {
+    dealedTableData() {
       const filtered = this.tableData.filter(item => {
         let flag = true
         Object.entries(this.filterValues).forEach(([key, arr]) => {
@@ -486,7 +672,7 @@ export default {
   },
   watch: {
     flightDate: {
-      handler (val) {
+      handler(val) {
         if (val === null) {
           this.flightDate = ['', '']
         }
@@ -494,7 +680,7 @@ export default {
       deep: true
     },
     dealedTableData: {
-      handler (val) {
+      handler(val) {
         this.spanArr = []
         let contactDot = this.contactDot
         val.forEach((item, index, arr) => {
@@ -520,7 +706,7 @@ export default {
       deep: true
     }
   },
-  created () {
+  created() {
     Object.values(this.tableCols).forEach(({ prop, filterable, sortable }) => {
       if (filterable) {
         this.$set(this.tableDataFilters, prop, [])
@@ -538,7 +724,7 @@ export default {
     // }
     // this.statItemsQueryByStatMain(dataContent);
   },
-  mounted () {
+  mounted() {
     // window.addEventListener('keyup', () => {
     //   console.dir(document.activeElement)
     // })
@@ -569,13 +755,13 @@ export default {
       this.onCheckGj()
     }
   },
-  updated () {
+  updated() {
     // table数据更新
     this.$nextTick(() => {
       this.$refs.table.doLayout()
     })
   },
-  beforeDestroy () {
+  beforeDestroy() {
     // console.log(this.$route.matched.filter(item => item.name && item.meta.title))
     if (this.$route.matched.filter(item => item.name && item.meta.title).length > 1) {
       this.$store.dispatch('app/setQueryForm', {
@@ -587,13 +773,13 @@ export default {
     }
   },
   methods: {
-    dialogShow () {
+    dialogShow() {
       this.gjFlag = true
       this.$nextTick(() => {
         this.dialogFocus()
       })
     },
-    dialogFocus () {
+    dialogFocus() {
       this.$refs['dialog'].focus()
     },
     // startDateChangeHandler(val) {
@@ -626,17 +812,17 @@ export default {
     //     this.$message.info('时间跨度不能超过三天，请重新选择')
     //   }
     // },
-    dateRangePickHandler ({ maxDate, minDate }) {
+    dateRangePickHandler({ maxDate, minDate }) {
       if (!maxDate) {
         this.pickedDate = minDate
       } else {
         this.pickedDate = null
       }
     },
-    dateRangeDisabled (date) {
+    dateRangeDisabled(date) {
       return this.pickedDate ? Math.abs(date - this.pickedDate) > 2 * 24 * 60 * 60 * 1000 : false
     },
-    objectSpanMethod ({ row, column, rowIndex, columnIndex }) {
+    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
       if (['passengerNameUpcase', 'bagWeight'].includes(column.property)) {
         const _row = this.spanArr[rowIndex]
         const _col = _row > 0 ? 1 : 0
@@ -647,7 +833,7 @@ export default {
       }
     },
     // 给表头单元格加上 ascending 或 descending 使用 element 自带的排序箭头变色
-    headerCellClass ({ row, column, rowIndex, columnIndex }) {
+    headerCellClass({ row, column, rowIndex, columnIndex }) {
       const classes = []
       const rule = this.tableDataSortRules[column.property]
       if (rule) {
@@ -655,16 +841,16 @@ export default {
       }
       return classes.join(' ')
     },
-    tableRowClassName ({ row, rowIndex }) {
+    tableRowClassName({ row, rowIndex }) {
       const classes = []
       if (row.deleted === 'DEL') {
         classes.push('bgl-deleted')
       }
       return classes.join(' ')
     },
-    cellClass ({ row, column, rowIndex, columnIndex }) {
+    cellClass({ row, column, rowIndex, columnIndex }) {
       const classes = []
-      if (['flightNO', 'transferFlightNO', 'bagSN'].includes(column.property)) {
+      if (['flightNO', 'bagSN', 'preFlightNO', 'transferFlightNO'].includes(column.property) && row[column.property]) {
         classes.push('cell-click')
         if (
           this.clickedCells.some(
@@ -679,8 +865,8 @@ export default {
       }
       return classes.join(' ')
     },
-    cellClickHandler (row, column, cell, event) {
-      if (['flightNO', 'transferFlightNO', 'bagSN'].includes(column.property)) {
+    cellClickHandler(row, column, cell, event) {
+      if (['flightNO', 'bagSN', 'preFlightNO', 'transferFlightNO'].includes(column.property)) {
         this.$store.dispatch('keepAlive/addClickedCell', {
           row,
           columnProp: column.property,
@@ -697,22 +883,31 @@ export default {
             }
           })
           break
+        case 'bagSN':
+          this.$router.push({
+            path: '/advance/baggageView',
+            query: {
+              flightNO: row.flightNO,
+              flightDate: row.flightDate,
+              bagSN: row.bagSN
+            }
+          })
+          break
         case 'transferFlightNO':
           this.$router.push({
             path: '/advance/flightView',
             query: {
               flightNO: row.transferFlightNO,
-              flightDate: row.flightDate
+              flightDate: row.transferFlightDate
             }
           })
           break
-        case 'bagSN':
+        case 'preFlightNO':
           this.$router.push({
-            path: '/advance/baggageView',
+            path: '/advance/flightView',
             query: {
-              flightNO: row.flightNO,
-              flightDate: row.flightDate,
-              bagSN: row.bagSN
+              flightNO: row.preFlightNO,
+              flightDate: row.preFlightDate
             }
           })
           break
@@ -720,8 +915,20 @@ export default {
           break
       }
     },
+    tableFormat(row, column, cellValue) {
+      switch (column.property) {
+        case 'departureTime':
+          return cellValue.replace('T', ' ')
+        case 'deleted':
+          return cellValue === 'DEL' ? cellValue : ''
+        case 'activated':
+          return cellValue === 'I' ? '未激活' : '激活'
+        default:
+          return cellValue ?? ''
+      }
+    },
     // 查询
-    getSearchData (val) {
+    getSearchData(val) {
       this.clearForm()
       if (this.flightDate[0] === '' || this.flightDate[1] === '' || val === '') {
         this.$message.error('请先输入完整查询信息')
@@ -755,18 +962,18 @@ export default {
       }
     },
     // 清除查询
-    clearSearchData () {
+    clearSearchData() {
       this.clearForm()
       this.tableData = []
     },
     // 清除表单
-    clearForm () {
+    clearForm() {
       Object.keys(this.form).forEach(key => {
         this.form[key] = ''
       })
     },
     // 高级查询-确定
-    onCheckGj (singleJump) {
+    onCheckGj(singleJump) {
       /* 参数顺序
       【航班开始日期，航班结束日期，航班号，航班号，行李牌号，行李牌号，起飞站，起飞站，目的站，目的站，特殊行李类型，特殊行李类型，旅客姓名大写拼音，旅客姓名大写拼音，
       PNR，PNR，值机号，值机号，中转进航班，中转进航班，中转出航班，中转出航班，容器编号，容器编号，
@@ -825,10 +1032,10 @@ export default {
         this.$message.error('请先选择要查询的时间')
       }
     },
-    closeCheckGj () {
+    closeCheckGj() {
       this.gjFlag = false
     },
-    setDataContent (...dataContent) {
+    setDataContent(...dataContent) {
       dataContent.forEach(target => {
         target = typeof target === 'string' ? target.trim() : target
         if ((target ?? '') !== '') {
@@ -839,7 +1046,7 @@ export default {
       })
     },
     // 数据查询
-    async statItemsQueryByStatMain (dataContent, singleJump) {
+    async statItemsQueryByStatMain(dataContent, singleJump) {
       this.loading = true
       this.tableData = []
       try {
@@ -881,11 +1088,7 @@ export default {
             }
           }
           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' ? '未激活' : '激活'
-            return item
-          })
+          this.tableData = tableData
           setTableFilters(this.tableData, this.tableDataFilters)
         } else {
           this.$message.info('未查询到匹配结果')
@@ -896,7 +1099,7 @@ export default {
       this.loading = false
     },
     // 特殊行李类型下拉选项查询
-    async baggageTypeQuery () {
+    async baggageTypeQuery() {
       try {
         const result = await myQuery(DATACONTENT_ID.baggageTypeId)
         this.baggageTypeList = result
@@ -921,7 +1124,7 @@ export default {
     //   }
     // },
     // 统计行数
-    summaryRow (num) {
+    summaryRow(num) {
       return function () {
         return ['合计', `共${num}件`]
       }
@@ -942,7 +1145,7 @@ export default {
       width: 32px;
       cursor: pointer;
       background-size: 100% 100%;
-      background: url("../../../assets/baggage/ic_setting.png") no-repeat;
+      background: url('../../../assets/baggage/ic_setting.png') no-repeat;
       margin-left: 12px;
       position: relative;
       top: 2px;
@@ -969,7 +1172,7 @@ export default {
       padding: 0;
       text-align: center;
       font-size: 14px;
-      font-family: Helvetica, "Microsoft YaHei";
+      font-family: Helvetica, 'Microsoft YaHei';
       letter-spacing: 0;
     }
     .cell-click {

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

@@ -664,8 +664,8 @@ export default {
       return myQuery(queryMap.message, ...dataContent)
     },
     async queryBaggageAll(queryData = this.queryData) {
-      const { flightNO, flightDate, BagSN } = queryData
-      const dataContent = [flightNO, flightDate, BagSN]
+      const { flightNO, flightDate, bagSN } = queryData
+      const dataContent = [flightNO, flightDate, bagSN]
       try {
         const [
           baggageBasicInfo,
@@ -703,8 +703,8 @@ export default {
       }
     },
     async baggageMessageQuery() {
-      const { flightNO, flightDate, BagSN } = this.queryData
-      const dataContent = [flightNO, flightDate, BagSN]
+      const { flightNO, flightDate, bagSN } = this.queryData
+      const dataContent = [flightNO, flightDate, bagSN]
       try {
         const result = await this.queryMessage(dataContent)
         this.messageList = result.map(message => {

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

@@ -806,7 +806,7 @@ export default {
           this.$router.push({
             path: `/${this.$route.path.split('/').slice(1, -1).join('/')}/baggageView`,
             query: {
-              BagSN: row.BagSN,
+              bagSN: row.BagSN,
               flightNO: this.queryData.flightNO,
               flightDate: this.queryData.flightDate
             }

src/views/baggageManagement/mixins/timeZone.js

@@ -9,10 +9,6 @@
 import { timeInZone } from '@/utils/table'
 import { mapGetters } from 'vuex'
 
-function getTimeInZone(time, timeZone) {
-  return timeInZone((time ?? '').replace('T', ' '), timeZone)
-}
-
 export default {
   computed: {
     ...mapGetters(['timeZone'])

src/views/statisticsCharts/components/statisticsHeader.vue

@@ -13,6 +13,9 @@
         :key="item.prop"
         :prop="item.prop"
         :label="item.label"
+        :style="{
+          width: item.width || '144px'
+        }"
       >
         <template v-if="item.inputType === 'input'">
           <el-input
@@ -69,10 +72,10 @@
       </el-form-item>
       <el-form-item v-if="formItems.length">
         <el-button
+          type="primary"
           size="small"
-          style="height:33px;border-radius:4px"
           @click="getData"
-        >查询</el-button>
+        >{{ buttonText }}</el-button>
       </el-form-item>
     </el-form>
   </div>
@@ -94,6 +97,10 @@ export default {
     data: {
       type: Object,
       default: undefined
+    },
+    buttonText: {
+      type: String,
+      default: '查询'
     }
   },
   data() {
@@ -175,7 +182,7 @@ export default {
         {
           prop: 'interval',
           inputType: 'select',
-          placeholder: '请选择统计时间维度',
+          placeholder: '统计时间维度',
           clearable: true,
           options: [
             {
@@ -200,6 +207,7 @@ export default {
           prop: 'dateTime',
           inputType: 'datePicker',
           clearable: true,
+          width: '240px',
           options: []
         },
         {
@@ -446,6 +454,9 @@ export default {
       &:not(:last-child) {
         margin-right: 8px;
       }
+      &:nth-last-child(2) {
+        margin-right: 16px;
+      }
       .el-form-item__content {
         height: 32px;
         line-height: 30px;
@@ -470,15 +481,20 @@ export default {
         .el-date-editor--daterange.el-input__inner,
         .el-date-editor--timerange.el-input,
         .el-date-editor--timerange.el-input__inner {
-          width: 230px;
+          width: 100%;
           border-radius: 4px;
           border-color: #ffffff;
+          color: #303133;
+          font-family: Helvetica, 'Microsoft YaHei';
           &:hover {
             border-color: #c0c4cc;
           }
           &.is-active {
             border-color: #409eff;
           }
+          .el-input__icon {
+            color: #303133;
+          }
           .el-range-separator {
             line-height: 28px;
           }
@@ -500,6 +516,10 @@ export default {
             }
           }
         }
+        .el-button {
+          border-radius: 4px;
+          font-family: Helvetica, 'Microsoft YaHei';
+        }
       }
     }
   }

src/views/statisticsCharts/views/nodeStatisticsCharts.vue

@@ -8,6 +8,7 @@
         title="扫描节点与位置分析"
         :items="formItems"
         :data="formData"
+        button-text="开始分析"
         @getFormData="getFormData"
       />
     </div>
@@ -99,21 +100,13 @@ export default {
           inputType: 'select',
           placeholder: '请选择进离港',
           clearable: true,
-          options: [
-            {
-              label: '离港',
-              value: 'L'
-            },
-            {
-              label: '进港',
-              value: 'X'
-            }
-          ]
+          options: []
         },
         {
           prop: 'dateTime',
           inputType: 'datePicker',
           clearable: true,
+          width: '240px',
           options: []
         }
       ],
@@ -163,7 +156,7 @@ export default {
     }
   },
   computed: {
-    ...mapGetters(['sidebar', 'permission_routes'])
+    ...mapGetters(['sidebar'])
   },
   watch: {
     // 监听数据变化 重绘图形
@@ -202,11 +195,15 @@ export default {
     getFormData(data) {
       this.getData(data)
     },
-    // 243 时间类型 查询范围 开始时间  结束时间  进离岗  航线/航站/航站楼
-    // 244 时间类型 开始时间  结束时间  进离岗  基地分公司
+    // 243 时间类型 查询范围 开始时间  结束时间  进离港  航线/航站/航站楼
+    // 244 时间类型 开始时间  结束时间  进离港  基地分公司
     async getData(data) {
-      let params = []
-      if (data.airport === '') {
+      const params = []
+      if (data.range === '航线' && data.airline === '') {
+        this.$message.warning('请先选择航线')
+        return
+      }
+      if (data.range === '航站' && data.airport === '') {
         this.$message.warning('请先选择航站')
         return
       }
@@ -219,7 +216,14 @@ export default {
         return
       }
       const id = DATACONTENT_ID.nodeStatistics
-      params = [data.airport, data.inOrOut, data.dateTime[0], data.dateTime[1]]
+      if (data.range === '航线') {
+        params.push(data.airline)
+      } else if (data.range === '航站') {
+        params.push(data.airport)
+      } else {
+        params.push('全部')
+      }
+      params.push(data.inOrOut, data.dateTime[0], data.dateTime[1])
       try {
         const res = await Query({
           id: id,

src/views/systemSettings/views/queryTemplate/queryTemplateadd.vue

@@ -130,7 +130,7 @@ export default {
     },
     async getSelectOption (ID) {
       try {
-        const { listValues } = await myQuery(ID)
+        const listValues = await myQuery(ID)
         return listValues
       } catch (error) {
         this.$message.error(error)

src/views/systemSettings/views/queryTemplate/queryTemplateedit.vue

@@ -124,7 +124,7 @@ export default {
     async queryQueryTemplateByID (queryTemplateID) {
       try {
         const templateInfo = await myQuery(DATACONTENT_ID.sysQueryEditId, queryTemplateID)
-        Object.entries(templateInfo.listValues[0]).forEach(([key, value]) => {
+        Object.entries(templateInfo[0]).forEach(([key, value]) => {
           this.ruleForm[key] = value
         })
       } catch (error) {
@@ -149,7 +149,7 @@ export default {
     },
     async getSelectOption (ID) {
       try {
-        const { listValues } = await myQuery(ID)
+        const listValues = await myQuery(ID)
         return listValues
       } catch (error) {
         this.$message.error(error)

src/views/systemSettings/views/serviceManagement/serviceAdd.vue

@@ -294,7 +294,7 @@ export default {
     },
     async getSelectOption (ID) {
       try {
-        const { listValues } = await myQuery(ID)
+        const listValues = await myQuery(ID)
         return listValues
       } catch (error) {
         this.$message.error(error)
@@ -303,7 +303,7 @@ export default {
     },
     async queryServiceByID (serviceID) {
       const serviceInfo = await myQuery(39, serviceID)
-      Object.entries(serviceInfo.listValues[0]).forEach(([key, value]) => {
+      Object.entries(serviceInfo[0]).forEach(([key, value]) => {
         this.serviceForm[key] = value
       })
     }

src/views/systemSettings/views/serviceManagement/serviceEdit.vue

@@ -315,7 +315,7 @@ export default {
     },
     async getSelectOption (ID) {
       try {
-        const { listValues } = await myQuery(ID)
+        const listValues = await myQuery(ID)
         return listValues
       } catch (error) {
         this.$message.error(error)
@@ -324,7 +324,7 @@ export default {
     },
     async queryServiceByID (serviceID) {
       const serviceInfo = await myQuery(DATACONTENT_ID.sysServiceEditId, serviceID)
-      Object.entries(serviceInfo.listValues[0]).forEach(([key, value]) => {
+      Object.entries(serviceInfo[0]).forEach(([key, value]) => {
         this.serviceForm[key] = value
       })
     },