Browse Source

Merge branch 'master' of http://120.26.64.82:3000/BFFE/CABaggageData2.0

zhaoke 2 years ago
parent
commit
a7fa5d0d3b

+ 1 - 1
public/config.js

@@ -3,7 +3,7 @@
  * @Date: 2022-04-25 14:05:21
  * @LastEditTime: 2022-05-06 09:40:40
  * @LastEditors: your name
- * @Description: 
+ * @Description:
  * have a nice day!
  */
 var PLATFROM_CONFIG = {};

+ 10 - 1
src/views/advancedQuery/views/advancedHome.vue

@@ -8,6 +8,7 @@
             v-model="timeStart"
             size="small"
             type="date"
+            value-format="yyyy-MM-dd"
             placeholder="选择开始日期时间"
           />
         </div>
@@ -16,6 +17,7 @@
             v-model="timeEnd"
             size="small"
             type="date"
+            value-format="yyyy-MM-dd"
             placeholder="选择结束日期时间"
           />
         </div>
@@ -63,6 +65,10 @@
         show-summary
         :summary-method="summaryRow(tableData.length)"
       >
+        <el-table-column
+          prop="index"
+          label="序号"
+        />
         <el-table-column
           prop="FlightNO"
           label="航班号"
@@ -588,7 +594,10 @@ export default {
           dataContent
         })
         if (res.code == 0) {
-          this.tableData = res.returnData
+          this.tableData = res.returnData.map((item, index) => {
+            item['index'] = index + 1
+            return item
+          })
           this.getTableFilterItem()
         } else {
           this.$message.error(res.message)

+ 5 - 5
src/views/baggageManagement/mixins/terminal.js

@@ -154,11 +154,11 @@ export default {
     },
     // 表格行点击跳转
     rowClick(row, column, event) {
-      // this.$router.push({
-      //   path: `/${this.$route.path.split('/').slice(1, -1).join('/')}/flightView`,
-      //   query: row
-      // })
-      this.$router.push({ path: '/advance/flightView', query: row })
+      this.$router.push({
+        path: `${this.$route.path}/flightView`,
+        query: row
+      })
+      // this.$router.push({ path: '/departure/flightView', query: row })
     },
     // 全部机场查询
     async currentAirportQuery() {