修改

public/config.js

@@ -173,11 +173,11 @@ window.SERVICE_ID = {
   baggageAbnormalNew: 200318, //旅客分类统计-非正常行李统计
 
   /***-----统计表格------***/
-  transferBaggageProption: 1848, //中转行李比例明细
+  transferBaggageProption: 200506, //中转行李比例明细-oldid(1848)
   transferBaggageFactor: 1849, // 中转行李因素分析
   transferBaggageDetails: 1850, // 中转行李明细
-  transferBaggageDirection: 1851, // 中转行李四个流向
-  transferBaggageDirectionDetails: 1852, // 中转行李流向明细
+  transferBaggageDirection: 200504, // 中转行李四个流向-oldid(1851)
+  transferBaggageDirectionDetails: 200505, // 中转行李流向明细-oldid(1852)
   baggageServicePercentage: 1853, // 行李全流程服务水平百分比
   workerqueryAll: 200502,//工作者查询
   workloadTableID: 200501,//工作量统计

src/views/newBagAbnormal/components/baggageAbnormal.vue

@@ -0,0 +1,31 @@
+<template>
+  <div v-loading="loading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.8)" class="baggageAbnormal">
+    <Table style="height:100%" tableName="异常行李表" :tableTag="tableTag" ref="table" />
+  </div>
+</template>
+
+<script>
+import Table from '../../newQuery/components/table.vue'
+export default {
+  name: 'BaggageAbnormal',
+  components: { Table },
+  data () {
+    return {
+      loading: false,
+      tableTag: {}
+    }
+  },
+  mounted () {
+    const { query } = this.$route
+    const newQuery = _.cloneDeep(query)
+    if (newQuery.ID) delete newQuery.ID
+    this.tableTag = newQuery
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.baggageAbnormal {
+  height: 100%;
+}
+</style>

src/views/newBagAbnormal/components/baggageList.vue

@@ -0,0 +1,188 @@
+<template>
+  <div v-loading="loading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.8)" class="baggageList">
+    <Table style="height:100%" tableName="行李跟踪信息表" :istableCol="true" :tableTag="tableTag" ref="table" />
+    <div class="btns">
+      <img class="btn-square btn-shadow r16" src="@/assets/baggage/ic_export.png" title="导出" @click="exportHandler('table', '行李节点列表')">
+    </div>
+  </div>
+</template>
+
+<script>
+import Table from '../../newQuery/components/table.vue'
+import Dialog from '@/layout/components/Dialog/index.vue'
+import pf from '@/layout/mixin/publicFunc'
+import { exportToExcel } from '@/utils/table'
+export default {
+  name: 'BaggageList',
+  mixins: [pf],
+  components: { Dialog, Table },
+  props: {
+    query: {
+      type: Object,
+      default: () => { }
+    },
+    tagObj: {
+      type: Object,
+      default: () => { }
+    },
+    tableDatas: {
+      type: Array,
+      default: []
+    },
+  },
+  data () {
+    return {
+      tableCols: [],
+      baggageTableData: [],
+      spanArr: [],
+      pos: 0,
+      loading: false,
+      dataContent: {},
+      tableTag: {}
+    }
+  },
+  watch: {
+    tagObj: {
+      handler (obj) {
+        this.tableTag = obj
+      },
+      deep: true,
+    }
+  },
+  mounted () {
+    this.tableTag = this.tagObj
+  },
+  methods: {
+    async queryDetails (auth_id) {
+      try {
+        this.loading = true
+        const { code, returnData } = await this.getQueryListAuth(SERVICE_ID.bagDetailId, this.dataContent, 1, 20, auth_id)
+        if (code == 0 && returnData && returnData.length) {
+          this.baggageTableData = returnData.map((item, index) => {
+            if (item['dealTime']) {
+              item['dealTime'] = item['dealTime'].replace('T', ' ')
+            }
+            item['departureInfo'] = `${item['departureAirport']}\n${item['departureTime'] ? item['departureTime'].replace('T', '\n') : ''
+              }`
+            item['landingInfo'] = `${item['landingAirport']}\n${item['landingTime'] ? item['landingTime'].replace('T', '\n') : ''
+              }`
+            return item
+          })
+          this.initTableData(this.baggageTableData)
+          this.loading = false
+        } else {
+          this.loading = false
+        }
+      } catch (error) {
+        this.loading = false
+        console.log(error)
+        this.$message.error('失败')
+      }
+    },
+    initTableData (tableData) {
+      const spanArr = []
+      let pos = 0
+      for (let i = 0; i < tableData.length; i++) {
+        if (i === 0) {
+          spanArr.push(1)
+        } else {
+          if (
+            tableData[i]['F1'] === tableData[i - 1]['F1'] &&
+            tableData[i]['F2'] === tableData[i - 1]['F2'] &&
+            tableData[i]['departureAirport'] === tableData[i - 1]['departureAirport'] &&
+            tableData[i]['landingAirport'] === tableData[i - 1]['landingAirport']
+          ) {
+            spanArr[pos] += 1
+            spanArr.push(0)
+          } else {
+            spanArr.push(1)
+            pos = i
+          }
+        }
+      }
+      this.spanArr = spanArr
+      this.pos = pos
+    },
+    headerCellClass ({ row, column, rowIndex, columnIndex }) {
+      if (['departureInfo', 'landingInfo'].includes(column.property)) {
+        return 'pre-line'
+      }
+    },
+    cellClass ({ row, column, rowIndex, columnIndex }) {
+      const classes = []
+      if (
+        ['flightNO', 'U_Device_ID'].includes(column.property) &&
+        row[column.property] &&
+        row[column.property] !== 'FBULK'
+      ) {
+        classes.push('cell-click')
+      }
+      if (['departureInfo', 'landingInfo'].includes(column.property)) {
+        classes.push('pre-line')
+      }
+      return classes.join(' ')
+    },
+    cellClickHandler (row, column, cell, event) {
+      if (row[column.property] && row[column.property] !== 'FBULK') {
+        switch (column.property) {
+          case 'flightNO':
+            this.$router.push({
+              path: `${this.$route.path.split('/').slice(0, -1).join('/')}/flightView`,
+              query: {
+                flightNO: row.flightNO,
+                flightDate: row.flightDate
+              }
+            })
+            break
+          case 'U_Device_ID':
+            this.$router.push({
+              path: `${this.$route.path.split('/').slice(0, -1).join('/')}/containerView`,
+              query: {
+                flightNO: row.flightNO,
+                flightDate: row.flightDate,
+                departureAirport: row.departureAirport,
+                landingAirport: row.landingAirport,
+                containerID: row.U_Device_ID
+              }
+            })
+            break
+          default:
+            break
+        }
+      }
+    },
+    tableSpanMethod ({ row, column, rowIndex, columnIndex }) {
+      if (['flightNO', 'flightDate', 'departureInfo', 'landingInfo'].includes(column['property'])) {
+        const _row = this.spanArr[rowIndex]
+        const _col = _row > 0 ? 1 : 0
+        return {
+          rowspan: _row,
+          colspan: _col
+        }
+      }
+    },
+    exportHandler (refName, tableName) {
+      const table = this.$refs[refName].$el.cloneNode(true)
+      const { luggageNum, carrierFlights, carrierFlightsDate } = this.query
+      const fileName = `${tableName}-${luggageNum}-${carrierFlights}-${carrierFlightsDate}.xlsx`
+      exportToExcel(table, tableName, fileName)
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.baggageList {
+  height: 100%;
+  position: relative;
+  .btns {
+    position: absolute;
+    top: -50px;
+    right: 66px;
+    z-index: 10;
+    .r16 {
+      margin-right: 16px;
+    }
+  }
+}
+</style>

src/views/newBagAbnormal/components/baggageMessage.vue

@@ -0,0 +1,281 @@
+<template>
+  <div v-loading="loading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.8)" class="baggageMessage">
+    <div class="baggageMessage-content">
+      <template v-if="messageList.length">
+        <el-scrollbar style="height: 100%">
+          <el-row style="margin:0" :gutter="15">
+            <el-col v-for="(message, index) in messageList" :key="index" :span="6">
+              <div class="card">
+                <div class="message-date">{{ message.readTime }}</div>
+                <div class="message-content">
+                  <el-scrollbar style="height: 100%">
+                    <div>{{ message.sourceData.replaceAll('n', '\n').replaceAll('r', '').replaceAll('\\', '').replaceAll('"', '') }}</div>
+                  </el-scrollbar>
+                </div>
+              </div>
+            </el-col>
+          </el-row>
+        </el-scrollbar>
+      </template>
+      <template v-else>
+        <el-empty :image-size="1" description="暂无数据" />
+      </template>
+    </div>
+    <div class="btns">
+      <img class="btn-square btn-shadow" src="@/assets/baggage/ic_export.png" title="导出" @click="exportMessageToExcel">
+    </div>
+  </div>
+</template>
+
+<script>
+import pf from '@/layout/mixin/publicFunc'
+import * as XLSX from 'xlsx'
+import XLSX_STYLE from 'xlsx-style'
+import FileSaver from 'file-saver'
+export default {
+  name: 'BaggageMessage',
+  mixins: [pf],
+  props: {
+    query: {
+      type: Object,
+      default: () => { }
+    },
+    tagObj: {
+      type: Object,
+      default: () => { }
+    }
+  },
+  data () {
+    return {
+      messageList: [],
+      loading: false,
+      dataContent: []
+    }
+  },
+  watch: {
+    tagObj: {
+      handler (obj) {
+        this.dataContent = obj
+        this.queryDetails()
+      },
+      deep: true
+    }
+  },
+  created () {
+    this.dataContent = this.tagObj
+  },
+  mounted () {
+    this.queryDetails()
+  },
+  methods: {
+    async queryDetails () {
+      try {
+        this.loading = true
+        const { code, returnData } = await this.getQueryList(SERVICE_ID.bagDetailId, this.dataContent)
+        if (code == 0 && returnData && returnData.length) {
+          // this.messageList = [...returnData]
+          const messageDatas = [...returnData]
+          messageDatas.map(item => {
+            const { dataObjectId, dataType } = item
+            const other = dataType == ('BSM' || 'bsm') ? '（航信）' : '（BRS）'
+            if (dataObjectId && dataObjectId.length) {
+              const len = dataObjectId.length
+              const popNums = [100, 101, 102].map(item => item.toString())
+              const target = dataObjectId.substring(len - 3, len)
+              const place = popNums.includes(target) ? '（国航）' : dataObjectId.substring(len - 5, len) == '10000' ? '（国航）' : dataObjectId.substring(len - 5, len) == '20021' ? other : other
+              item.readTime = item.readTime ? item.readTime.replace('T', ' ') + place : item.createAt.replace('T', ' ') + place
+            } else {
+              item.readTime = item.readTime ? item.readTime.replace('T', ' ') + other : item.createAt.replace('T', ' ') + other
+            }
+          })
+          this.messageList = messageDatas
+          // this.messageList = returnData.map(message => ({
+          //   ...message,
+          //   readTime: message.readTime ? `${message.readTime.replace('T', ' ')}（广州）` : '（北京）'
+          // }))
+          this.loading = false
+        } else {
+          this.loading = false
+        }
+      } catch (error) {
+        this.loading = false
+        console.log(error)
+        this.$message.error('失败')
+      }
+    },
+    //初始化数据地址
+    formatTableData (returnData) {
+      const messageDatas = [...returnData]
+      messageDatas.forEach(item => {
+        const { dataObjectId, dataType } = item
+        if (dataObjectId) {
+          const len = dataObjectId.length
+          const place = dataObjectId.substring(len - 5, len) == '20021'
+          if (place) {
+            const bsm = dataType ? `${dataType} `.toLocaleUpperCase() == 'BSM' : false
+            const bpm = dataType ? `${dataType} `.toLocaleUpperCase() == 'BPM' : false
+            if (place && bsm) {
+              item.readTime = item.readTime ? item.readTime.replace('T', ' ') + '航信' : item.readTime
+            }
+            if (place && bpm) {
+              item.readTime = item.readTime ? item.readTime.replace('T', ' ') + 'BRS' : item.readTime
+            }
+          } else {
+            item.readTime = item.readTime ? item.readTime.replace('T', ' ') : item.createAt.replace('T', ' ')
+          }
+        } else {
+          item.readTime = item.readTime ? item.readTime.replace('T', ' ') : item.createAt.replace('T', ' ')
+        }
+      })
+      return messageDatas
+    },
+    exportMessageToExcel () {
+      const xlsxDatas = [['Date & Time', 'Message']]
+      xlsxDatas.push(
+        ...this.messageList.map(message => [
+          message.readTime || message.createAt.replace('T', ' '),
+          message.sourceData.replaceAll('n', '\n').replaceAll('r', '').replaceAll('\\', '').replaceAll('"', '')
+          // message.sourceData.replaceAll(/[\\r\\n]{2,}/g, '\n').replaceAll('\\', '')
+        ])
+      )
+      const columnWidths = []
+      xlsxDatas.forEach(row => {
+        // 计算每一列宽度，考虑换行
+        row.forEach((cell, columnIndex) => {
+          const cellWidth = Math.max(
+            ...cell
+              .toString()
+              .split('\n')
+              .map(cellRow =>
+                cellRow.split('').reduce((pre, curr) => {
+                  const letterSize = curr.charCodeAt(0) > 255 ? 2 : 1
+                  return pre + letterSize
+                }, 0)
+              )
+          )
+          if ((!columnWidths[columnIndex] && cellWidth > 0) || cellWidth > columnWidths[columnIndex]) {
+            columnWidths[columnIndex] = cellWidth
+          }
+        })
+      })
+      // 生成表格数据
+      const sheet = XLSX.utils.aoa_to_sheet(xlsxDatas)
+      // 添加列宽度
+      sheet['!cols'] = columnWidths.map(width => ({
+        wch: width + 2
+      }))
+      // 表格对齐、添加边框
+      const borderStyle = {
+        style: 'medium',
+        color: {
+          rgb: 'FFFFFF'
+        }
+      }
+      const reg = /^[A-Z]+([\d]+$)/
+      for (const key in sheet) {
+        const match = reg.test(key)
+        if (match) {
+          const rowIndex = reg.exec(key)[1]
+          let cellStyle = {
+            alignment: {
+              horizontal: 'center',
+              vertical: 'center',
+              wrapText: true
+            }
+          }
+          if (Number(rowIndex) === 1) {
+            cellStyle = {
+              ...cellStyle,
+              border: {
+                top: borderStyle,
+                right: borderStyle,
+                bottom: borderStyle,
+                left: borderStyle
+              },
+              font: {
+                color: {
+                  rgb: 'FFFFFF'
+                }
+              },
+              fill: {
+                fgColor: {
+                  rgb: '3366FF'
+                }
+              }
+            }
+          } else {
+            cellStyle.alignment.horizontal = 'left'
+          }
+          sheet[key].s = cellStyle
+        }
+      }
+      // 表格数据转换
+      const workBook = XLSX.utils.book_new()
+      XLSX.utils.book_append_sheet(workBook, sheet, '行李原始报文')
+      const tableWrite = XLSX_STYLE.write(workBook, {
+        bookType: 'xlsx',
+        bookSST: true,
+        type: 'buffer',
+        cellStyles: true
+      })
+      // 下载表格
+      const { luggageNum, flightNo, flightDate, carrierFlights, carrierFlightsDate } = this.query
+      let fileName
+      if (flightNo || flightDate) {
+        fileName = `行李原始报文-${luggageNum}-${flightNo}-${flightDate}.xlsx`
+      } else {
+        fileName = `行李原始报文-${luggageNum}-${carrierFlights}-${carrierFlightsDate}.xlsx`
+      }
+      FileSaver.saveAs(new Blob([tableWrite], { type: 'application/octet-stream' }), fileName)
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.baggageMessage {
+  height: 100%;
+  position: relative;
+  &-content {
+    padding: 24px;
+    height: 100%;
+  }
+  .card {
+    width: 100%;
+    height: 440px;
+    padding: 20px;
+    background: #ffffff;
+    border: 1px solid #dfe3ea;
+    box-shadow: 0px 3px 2px 0px rgba(0, 0, 0, 0.29);
+    margin-bottom: 12px;
+    > .message-date {
+      // width: 180px;
+      width: 200px;
+      height: 26px;
+      line-height: 14px;
+      font-size: 14px;
+      font-family: Helvetica;
+      color: #afb4bf;
+      border-bottom: 1px solid #afb4bf;
+      margin-bottom: 18px;
+    }
+    > .message-content {
+      white-space: pre-line;
+      line-height: 24px;
+      font-size: 14px;
+      color: #303133;
+      word-break: break-all;
+      height: calc(100% - 44px);
+    }
+  }
+  .btns {
+    position: absolute;
+    top: -50px;
+    right: 24px;
+    z-index: 10;
+    .r16 {
+      margin-right: 16px;
+    }
+  }
+}
+</style>

src/views/newBagAbnormal/components/baggageStory.vue

@@ -0,0 +1,112 @@
+<template>
+  <div class="baggageStory">
+    <div class="table">
+      <el-table height="400" :data="storyTable" border style="width: 100%">
+        <el-table-column prop="luggageDescribe" label="行李服务记录">
+        </el-table-column>
+        <el-table-column prop="createtime" label="创建时间">
+        </el-table-column>
+      </el-table>
+    </div>
+    <div class="content t30">
+      <el-form ref="form" :model="form" label-width="70px">
+        <el-form-item label="输入备注">
+          <el-input type="textarea" clearable v-model="form.desc"></el-input>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div class="right t30">
+      <el-button size="medium" class="r24" type="primary" @click="onStoryCheck">确定</el-button>
+      <el-button size="medium" @click="storyFlag = false">取消</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import { parseTime } from '@/utils'
+import { getToken } from '@/utils/auth'
+import { Query, newData, modifyData } from '@/api/webApi'
+export default {
+  name: 'BaggageStory',
+  props: {
+    bagID: {
+      type: Number || String,
+      default: 0
+    }
+  },
+  data () {
+    return {
+      storyFlag: false,
+      storyTable: [],
+      form: {
+        desc: ''
+      },
+      storyId: ''
+    }
+  },
+  mounted () {
+    this.storyId = this.bagID || ''
+    if (this.storyId) {
+      this.queryStoryCheck()
+    }
+  },
+  methods: {
+    async onStoryCheck () {
+      if (!this.storyId) return
+      const params = {
+        serviceId: SERVICE_ID.advancedStoryId,
+        dataContent: {
+          luggageID: this.storyId,
+          luggageDescribe: this.form.desc,
+          user_id: getToken('userid')
+        },
+        event: '1'
+      }
+      const parmasts = {
+        "serviceId": SERVICE_ID.advancedRemakesId,
+        "page": 1,
+        "pageSize": 10,
+        "dataContent": {
+          "ID": this.storyId,
+          "luggage_describe": "..."
+        },
+        "event": "2"
+      }
+      await modifyData(parmasts)
+      const { code } = await newData(params)
+      if (code == 0) {
+        const item = {
+          luggageDescribe: this.form.desc,
+          createtime: parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}')
+        }
+        this.storyTable.push(item)
+        this.$message.success('操作成功')
+        this.form.desc = ''
+      }
+      else this.$message.success('操作失败')
+    },
+    async queryStoryCheck () {
+      this.storyTable = []
+      const params = {
+        serviceId: SERVICE_ID.advancedStoryId,
+        dataContent: {
+          luggageID: this.storyId,
+        },
+        event: '0'
+      }
+      const { code, returnData } = await Query(params)
+      if (code == 0 && returnData?.length) {
+        const ndatas = [...returnData]
+        ndatas.forEach(item => item.createtime = parseTime(item.createtime.replace('T', ' '), '{y}-{m}-{d} {h}:{i}:{s}'))
+        this.storyTable = ndatas
+      }
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.baggageStory {
+  padding: 20px;
+}
+</style>

src/views/newBagAbnormal/components/baggageView.vue

@@ -0,0 +1,467 @@
+<template>
+  <div v-loading="loading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.8)" class="baggageView">
+    <el-scrollbar style="height: 100%">
+      <div v-infinite-scroll="load" class="baggageView-content">
+        <div v-for="(item,index) in tableData" :key="index" class="baggageView-list">
+          <div class="part2">
+            <div class="part2_info">
+              <div class="title">
+                <div class="fightNo">{{ item.carrierFlights || item.inflightNo }}</div>
+                <div class="fightDate">{{ item.carrierFlightsDate || item.inflightDate }}</div>
+                <div class="fightLine">{{ item.outAirport }}{{ item.takeoff_terminal }} -- {{item.landAirport}}{{ item.target_terminal }}</div>
+                <div class="fightTime">{{ item.takeTime }} -- {{ item.landTime }}</div>
+              </div>
+              <div class="baggage-track-chart">
+                <div class="step-line">
+                  <div v-for="(line, index) in 6" :key="index" :class="['step-line-segment', { 'step-line-active': activeStepLine(index,item.bagStatus) }]"></div>
+                </div>
+                <div v-for="(p, cindex) in item.bagStatus" :key="cindex" :class="{ 'step-item': true, 'active-item': p.timeValue }">
+                  <div :class="activeStepLineDanger(cindex,item)" class="step-circle">
+                    <span class="step-name">{{ p.nodeName }}</span>
+                  </div>
+                  <div v-if="p.timeValue || p.stateValue || p.loclValue || p.fourSecurity" class="step-info">
+                    <div :class="statusClasses(p.stateValue)">{{ p.stateValue }}</div>
+                    <span class="step-time">{{ p.timeValue }}</span>
+                    <div class="step-location">{{ p.loclValue }}</div>
+                    <div :class="statusClasses(p.fourSecurity)">{{ p.fourSecurity }}</div>
+                  </div>
+                  <div v-else class="step-info">无</div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </el-scrollbar>
+  </div>
+</template>
+
+<script>
+import pf from '@/layout/mixin/publicFunc'
+export default {
+  name: 'BaggageView',
+  mixins: [pf],
+  props: {
+    queryObj: {
+      type: Object,
+      default: () => { }
+    },
+    tagObj: {
+      type: Object,
+      default: () => { }
+    }
+  },
+  data () {
+    return {
+      stepNodes: [
+        {
+          nodeCode: 'CHECKIN',
+          nodeName: '值机',
+          timeProp: 'checkInDate',
+          timeValue: '',
+          loclProp: 'checkInLocation',
+          loclValue: '',
+          stateProp: 'checkState',
+          stateValue: '',
+        },
+        {
+          nodeCode: 'SECURITY',
+          nodeName: '安检',
+          timeProp: 'security_check_time',
+          timeValue: '',
+          loclProp: 'security_location',
+          loclValue: '',
+          stateProp: 'securityInspectionResults',
+          stateValue: '',
+        },
+        {
+          nodeCode: 'SORT',
+          nodeName: '分拣',
+          timeProp: 'sorting_time',
+          timeValue: '',
+          loclProp: 'sorting_location',
+          loclValue: '',
+          stateProp: 'sortState',
+          stateValue: '',
+        },
+        {
+          nodeCode: 'LOAD',
+          nodeName: '装车',
+          timeProp: 'loading_time',
+          timeValue: '',
+          loclProp: 'installationAddress',
+          loclValue: '',
+          stateProp: 'loadState',
+          stateValue: '',
+        },
+        {
+          nodeCode: 'INFL',
+          nodeName: '装机',
+          timeProp: 'installation_time',
+          timeValue: '',
+          loclProp: 'installation_location',
+          loclValue: '',
+          stateProp: 'normal',
+          stateValue: '',
+        },
+        {
+          nodeCode: 'UNLOAD',
+          nodeName: '卸机',
+          timeProp: 'unloadtime',
+          timeValue: '',
+          loclProp: 'unloadLocation',
+          loclValue: '',
+          stateProp: 'normal',
+          stateValue: '',
+        },
+        {
+          nodeCode: 'ARRIVED',
+          nodeName: '到达',
+          timeProp: 'arrivedtime',
+          timeValue: '',
+          loclProp: 'arrviedLocation',
+          loclValue: '',
+          stateProp: 'normal',
+          stateValue: '',
+        }
+      ],
+      tableData: [],
+      tableDataCopy: [],
+      page: 0,
+      pageSize: 20,
+      dataContent: {},
+      loading: false,
+      noMore: false
+    }
+  },
+  computed: {
+    activeStepLine () {
+      return function (index, arrs) {
+        return (arrs[index].stateValue || arrs[index].loclValue || arrs[index].timeValue) && (arrs[index + 1].stateValue || arrs[index + 1].loclValue || arrs[index + 1].timeValue)
+      }
+    },
+    activeStepLineDanger () {
+      return function (index, item) {
+        function diffMinutes () {
+          const { takeTime } = item
+          const [hour, minutes] = takeTime?.split(':')
+          if (minutes - 15 >= 0) {
+            return `${hour}: ${minutes - 15 >= 10 ? minutes - 15 : '0' + (minutes - 15)}`
+          } else {
+            if (hour - 1 > 0) {
+              return `${hour - 1}:${minutes - 15 + 60 >= 10 ? minutes - 15 + 60 : '0' + (minutes - 15 + 60)}`
+            } else {
+              return `23:${minutes - 15 + 60 >= 10 ? minutes - 15 + 60 : '0' + (minutes - 15 + 60)}`
+            }
+          }
+        }
+        const arrs = item.bagStatus
+        const { stateProp, stateValue } = arrs[index]
+        if (stateProp == 'securityInspectionResults' && stateValue == 'UCL') {
+          if (arrs[index + 1].stateValue || arrs[index + 1].loclValue || arrs[index + 1].timeValue || arrs[index + 2].stateValue || arrs[index + 2].loclValue || arrs[index + 2].timeValue) {
+            return 'step-circle-waring'
+          } else {
+            return 'step-circle-danger'
+          }
+        }
+        // if (stateProp == 'securityInspectionResults' && !stateValue) {
+        //   if (this.tableData.length >= 2 || arrs[index + 1].stateValue || arrs[index + 1].loclValue || arrs[index + 1].timeValue || arrs[index + 2].stateValue || arrs[index + 2].loclValue || arrs[index + 2].timeValue) {
+        //     return 'step-circle-waring'
+        //   }
+        // }
+      }
+    },
+    statusClasses () {
+      return function (status) {
+        const classes = ['step-status']
+        if (typeof status === 'string') {
+          if (status.includes('不正常') || status.includes('不通过')) {
+            classes.push('step-status-abnormal')
+          }
+          else if (status.includes('正常') || status.includes('通过')) {
+            classes.push('step-status-normal')
+          }
+          else {
+            classes.push('step-status-abnormal')
+          }
+        }
+        return classes
+      }
+    }
+  },
+  watch: {
+    tagObj: {
+      handler (obj) {
+        this.dataContent = obj
+        this.restTable()
+        this.load()
+      },
+      deep: true
+    },
+    queryObj: {
+      handler (obj) {
+        this.tableDataCopy = []
+        this.tableData = []
+        this.dataContent = obj
+        this.restTable()
+        this.load()
+      },
+      deep: true
+    },
+  },
+  created () {
+    this.dataContent = this.queryObj
+  },
+  methods: {
+    //获取行李信息
+    async getLuggageList (id, dataContent = this.dataContent, page, pageSize) {
+      try {
+        this.loading = true
+        const { code, returnData } = await this.getQueryList(id, dataContent, page, pageSize)
+        if (code == 0) {
+          if (returnData.length === 0) {
+            this.page--;
+            this.noMore = true;
+            this.loading = false;
+          }
+          returnData.forEach(item => {
+            item.bagStatus = _.cloneDeep(this.stepNodes)
+          })
+          this.tableDataCopy.push(...returnData)
+          // this.tableDataCopy = _.uniqBy(this.tableDataCopy, 'ID')
+          // this.tableDataCopy = this.tableDataCopy.sort((a, b) => Date.parse(a.carrierFlightsDate) - Date.parse(b.carrierFlightsDate))
+          this.tableDataCopy.forEach(item => {
+            item.bagStatus.map(p => {
+              const { timeProp, loclProp, stateProp } = p
+              if (item.hasOwnProperty(timeProp) || item.hasOwnProperty(loclProp) || item.hasOwnProperty(stateProp)) {
+                p.timeValue = item[timeProp]
+                p.loclValue = item[loclProp]
+                p.stateValue = item[stateProp]
+              }
+            })
+          })
+          this.getBagTime(this.tableDataCopy)
+          this.loading = false
+        } else {
+          this.page--
+          this.loading = false
+          this.$message.error("获取表格数据失败")
+        }
+      } catch (error) {
+        this.loading = false;
+        console.log(error)
+      }
+    },
+    statusSecurity (item) {
+      const { securityInspectionResults, security_location } = item
+      const securityNums = ['XSA001', 'XSA003', 'XSB001', 'XSB004']
+      // if (securityInspectionResults == 'CLR') return securityInspectionResults
+      // if (securityInspectionResults == 'UCLR') return securityInspectionResults
+      if (securityNums.includes(security_location)) return 'ULR'
+      else return securityInspectionResults
+    },
+    restTable () {
+      this.loading = false
+      this.noMore = false
+      this.page = 0
+      this.tableData = []
+    },
+    load () {
+      if (Object.keys(this.queryObj).length || Object.keys(this.tagObj).length) {
+        if (this.noMore || this.loading) {
+          return;
+        }
+        this.getLuggageList(SERVICE_ID.bagTableDqId, this.dataContent, ++this.page, this.pageSize);
+      }
+    },
+    async getBagTime (arr) {
+      const newArr = [...arr]
+      const reqUrls = []
+      newArr.forEach(item => {
+        const { carrierFlights, carrierFlightsDate, outAirport, landAirport, bagStatus } = item
+        const index = bagStatus.findIndex(citem => citem.stateProp == 'securityInspectionResults')
+        if (index > -1) {
+          bagStatus[index]['stateValue'] = this.statusSecurity(item)
+          bagStatus[index]['fourSecurity'] = item.fourSecurity
+        }
+        const reqItem = this.getQueryList(SERVICE_ID.baggageTime, {
+          carrierFlights,
+          carrierFlightsDate,
+          outAirport,
+          landAirport
+        })
+        reqUrls.push(reqItem)
+      })
+      const allReqs = await Promise.allSettled(reqUrls)
+      allReqs.forEach((item, index) => {
+        const { status, value } = item
+        if (status == 'fulfilled') {
+          const { returnData } = value
+          const newArray = [...returnData]
+          if (newArray && newArray.length) {
+            const itemObj = newArray[0]
+            const newObj = {}
+            const { actualTakeOffTime, estimateTakeOffTime, scheduleTakeOffTime, actualLandInTime, estimateLandInTime, scheduleLandInTime } = itemObj
+            newObj.newTakeoff_time = actualTakeOffTime ? actualTakeOffTime : estimateTakeOffTime ? estimateTakeOffTime : scheduleTakeOffTime
+            newObj.newLand_time = actualLandInTime ? actualLandInTime : estimateLandInTime ? estimateLandInTime : scheduleLandInTime
+            newObj.takeTime = newObj.newTakeoff_time?.split('T').at(-1)
+            newObj.landTime = newObj.newLand_time?.split('T').at(-1)
+            newArr[index] = Object.assign(newArr[index], newObj)
+          }
+        }
+      })
+      this.tableData = _.orderBy([...newArr], ["carrierFlightsDate", "takeTime"], ["asc"]);
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.baggageView {
+  height: 100%;
+  &-list {
+    height: 183px;
+    border-bottom: 1px solid #dfe3ea;
+    padding: 30px 32px 47px 32px;
+    &:last-child {
+      border-bottom: none;
+    }
+    .part2 {
+      width: 100%;
+      background: #ffffff;
+      display: flex;
+      flex-direction: row;
+      justify-content: space-between;
+      align-items: flex-start;
+      .part2_info {
+        flex: 1;
+        display: flex;
+        flex-direction: row;
+        justify-content: flex-start;
+        align-items: flex-start;
+        line-height: 42px;
+
+        .title {
+          width: 160px;
+          margin-right: 30px;
+          font-size: 14px;
+          font-family: Helvetica;
+          font-weight: 400;
+          color: #101116;
+          line-height: 1;
+          .fightNo {
+            font-size: 24px;
+            font-family: Helvetica;
+            font-weight: bold;
+            margin-bottom: 8px;
+          }
+          .fightDate {
+            margin-bottom: 15px;
+          }
+          .fightLine {
+            margin-bottom: 8px;
+          }
+          .fightTime {
+            margin-top: 13px;
+          }
+        }
+        .type {
+          font-size: 18px;
+          font-weight: bold;
+          margin-right: 20px;
+          .warn {
+            color: #df3559;
+          }
+          .normal {
+            color: #519f6b;
+          }
+        }
+        .airline {
+          width: 120px;
+          margin-right: 20px;
+        }
+        .baggage-track-chart {
+          flex: 1;
+          height: 124px;
+          position: relative;
+          display: flex;
+          flex-direction: row;
+          justify-content: space-between;
+          width: 100%;
+        }
+        .step-line {
+          width: calc(100% - 80px);
+          height: 10px;
+          position: absolute;
+          top: 16px;
+          right: 0;
+          left: 0;
+          margin: auto;
+          display: flex;
+          .step-line-segment {
+            width: calc(100% / 6);
+            height: 100%;
+            background: #afb4bf;
+            &.step-line-active {
+              background: #2d67e3;
+            }
+          }
+        }
+        .step-item {
+          width: 80px;
+          height: 100%;
+          text-align: center;
+          font-size: 14px;
+          display: flex;
+          flex-direction: column;
+          align-items: center;
+          justify-content: flex-start;
+          z-index: 1;
+          font-family: Helvetica, "Microsoft Yahei";
+          .step-circle {
+            width: 42px;
+            height: 42px;
+            border-radius: 50%;
+            background: #aaacb2;
+            .step-name {
+              color: #ffffff;
+              font-size: 14px;
+              font-weight: bold;
+            }
+          }
+          .step-info {
+            margin-top: 8px;
+            color: #101116;
+            line-height: 22px;
+            .step-status {
+              &-normal {
+                color: #4ab36f;
+              }
+              &-abnormal {
+                color: #e9af4b;
+              }
+            }
+            .step-time {
+              white-space: pre-line;
+              font-size: 12px;
+              line-height: 20px;
+            }
+          }
+          &.active-item .step-circle {
+            background: #2d67e3;
+          }
+          .step-circle-danger {
+            background: #ff3303 !important;
+          }
+          .step-circle-waring {
+            background: #2d67e3;
+          }
+        }
+      }
+      .btns {
+        margin-top: 6px;
+      }
+    }
+  }
+}
+</style>

src/views/newBagAbnormal/index.vue

@@ -0,0 +1,464 @@
+<template>
+  <div class="newBagDetails">
+    <div v-loading="loading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.8)" class="newBagDetails-info">
+      <div class="newBagDetails-info-look">
+        <el-row :gutter="20">
+          <el-col :span="4">
+            <div class="flex-wrap">
+              <el-tooltip class="item" effect="dark" :content="passengerName" placement="top">
+                <span class="newBagDetails-info-look-name">{{ passengerName }}</span>
+              </el-tooltip>
+              <el-button type="text">查看</el-button>
+            </div>
+          </el-col>
+          <el-col :span="18">
+            <el-scrollbar>
+              <div class="tags-view-wrapper">
+                <div v-for="(item,index) in detailsArr" class="tags-view-item" @click="tagClick(item,index)" :class="activeIndex == index ? 'active' : ''" :key="index">{{ item.luggageNum }}</div>
+              </div>
+            </el-scrollbar>
+          </el-col>
+          <el-col :span="2">
+            <el-button @click="dialogFlag = true" type="text">行李信息设置</el-button>
+          </el-col>
+        </el-row>
+      </div>
+      <div class="newBagDetails-info-details">
+        <div class="newBagDetails-info-details-msgs">
+          <el-scrollbar style="height: 100%;">
+            <el-row class="newBagDetails-info-details-msgs-l1" :gutter="20">
+              <el-col :span="6" class="msgs-list" v-for="(item,index) in tableColsCopy" :key="index">{{ item.columnLabel }}：
+                <el-tooltip class="item" effect="dark" :content="item.value" placement="top">
+                  <span>{{ item.value }}</span>
+                </el-tooltip>
+              </el-col>
+            </el-row>
+          </el-scrollbar>
+        </div>
+      </div>
+    </div>
+    <div class="newBagDetails-contents">
+      <div class="newBagDetails-contents-tabs flex-wrap">
+        <div class="newBagDetails-contents-tabs-title">行李跟踪信息</div>
+        <div class="newBagDetails-contents-tabs-btns flex-wrap">
+          <div v-for="(item,index) in tabMenu" @click="tabClick(item,index)" :key="index" :class="index == tabIndex ? 'is-active' : ''" class="newBagDetails-contents-tabs-btns-bt">{{ item.name }}</div>
+        </div>
+      </div>
+      <div class="newBagDetails-contents-page">
+        <component ref="dataChild" :query="query" :queryObj="queryObj" :tableDatas="tableDatas" :tagObj="tagObj" :bagID="bagID" :is="componentName"></component>
+      </div>
+    </div>
+    <Dialog :flag="dialogFlag" width="600px" class="dialog-check-group">
+      <div class="dialog-wrapper">
+        <div class="title">列设置</div>
+        <div style="height: 600px" class="content">
+          <el-scrollbar style="height: 100%">
+            <el-tree ref="columnSetTree" :data="tableCols" :class="colsCheckClass" show-checkbox node-key="queryTemplateColumnSetID" :default-expand-all="true" :props="{
+                  label: 'columnLabel',
+                  children: 'children',
+                }" :default-checked-keys="checkedKeysTemp" @check="handleCheck" />
+          </el-scrollbar>
+        </div>
+        <div class="foot right t30">
+          <el-button size="medium" class="r24" type="primary" @click="onCheck('baggageTableData')">确定</el-button>
+          <el-button size="medium" @click="hide">取消</el-button>
+        </div>
+      </div>
+    </Dialog>
+  </div>
+</template>
+
+<script>
+import ScrollPane from "@/layout/components/TagsView/ScrollPane.vue"
+import baggageView from './components/baggageView.vue'
+import baggageList from './components/baggageList.vue'
+import baggageMessage from './components/baggageMessage.vue'
+import baggageAbnormal from './components/baggageAbnormal.vue'
+import baggageStory from './components/baggageStory.vue'
+import Dialog from '@/layout/components/Dialog/index.vue'
+import pf from '@/layout/mixin/publicFunc'
+import tableColsMixin from './mix/tableCols'
+import { getAuthData, formatOrder } from '@/utils/validate'
+import { getToken } from '@/utils/auth'
+import { showCols } from './mix/showCols'
+export default {
+  name: 'NewBagDetails',
+  mixins: [pf, tableColsMixin],
+  components: { ScrollPane, baggageView, baggageList, baggageMessage, baggageAbnormal, baggageStory, Dialog },
+  data () {
+    return {
+      infoArrs: [],
+      passenger_name: '',
+      detailsArr: [],
+      tableCols: [],
+      activeIndex: null,
+      msgs1: [],
+      dialogFlag: false,
+      tabMenu: [
+        {
+          key: 'baggageView',
+          name: '行李流程图'
+        },
+        {
+          key: 'baggageList',
+          name: '行李流程列表信息'
+        },
+        {
+          key: 'baggageMessage',
+          name: '行李报文'
+        },
+        {
+          key: 'baggageAbnormal',
+          name: '异常行李'
+        },
+        {
+          key: 'baggageStory',
+          name: '服务记录'
+        },
+      ],
+      tabIndex: 0,
+      componentName: 'baggageView',
+      query: '',
+      passengerName: '',
+      PNRNO: '',
+      tagObj: {},
+      tableDatas: [],
+      tableDatas5Id: '',
+      loading: false,
+      queryObj: {},
+      checkObj: {},
+      tabClickObj: {},
+      tabClickKey: '',
+      bagID: null
+    }
+  },
+  created () {
+    const { query } = this.$route
+    const { auth_id } = this.$route.meta
+    const { arrs } = getAuthData(auth_id)
+    const table = arrs.filter(item => item.auth_type == 4 || item.auth_type == 5)
+    if (table && table.length) {
+      this.tableDatas = table
+      const tableDatas5 = table.filter(item => item.auth_type == 5)
+      if (tableDatas5 && tableDatas5.length) {
+        const { auth_id } = tableDatas5[0]
+        this.tableDatas5Id = auth_id
+        this.getColumnData(auth_id)
+      }
+    }
+    // if (arrs.every(item => item.auth_ident !== 'baggage_message')) {
+    //   this.tabMenu = this.tabMenu.filter(tab => tab.key !== 'baggageMessage')
+    // }
+    const newQuery = _.cloneDeep(query)
+    if (newQuery.ID) delete newQuery.ID
+    this.query = _.cloneDeep(newQuery)
+    this.tabClickObj = _.cloneDeep(newQuery)
+  },
+  methods: {
+    //获取表头数据
+    async getColumnData (auth_id) {
+      try {
+        const { code, returnData } = await this.getQueryList(SERVICE_ID.sysUserAuthId, [{
+          user_id: getToken('userid'),
+          auth_id
+        }]);
+        if (code == 0) {
+          if (returnData && returnData.length) {
+            const nodeDatas = returnData.filter(item => item.needShow)
+            this.msgs1 = [...nodeDatas]
+            this.getLuggageInfo(auth_id)
+          }
+        } else {
+          this.$message.error("获取表头数据失败");
+        }
+      } catch (error) {
+        console.log(error)
+      }
+    },
+    //设置行李信息弹框
+    setBagInfo () {
+      const bagColsMap = JSON.parse(localStorage.getItem('bagColsMap')) || {}
+      this.tableCols = [...this.orderColData([...this.msgs1]), ...this.hideData([...this.msgs1])]
+      if (!Object.keys(bagColsMap).length) {
+        this.tableColsCopy = this.orderColData([...this.msgs1])
+        this.checkedKeysTemp = this.orderColData([...this.msgs1]).map(item => item.queryTemplateColumnSetID)
+      } else {
+        this.tableColsCopy = [...bagColsMap.bagColsLists]
+        this.checkedKeysTemp = [...bagColsMap.bagColsKeys]
+      }
+    },
+    //获取行李信息
+    async getLuggageInfo (auth_id, checkParams) {
+      try {
+        this.loading = true
+        const { code, returnData } = await this.getQueryListAuth(SERVICE_ID.bagTableId, checkParams ? this.checkObj : this.query, 1, 20, auth_id)
+        if (code == 0 && returnData && returnData.length) {
+          const datasObj = [...returnData][0]
+          this.passengerName = datasObj['passengerName']
+          this.PNRNO = datasObj['PNRNO']
+          const { luggageNum, PNRNO, carrierFlightsDate, ID } = datasObj
+          this.bagID = ID
+          for (const key in datasObj) {
+            this.msgs1.map(item => {
+              if (item.columnName == key) {
+                item.value = datasObj[key] != 0 && datasObj[key] != 1 ? datasObj[key] : datasObj[key] == 0 ? 'N' : 'Y'
+              }
+              if (item.columnName == 'activeState' && key == 'activeState') {
+                item.value = datasObj[key] == 0 ? 'Y' : 'N'
+              }
+            })
+          }
+          this.setBagInfo()
+          if (!checkParams) {
+            this.getLuggageNums()
+          }
+          this.queryObj = this.PNRNO ? {
+            luggageNum,
+            carrierFlightsDate,
+            PNRNO
+          } : this.query
+          this.loading = false
+        } else {
+          this.loading = false
+        }
+      } catch (error) {
+        this.loading = false
+        console.log(error)
+      }
+    },
+    orderColData (datas) {
+      const ndata = [...datas]
+      const needShowData = showCols.filter(item => item.index)
+      if (!ndata.length) return []
+      ndata.forEach(item => {
+        needShowData.map(citem => {
+          if (item.columnName == citem.columnName) {
+            item.index = citem.index
+          }
+        })
+      })
+      const dialogShowList = ndata.filter(item => item.index)
+      const dialogShowCols = _.orderBy(dialogShowList, ['index'], ['asc']) || []
+      return dialogShowCols
+    },
+    hideData (datas) {
+      const hdata = []
+      const ndata = [...datas]
+      const needHideData = [...showCols].filter(item => !item.index)
+      if (!ndata.length) return hdata
+      ndata.forEach(item => {
+        needHideData.map(citem => {
+          if (item.columnName == citem.columnName) {
+            hdata.push(item)
+          }
+        })
+      })
+      return hdata
+    },
+    //获取行李号
+    async getLuggageNums () {
+      try {
+        const { carrierFlights, carrierFlightsDate } = this.query
+        const parmObj = this.PNRNO ? {
+          PNRNO: this.PNRNO,
+          passengerName: this.passengerName,
+          carrierFlights,
+          carrierFlightsDate
+        } : this.query
+        const { code, returnData } = await this.getQueryList(SERVICE_ID.bagTableId, parmObj)
+        if (code == 0 && returnData && returnData.length) {
+          this.detailsArr = _.uniqBy([...returnData], 'luggageNum')
+        }
+      } catch (error) {
+        console.log(error)
+      }
+    },
+    tagClick (item, index) {
+      const { luggageNum, carrierFlights, carrierFlightsDate, PNRNO, passengerName } = item
+      this.PNRNO = PNRNO
+      this.checkObj = PNRNO ? {
+        PNRNO,
+        passengerName,
+        luggageNum,
+        carrierFlightsDate
+      } : {
+        luggageNum,
+        carrierFlights,
+        carrierFlightsDate
+      }
+      this.tabClickObj = {
+        luggageNum,
+        carrierFlights,
+        carrierFlightsDate
+      }
+      this.activeIndex = index
+      this.getLuggageInfo(this.tableDatas5Id, true)
+      if (this.tabClickKey && this.tabClickKey != 'baggageView') {
+        if (this.PNRNO) {
+          if (this.tabClickObj.carrierFlights) {
+            delete this.tabClickObj.carrierFlights
+          }
+        }
+        this.tagObj = Object.assign(this.tabClickObj, { PNRNO: this.PNRNO ? this.PNRNO : null })
+      }
+    },
+    tabClick (item, index) {
+      this.tabClickKey = item.key
+      if (item.key == 'baggageList' || item.key == 'baggageMessage') {
+        if (this.PNRNO) {
+          if (this.tabClickObj.carrierFlights) {
+            delete this.tabClickObj.carrierFlights
+          }
+        }
+        this.tagObj = Object.assign(this.tabClickObj, { PNRNO: this.PNRNO ? this.PNRNO : null })
+      }
+      setTimeout(() => {
+        this.tabIndex = index
+        this.componentName = item.key
+      }, 10);
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.newBagDetails {
+  height: calc(100vh - 80px);
+  padding: 12px;
+  &-info {
+    height: 200px;
+    background: #051436;
+    color: #fff;
+    font-size: 14px;
+    &-look {
+      padding: 0 32px;
+      height: 64px;
+      line-height: 64px;
+      background: #041741;
+      &-name {
+        font-size: 18px;
+        font-family: Microsoft YaHei;
+        font-weight: bold;
+        color: #ffffff;
+        margin-right: 7px;
+        max-width: 101px;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        overflow: hidden;
+        display: inline-block;
+      }
+      .el-scrollbar {
+        height: 64px;
+        ::-webkit-scrollbar {
+          height: 0;
+        }
+        .tags-view-wrapper {
+          display: flex;
+          .tags-view-item {
+            position: relative;
+            cursor: pointer;
+            height: 64px;
+            line-height: 64px;
+            // border: 1px solid #767eba;
+            // border-radius: 4px;
+            font-size: 14px;
+            font-family: Microsoft YaHei;
+            font-weight: 400;
+            color: #aaacb2;
+            margin-right: 100px;
+            &:last-child {
+              margin-right: 0;
+            }
+            &.active {
+              color: #fff;
+              position: relative;
+              &::after {
+                position: absolute;
+                content: "";
+                width: 100%;
+                left: 0;
+                bottom: 0;
+                height: 3px;
+                background: #2d67e3;
+              }
+            }
+          }
+        }
+      }
+    }
+    &-details {
+      position: relative;
+      padding: 0 32px;
+      height: 136px;
+      &-tags {
+        height: 32px;
+        line-height: 32px;
+      }
+      &-msgs {
+        padding: 12px 0;
+        height: 135px;
+        ::v-deep .el-scrollbar__wrap {
+          overflow-x: hidden;
+        }
+        ::v-deep .el-scrollbar__bar.is-horizontal {
+          height: 0 !important;
+        }
+        &-l1 {
+          .msgs-list {
+            margin-bottom: 22px;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+            overflow: hidden;
+          }
+        }
+      }
+    }
+  }
+  &-contents {
+    margin-top: 8px;
+    background-color: #fff;
+    height: calc(100% - 208px);
+    &-tabs {
+      line-height: 65px;
+      padding: 0 32px;
+      border-bottom: 1px solid #dfe3ea;
+      &-title {
+        font-size: 18px;
+        font-family: Microsoft YaHei;
+        font-weight: bold;
+        color: #303133;
+        margin-right: 92px;
+      }
+      &-btns {
+        font-size: 14px;
+        font-family: Microsoft YaHei;
+        font-weight: 400;
+        color: #afb4bf;
+        &-bt {
+          margin-right: 55px;
+          cursor: pointer;
+          position: relative;
+          &:last-child {
+            margin-right: 0;
+          }
+          &.is-active {
+            color: #303133;
+            &::after {
+              position: absolute;
+              content: "";
+              width: 100%;
+              left: 0;
+              bottom: 0;
+              height: 3px;
+              background: #2d67e3;
+            }
+          }
+        }
+      }
+    }
+    &-page {
+      height: calc(100% - 66px);
+    }
+  }
+}
+</style>

src/views/newBagAbnormal/mix/showCols.js

@@ -0,0 +1,391 @@
+export const showCols = [
+  {
+    "queryTemplateColumnSetID": 1669,
+    "serviceOutPutId": 216,
+    "columnName": "specialType",
+    "columnLabel": "特殊行李类型",
+    "columnDescribe": null,
+    "needSort": null,
+    "needFilters": null,
+    "needShow": 1,
+    "needGroup": null,
+    "dataType": null,
+    "listqueryTemplateID": null,
+    "needCount": null,
+    "orderNumber": null,
+    "columnKey": null,
+    "is_search": null,
+    "default_query_parameters": null,
+    "groupName": null,
+    "nameLength": null,
+    "value": null,
+    index: 10
+  },
+  {
+    "queryTemplateColumnSetID": 1670,
+    "serviceOutPutId": 216,
+    "columnName": "PNRNO",
+    "columnLabel": "PNR编号",
+    "columnDescribe": null,
+    "needSort": null,
+    "needFilters": null,
+    "needShow": 1,
+    "needGroup": null,
+    "dataType": null,
+    "listqueryTemplateID": null,
+    "needCount": null,
+    "orderNumber": null,
+    "columnKey": null,
+    "is_search": null,
+    "default_query_parameters": null,
+    "groupName": null,
+    "nameLength": null,
+    "value": "NX7GZT"
+  },
+  {
+    "queryTemplateColumnSetID": 1671,
+    "serviceOutPutId": 216,
+    "columnName": "passengerName",
+    "columnLabel": "旅客姓名",
+    "columnDescribe": null,
+    "needSort": null,
+    "needFilters": null,
+    "needShow": 1,
+    "needGroup": null,
+    "dataType": null,
+    "listqueryTemplateID": null,
+    "needCount": null,
+    "orderNumber": null,
+    "columnKey": null,
+    "is_search": null,
+    "default_query_parameters": null,
+    "groupName": null,
+    "nameLength": null,
+    "value": "LIJIAN"
+  },
+  {
+    "queryTemplateColumnSetID": 1672,
+    "serviceOutPutId": 216,
+    "columnName": "loadNumber",
+    "columnLabel": "装载序列号",
+    "columnDescribe": null,
+    "needSort": null,
+    "needFilters": null,
+    "needShow": 1,
+    "needGroup": null,
+    "dataType": null,
+    "listqueryTemplateID": null,
+    "needCount": null,
+    "orderNumber": null,
+    "columnKey": null,
+    "is_search": null,
+    "default_query_parameters": null,
+    "groupName": null,
+    "nameLength": null,
+    "value": "001",
+    index: 5
+  },
+  {
+    "queryTemplateColumnSetID": 1673,
+    "serviceOutPutId": 216,
+    "columnName": "luggageCount",
+    "columnLabel": "总件数",
+    "columnDescribe": null,
+    "needSort": null,
+    "needFilters": null,
+    "needShow": 1,
+    "needGroup": null,
+    "dataType": null,
+    "listqueryTemplateID": null,
+    "needCount": null,
+    "orderNumber": null,
+    "columnKey": null,
+    "is_search": null,
+    "default_query_parameters": null,
+    "groupName": null,
+    "nameLength": null,
+    "value": "1"
+  },
+  {
+    "queryTemplateColumnSetID": 1674,
+    "serviceOutPutId": 216,
+    "columnName": "luggageWeight",
+    "columnLabel": "总重量",
+    "columnDescribe": null,
+    "needSort": null,
+    "needFilters": null,
+    "needShow": 1,
+    "needGroup": null,
+    "dataType": null,
+    "listqueryTemplateID": null,
+    "needCount": null,
+    "orderNumber": null,
+    "columnKey": null,
+    "is_search": null,
+    "default_query_parameters": null,
+    "groupName": null,
+    "nameLength": null,
+    "value": "8"
+  },
+  {
+    "queryTemplateColumnSetID": 1676,
+    "serviceOutPutId": 216,
+    "columnName": "frequentflyerNO",
+    "columnLabel": "常旅客号",
+    "columnDescribe": null,
+    "needSort": null,
+    "needFilters": null,
+    "needShow": 1,
+    "needGroup": null,
+    "dataType": null,
+    "listqueryTemplateID": null,
+    "needCount": null,
+    "orderNumber": null,
+    "columnKey": null,
+    "is_search": null,
+    "default_query_parameters": null,
+    "groupName": null,
+    "nameLength": null,
+    "value": "CA313001031337",
+    index: 6
+  },
+  {
+    "queryTemplateColumnSetID": 1677,
+    "serviceOutPutId": 216,
+    "columnName": "frequentflyerGrade",
+    "columnLabel": "常旅客级别",
+    "columnDescribe": null,
+    "needSort": null,
+    "needFilters": null,
+    "needShow": 1,
+    "needGroup": null,
+    "dataType": null,
+    "listqueryTemplateID": null,
+    "needCount": null,
+    "orderNumber": null,
+    "columnKey": null,
+    "is_search": null,
+    "default_query_parameters": null,
+    "groupName": null,
+    "nameLength": null,
+    "value": null,
+    index: 7
+  },
+  {
+    "queryTemplateColumnSetID": 1678,
+    "serviceOutPutId": 216,
+    "columnName": "dataState",
+    "columnLabel": "取消值机",
+    "columnDescribe": null,
+    "needSort": null,
+    "needFilters": null,
+    "needShow": 1,
+    "needGroup": null,
+    "dataType": null,
+    "listqueryTemplateID": null,
+    "needCount": null,
+    "orderNumber": null,
+    "columnKey": null,
+    "is_search": null,
+    "default_query_parameters": null,
+    "groupName": null,
+    "nameLength": null,
+    "value": null
+  },
+  {
+    "queryTemplateColumnSetID": 1681,
+    "serviceOutPutId": 216,
+    "columnName": "activeState",
+    "columnLabel": "行李激活状态",
+    "columnDescribe": null,
+    "needSort": null,
+    "needFilters": null,
+    "needShow": 1,
+    "needGroup": null,
+    "dataType": null,
+    "listqueryTemplateID": null,
+    "needCount": null,
+    "orderNumber": null,
+    "columnKey": null,
+    "is_search": null,
+    "default_query_parameters": null,
+    "groupName": null,
+    "nameLength": null,
+    "value": "0",
+    index: 4
+  },
+  {
+    "queryTemplateColumnSetID": 1682,
+    "serviceOutPutId": 216,
+    "columnName": "No_BSM",
+    "columnLabel": "无BSM状态",
+    "columnDescribe": null,
+    "needSort": null,
+    "needFilters": null,
+    "needShow": 1,
+    "needGroup": null,
+    "dataType": null,
+    "listqueryTemplateID": null,
+    "needCount": null,
+    "orderNumber": null,
+    "columnKey": null,
+    "is_search": null,
+    "default_query_parameters": null,
+    "groupName": null,
+    "nameLength": null,
+    "value": "0",
+    index: 9
+  },
+  {
+    "queryTemplateColumnSetID": 1683,
+    "serviceOutPutId": 216,
+    "columnName": "inflightNo",
+    "columnLabel": "中转进航班",
+    "columnDescribe": null,
+    "needSort": null,
+    "needFilters": null,
+    "needShow": 1,
+    "needGroup": null,
+    "dataType": null,
+    "listqueryTemplateID": null,
+    "needCount": null,
+    "orderNumber": 15,
+    "columnKey": null,
+    "is_search": null,
+    "default_query_parameters": null,
+    "groupName": null,
+    "nameLength": null,
+    "value": null,
+    index: 1
+  },
+  {
+    "queryTemplateColumnSetID": 1685,
+    "serviceOutPutId": 216,
+    "columnName": "transferFlightNO",
+    "columnLabel": "中转出航班",
+    "columnDescribe": null,
+    "needSort": null,
+    "needFilters": null,
+    "needShow": 1,
+    "needGroup": null,
+    "dataType": null,
+    "listqueryTemplateID": null,
+    "needCount": null,
+    "orderNumber": 16,
+    "columnKey": null,
+    "is_search": null,
+    "default_query_parameters": null,
+    "groupName": null,
+    "nameLength": null,
+    "value": null,
+    index: 2
+  },
+  {
+    "queryTemplateColumnSetID": 1711,
+    "serviceOutPutId": 216,
+    "columnName": "passenger_cabin",
+    "columnLabel": "旅客舱位",
+    "columnDescribe": null,
+    "needSort": null,
+    "needFilters": null,
+    "needShow": 1,
+    "needGroup": null,
+    "dataType": null,
+    "listqueryTemplateID": null,
+    "needCount": null,
+    "orderNumber": null,
+    "columnKey": null,
+    "is_search": null,
+    "default_query_parameters": null,
+    "groupName": null,
+    "nameLength": null,
+    "value": "Y",
+    index: 8
+  },
+  {
+    "queryTemplateColumnSetID": 1712,
+    "serviceOutPutId": 216,
+    "columnName": "loadAddress",
+    "columnLabel": "腹舱位置",
+    "columnDescribe": null,
+    "needSort": null,
+    "needFilters": null,
+    "needShow": 1,
+    "needGroup": null,
+    "dataType": null,
+    "listqueryTemplateID": null,
+    "needCount": null,
+    "orderNumber": null,
+    "columnKey": null,
+    "is_search": null,
+    "default_query_parameters": null,
+    "groupName": null,
+    "nameLength": null,
+    "value": null
+  },
+  {
+    "queryTemplateColumnSetID": 1716,
+    "serviceOutPutId": 216,
+    "columnName": "weightUnit",
+    "columnLabel": "重量单位",
+    "columnDescribe": null,
+    "needSort": null,
+    "needFilters": null,
+    "needShow": 1,
+    "needGroup": null,
+    "dataType": null,
+    "listqueryTemplateID": null,
+    "needCount": null,
+    "orderNumber": null,
+    "columnKey": null,
+    "is_search": null,
+    "default_query_parameters": null,
+    "groupName": null,
+    "nameLength": null,
+    "value": "K"
+  },
+  {
+    "queryTemplateColumnSetID": 2674,
+    "serviceOutPutId": 216,
+    "columnName": "outflightDate",
+    "columnLabel": "中转出航班日期",
+    "columnDescribe": "中转出航班日期",
+    "needSort": null,
+    "needFilters": null,
+    "needShow": 1,
+    "needGroup": null,
+    "dataType": null,
+    "listqueryTemplateID": null,
+    "needCount": null,
+    "orderNumber": null,
+    "columnKey": null,
+    "is_search": null,
+    "default_query_parameters": null,
+    "groupName": null,
+    "nameLength": null,
+    "value": null,
+    index: 3
+  },
+  {
+    "queryTemplateColumnSetID": 2878,
+    "serviceOutPutId": 216,
+    "columnName": "createAt",
+    "columnLabel": "创建时间",
+    "columnDescribe": "创建时间",
+    "needSort": null,
+    "needFilters": null,
+    "needShow": 1,
+    "needGroup": null,
+    "dataType": null,
+    "listqueryTemplateID": null,
+    "needCount": null,
+    "orderNumber": null,
+    "columnKey": null,
+    "is_search": null,
+    "default_query_parameters": null,
+    "groupName": null,
+    "nameLength": null,
+    "value": "2024-06-10T06:51:17",
+    index: 11
+  }
+]

src/views/newBagAbnormal/mix/tableCols.js

@@ -0,0 +1,104 @@
+/*
+ * @Author: Badguy
+ * @Date: 2022-03-04 11:50:22
+ * @LastEditTime: 2022-03-15 17:56:34
+ * @LastEditors: your name
+ * @Description: 航站视图表格通用部分
+ * have a nice day!
+ */
+
+export default {
+  data () {
+    return {
+      // 筛选后表头
+      tableColsCopy: [],
+      // 列设置弹框选中
+      checkedKeys: [],
+      checkedKeysTemp: [],
+      halfCheckedKeys: [],
+      // 列设置弹框开关
+      dialogFlag: false
+    }
+  },
+  // created () {
+  //   this.initTableCols()
+  // },
+  updated () {
+    // table数据更新
+    this.$nextTick(() => {
+      this.$refs.table?.doLayout()
+    })
+  },
+  computed: {
+    colsCheckClass () {
+      return this.tableCols.some(col => col.children?.length) ? 'has-children' : 'no-children'
+    }
+  },
+  methods: {
+    // 列设置-初始化
+    initTableCols () {
+      const that = this
+      function setTableCols (cols) {
+        for (const col of cols) {
+          col.index = that.checkedKeys.length
+          that.checkedKeys.push(that.checkedKeys.length)
+          if (col.children?.length) {
+            setTableCols(col.children)
+          }
+        }
+      }
+      setTableCols(this.tableCols)
+      // this.tableColsCopy = this._.cloneDeep(this.tableCols)
+      this.checkedKeysTemp = [...this.checkedKeys]
+    },
+    // 列设置-确定
+    handleCheck (data, checked) {
+      this.checkedKeysTemp = [...checked.checkedKeys]
+      this.halfCheckedKeys = [...checked.halfCheckedKeys]
+    },
+    onCheck (tableDataName = 'tableData') {
+      if (this.dialogFlag === false) {
+        return
+      }
+      this.loading = true
+      const tableDataTemp = this._.cloneDeep(this[tableDataName])
+      this[tableDataName] = []
+      this.dialogFlag = false
+      this.checkedKeys = [...this.checkedKeysTemp]
+      const datas = this.colsFilter(this._.cloneDeep(this.tableCols))
+      const newTableColsCopy = datas.filter((item) => item.needShow)
+      this.tableColsCopy = _.cloneDeep(newTableColsCopy)
+      const bagColsMap = {}
+      bagColsMap.bagColsLists = _.cloneDeep(newTableColsCopy)
+      bagColsMap.bagColsKeys = [...this.checkedKeysTemp]
+      localStorage.setItem('bagColsMap', JSON.stringify(bagColsMap))
+      setTimeout(() => {
+        if (!this[tableDataName].length) {
+          this[tableDataName] = tableDataTemp
+        }
+        this.loading = false
+      }, 50)
+    },
+    colsFilter (cols) {
+      const temp = cols.filter(col => {
+        if (this.halfCheckedKeys.includes(col.queryTemplateColumnSetID)) {
+          col.children = this.colsFilter(col.children)
+          return true
+        } else if (this.checkedKeys.includes(col.queryTemplateColumnSetID)) {
+          return true
+        }
+        return false
+      })
+      return temp
+    },
+    // 弹框展开
+    show () {
+      this.dialogFlag = true
+    },
+    // 弹框关闭
+    hide () {
+      this.dialogFlag = false
+      this.checkedKeysTemp = [...this.checkedKeys]
+    }
+  }
+}

src/views/newQueryAdvance/index.vue

@@ -13,7 +13,7 @@
           <button class="btnAn" @click="exportHandler('queryTable', '高级查询结果')">
             导出
           </button>
-          <button class="btnAn">
+          <button v-if="isSwitch" class="btnAn">
             <router-link to="/newQuery">切换</router-link>
           </button>
         </div>
@@ -283,6 +283,22 @@ export default {
       tableTag: {}
     }
   },
+  computed: {
+    isSwitch () {
+      const { path } = this.$route
+      if (path && path == '/abnormalQuery') {
+        return false
+      } else {
+        return true
+      }
+    }
+  },
+  mounted () {
+    if (!this.isSwitch) {
+      this.form.outAirport = 'PEK'
+      this.advancedSubmitHandler(false)
+    }
+  },
   methods: {
     dialogShow () {
       this.gjFlag = true

src/views/statisticsCharts/components/tableformbrs.vue

@@ -455,30 +455,30 @@
       </template>
       <template v-else-if="tableData.length && upid == 7">
         <el-table ref="baggageProportionTableData" :data="tableData" height="calc(100vh - 260px)" style="width: 100%" :show-summary="true">
-          <el-table-column prop="a1" label="日期">
+          <el-table-column prop="fd" label="日期">
           </el-table-column>
           <el-table-column label="总">
-            <el-table-column prop="a2" label="中转行李百分比">
+            <el-table-column prop="transferlv_all" label="中转行李百分比">
             </el-table-column>
-            <el-table-column prop="a3" label="行李总件数">
+            <el-table-column prop="total_bag_all" label="行李总件数">
             </el-table-column>
-            <el-table-column prop="a4" label="中转行李件数">
+            <el-table-column prop="trans_bag_all" label="中转行李件数">
             </el-table-column>
           </el-table-column>
           <el-table-column label="国内">
-            <el-table-column prop="a5" label="中转行李百分比">
+            <el-table-column prop="transferlv_dom" label="中转行李百分比">
             </el-table-column>
-            <el-table-column prop="a6" label="行李总件数">
+            <el-table-column prop="total_bag_dom" label="行李总件数">
             </el-table-column>
-            <el-table-column prop="a7" label="中转行李件数">
+            <el-table-column prop="trans_bag_dom" label="中转行李件数">
             </el-table-column>
           </el-table-column>
           <el-table-column label="国际">
-            <el-table-column prop="a8" label="中转行李百分比">
+            <el-table-column prop="transferlv_int" label="中转行李百分比">
             </el-table-column>
-            <el-table-column prop="a9" label="行李总件数">
+            <el-table-column prop="total_bag_int" label="行李总件数">
             </el-table-column>
-            <el-table-column prop="a10" label="中转行李件数">
+            <el-table-column prop="trans_bag_int" label="中转行李件数">
             </el-table-column>
           </el-table-column>
         </el-table>
@@ -730,7 +730,7 @@ export default {
     async getQuery () {
       try {
         this.loading = true
-        if (this.upid === '9' || this.upid === '8') {
+        if (this.upid === '9' || this.upid === '8' || this.upid === '7' || this.upid === '4' || this.upid === '5') {
           const { code, returnData } = await TempQuery({
             serviceId: Number(this.dataId),
             dataContent: this.dataContent,
@@ -740,7 +740,79 @@ export default {
             this.tableCols = returnData.columnSet
             this.serviceId = returnData.submitID
             this.loading = false
-            if (this.upid == 8) {
+            if (this.upid == 4) {
+              this.tableData.forEach(element => {
+                element.Transferout_dd = (element.finish_trans_bag_dd * 100 / (element.need_trans_bag_dd > 0 ? element.need_trans_bag_dd : 1)).toFixed(2) + '%'
+                element.Transferout_di = (element.finish_trans_bag_di * 100 / (element.need_trans_bag_di > 0 ? element.need_trans_bag_di : 1)).toFixed(2) + '%'
+                element.Transferout_ii = (element.finish_trans_bag_ii * 100 / (element.need_trans_bag_ii > 0 ? element.need_trans_bag_ii : 1)).toFixed(2) + '%'
+                element.Transferout_id = (element.finish_trans_bag_id * 100 / (element.need_trans_bag_id > 0 ? element.need_trans_bag_id : 1)).toFixed(2) + '%'
+                element.a14 = (this.DD ? element.need_trans_flight_dd : 0) + (this.DI ? element.need_trans_flight_di : 0) + (this.II ? element.need_trans_flight_ii : 0) + (this.ID ? element.need_trans_flight_id : 0)
+                element.a15 = (this.DD ? element.finish_trans_flight_dd : 0) + (this.DI ? element.finish_trans_flight_di : 0) + (this.II ? element.finish_trans_flight_ii : 0) + (this.ID ? element.finish_trans_flight_id : 0)
+                element.a16 = (this.DD ? element.need_trans_bag_dd : 0) + (this.DI ? element.need_trans_bag_di : 0) + (this.II ? element.need_trans_bag_ii : 0) + (this.ID ? element.need_trans_bag_id : 0)
+                element.a17 = (this.DD ? element.finish_trans_bag_dd : 0) + (this.DI ? element.finish_trans_bag_di : 0) + (this.II ? element.finish_trans_bag_ii : 0) + (this.ID ? element.finish_trans_bag_id : 0)
+                element.a19 = (this.DD ? element.not_trans_bag_dd : 0) + (this.DI ? element.not_trans_bag_di : 0) + (this.II ? element.not_trans_bag_ii : 0) + (this.ID ? element.not_trans_bag_id : 0)
+                element.a18 = (element.a17 * 100 / (element.a16 > 0 ? element.a16 : 0)).toFixed(2) + '%'
+              });
+            }
+            else if (this.upid == 5) {
+              this.tableData.forEach(element => {
+                element.Transferout_dd_22 = (element.finish_trans_bag_dd_22 * 100 / (element.need_trans_bag_dd_22 > 0 ? element.need_trans_bag_dd_22 : 1)).toFixed(2) + '%'
+                element.Transferout_dd_23 = (element.finish_trans_bag_dd_23 * 100 / (element.need_trans_bag_dd_23 > 0 ? element.need_trans_bag_dd_23 : 1)).toFixed(2) + '%'
+                element.Transferout_dd_33 = (element.finish_trans_bag_dd_33 * 100 / (element.need_trans_bag_dd_33 > 0 ? element.need_trans_bag_dd_33 : 1)).toFixed(2) + '%'
+                element.Transferout_dd_32 = (element.finish_trans_bag_dd_32 * 100 / (element.need_trans_bag_dd_32 > 0 ? element.need_trans_bag_dd_32 : 1)).toFixed(2) + '%'
+
+                element.Transferout_di_22 = (element.finish_trans_bag_di_22 * 100 / (element.need_trans_bag_di_22 > 0 ? element.need_trans_bag_di_22 : 1)).toFixed(2) + '%'
+                element.Transferout_di_23 = (element.finish_trans_bag_di_23 * 100 / (element.need_trans_bag_di_23 > 0 ? element.need_trans_bag_di_23 : 1)).toFixed(2) + '%'
+                element.Transferout_di_33 = (element.finish_trans_bag_di_33 * 100 / (element.need_trans_bag_di_33 > 0 ? element.need_trans_bag_di_33 : 1)).toFixed(2) + '%'
+                element.Transferout_di_32 = (element.finish_trans_bag_di_32 * 100 / (element.need_trans_bag_di_32 > 0 ? element.need_trans_bag_di_32 : 1)).toFixed(2) + '%'
+
+                element.Transferout_ii_22 = (element.finish_trans_bag_ii_22 * 100 / (element.need_trans_bag_ii_22 > 0 ? element.need_trans_bag_ii_22 : 1)).toFixed(2) + '%'
+                element.Transferout_ii_23 = (element.finish_trans_bag_ii_23 * 100 / (element.need_trans_bag_ii_23 > 0 ? element.need_trans_bag_ii_23 : 1)).toFixed(2) + '%'
+                element.Transferout_ii_33 = (element.finish_trans_bag_ii_33 * 100 / (element.need_trans_bag_ii_33 > 0 ? element.need_trans_bag_ii_33 : 1)).toFixed(2) + '%'
+                element.Transferout_ii_32 = (element.finish_trans_bag_ii_32 * 100 / (element.need_trans_bag_ii_32 > 0 ? element.need_trans_bag_ii_32 : 1)).toFixed(2) + '%'
+
+                element.Transferout_id_22 = (element.finish_trans_bag_id_22 * 100 / (element.need_trans_bag_id_22 > 0 ? element.need_trans_bag_id_22 : 1)).toFixed(2) + '%'
+                element.Transferout_id_23 = (element.finish_trans_bag_id_23 * 100 / (element.need_trans_bag_id_23 > 0 ? element.need_trans_bag_id_23 : 1)).toFixed(2) + '%'
+                element.Transferout_id_33 = (element.finish_trans_bag_id_33 * 100 / (element.need_trans_bag_id_33 > 0 ? element.need_trans_bag_id_33 : 1)).toFixed(2) + '%'
+                element.Transferout_id_32 = (element.finish_trans_bag_id_32 * 100 / (element.need_trans_bag_id_32 > 0 ? element.need_trans_bag_id_32 : 1)).toFixed(2) + '%'
+
+                let t1DD = (this.t1 ? element.need_trans_flight_dd_22 : 0) + (this.t2 ? element.need_trans_flight_dd_23 : 0) + (this.t3 ? element.need_trans_flight_dd_33 : 0) + (this.t4 ? element.need_trans_flight_dd_32 : 0)
+                let t1DI = (this.t1 ? element.need_trans_flight_di_22 : 0) + (this.t2 ? element.need_trans_flight_di_23 : 0) + (this.t3 ? element.need_trans_flight_di_23 : 0) + (this.t4 ? element.need_trans_flight_di_32 : 0)
+                let t1II = (this.t1 ? element.need_trans_flight_ii_22 : 0) + (this.t2 ? element.need_trans_flight_ii_23 : 0) + (this.t3 ? element.need_trans_flight_ii_33 : 0) + (this.t4 ? element.need_trans_flight_ii_32 : 0)
+                let t1ID = (this.t1 ? element.need_trans_flight_id_22 : 0) + (this.t2 ? element.need_trans_flight_id_23 : 0) + (this.t3 ? element.need_trans_flight_id_33 : 0) + (this.t4 ? element.need_trans_flight_id_32 : 0)
+                element.a14 = (this.DD ? t1DD : 0) + (this.DI ? t1DI : 0) + (this.II ? t1II : 0) + (this.II ? t1ID : 0)
+
+                let t2DD = (this.t1 ? element.finish_trans_flight_dd_22 : 0) + (this.t2 ? element.finish_trans_flight_dd_23 : 0) + (this.t3 ? element.finish_trans_flight_dd_33 : 0) + (this.t4 ? element.finish_trans_flight_dd_32 : 0)
+                let t2DI = (this.t1 ? element.finish_trans_flight_di_22 : 0) + (this.t2 ? element.finish_trans_flight_di_23 : 0) + (this.t3 ? element.finish_trans_flight_di_33 : 0) + (this.t4 ? element.finish_trans_flight_di_32 : 0)
+                let t2II = (this.t1 ? element.finish_trans_flight_ii_22 : 0) + (this.t2 ? element.finish_trans_flight_ii_23 : 0) + (this.t3 ? element.finish_trans_flight_ii_33 : 0) + (this.t4 ? element.finish_trans_flight_ii_32 : 0)
+                let t2ID = (this.t1 ? element.finish_trans_flight_id_22 : 0) + (this.t2 ? element.finish_trans_flight_id_23 : 0) + (this.t3 ? element.finish_trans_flight_id_33 : 0) + (this.t4 ? element.finish_trans_flight_id_32 : 0)
+                element.a15 = (this.DD ? t2DD : 0) + (this.DI ? t2DI : 0) + (this.II ? t2II : 0) + (this.II ? t2ID : 0)
+
+                let t3DD = (this.t1 ? element.need_trans_bag_dd_22 : 0) + (this.t2 ? element.need_trans_bag_dd_23 : 0) + (this.t3 ? element.need_trans_bag_dd_33 : 0) + (this.t4 ? element.need_trans_bag_dd_32 : 0)
+                let t3DI = (this.t1 ? element.need_trans_bag_di_22 : 0) + (this.t2 ? element.need_trans_bag_di_23 : 0) + (this.t3 ? element.need_trans_bag_di_33 : 0) + (this.t4 ? element.need_trans_bag_di_32 : 0)
+                let t3II = (this.t1 ? element.need_trans_bag_ii_22 : 0) + (this.t2 ? element.need_trans_bag_ii_23 : 0) + (this.t3 ? element.need_trans_bag_ii_33 : 0) + (this.t4 ? element.need_trans_bag_ii_32 : 0)
+                let t3ID = (this.t1 ? element.need_trans_bag_id_22 : 0) + (this.t2 ? element.need_trans_bag_id_23 : 0) + (this.t3 ? element.need_trans_bag_id_33 : 0) + (this.t4 ? element.need_trans_bag_id_32 : 0)
+                element.a16 = (this.DD ? t3DD : 0) + (this.DI ? t3DI : 0) + (this.II ? t3II : 0) + (this.II ? t3ID : 0)
+
+                let t4DD = (this.t1 ? element.finish_trans_bag_dd_22 : 0) + (this.t2 ? element.finish_trans_bag_dd_23 : 0) + (this.t3 ? element.finish_trans_bag_dd_33 : 0) + (this.t4 ? element.finish_trans_bag_dd_32 : 0)
+                let t4DI = (this.t1 ? element.finish_trans_bag_di_22 : 0) + (this.t2 ? element.finish_trans_bag_di_23 : 0) + (this.t3 ? element.finish_trans_bag_di_33 : 0) + (this.t4 ? element.finish_trans_bag_di_32 : 0)
+                let t4II = (this.t1 ? element.finish_trans_bag_ii_22 : 0) + (this.t2 ? element.finish_trans_bag_ii_23 : 0) + (this.t3 ? element.finish_trans_bag_ii_33 : 0) + (this.t4 ? element.finish_trans_bag_ii_32 : 0)
+                let t4ID = (this.t1 ? element.finish_trans_bag_id_22 : 0) + (this.t2 ? element.finish_trans_bag_id_23 : 0) + (this.t3 ? element.finish_trans_bag_id_33 : 0) + (this.t4 ? element.finish_trans_bag_id_32 : 0)
+                element.a17 = (this.DD ? t4DD : 0) + (this.DI ? t4DI : 0) + (this.II ? t4II : 0) + (this.II ? t4ID : 0)
+
+                let t5DD = (this.t1 ? element.not_trans_bag_dd_22 : 0) + (this.t2 ? element.not_trans_bag_dd_23 : 0) + (this.t3 ? element.not_trans_bag_dd_33 : 0) + (this.t4 ? element.not_trans_bag_dd_32 : 0)
+                let t5DI = (this.t1 ? element.not_trans_bag_di_22 : 0) + (this.t2 ? element.not_trans_bag_di_23 : 0) + (this.t3 ? element.not_trans_bag_di_33 : 0) + (this.t4 ? element.not_trans_bag_di_32 : 0)
+                let t5II = (this.t1 ? element.not_trans_bag_ii_22 : 0) + (this.t2 ? element.not_trans_bag_ii_23 : 0) + (this.t3 ? element.not_trans_bag_ii_33 : 0) + (this.t4 ? element.not_trans_bag_ii_32 : 0)
+                let t5ID = (this.t1 ? element.not_trans_bag_id_22 : 0) + (this.t2 ? element.not_trans_bag_id_23 : 0) + (this.t3 ? element.not_trans_bag_id_33 : 0) + (this.t4 ? element.not_trans_bag_id_32 : 0)
+                element.a19 = (this.DD ? t5DD : 0) + (this.DI ? t5DI : 0) + (this.II ? t5II : 0) + (this.II ? t5ID : 0)
+
+                element.a18 = (element.a17 * 100 / (element.a16 > 0 ? element.a16 : 0)).toFixed(2) + '%'
+
+
+
+              });
+            }
+            else if (this.upid == 8) {
               this.tableData.forEach(element => {
                 element.lv = element.lv.toFixed(2)
                 element.time = this.dataContent['fd1'] + '至' + this.dataContent['fd2']
@@ -815,77 +887,6 @@ export default {
             this.tableCols = returnData.columnSet
             this.serviceId = returnData.submitID
             this.loading = false
-            if (this.upid == 4) {
-              this.tableData.forEach(element => {
-                element.Transferout_dd = (element.finish_trans_bag_dd * 100 / (element.need_trans_bag_dd > 0 ? element.need_trans_bag_dd : 1)).toFixed(2) + '%'
-                element.Transferout_di = (element.finish_trans_bag_di * 100 / (element.need_trans_bag_di > 0 ? element.need_trans_bag_di : 1)).toFixed(2) + '%'
-                element.Transferout_ii = (element.finish_trans_bag_ii * 100 / (element.need_trans_bag_ii > 0 ? element.need_trans_bag_ii : 1)).toFixed(2) + '%'
-                element.Transferout_id = (element.finish_trans_bag_id * 100 / (element.need_trans_bag_id > 0 ? element.need_trans_bag_id : 1)).toFixed(2) + '%'
-                element.a14 = (this.DD ? element.need_trans_flight_dd : 0) + (this.DI ? element.need_trans_flight_di : 0) + (this.II ? element.need_trans_flight_ii : 0) + (this.ID ? element.need_trans_flight_id : 0)
-                element.a15 = (this.DD ? element.finish_trans_flight_dd : 0) + (this.DI ? element.finish_trans_flight_di : 0) + (this.II ? element.finish_trans_flight_ii : 0) + (this.ID ? element.finish_trans_flight_id : 0)
-                element.a16 = (this.DD ? element.need_trans_bag_dd : 0) + (this.DI ? element.need_trans_bag_di : 0) + (this.II ? element.need_trans_bag_ii : 0) + (this.ID ? element.need_trans_bag_id : 0)
-                element.a17 = (this.DD ? element.finish_trans_bag_dd : 0) + (this.DI ? element.finish_trans_bag_di : 0) + (this.II ? element.finish_trans_bag_ii : 0) + (this.ID ? element.finish_trans_bag_id : 0)
-                element.a19 = (this.DD ? element.not_trans_bag_dd : 0) + (this.DI ? element.not_trans_bag_di : 0) + (this.II ? element.not_trans_bag_ii : 0) + (this.ID ? element.not_trans_bag_id : 0)
-                element.a18 = (element.a17 * 100 / (element.a16 > 0 ? element.a16 : 0)).toFixed(2) + '%'
-              });
-            } else if (this.upid == 5) {
-              this.tableData.forEach(element => {
-                element.Transferout_dd_22 = (element.finish_trans_bag_dd_22 * 100 / (element.need_trans_bag_dd_22 > 0 ? element.need_trans_bag_dd_22 : 1)).toFixed(2) + '%'
-                element.Transferout_dd_23 = (element.finish_trans_bag_dd_23 * 100 / (element.need_trans_bag_dd_23 > 0 ? element.need_trans_bag_dd_23 : 1)).toFixed(2) + '%'
-                element.Transferout_dd_33 = (element.finish_trans_bag_dd_33 * 100 / (element.need_trans_bag_dd_33 > 0 ? element.need_trans_bag_dd_33 : 1)).toFixed(2) + '%'
-                element.Transferout_dd_32 = (element.finish_trans_bag_dd_32 * 100 / (element.need_trans_bag_dd_32 > 0 ? element.need_trans_bag_dd_32 : 1)).toFixed(2) + '%'
-
-                element.Transferout_di_22 = (element.finish_trans_bag_di_22 * 100 / (element.need_trans_bag_di_22 > 0 ? element.need_trans_bag_di_22 : 1)).toFixed(2) + '%'
-                element.Transferout_di_23 = (element.finish_trans_bag_di_23 * 100 / (element.need_trans_bag_di_23 > 0 ? element.need_trans_bag_di_23 : 1)).toFixed(2) + '%'
-                element.Transferout_di_33 = (element.finish_trans_bag_di_33 * 100 / (element.need_trans_bag_di_33 > 0 ? element.need_trans_bag_di_33 : 1)).toFixed(2) + '%'
-                element.Transferout_di_32 = (element.finish_trans_bag_di_32 * 100 / (element.need_trans_bag_di_32 > 0 ? element.need_trans_bag_di_32 : 1)).toFixed(2) + '%'
-
-                element.Transferout_ii_22 = (element.finish_trans_bag_ii_22 * 100 / (element.need_trans_bag_ii_22 > 0 ? element.need_trans_bag_ii_22 : 1)).toFixed(2) + '%'
-                element.Transferout_ii_23 = (element.finish_trans_bag_ii_23 * 100 / (element.need_trans_bag_ii_23 > 0 ? element.need_trans_bag_ii_23 : 1)).toFixed(2) + '%'
-                element.Transferout_ii_33 = (element.finish_trans_bag_ii_33 * 100 / (element.need_trans_bag_ii_33 > 0 ? element.need_trans_bag_ii_33 : 1)).toFixed(2) + '%'
-                element.Transferout_ii_32 = (element.finish_trans_bag_ii_32 * 100 / (element.need_trans_bag_ii_32 > 0 ? element.need_trans_bag_ii_32 : 1)).toFixed(2) + '%'
-
-                element.Transferout_id_22 = (element.finish_trans_bag_id_22 * 100 / (element.need_trans_bag_id_22 > 0 ? element.need_trans_bag_id_22 : 1)).toFixed(2) + '%'
-                element.Transferout_id_23 = (element.finish_trans_bag_id_23 * 100 / (element.need_trans_bag_id_23 > 0 ? element.need_trans_bag_id_23 : 1)).toFixed(2) + '%'
-                element.Transferout_id_33 = (element.finish_trans_bag_id_33 * 100 / (element.need_trans_bag_id_33 > 0 ? element.need_trans_bag_id_33 : 1)).toFixed(2) + '%'
-                element.Transferout_id_32 = (element.finish_trans_bag_id_32 * 100 / (element.need_trans_bag_id_32 > 0 ? element.need_trans_bag_id_32 : 1)).toFixed(2) + '%'
-
-                let t1DD = (this.t1 ? element.need_trans_flight_dd_22 : 0) + (this.t2 ? element.need_trans_flight_dd_23 : 0) + (this.t3 ? element.need_trans_flight_dd_33 : 0) + (this.t4 ? element.need_trans_flight_dd_32 : 0)
-                let t1DI = (this.t1 ? element.need_trans_flight_di_22 : 0) + (this.t2 ? element.need_trans_flight_di_23 : 0) + (this.t3 ? element.need_trans_flight_di_23 : 0) + (this.t4 ? element.need_trans_flight_di_32 : 0)
-                let t1II = (this.t1 ? element.need_trans_flight_ii_22 : 0) + (this.t2 ? element.need_trans_flight_ii_23 : 0) + (this.t3 ? element.need_trans_flight_ii_33 : 0) + (this.t4 ? element.need_trans_flight_ii_32 : 0)
-                let t1ID = (this.t1 ? element.need_trans_flight_id_22 : 0) + (this.t2 ? element.need_trans_flight_id_23 : 0) + (this.t3 ? element.need_trans_flight_id_33 : 0) + (this.t4 ? element.need_trans_flight_id_32 : 0)
-                element.a14 = (this.DD ? t1DD : 0) + (this.DI ? t1DI : 0) + (this.II ? t1II : 0) + (this.II ? t1ID : 0)
-
-                let t2DD = (this.t1 ? element.finish_trans_flight_dd_22 : 0) + (this.t2 ? element.finish_trans_flight_dd_23 : 0) + (this.t3 ? element.finish_trans_flight_dd_33 : 0) + (this.t4 ? element.finish_trans_flight_dd_32 : 0)
-                let t2DI = (this.t1 ? element.finish_trans_flight_di_22 : 0) + (this.t2 ? element.finish_trans_flight_di_23 : 0) + (this.t3 ? element.finish_trans_flight_di_33 : 0) + (this.t4 ? element.finish_trans_flight_di_32 : 0)
-                let t2II = (this.t1 ? element.finish_trans_flight_ii_22 : 0) + (this.t2 ? element.finish_trans_flight_ii_23 : 0) + (this.t3 ? element.finish_trans_flight_ii_33 : 0) + (this.t4 ? element.finish_trans_flight_ii_32 : 0)
-                let t2ID = (this.t1 ? element.finish_trans_flight_id_22 : 0) + (this.t2 ? element.finish_trans_flight_id_23 : 0) + (this.t3 ? element.finish_trans_flight_id_33 : 0) + (this.t4 ? element.finish_trans_flight_id_32 : 0)
-                element.a15 = (this.DD ? t2DD : 0) + (this.DI ? t2DI : 0) + (this.II ? t2II : 0) + (this.II ? t2ID : 0)
-
-                let t3DD = (this.t1 ? element.need_trans_bag_dd_22 : 0) + (this.t2 ? element.need_trans_bag_dd_23 : 0) + (this.t3 ? element.need_trans_bag_dd_33 : 0) + (this.t4 ? element.need_trans_bag_dd_32 : 0)
-                let t3DI = (this.t1 ? element.need_trans_bag_di_22 : 0) + (this.t2 ? element.need_trans_bag_di_23 : 0) + (this.t3 ? element.need_trans_bag_di_33 : 0) + (this.t4 ? element.need_trans_bag_di_32 : 0)
-                let t3II = (this.t1 ? element.need_trans_bag_ii_22 : 0) + (this.t2 ? element.need_trans_bag_ii_23 : 0) + (this.t3 ? element.need_trans_bag_ii_33 : 0) + (this.t4 ? element.need_trans_bag_ii_32 : 0)
-                let t3ID = (this.t1 ? element.need_trans_bag_id_22 : 0) + (this.t2 ? element.need_trans_bag_id_23 : 0) + (this.t3 ? element.need_trans_bag_id_33 : 0) + (this.t4 ? element.need_trans_bag_id_32 : 0)
-                element.a16 = (this.DD ? t3DD : 0) + (this.DI ? t3DI : 0) + (this.II ? t3II : 0) + (this.II ? t3ID : 0)
-
-                let t4DD = (this.t1 ? element.finish_trans_bag_dd_22 : 0) + (this.t2 ? element.finish_trans_bag_dd_23 : 0) + (this.t3 ? element.finish_trans_bag_dd_33 : 0) + (this.t4 ? element.finish_trans_bag_dd_32 : 0)
-                let t4DI = (this.t1 ? element.finish_trans_bag_di_22 : 0) + (this.t2 ? element.finish_trans_bag_di_23 : 0) + (this.t3 ? element.finish_trans_bag_di_33 : 0) + (this.t4 ? element.finish_trans_bag_di_32 : 0)
-                let t4II = (this.t1 ? element.finish_trans_bag_ii_22 : 0) + (this.t2 ? element.finish_trans_bag_ii_23 : 0) + (this.t3 ? element.finish_trans_bag_ii_33 : 0) + (this.t4 ? element.finish_trans_bag_ii_32 : 0)
-                let t4ID = (this.t1 ? element.finish_trans_bag_id_22 : 0) + (this.t2 ? element.finish_trans_bag_id_23 : 0) + (this.t3 ? element.finish_trans_bag_id_33 : 0) + (this.t4 ? element.finish_trans_bag_id_32 : 0)
-                element.a17 = (this.DD ? t4DD : 0) + (this.DI ? t4DI : 0) + (this.II ? t4II : 0) + (this.II ? t4ID : 0)
-
-                let t5DD = (this.t1 ? element.not_trans_bag_dd_22 : 0) + (this.t2 ? element.not_trans_bag_dd_23 : 0) + (this.t3 ? element.not_trans_bag_dd_33 : 0) + (this.t4 ? element.not_trans_bag_dd_32 : 0)
-                let t5DI = (this.t1 ? element.not_trans_bag_di_22 : 0) + (this.t2 ? element.not_trans_bag_di_23 : 0) + (this.t3 ? element.not_trans_bag_di_33 : 0) + (this.t4 ? element.not_trans_bag_di_32 : 0)
-                let t5II = (this.t1 ? element.not_trans_bag_ii_22 : 0) + (this.t2 ? element.not_trans_bag_ii_23 : 0) + (this.t3 ? element.not_trans_bag_ii_33 : 0) + (this.t4 ? element.not_trans_bag_ii_32 : 0)
-                let t5ID = (this.t1 ? element.not_trans_bag_id_22 : 0) + (this.t2 ? element.not_trans_bag_id_23 : 0) + (this.t3 ? element.not_trans_bag_id_33 : 0) + (this.t4 ? element.not_trans_bag_id_32 : 0)
-                element.a19 = (this.DD ? t5DD : 0) + (this.DI ? t5DI : 0) + (this.II ? t5II : 0) + (this.II ? t5ID : 0)
-
-                element.a18 = (element.a17 * 100 / (element.a16 > 0 ? element.a16 : 0)).toFixed(2) + '%'
-
-
-
-              });
-            }
             // setTimeout(() => {
             //   this.initTableData();
             //   this.loading = false;

src/views/statisticsCharts/views/report/baggageProportionTable.vue

@@ -1,15 +1,7 @@
 <template>
   <!-- 中转行李比例明细统计 -->
   <div class="statstics-wrapper">
-    <StatisticsHeader
-      title="中转行李比例明细统计"
-      :items="formItems"
-      :data="formData"
-      with-setting
-      :withSetting="false"
-      @export="exportup"
-      @getFormData="getFormData"
-    />
+    <StatisticsHeader title="中转行李比例明细统计" :items="formItems" :data="formData" with-setting :withSetting="false" @export="exportup" @getFormData="getFormData" />
     <!-- <Tableformcp
       :isloadings="isloadings"
       :rows="12"
@@ -18,17 +10,7 @@
       width="800px"
       tableHeight="750"
     /> -->
-    <Tableformbrs
-      :data-id="dataId"
-      upid="7"
-      :isloadings="isloadings"
-      :data-content="dataContent"
-      :rows="12"
-      label-width="140px"
-      :min-height="70"
-      width="800px"
-      tableHeight="750"
-    />
+    <Tableformbrs :data-id="dataId" upid="7" :isloadings="isloadings" :data-content="dataContent" :rows="12" label-width="140px" :min-height="70" width="800px" tableHeight="750" />
   </div>
 </template>
 <script>
@@ -38,7 +20,7 @@ import Tableformbrs from '../../components/tableformbrs'
 import { Format } from '@/utils/validate'
 export default {
   name: 'ReportStatistics',
-  data() {
+  data () {
     return {
       formData: {
         airport: '',
@@ -58,6 +40,7 @@ export default {
           clearable: true,
           // multiple: true,
           // disabled: true,
+          requiredWarning: '请先选择机场',
           queryId: SERVICE_ID.nodeAirport,
           setKey: 'a2',
           options: [],
@@ -124,26 +107,39 @@ export default {
     // Tableformcp,
     Tableformbrs,
   },
-  mounted() {
-    this.dataContent = [
-      ...Array(3).fill(this.formData.timedim || '日'),
-      ...Array(4).fill(this.formData.company?.join(',') || '国航'),
-      this.formData.dateTime[0] || Format('yyyy-MM-dd', new Date()),
-      this.formData.dateTime[1] || Format('yyyy-MM-dd', new Date()),
-      this.formData.airport || 'PEK',
-    ]
+  mounted () {
+    // this.dataContent = [
+    //   ...Array(3).fill(this.formData.timedim || '日'),
+    //   ...Array(4).fill(this.formData.company?.join(',') || '国航'),
+    //   this.formData.dateTime[0] || Format('yyyy-MM-dd', new Date()),
+    //   this.formData.dateTime[1] || Format('yyyy-MM-dd', new Date()),
+    //   this.formData.airport || 'PEK',
+    // ]
+    const data = this.formData
+    this.dataContent = {
+      fd1: data.dateTime[0] || Format('yyyy-MM-dd', new Date()),
+      fd2: data.dateTime[1] || Format('yyyy-MM-dd', new Date()),
+      airport: data.airport || 'PEK',
+      flighttype: data.company?.join(',') || '国航'
+    }
   },
   methods: {
-    getFormData(data) {
-      this.dataContent = [
-        ...Array(3).fill(data.timedim || '日'),
-        ...Array(4).fill(this.formData.company?.join(',') || '国航'),
-        data.dateTime[0] || Format('yyyy-MM-dd', new Date()),
-        data.dateTime[1] || Format('yyyy-MM-dd', new Date()),
-        data.airport || 'PEK',
-      ]
+    getFormData (data) {
+      // this.dataContent = [
+      //   ...Array(3).fill(data.timedim || '日'),
+      //   ...Array(4).fill(this.formData.company?.join(',') || '国航'),
+      //   data.dateTime[0] || Format('yyyy-MM-dd', new Date()),
+      //   data.dateTime[1] || Format('yyyy-MM-dd', new Date()),
+      //   data.airport || 'PEK',
+      // ]
+      this.dataContent = {
+        fd1: data.dateTime[0] || Format('yyyy-MM-dd', new Date()),
+        fd2: data.dateTime[1] || Format('yyyy-MM-dd', new Date()),
+        airport: data.airport || 'PEK',
+        flighttype: data.company?.join(',') || '国航'
+      }
     },
-    exportup() {
+    exportup () {
       this.isloadings = this.isloadings += 1
     },
   },

src/views/statisticsCharts/views/report/transferDirectionTable.vue

@@ -1,15 +1,7 @@
 <template>
   <!-- 中转流向明细统计 -->
   <div class="statstics-wrapper">
-    <StatisticsHeader
-      title="中转流向明细统计"
-      :items="formItems"
-      :data.sync="formData"
-      with-setting
-      :withSetting="false"
-      @export="exportup"
-      @getFormData="getFormData"
-    />
+    <StatisticsHeader title="中转流向明细统计" :items="formItems" :data.sync="formData" with-setting :withSetting="false" @export="exportup" @getFormData="getFormData" />
     <!-- <Tableformcp
       :isloadings="isloadings"
       :rows="12"
@@ -18,25 +10,8 @@
       width="800px"
       tableHeight="750"
     /> -->
-    <Tableformbrs
-      :data-id="dataId"
-      :textShow="textShow"
-      :textShowtp="textShowtp"
-      upid="5"
-      :isloadings="isloadings"
-      :data-content="dataContent"
-      :rows="12"
-      label-width="140px"
-      :min-height="70"
-      width="800px"
-      tableHeight="750"
-      @cell-click="cellClickHandler"
-    />
-    <TableDialog
-      :flag.sync="dialogFlag"
-      :query-params="queryParams"
-      :title="dialogTitle"
-    />
+    <Tableformbrs :data-id="dataId" :textShow="textShow" :textShowtp="textShowtp" upid="5" :isloadings="isloadings" :data-content="dataContent" :rows="12" label-width="140px" :min-height="70" width="800px" tableHeight="750" @cell-click="cellClickHandler" />
+    <TableDialog :flag.sync="dialogFlag" :query-params="queryParams" :title="dialogTitle" />
   </div>
 </template>
 <script>
@@ -47,7 +22,7 @@ import TableDialog from '../../components/TableDialog.vue'
 import { Format } from '@/utils/validate'
 export default {
   name: 'ReportStatistics',
-  data() {
+  data () {
     return {
       textShow: [],
       textShowtp: [],
@@ -123,7 +98,8 @@ export default {
           filterable: true,
           clearable: true,
           // multiple: true,
-          disabled: true,
+          // disabled: true,
+          requiredWarning: '请先选择机场',
           queryId: SERVICE_ID.nodeAirport,
           setKey: 'a2',
           options: [],
@@ -194,31 +170,44 @@ export default {
     Tableformbrs,
     TableDialog,
   },
-  mounted() {
-    this.dataContent = [
-      ...Array(3).fill(this.formData.timedim || '日'),
-      this.formData.airport || 'PEK',
-      this.formData.dateTime[0] || Format('yyyy-MM-dd', new Date()),
-      this.formData.dateTime[1] || Format('yyyy-MM-dd', new Date()),
-      ...Array(4).fill(this.formData.company?.join(',') || '国航'),
-    ]
+  mounted () {
+    // this.dataContent = [
+    //   ...Array(3).fill(this.formData.timedim || '日'),
+    //   this.formData.airport || 'PEK',
+    //   this.formData.dateTime[0] || Format('yyyy-MM-dd', new Date()),
+    //   this.formData.dateTime[1] || Format('yyyy-MM-dd', new Date()),
+    //   ...Array(4).fill(this.formData.company?.join(',') || '国航'),
+    // ]
+    const data = this.formData
+    this.dataContent = {
+      fd1: data.dateTime[0] || Format('yyyy-MM-dd', new Date()),
+      fd2: data.dateTime[1] || Format('yyyy-MM-dd', new Date()),
+      airport: data.airport || 'PEK',
+      flighttype: data.company?.join(',') || '国航'
+    }
   },
   methods: {
-    getFormData(data) {
+    getFormData (data) {
       this.textShow = data.trd
       this.textShowtp = data.ts
-      this.dataContent = [
-        ...Array(3).fill(data.timedim || '日'),
-        data.formData || 'PEK',
-        data.dateTime[0] || Format('yyyy-MM-dd', new Date()),
-        data.dateTime[1] || Format('yyyy-MM-dd', new Date()),
-        ...Array(4).fill(this.formData.company?.join(',') || '国航'),
-      ]
+      // this.dataContent = [
+      //   ...Array(3).fill(data.timedim || '日'),
+      //   data.formData || 'PEK',
+      //   data.dateTime[0] || Format('yyyy-MM-dd', new Date()),
+      //   data.dateTime[1] || Format('yyyy-MM-dd', new Date()),
+      //   ...Array(4).fill(this.formData.company?.join(',') || '国航'),
+      // ]
+      this.dataContent = {
+        fd1: data.dateTime[0] || Format('yyyy-MM-dd', new Date()),
+        fd2: data.dateTime[1] || Format('yyyy-MM-dd', new Date()),
+        airport: data.airport || 'PEK',
+        flighttype: data.company?.join(',') || '国航'
+      }
     },
-    exportup() {
+    exportup () {
       this.isloadings = this.isloadings += 1
     },
-    cellClickHandler(row, column, cell, event) {
+    cellClickHandler (row, column, cell, event) {
       if (
         column.property.includes('trans_bag') &&
         row[column.property] &&

src/views/statisticsCharts/views/report/transitTables.vue

@@ -68,6 +68,7 @@ export default {
           placeholder: 'PEK',
           filterable: true,
           clearable: true,
+          requiredWarning: '请先选择机场',
           // multiple: true,
           // disabled: true,
           queryId: SERVICE_ID.nodeAirport,
@@ -142,24 +143,37 @@ export default {
     TableDialog,
   },
   mounted () {
-    this.dataContent = [
-      ...Array(3).fill(this.formData.timedim || '日'),
-      this.formData.airport || 'PEK',
-      this.formData.dateTime[0] || Format('yyyy-MM-dd', new Date()),
-      this.formData.dateTime[1] || Format('yyyy-MM-dd', new Date()),
-      ...Array(4).fill(this.formData.company?.join(',') || '国航'),
-    ]
+    // this.dataContent = [
+    //   ...Array(3).fill(this.formData.timedim || '日'),
+    //   this.formData.airport || 'PEK',
+    //   this.formData.dateTime[0] || Format('yyyy-MM-dd', new Date()),
+    //   this.formData.dateTime[1] || Format('yyyy-MM-dd', new Date()),
+    //   ...Array(4).fill(this.formData.company?.join(',') || '国航'),
+    // ]
+    const data = this.formData
+    this.dataContent = {
+      fd1: data.dateTime[0] || Format('yyyy-MM-dd', new Date()),
+      fd2: data.dateTime[1] || Format('yyyy-MM-dd', new Date()),
+      airport: data.airport || 'PEK',
+      flighttype: data.company?.join(',') || '国航'
+    }
   },
   methods: {
     getFormData (data) {
       this.textShow = data.trd
-      this.dataContent = [
-        ...Array(3).fill(data.timedim || '日'),
-        data.airport || 'PEK',
-        data.dateTime[0] || Format('yyyy-MM-dd', new Date()),
-        data.dateTime[1] || Format('yyyy-MM-dd', new Date()),
-        ...Array(4).fill(this.formData.company?.join(',') || '国航'),
-      ]
+      // this.dataContent = [
+      //   ...Array(3).fill(data.timedim || '日'),
+      //   data.airport || 'PEK',
+      //   data.dateTime[0] || Format('yyyy-MM-dd', new Date()),
+      //   data.dateTime[1] || Format('yyyy-MM-dd', new Date()),
+      //   ...Array(4).fill(this.formData.company?.join(',') || '国航'),
+      // ]
+      this.dataContent = {
+        fd1: data.dateTime[0] || Format('yyyy-MM-dd', new Date()),
+        fd2: data.dateTime[1] || Format('yyyy-MM-dd', new Date()),
+        airport: data.airport || 'PEK',
+        flighttype: this.formData.company?.join(',') || '国航'
+      }
     },
     exportup () {
       this.isloadings = this.isloadings += 1