Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem

@@ -52,6 +52,11 @@
                 </el-table-column>
                 </el-table-column>
             </el-table>
             </el-table>
         </div>
         </div>
+        <div class="pagination">
+            <el-pagination background layout="prev, pager, next,total" :total="total"
+                           :current-page="pageNo"       :page-size="pageSize"    @current-change="handleCurrentChange">
+            </el-pagination>
+        </div>
     </div>
     </div>
 </template>
 </template>
 
 
@@ -65,6 +70,10 @@
                 errorLog:[],
                 errorLog:[],
                 concreteLog:'',
                 concreteLog:'',
 
 
+                total: 0,
+                pageNo: 1,
+                pageSize: 50,
+
                 outerVisible: false,
                 outerVisible: false,
                 innerVisible: false,
                 innerVisible: false,
 
 
@@ -98,15 +107,21 @@
         methods:{
         methods:{
             getData(){
             getData(){
                 let data={
                 let data={
-                        "startTime": "",
-                        "pageNo": 1,
-                        "pageSize": 50
+                        "startTime": this.startValue,
+                        "endTime": this.endValue,
+                        "pageNo": this.pageNo,
+                        "pageSize": this.pageSize
                     };
                     };
                 getLogData(data).then((res)=>{
                 getLogData(data).then((res)=>{
                     console.log(res.result);
                     console.log(res.result);
                     this.tableData = res.result.records;
                     this.tableData = res.result.records;
+                    this.total = res.result.total
                 })
                 })
             },
             },
+            handleCurrentChange(val) {
+                this.pageNo = val;
+                this.getData();
+            },
             query(){
             query(){
                 let data={
                 let data={
                     "startTime": this.startValue,
                     "startTime": this.startValue,
@@ -175,5 +190,8 @@
         margin:10px;
         margin:10px;
     }
     }
 
 
+    .pagination {
+        padding: 18px 0;
+    }
 
 
 </style>
 </style>
\ No newline at end of file