diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 228bf65..551c2d7 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -49,8 +49,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  //.edit_btn{
+  //  float:right;
+  //  margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+  //}
 </style>

diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 228bf65..551c2d7 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -49,8 +49,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  //.edit_btn{
+  //  float:right;
+  //  margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+  //}
 </style>
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 918c857..0d6a908 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -159,3 +159,13 @@
 .el-table td{
   padding: 4px 0px !important;
 }
+
+.upload-btn{
+  display: inline-block;
+}
+.el-button + .upload-btn {
+  margin-left: 3px;
+}
+.upload-btn+ .el-button {
+  margin-left: 3px;
+}

diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 228bf65..551c2d7 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -49,8 +49,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  //.edit_btn{
+  //  float:right;
+  //  margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+  //}
 </style>
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 918c857..0d6a908 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -159,3 +159,13 @@
 .el-table td{
   padding: 4px 0px !important;
 }
+
+.upload-btn{
+  display: inline-block;
+}
+.el-button + .upload-btn {
+  margin-left: 3px;
+}
+.upload-btn+ .el-button {
+  margin-left: 3px;
+}
diff --git a/src/views/wellManage/listWell.vue b/src/views/wellManage/listWell.vue
index 2392699..9c9e892 100644
--- a/src/views/wellManage/listWell.vue
+++ b/src/views/wellManage/listWell.vue
@@ -19,53 +19,53 @@
       </search-item>
     </search-area>
     <!--查询结果Table显示-->
-    <div>
-      <el-row class="table-title">
-        <el-col :span="6">
-          <div class="title-header">
-            <i class="el-icon-menu" />数据列表
-          </div>
-        </el-col>
-        <el-col :span="18" class="edit_btns">
-          <el-button v-if="hasPerm('/well/batchExport')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :total="total"
+      :query="listQuery"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+      @change="changePage"
+      @selection-change="handleSelectionChange"
+    >
+      <template slot="btns">
+        <el-button v-if="hasPerm('/well/add')" size="small" @click="add">
+          新增
+        </el-button>
+        <el-button v-if="hasPerm('/well/delete')" size="small" @click="del">
+          删除
+        </el-button>
+        <el-button v-if="hasPerm('/well/batchBfcf')" size="small" @click="batchBf">
+          一键布防
+        </el-button>
+        <el-button v-if="hasPerm('/well/batchBfcf')" size="small" @click="batchCf">
+          一键撤防
+        </el-button>
+        <download-template v-if="hasPerm('/well/batchImport')" :filename="filename" />
+        <el-upload
+          v-if="hasPerm('/well/batchImport')"
+          :limit="1"
+          :show-file-list="false"
+          :http-request="uploadFile"
+          :file-list="fileList"
+          action="string"
+          accept=".xls,.xlsx"
+          class="upload-btn"
+        >
+          <el-button slot="trigger" size="small">
+            批量导入
+          </el-button>
+          <el-button v-if="hasPerm('/well/batchExport')" :disabled="total===0" size="small" @click="batchExport">
             导出记录
           </el-button>
-          <!--<el-button v-if="hasPerm('/template/download')" class="edit_btn" size="small" @click="downloadTemplate">批量导入模板下载</el-button>-->
-          <download-template v-if="hasPerm('/well/batchImport')" :filename="filename" />
-          <el-upload
-            v-if="hasPerm('/well/batchImport')"
-            :limit="1"
-            :show-file-list="false"
-            :http-request="uploadFile"
-            :file-list="fileList"
-            action="string"
-            accept=".xls,.xlsx"
-            class="edit_btn"
-          >
-            <el-button slot="trigger" size="small">
-              批量导入
-            </el-button>
-          </el-upload>
-          <el-button v-if="hasPerm('/well/batchBfcf')" class="edit_btn" size="small" @click="batchBf">
-            一键布防
-          </el-button>
-          <el-button v-if="hasPerm('/well/batchBfcf')" class="edit_btn" size="small" @click="batchCf">
-            一键撤防
-          </el-button>
-          <el-button v-if="hasPerm('/well/delete')" class="edit_btn" size="small" @click="del">
-            删除
-          </el-button>
-          <el-button v-if="hasPerm('/well/add')" class="edit_btn" size="small" @click="add">
-            新增
-          </el-button>
-        </el-col>
-      </el-row>
-      <el-table v-loading="listLoading" :data="list" class="table" size="small" border @selection-change="handleSelectionChange">
-        <el-table-column align="center" type="selection" width="55" />
-        <el-table-column :index="indexMethod" align="center" type="index" />
+        </el-upload>
+      </template>
+      <template slot="columns">
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-button v-if="column.type=='Button' && scope.row.deviceCount>0" type="text" @click="goDeviceList(scope.row)">
+            <el-button v-if="column.type=='Button' && scope.row.deviceCount>0" type="text" size="mini" @click="goDeviceList(scope.row)">
               {{ scope.row[column.value] }}
             </el-button>
             <span v-else :class="column.class">{{ scope.row[column.value] }}</span>
