diff --git a/src/views/system/log/listLog.vue b/src/views/system/log/listLog.vue
index da954b9..931663b 100644
--- a/src/views/system/log/listLog.vue
+++ b/src/views/system/log/listLog.vue
@@ -1,67 +1,41 @@
 <template>
-  <div class="app-container">
+  <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-row>
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model.trim="listQuery.keywords" placeholder="日志名称" clearable/>
-          </el-form-item>
-          <!--<el-form-item class="selectForm-container-item" prop="keywords">-->
-          <!--<el-select v-model="listQuery.logType" placeholder="日志类型">-->
-          <!--<el-option-->
-          <!--v-for="item in logTypeList"-->
-          <!--:key="item.value"-->
-          <!--:label="item.name"-->
-          <!--:value="item.name"/>-->
-          <!--</el-select>-->
-          <!--</el-form-item>-->
-          <el-form-item class="selectForm-container-item">
-            <el-date-picker
-              v-model="listQuery.beginTime"
-              type="datetime"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              placeholder="选择开始时间"/>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item">
-            <el-date-picker
-              v-model="listQuery.endTime"
-              type="datetime"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              placeholder="选择结束时间"/>
-          </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
-          <el-button v-if="hasPerm('/log/clearAll')" class="filter-item" type="info" icon="el-icon-delete" @click="cleanAll">清空日志</el-button>
-        </el-row>
-      </el-form>
-    </div>
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="日志名称" clearable/>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="listQuery.beginTime"
+          type="datetime"
+          size="small"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          placeholder="选择开始时间"/>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="listQuery.endTime"
+          type="datetime"
+          size="small"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          placeholder="选择结束时间"/>
+      </search-item>
+      <template slot="btns">
+        <el-button v-if="hasPerm('/log/clearAll')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">清空日志</el-button>
+      </template>
+    </search-area>
     <!--查询结果Table显示-->
-    <el-table v-loading="listLoading" :data="list" class="table" border>
-      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" show-overflow-tooltip>
-        <template slot-scope="scope">
-          {{ scope.row[column.value] }}
-        </template>
-      </el-table-column>
-      <el-table-column label="" width="60">
-        <template slot-scope="scope">
-          <el-button type="primary" size="mini" plain @click="detail(scope.row)">详情</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[20,30,50]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
-  </div>
+    <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" @change="changePage">
+      <template slot="columns">
+        <el-table-column label="操作" width="70" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="detail(scope.row)">详情</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+  </app-container>
 </template>
 
 <script>
@@ -92,8 +66,7 @@
         },
         {
           text: '账户',
-          value: 'userName',
-          width: 50
+          value: 'userName'
         },
         {
           text: '时间',
@@ -170,14 +143,14 @@
         this.logTypeList = response.data
       })
     },
-    // 改变页容量
-    handleSizeChange(val) {
-      this.listQuery.limit = val
-      this.fetchData()
-    },
-    // 改变当前页
-    handleCurrentChange(val) {
-      this.listQuery.offset = val
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
       this.fetchData()
     }
   }

diff --git a/src/views/system/log/listLog.vue b/src/views/system/log/listLog.vue
index da954b9..931663b 100644
--- a/src/views/system/log/listLog.vue
+++ b/src/views/system/log/listLog.vue
@@ -1,67 +1,41 @@
 <template>
-  <div class="app-container">
+  <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-row>
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model.trim="listQuery.keywords" placeholder="日志名称" clearable/>
-          </el-form-item>
-          <!--<el-form-item class="selectForm-container-item" prop="keywords">-->
-          <!--<el-select v-model="listQuery.logType" placeholder="日志类型">-->
-          <!--<el-option-->
-          <!--v-for="item in logTypeList"-->
-          <!--:key="item.value"-->
-          <!--:label="item.name"-->
-          <!--:value="item.name"/>-->
-          <!--</el-select>-->
-          <!--</el-form-item>-->
-          <el-form-item class="selectForm-container-item">
-            <el-date-picker
-              v-model="listQuery.beginTime"
-              type="datetime"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              placeholder="选择开始时间"/>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item">
-            <el-date-picker
-              v-model="listQuery.endTime"
-              type="datetime"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              placeholder="选择结束时间"/>
-          </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
-          <el-button v-if="hasPerm('/log/clearAll')" class="filter-item" type="info" icon="el-icon-delete" @click="cleanAll">清空日志</el-button>
-        </el-row>
-      </el-form>
-    </div>
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="日志名称" clearable/>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="listQuery.beginTime"
+          type="datetime"
+          size="small"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          placeholder="选择开始时间"/>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="listQuery.endTime"
+          type="datetime"
+          size="small"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          placeholder="选择结束时间"/>
+      </search-item>
+      <template slot="btns">
+        <el-button v-if="hasPerm('/log/clearAll')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">清空日志</el-button>
+      </template>
+    </search-area>
     <!--查询结果Table显示-->
