朱兆平 / vue_cli · 提交

转到一个项目

作者 shenhailong
提交 4c56d789c4dafd20e214a4a35d9fd480a4bcb4df 1 个父辈 530c107f

完善航班列表显示问题

内嵌 并排对比
正在显示 3 个修改的文件 包含 18 行增加 和 18 行删除
@@ -12,13 +12,13 @@ @@ -12,13 +12,13 @@
12 <el-table :data="flightData" stripe style="font-size: 14px" border> 12 <el-table :data="flightData" stripe style="font-size: 14px" border>
13 <el-table-column label="航班号" width="180px" align="center"> 13 <el-table-column label="航班号" width="180px" align="center">
14 <template slot-scope="scope"> 14 <template slot-scope="scope">
15 - <span>{{ scope.row.carrier }}{{ scope.row.flightNo }}</span> 15 + <span>{{ scope.row.carrier }}{{ scope.row.flightno }}</span>
16 </template> 16 </template>
17 </el-table-column> 17 </el-table-column>
18 <el-table-column label="航班日期" width="190px" align="center"> 18 <el-table-column label="航班日期" width="190px" align="center">
19 <template slot-scope="scope"> 19 <template slot-scope="scope">
20 <i class="el-icon-time"></i> 20 <i class="el-icon-time"></i>
21 - <span>{{ scope.row.flightDate }}</span> 21 + <span>{{ scope.row.flightdate }}</span>
22 </template> 22 </template>
23 </el-table-column> 23 </el-table-column>
24 <el-table-column label="始发站" width="160px" align="center"> 24 <el-table-column label="始发站" width="160px" align="center">
@@ -75,8 +75,8 @@ @@ -75,8 +75,8 @@
75 }, 75 },
76 getList() { 76 getList() {
77 getFlightListForParam(this.listQuery).then(res => { 77 getFlightListForParam(this.listQuery).then(res => {
78 - this.flightData = res.data.dataList  
79 - this.total = res.data.count 78 + this.flightData = res.data.data.list
  79 + this.total = res.data.data.total
80 }) 80 })
81 }, 81 },
82 handleSearch() { 82 handleSearch() {
@@ -84,26 +84,26 @@ @@ -84,26 +84,26 @@
84 }, 84 },
85 handleLoading(row) { 85 handleLoading(row) {
86 row.messageType = 'MT4201' 86 row.messageType = 'MT4201'
87 - row.flightdate = row.flightDate  
88 - row.flightno = row.flightNo 87 + row.flightdate = row.flightdate
  88 + row.flightno = row.flightno
89 this.$router.push({name: '出港航班信息', params: {scopeRow: row}}) 89 this.$router.push({name: '出港航班信息', params: {scopeRow: row}})
90 }, 90 },
91 handleTidy(row) { 91 handleTidy(row) {
92 row.messageType = 'MT5202' 92 row.messageType = 'MT5202'
93 - row.flightdate = row.flightDate  
94 - row.flightno = row.flightNo 93 + row.flightdate = row.flightdate
  94 + row.flightno = row.flightno
95 this.$router.push({name: '出港航班信息', params: {scopeRow: row}}) 95 this.$router.push({name: '出港航班信息', params: {scopeRow: row}})
96 }, 96 },
97 handleArrive(row) { 97 handleArrive(row) {
98 row.messageType = 'MT3201' 98 row.messageType = 'MT3201'
99 - row.flightdate = row.flightDate  
100 - row.flightno = row.flightNo 99 + row.flightdate = row.flightdate
  100 + row.flightno = row.flightno
101 this.$router.push({name: '出港航班信息', params: {scopeRow: row}}) 101 this.$router.push({name: '出港航班信息', params: {scopeRow: row}})
102 }, 102 },
103 handlePre(row) { 103 handlePre(row) {
104 row.messageType = 'MT2201' 104 row.messageType = 'MT2201'
105 - row.flightdate = row.flightDate  
106 - row.flightno = row.flightNo 105 + row.flightdate = row.flightdate
  106 + row.flightno = row.flightno
107 this.$router.push({name: '出港航班信息', params: {scopeRow: row}}) 107 this.$router.push({name: '出港航班信息', params: {scopeRow: row}})
108 } 108 }
109 }, 109 },
@@ -117,7 +117,7 @@ @@ -117,7 +117,7 @@
117 this.flight.originstation = this.$route.params.scopeRow.originstation 117 this.flight.originstation = this.$route.params.scopeRow.originstation
118 this.flight.destinationstation = this.$route.params.scopeRow.destinationstation 118 this.flight.destinationstation = this.$route.params.scopeRow.destinationstation
119 this.flight.messageType = this.$route.params.scopeRow.messageType 119 this.flight.messageType = this.$route.params.scopeRow.messageType
120 - if (this.$route.params.scopeRow.awba !== undefined) { 120 + if (this.$route.params.scopeRow.awba !== undefined && this.$route.params.scopeRow.awba != null) {
121 this.flight.awba = this.$route.params.scopeRow.awba.replace('-', '') 121 this.flight.awba = this.$route.params.scopeRow.awba.replace('-', '')
122 } 122 }
123 } 123 }
@@ -556,9 +556,9 @@ @@ -556,9 +556,9 @@
556 this.listLoading = true 556 this.listLoading = true
557 if (this.loadingQuery.awba !== undefined && this.loadingQuery.awba !== '') { 557 if (this.loadingQuery.awba !== undefined && this.loadingQuery.awba !== '') {
558 getMt4201ListForParam(this.loadingQuery).then(res => { 558 getMt4201ListForParam(this.loadingQuery).then(res => {
559 - this.loadingData = res.data.dataList  
560 - this.total = res.data.count  
561 - if (res.data.count > 0) { 559 + this.loadingData = res.data.data.list
  560 + this.total = res.data.data.total
  561 + if (res.data.data.total > 0) {
562 this.loadingQuery.carrier = this.loadingData[0].carrier 562 this.loadingQuery.carrier = this.loadingData[0].carrier
563 this.loadingQuery.flightno = this.loadingData[0].flightno 563 this.loadingQuery.flightno = this.loadingData[0].flightno
564 this.loadingQuery.flightdate = this.loadingData[0].flightdate 564 this.loadingQuery.flightdate = this.loadingData[0].flightdate
@@ -572,8 +572,8 @@ @@ -572,8 +572,8 @@
572 }) 572 })
573 } else { 573 } else {
574 getMt4201ListForParam(this.loadingQuery).then(res => { 574 getMt4201ListForParam(this.loadingQuery).then(res => {
575 - this.loadingData = res.data.dataList  
576 - this.total = res.data.count 575 + this.loadingData = res.data.data.list
  576 + this.total = res.data.data.total
577 setTimeout(() => { 577 setTimeout(() => {
578 this.listLoading = false 578 this.listLoading = false
579 }, 1.5 * 1000) 579 }, 1.5 * 1000)