修改

src/views/newFlightView/index.vue

@@ -8,7 +8,9 @@
             <div class="newFlightView-left-top-top-title-no">{{ flightObj.flightNo }}</div>
           </div>
           <div class="newFlightView-left-top-top-status">
-            PEK-<el-radio v-model="radio" label="1" />-NKG- <el-radio v-model="radio" label="1" />-STU- -HGH- -
+            <el-checkbox-group v-model="checkList">
+              PEK-<el-checkbox label="复选框 A" />-NKG- -STU- -HGH- -
+            </el-checkbox-group>
           </div>
         </div>
         <div class="newFlightView-left-top-list">
@@ -39,7 +41,7 @@
         </div>
       </div>
       <div class="newFlightView-left-bottom">
-        <Table tableName="容器列表" />
+        <Table :tableTag="table1" tableName="容器列表" />
       </div>
     </div>
     <div class="newFlightView-right">
@@ -59,7 +61,7 @@
         </div>
       </div>
       <div class="newFlightView-right-bottom">
-        <Table ref="table" :btnStyle="{top:'-52px'}" :istableCol="true" tableName="航班行李列表" />
+        <Table :tableTag="table2" ref="table" :btnStyle="{top:'-52px'}" :istableCol="true" tableName="航班行李列表" />
       </div>
     </div>
   </div>