-    <el-table v-loading="listLoading" :data="list" class="table" border>
-      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" show-overflow-tooltip>
-        <template slot-scope="scope">
-          {{ scope.row[column.value] }}
-        </template>
-      </el-table-column>
-      <el-table-column label="" width="60">
-        <template slot-scope="scope">
-          <el-button type="primary" size="mini" plain @click="detail(scope.row)">详情</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[20,30,50]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
-  </div>
+    <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" @change="changePage">
+      <template slot="columns">
+        <el-table-column label="操作" width="70" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="detail(scope.row)">详情</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+  </app-container>
 </template>
 
 <script>
@@ -92,8 +66,7 @@
         },
         {
           text: '账户',
-          value: 'userName',
-          width: 50
+          value: 'userName'
         },
         {
           text: '时间',
@@ -170,14 +143,14 @@
         this.logTypeList = response.data
       })
     },
-    // 改变页容量
-    handleSizeChange(val) {
-      this.listQuery.limit = val
-      this.fetchData()
-    },
-    // 改变当前页
-    handleCurrentChange(val) {
-      this.listQuery.offset = val
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
       this.fetchData()
     }
   }
diff --git a/src/views/system/log/loginLog.vue b/src/views/system/log/loginLog.vue
index 9e11c6f..3f820b3 100644
--- a/src/views/system/log/loginLog.vue
+++ b/src/views/system/log/loginLog.vue
@@ -1,53 +1,34 @@
 <template>
-  <div class="app-container">
+  <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-row>
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model.trim="listQuery.keywords" placeholder="日志名称" clearable/>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item">
-            <el-date-picker
-              v-model="listQuery.beginTime"
-              type="datetime"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              placeholder="选择开始时间"/>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item">
-            <el-date-picker
-              v-model="listQuery.endTime"
-              type="datetime"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              placeholder="选择结束时间"/>
-          </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
-          <el-button v-if="hasPerm('/log/clearAll')" class="filter-item" type="info" icon="el-icon-delete" @click="cleanAll">清空日志</el-button>
-        </el-row>
-      </el-form>
-    </div>
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="日志名称" clearable/>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="listQuery.beginTime"
+          type="datetime"
+          size="small"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          placeholder="选择开始时间"/>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="listQuery.endTime"
+          type="datetime"
+          size="small"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          placeholder="选择结束时间"/>
+      </search-item>
+    </search-area>
     <!--查询结果Table显示-->
-    <el-table v-loading="listLoading" :data="list" class="table" border>
-      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" show-overflow-tooltip>
-        <template slot-scope="scope">
-          {{ scope.row[column.value] }}
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[20,30,50]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
-  </div>
+    <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" @change="changePage">
+      <template slot="btns">
+        <el-button v-if="hasPerm('/log/clearAll')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">清空日志</el-button>
+      </template>
+    </normal-table>
+  </app-container>
 </template>
 
 <script>
@@ -73,18 +54,15 @@
         },
         {
           text: '账户',
-          value: 'userName',
-          width: 50
+          value: 'userName'
         },
         {
           text: '登录ip',
-          value: 'ip',
-          width: 50
+          value: 'ip'
         },
         {
           text: '操作成功与否',
-          value: 'succeed',
-          width: 50
+          value: 'succeed'
         },
         {
           text: '时间',
@@ -146,14 +124,14 @@
         this.listLoading = false
       })
     },
-    // 改变页容量
-    handleSizeChange(val) {
-      this.listQuery.limit = val
-      this.fetchData()
-    },
-    // 改变当前页
-    handleCurrentChange(val) {
-      this.listQuery.offset = val
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
       this.fetchData()
     }
   }