Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
shanyunduo.cheng
7d78c45b 2 parents 416831fb 59b5907c

Merge branch 'master' of http://118.178.128.178/Fedex/imac-vue

Inline Side-by-side
Showing 2 changed files with 10 additions and 6 deletions
...@@ -53,7 +53,7 @@ export default { ...@@ -53,7 +53,7 @@ export default {
53 cookiePassword: "", 53 cookiePassword: "",
54 loginForm: { 54 loginForm: {
55 username: "root", 55 username: "root",
56 - password: "123", 56 + password: "123456",
57 rememberMe: false 57 rememberMe: false
58 }, 58 },
59 loginRules: { 59 loginRules: {
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
40 <el-table-column label="原航班" align="center" prop="sourceFlightNo"/> 40 <el-table-column label="原航班" align="center" prop="sourceFlightNo"/>
41 <el-table-column label="目的航班排序" align="center" prop="flightRank" width="280"/> 41 <el-table-column label="目的航班排序" align="center" prop="flightRank" width="280"/>
42 <el-table-column label="优先级" align="center" prop="priority" /> 42 <el-table-column label="优先级" align="center" prop="priority" />
43 - <el-table-column label="周期" align="center" prop="dayOfWeek" /> 43 + <el-table-column label="周期" align="center" prop="dayOfWeek" width="180"/>
44 <el-table-column label="状态" align="center" prop="status" :formatter="statusFormat" /> 44 <el-table-column label="状态" align="center" prop="status" :formatter="statusFormat" />
45 <el-table-column label="开始时间" align="center" prop="startDate" width="100"/> 45 <el-table-column label="开始时间" align="center" prop="startDate" width="100"/>
46 <el-table-column label="结束时间" align="center" prop="endDate" width="100"/> 46 <el-table-column label="结束时间" align="center" prop="endDate" width="100"/>
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
71 // 遮罩层 71 // 遮罩层
72 loading: false, 72 loading: false,
73 // 总条数 73 // 总条数
74 - total: 110, 74 + total: 0,
75 // 原航班规则数据 75 // 原航班规则数据
76 sourceFlightRulesList: [], 76 sourceFlightRulesList: [],
77 statusList: [{'id':1,'name':'有效'}, {'id':2,'name':'配置中'},{'id':3,'name':'停用'}], 77 statusList: [{'id':1,'name':'有效'}, {'id':2,'name':'配置中'},{'id':3,'name':'停用'}],
...@@ -100,11 +100,14 @@ ...@@ -100,11 +100,14 @@
100 findSourceFlightRules() { 100 findSourceFlightRules() {
101 //this.loading = true; 101 //this.loading = true;
102 if (this.queryParams.pageNum > 1) { 102 if (this.queryParams.pageNum > 1) {
103 - this.queryParams.start = (this.queryParams.pageNum - 1) * this.queryParams.limit + 1 103 + this.queryParams.start = (this.queryParams.pageNum - 1) * this.queryParams.limit
104 + }else{
105 + this.queryParams.start=0;
104 } 106 }
105 findSourceFlightRulesApi(this.queryParams).then(response => { 107 findSourceFlightRulesApi(this.queryParams).then(response => {
106 - this.sourceFlightRulesList = response.list; 108 +
107 - this.total = response.totalCount; 109 + this.sourceFlightRulesList = response.data.list;
110 + this.total = response.data.totalCount;
108 this.loading = false; 111 this.loading = false;
109 }); 112 });
110 113
...@@ -128,6 +131,7 @@ ...@@ -128,6 +131,7 @@
128 /** 搜索按钮操作 */ 131 /** 搜索按钮操作 */
129 handleQuery() { 132 handleQuery() {
130 this.queryParams.pageNum = 1; 133 this.queryParams.pageNum = 1;
134 + this.queryParams.start=0;
131 this.findSourceFlightRules(); 135 this.findSourceFlightRules();
132 } 136 }
133 137
......