@@ -95,7 +97,11 @@ export default {
       value: '',
       dataContent: {},
       flightObj: {},
-      infoObj: {}
+      infoObj: {},
+      checkList: [],
+      checkStates: [],
+      table1: {},
+      table2: {}
     }
   },
   async created () {
@@ -106,7 +112,22 @@ export default {
     const res = await this.getViewInfo(query)
     this.infoObj = res[0]
     const sts = await this.getViewInfo({ flightNo, flightDate })
-    console.log(sts)
+    if (sts && sts.length) {
+      for (const p of sts) {
+        const { depStation_iataCd, arrStation_iataCd } = p
+        this.checkStates.push({
+          depStation_iataCd,
+          arrStation_iataCd
+        })
+      }
+    }
+  },
+  mounted () {
+    const { flightNo, flightDate } = this.flightObj
+    this.table1 = {
+      flightNo,
+      flightDate
+    }
   },
   methods: {
     // 获取基本信息
@@ -124,8 +145,9 @@ export default {
     },
     // 导出
     exportHandler (refName, tableName) {
+      const { flightNo, flightDate, depStation_iataCd, arrStation_iataCd } = this.flightObj
       const table = this.$refs[refName].$el.cloneNode(true);
-      const fileName = `${tableName}-${this.currentAirport}-${this.startDate}-${this.endDate}.xlsx`;
+      const fileName = `${tableName}-${flightNo}-${flightDate}-${depStation_iataCd}-${arrStation_iataCd}.xlsx`;
       throttledExportToExcel(table, tableName, fileName);
     },
   }
@@ -163,9 +185,12 @@ export default {
           font-family: Microsoft YaHei;
           font-weight: bold;
           color: #101116;
-          ::v-deep .el-radio {
-            margin-right: 0;
-            .el-radio__label {
+          ::v-deep .el-checkbox-group {
+            font-size: initial;
+            .el-checkbox__inner {
+              border-radius: 50%;
+            }
+            .el-checkbox__label {
               display: none;
             }
           }

src/views/newQuery/components/search.vue

@@ -7,7 +7,7 @@
         <el-button type="primary" size="small" @click="advancedQueryHandler(false)">查询</el-button>
       </div> -->
       <el-form ref="paramsForm" class="query-params" :model="paramsForm" :rules="paramsForm.validateRules" :inline="true">
-        <el-table :data="paramsForm.params" height="248" border stripe>
+        <el-table :data="paramsForm.params" height="165" border stripe>
           <el-table-column type="index" label="行号" :index="index => index + 1" align="center" width="60" />
           <el-table-column v-for="(col, index) in paramsTableCols" :key="index" :label="col.label" :align="col.align || 'center'">
             <template slot-scope="scope">
@@ -249,6 +249,7 @@ export default {
           })
           this.queryHandler()
           setTimeout(() => {
+            this.paramsTableCols[2].options = new Array(arr.length).fill(comparisonOperatorOptions.slice(0, 5).reverse())
             this.paramsTableCols[3].inputType = types
             this.paramsForm.params = datas
           }, 200);
@@ -256,7 +257,8 @@ export default {
           this.paramsForm.params = []
         }
       },
-      deep: true
+      deep: true,
+      immediate: true
     },
   },
   mounted () {
@@ -310,11 +312,11 @@ export default {
     addParamsHandler () {
       this.paramsTableCols[3].inputType.push('text')
       this.paramsForm.params.push({
-        leftBrackets: '',
+        leftBrackets: '(',
         paramKey: '',
         comparisonOperator: '',
         paramValue: '',
-        rightBrackets: '',
+        rightBrackets: ')',
         connector: 'and'
       })
     },

src/views/newQuery/components/table.vue

@@ -22,12 +22,14 @@
       <el-table v-el-table-infinite-scroll="load" :data="dealedTableData" :summary-method="getSummaries" :span-method="tableSpanMethod" stripe :show-summary="showSummary" border @cell-click="cellClick" :cell-class-name="cellClass" ref="table" height="100%" class="table infinite-list">
         <el-table-column v-for="(item, index) in tableColsCopy" :sortable="item.needSort ? true : false" :key="index" :prop="item.columnName" :label="item.columnLabel" :show-overflow-tooltip="showOverflowTooltip">
           <template #header>
-            <template v-if="item.needFilters">
-              <TableHeaderCell :label="item.columnLabel" :filter-options="tableDataFilters[item.columnName]" :filter-values.sync="filterValues[item.columnName]" :sortable="item.needSort" />
-            </template>
-            <template v-else>
-              <div>{{ item.columnLabel }}</div>
-            </template>
+            <el-tooltip :content="item.columnDescribe || item.columnLabel" placement="top">
+              <template v-if="item.needFilters">
+                <TableHeaderCell :label="item.columnLabel" :filter-options="tableDataFilters[item.columnName]" :filter-values.sync="filterValues[item.columnName]" />
+              </template>
+              <template v-else>
+                <div>{{ item.columnLabel }}</div>
+              </template>
+            </el-tooltip>
           </template>
         </el-table-column>
       </el-table>
@@ -95,11 +97,14 @@ export default {
       type: Object,
       default: () => { }
     },
+    pageSize: {
+      type: Number,
+      default: 20
+    }
   },
   data () {
     return {
       page: 0,
-      pageSize: 20,
       queryId: '',
       noMore: false,
       loading: false,
@@ -493,6 +498,13 @@ export default {
     .cell {
       color: #000;
       text-align: center;
+      white-space: nowrap;
+      display: flex;
+      .el-tooltip {
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        overflow: hidden;
+      }
     }
   }
   .btns {

src/views/newQuery/index.vue

@@ -103,9 +103,9 @@ export default {
   computed: {
     tableHeight () {
       if (this.flag) {
-        return 'calc(100% - 390px)';
+        return 'calc(100% - 269px)';
       } else {
-        return 'calc(100% - 120px)';
+        return 'calc(100% - 85px)';
       }
     }
   },

src/views/newQuery/mix/tableCols.js

@@ -68,7 +68,6 @@ export default {
       const datas = this.colsFilter(this._.cloneDeep(this.tableCols))
       const newTableColsCopy = datas.filter((item) => item.needShow)
       this.tableColsCopy = _.cloneDeep(newTableColsCopy)
-      console.log(newTableColsCopy)
       setTimeout(() => {
         if (!this[tableDataName].length) {
           this[tableDataName] = tableDataTemp