@@ -91,24 +91,11 @@
             </el-button>
           </template>
         </el-table-column>
-      </el-table>
-    </div>
-    <!--分页-->
-    <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>
-
+      </template>
+    </normal-table>
+    <!--编辑井组件-->
     <edit-well ref="editwell" @watchChild="fetchData" />
+    <!--井详情组件-->
     <detail-well ref="detailwell" />
   </app-container>
 </template>
@@ -135,60 +122,20 @@
         order: 'asc'
       }, // 筛选条件
       columns: [
-        {
-          text: '点位编号',
-          value: 'wellCode',
-          align: 'center'
-        },
-        {
-          text: '点位名称',
-          value: 'wellName',
-          align: 'center'
-        },
-        {
-          text: '井深(m)',
-          value: 'deep',
-          align: 'center'
-        },
-        {
-          text: '详细地址',
-          value: 'position',
-          align: 'center'
-        },
-        {
-          text: '点位类型',
-          value: 'wellTypeName',
-          align: 'center'
-        },
-        {
-          text: '权属单位',
-          value: 'deptName',
-          align: 'center'
-        },
-        {
-          text: '设备数量',
-          value: 'deviceCount',
-          align: 'center',
-          type: 'Button'
-        },
-        {
-          text: '布防状态',
-          value: 'bfztName',
-          align: 'center'
-        }
+        { text: '点位编号', value: 'wellCode', align: 'center' },
+        { text: '点位名称', value: 'wellName', align: 'center' },
+        { text: '井深(m)', value: 'deep', align: 'center' },
+        { text: '详细地址', value: 'position', align: 'center' },
+        { text: '点位类型', value: 'wellTypeName', align: 'center' },
+        { text: '权属单位', value: 'deptName', align: 'center' },
+        { text: '设备数量', value: 'deviceCount', align: 'center', type: 'Button' },
+        { text: '布防状态', value: 'bfztName', align: 'center' }
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       total: 0, // 数据总数
       showWellType: true, // 是否显示点位类型下拉
-      wellTypeList: null, // 点位类型列表
-      deptProps: {
-        parent: 'pid',
-        value: 'id',
-        label: 'name',
-        children: 'children'
-      }, // 权属单位树形下拉菜单
-      deptTreeList: null, // 组织树列表数据
+      wellTypeList: [], // 点位类型列表
       deptShowTop: false, // 权属单位下拉是否显示顶级
       listLoading: true, // 加载动画
       fullscreenLoading: false, // 全屏加载动画
@@ -217,7 +164,6 @@
   methods: {
     // 打开详情对话框
     detail(row) {
-      console.log(row, '============++++')
       this.detailShow = true
       this.$refs.detailwell.initDialog(true, row)
     },
@@ -234,7 +180,6 @@
     },
     // 编辑井信息
     edit(row) {
-      console.log(row, '===row====')
       this.dialogFormVisible = true
       this.editShow = true
       this.$refs.editwell.initDialog(this.dialogFormVisible, row)
@@ -468,23 +413,18 @@
     goDeviceList(row) {
       this.$router.push({ name: 'DeviceList', query: { wellCode: row.wellCode }})
     },
+    // 去报警记录页
     goAlarmRecords(row) {
       this.$router.push({ name: 'AlarmRecords', query: { wellCode: row.wellCode }})
     },
-    handleSuccess() {
-      console.log('handleSuccess')
-    },
-    indexMethod(index) {
-      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
-    },
-    // 改变页容量
-    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()
     },
     // 多选触发方法
@@ -496,30 +436,5 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight:46px;
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 50px;
-  }
-  .table-title{
-    background-color:rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header{
-      line-height:$tableTitleHeight;
-      color: #606266;
-      font-size: 15px;
-      i{
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
-  .edit_btns{
-    .edit_btn{
-      float:right;
-      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-    }
-  }
+
 </style>