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

@@ -53,7 +53,7 @@ export default {
       cookiePassword: "",
       loginForm: {
         username: "root",
-        password: "123",
+        password: "123456",
         rememberMe: false
       },
       loginRules: {

@@ -39,8 +39,8 @@
 
       <el-table-column label="原航班" align="center" prop="sourceFlightNo"/>
       <el-table-column label="目的航班排序" align="center" prop="flightRank" width="280"/>
-      <el-table-column label="优先级" align="center" prop="priority"  />
-      <el-table-column label="周期" align="center" prop="dayOfWeek" />
+     <el-table-column label="优先级" align="center" prop="priority"  />
+      <el-table-column label="周期" align="center" prop="dayOfWeek"  width="180"/>
       <el-table-column label="状态" align="center" prop="status" :formatter="statusFormat" />
       <el-table-column label="开始时间" align="center" prop="startDate"  width="100"/>
       <el-table-column label="结束时间" align="center" prop="endDate" width="100"/>
@@ -71,7 +71,7 @@
         // 遮罩层
         loading: false,
         // 总条数
-        total: 110,
+        total: 0,
         // 原航班规则数据
         sourceFlightRulesList: [],
         statusList: [{'id':1,'name':'有效'}, {'id':2,'name':'配置中'},{'id':3,'name':'停用'}],
@@ -100,11 +100,14 @@
       findSourceFlightRules() {
         //this.loading = true;
         if (this.queryParams.pageNum > 1) {
-          this.queryParams.start = (this.queryParams.pageNum - 1) * this.queryParams.limit + 1
+          this.queryParams.start = (this.queryParams.pageNum - 1) * this.queryParams.limit
+        }else{
+          this.queryParams.start=0;
         }
        findSourceFlightRulesApi(this.queryParams).then(response => {
-        this.sourceFlightRulesList = response.list;
-        this.total = response.totalCount;
+
+        this.sourceFlightRulesList = response.data.list;
+        this.total = response.data.totalCount;
         this.loading = false;
       });
 
@@ -128,6 +131,7 @@
       /** 搜索按钮操作 */
       handleQuery() {
         this.queryParams.pageNum = 1;
+        this.queryParams.start=0;
         this.findSourceFlightRules();
       }