diff --git a/src/assets/scss/modules/management/list-main.scss b/src/assets/scss/modules/management/list-main.scss
index ff0c8ab48..3aa73bc79 100644
--- a/src/assets/scss/modules/management/list-main.scss
+++ b/src/assets/scss/modules/management/list-main.scss
@@ -18,7 +18,7 @@
     }
 
     .search_form{
-      
+
     }
 
     .div_search_btn{
@@ -57,9 +57,11 @@
   }
 
   .div_table{
-    margin:15px 7px 7px;
-    // padding: 10px 20px;
+    margin:16px 7px 7px;
+    background: #FFFFFF;
+    box-shadow: 0px 6px 16px 0px rgba(0,0,0,0.08), 0px 3px 6px -4px rgba(0,0,0,0.12);
     position: relative;
+    padding:24px 16px 0;
 
     .div_btn {
       display: flex;
@@ -72,6 +74,7 @@
         .btn_upload {
           margin-left: 10px;
           display: flex;
+          text-align: center;
         }
       }
     
@@ -83,7 +86,7 @@
     }
 
     .div_table_item {
-      margin-top: 10px;
+      margin-top: 16px;
       position: relative;
     }
   }
@@ -109,41 +112,6 @@
   }
 }
 
-// .div_table {
-//   // background: #ffffff;
-//   // box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
-//   // border-radius: 4px;
-//   margin-top: 15px;
-//   // padding: 10px 20px;
-//   position: relative;
-
-  
-
-//   .div_btn {
-//     margin-top: 10px;
-//     // margin-left: 10px;
-//     display: flex;
-
-//     .btn_upload {
-//       margin-left: 10px;
-//       display: flex;
-//     }
-//   }
-//   .table {
-//     margin-top: 20px;
-
-//     .img-voice{
-//       width:30px;
-//       height:30px;
-//     }
-//   }
-
-//   .div_notice {
-//     position: absolute;
-//     left: 15px;
-//     bottom: 0;
-//   }
-// }
 
 .div-mult-form {
   margin-top: 20px;
diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue
index e99e4dd48..61072b2f7 100644
--- a/src/views/modules/base/community/buildTable.vue
+++ b/src/views/modules/base/community/buildTable.vue
@@ -4,53 +4,68 @@
     <div class="div_btn">
       <div class="div_btn_left">
         <el-button style=""
-                   class="diy-button--purple"
+                   class="diy-button--blue"
+                   icon="el-icon-plus"
                    size="small"
                    @click="handleAdd">新增楼栋</el-button>
 
-        <el-button style="margin-left:10px"
-                   class="diy-button--green"
-                   size="small"
-                   @click="handleExport">导出</el-button>
-
         <div class="btn_upload"
              v-if="showImportBtn">
 
-          <el-upload :headers="$getElUploadHeaders()"
-                     style=""
-                     ref="upload_building"
-                     :multiple='false'
-                     :show-file-list='false'
-                     :before-upload="((file)=>{beforeUpload(file, 'building')})"
-                     action=""
-                     accept=".xls,.xlsx"
-                     :http-request="(()=>{uploadFile( 'building')})">
-            <el-button style=""
-                       size="small"
-                       class="diy-button--yellow">导入楼栋数据</el-button>
-          </el-upload>
-
-          <el-upload :headers="$getElUploadHeaders()"
-                     style=""
-                     ref="upload_room"
-                     :multiple='false'
-                     :show-file-list='false'
-                     :before-upload="((file)=>{beforeUpload(file, 'room')})"
-                     action=""
-                     accept=".xls,.xlsx"
-                     :http-request="(()=>{uploadFile( 'room')})">
-            <el-button style="margin-left:10px"
-                       size="small"
-                       class="diy-button--orange">导入房屋数据</el-button>
-          </el-upload>
+          <el-popover popper-class="btn-popper"
+                      placement="bottom"
+                      width="20"
+                      trigger="hover">
+
+            <div class="table-more-btn">
+
+              <el-upload :headers="$getElUploadHeaders()"
+                         style="text-align: center"
+                         ref="upload_building"
+                         :multiple='false'
+                         :show-file-list='false'
+                         :before-upload="((file)=>{beforeUpload(file, 'building')})"
+                         action=""
+                         accept=".xls,.xlsx"
+                         :http-request="(()=>{uploadFile( 'building')})">
+                <el-button style=""
+                           size="small"
+                           type="text"
+                           class="diy-button--other">导入楼栋数据</el-button>
+              </el-upload>
+            </div>
 
-          <el-button style="margin-left:10px"
-                     class="diy-button--red"
-                     size="small"
-                     @click="deleteBatch">批量删除</el-button>
+            <div class="table-more-btn">
+              <el-upload :headers="$getElUploadHeaders()"
+                         style="text-align: center"
+                         ref="upload_room"
+                         :multiple='false'
+                         :show-file-list='false'
+                         :before-upload="((file)=>{beforeUpload(file, 'room')})"
+                         action=""
+                         accept=".xls,.xlsx"
+                         :http-request="(()=>{uploadFile( 'room')})">
+                <el-button size="small"
+                           type="text"
+                           class="diy-button--other">导入房屋数据</el-button>
+              </el-upload>
 
-        </div>
+            </div>
+            <el-button size="small"
+                       style="float:right"
+                       class="diy-button--white"
+                       slot="reference">导入<i class="el-icon-arrow-down el-icon--right"></i></el-button>
+          </el-popover>
 
+        </div>
+        <el-button style="margin-left:10px"
+                   class="diy-button--white"
+                   size="small"
+                   @click="handleExport">导出</el-button>
+        <el-button style="margin-left:10px"
+                   class="diy-button--white"
+                   size="small"
+                   @click="deleteBatch">批量删除</el-button>
       </div>
 
       <div class="div_btn_right">
@@ -96,7 +111,7 @@
           <el-button size="small"
                      style="float:right"
                      class="diy-button--white"
-                     slot="reference">更多操作<i class="el-icon-caret-bottom"></i></el-button>
+                     slot="reference">更多<i class="el-icon-arrow-down el-icon--right"></i></el-button>
         </el-popover>
       </div>
 
diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue
index aad16f3fe..32bec4824 100644
--- a/src/views/modules/base/community/community.vue
+++ b/src/views/modules/base/community/community.vue
@@ -37,150 +37,150 @@
         <el-form :inline="true"
                  ref="ref_searchform"
                  :label-width="'100px'">
-          <div class="search_form">
-            <el-form-item label="房主姓名"
-                          prop="ownerName">
-              <el-input v-model="ownerName"
-                        class="item_width_normal"
-                        size="small"
-                        clearable
-                        placeholder="请输入内容">
-
-              </el-input>
-            </el-form-item>
-            <el-form-item label="联系方式"
-                          prop="ownerPhone">
-              <el-input v-model="ownerPhone"
-                        class="item_width_normal"
-                        size="small"
-                        clearable
-                        placeholder="请输入手机">
-              </el-input>
-
-            </el-form-item>
-
-            <el-form-item label="房屋状态"
-                          prop="rentFlag">
-              <el-select class="item_width_normal"
-                         v-model="rentFlag"
-                         placeholder="请选择"
-                         size="small"
-                         clearable>
-                <el-option v-for="item in rentList"
-                           :key="item.value"
-                           :label="item.label"
-                           :value="item.value">
-                </el-option>
-              </el-select>
-            </el-form-item>
-
-            <el-form-item label="房屋用途"
-                          prop="purpose">
-              <el-select v-model="purpose"
-                         class="item_width_normal"
-                         placeholder="请选择"
-                         size="small"
-                         clearable>
-                <el-option v-for="item in purposeArr"
-                           :key="item.dictValue"
-                           :label="item.dictName"
-                           :value="item.dictValue">
-                </el-option>
-              </el-select>
-
-            </el-form-item>
-
-            <el-form-item label="更新时间"
-                          prop="updateStartDate">
-              <el-date-picker v-model="updateStartDate"
-                              :picker-options="startPickerOptions"
-                              class="item_width_daterange"
-                              size="small"
-                              type="date"
-                              value-format="yyyyMMdd"
-                              value="yyyy-MM-dd"
-                              placeholder="开始时间">
-              </el-date-picker>
-              <span class="data-tag">至</span>
-              <el-date-picker v-model="updateEndDate"
-                              :picker-options="endPickerOptions"
-                              class="item_width_daterange data-tag"
-                              size="small"
-                              type="date"
-                              value-format="yyyyMMdd"
-                              value="yyyy-MM-dd"
-                              placeholder="结束时间">
-              </el-date-picker>
-            </el-form-item>
-            <el-form-item label="备注"
-                          prop="remark">
-              <el-input v-model="remark"
-                        class="item_width_normal"
-                        size="small"
-                        clearable
-                        placeholder="请输入备注">
-              </el-input>
-            </el-form-item>
-
-            <el-form-item label="所属房屋"
-                          prop="neighborHoodId">
-              <el-select v-model.trim="neighborHoodId"
-                         :disabled="vDisabled"
-                         placeholder="小区"
-                         size="small"
-                         clearable
-                         class="item_width_communitycascader"
-                         @change="handleChangeV">
-                <el-option v-for="item in optionsV"
-                           :key="item.value"
-                           :label="item.label"
-                           :value="item.value">
-                </el-option>
-              </el-select>
-              <el-select v-model.trim="buildingId"
-                         placeholder="楼号"
-                         :disabled="!neighborHoodId || bDisabled"
-                         size="small"
-                         clearable
-                         class="item_width_buildcascader"
-                         style="margin-left:5px"
-                         @change="handleChangeB">
-                <el-option v-for="item in optionsB"
-                           :key="item.value"
-                           :label="item.label"
-                           :value="item.value">
-                </el-option>
-              </el-select>
-              <el-select v-model.trim="buildingUnitId"
-                         placeholder="单元"
-                         size="small"
-                         :disabled="!buildingId"
-                         clearable
-                         class="item_width_buildcascader"
-                         style="margin-left:5px"
-                         @change="handleChangeD">
-                <el-option v-for="item in optionsD"
-                           :key="item.value"
-                           :label="item.label"
-                           :value="item.value">
-                </el-option>
-              </el-select>
-              <el-select v-model.trim="houseId"
-                         placeholder="房号"
-                         :disabled="!buildingUnitId"
-                         size="small"
-                         clearable
-                         class="item_width_buildcascader"
-                         style="margin-left:5px">
-                <el-option v-for="item in optionsH"
-                           :key="item.value"
-                           :label="item.label"
-                           :value="item.value">
-                </el-option>
-              </el-select>
-            </el-form-item>
-
-          </div>
+          <!-- <div class="search_form"> -->
+          <el-form-item label="房主姓名"
+                        prop="ownerName">
+            <el-input v-model="ownerName"
+                      class="item_width_normal"
+                      size="small"
+                      clearable
+                      placeholder="请输入内容">
+
+            </el-input>
+          </el-form-item>
+          <el-form-item label="联系方式"
+                        prop="ownerPhone">
+            <el-input v-model="ownerPhone"
+                      class="item_width_normal"
+                      size="small"
+                      clearable
+                      placeholder="请输入手机">
+            </el-input>
+
+          </el-form-item>
+
+          <el-form-item label="房屋状态"
+                        prop="rentFlag">
+            <el-select class="item_width_normal"
+                       v-model="rentFlag"
+                       placeholder="请选择"
+                       size="small"
+                       clearable>
+              <el-option v-for="item in rentList"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="房屋用途"
+                        prop="purpose">
+            <el-select v-model="purpose"
+                       class="item_width_normal"
+                       placeholder="请选择"
+                       size="small"
+                       clearable>
+              <el-option v-for="item in purposeArr"
+                         :key="item.dictValue"
+                         :label="item.dictName"
+                         :value="item.dictValue">
+              </el-option>
+            </el-select>
+
+          </el-form-item>
+
+          <el-form-item label="更新时间"
+                        prop="updateStartDate">
+            <el-date-picker v-model="updateStartDate"
+                            :picker-options="startPickerOptions"
+                            class="item_width_daterange"
+                            size="small"
+                            type="date"
+                            value-format="yyyyMMdd"
+                            value="yyyy-MM-dd"
+                            placeholder="开始时间">
+            </el-date-picker>
+            <span class="data-tag">至</span>
+            <el-date-picker v-model="updateEndDate"
+                            :picker-options="endPickerOptions"
+                            class="item_width_daterange data-tag"
+                            size="small"
+                            type="date"
+                            value-format="yyyyMMdd"
+                            value="yyyy-MM-dd"
+                            placeholder="结束时间">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="备注"
+                        prop="remark">
+            <el-input v-model="remark"
+                      class="item_width_normal"
+                      size="small"
+                      clearable
+                      placeholder="请输入备注">
+            </el-input>
+          </el-form-item>
+
+          <el-form-item label="所属房屋"
+                        prop="neighborHoodId">
+            <el-select v-model.trim="neighborHoodId"
+                       :disabled="vDisabled"
+                       placeholder="小区"
+                       size="small"
+                       clearable
+                       class="item_width_communitycascader"
+                       @change="handleChangeV">
+              <el-option v-for="item in optionsV"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
+            <el-select v-model.trim="buildingId"
+                       placeholder="楼号"
+                       :disabled="!neighborHoodId || bDisabled"
+                       size="small"
+                       clearable
+                       class="item_width_buildcascader"
+                       style="margin-left:5px"
+                       @change="handleChangeB">
+              <el-option v-for="item in optionsB"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
+            <el-select v-model.trim="buildingUnitId"
+                       placeholder="单元"
+                       size="small"
+                       :disabled="!buildingId"
+                       clearable
+                       class="item_width_buildcascader"
+                       style="margin-left:5px"
+                       @change="handleChangeD">
+              <el-option v-for="item in optionsD"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
+            <el-select v-model.trim="houseId"
+                       placeholder="房号"
+                       :disabled="!buildingUnitId"
+                       size="small"
+                       clearable
+                       class="item_width_buildcascader"
+                       style="margin-left:5px">
+              <el-option v-for="item in optionsH"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+
+          <!-- </div> -->
           <div class="div_search_btn">
             <el-button size="small"
                        class="diy-button--white"
@@ -200,7 +200,7 @@
 
       </div>
 
-      <div class="div_table">
+      <div class="">
         <build-table v-if="selTreeObj.level==='neighborHood'&&!showRoomTable"
                      ref="ref_neighTable"
                      :staffAgencyId="staffAgencyId"
diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue
index d5d34e1ed..cfb17aa54 100644
--- a/src/views/modules/base/community/communityTable.vue
+++ b/src/views/modules/base/community/communityTable.vue
@@ -6,60 +6,80 @@
       <div class="div_btn_left">
         <el-button style=""
                    size="small"
-                   class="diy-button--purple"
+                   class="diy-button--blue"
+                   icon="el-icon-plus"
                    @click="handleAdd">新增小区</el-button>
-        <el-button style="margin-left:10px"
-                   class="diy-button--green"
-                   size="small"
-                   @click="handleExportOpen">导出</el-button>
-        <div class="btn_upload"
-             v-if="showImportBtn">
-
-          <el-upload :headers="$getElUploadHeaders()"
-                     ref="upload_community"
-                     style=""
-                     :multiple='false'
-                     :show-file-list='false'
-                     :before-upload="((file)=>{beforeUpload(file, 'community')})"
-                     action=""
-                     accept=".xls,.xlsx"
-                     :http-request="(()=>{uploadFile( 'community')})">
+
+        <div class="btn_upload">
+
+          <el-popover v-if="showImportBtn"
+                      popper-class="btn-popper"
+                      placement="bottom"
+                      width="20"
+                      trigger="click">
+
+            <div class="table-more-btn">
+              <el-upload :headers="$getElUploadHeaders()"
+                         ref="upload_community"
+                         style="text-align: center"
+                         :multiple='false'
+                         :show-file-list='false'
+                         :before-upload="((file)=>{beforeUpload(file, 'community')})"
+                         action=""
+                         accept=".xls,.xlsx"
+                         :http-request="(()=>{uploadFile( 'community')})">
+                <el-button size="small"
+                           type="text"
+                           class="diy-button--other">导入小区数据</el-button>
+              </el-upload>
+            </div>
+
+            <div class="table-more-btn">
+
+              <el-upload :headers="$getElUploadHeaders()"
+                         style="text-align: center"
+                         ref="upload_building"
+                         :multiple='false'
+                         :show-file-list='false'
+                         :before-upload="((file)=>{beforeUpload(file, 'building')})"
+                         action=""
+                         accept=".xls,.xlsx"
+                         :http-request="(()=>{uploadFile( 'building')})">
+                <el-button size="small"
+                           type="text"
+                           class="diy-button--other">导入楼栋数据</el-button>
+              </el-upload>
+            </div>
+
+            <div class="table-more-btn">
+              <el-upload :headers="$getElUploadHeaders()"
+                         style="text-align: center"
+                         ref="upload_room"
+                         :multiple='false'
+                         :show-file-list='false'
+                         :before-upload="((file)=>{beforeUpload(file, 'room')})"
+                         action=""
+                         accept=".xls,.xlsx"
+                         :http-request="(()=>{uploadFile( 'room')})">
+                <el-button size="small"
+                           type="text"
+                           class="diy-button--other">导入房屋数据</el-button>
+              </el-upload>
+            </div>
             <el-button size="small"
-                       class="diy-button--blue">导入小区数据</el-button>
-          </el-upload>
-
-          <el-upload :headers="$getElUploadHeaders()"
-                     style=""
-                     ref="upload_building"
-                     :multiple='false'
-                     :show-file-list='false'
-                     :before-upload="((file)=>{beforeUpload(file, 'building')})"
-                     action=""
-                     accept=".xls,.xlsx"
-                     :http-request="(()=>{uploadFile( 'building')})">
-            <el-button style="margin-left:10px"
-                       size="small"
-                       class="diy-button--yellow">导入楼栋数据</el-button>
-          </el-upload>
-
-          <el-upload :headers="$getElUploadHeaders()"
-                     style=""
-                     ref="upload_room"
-                     :multiple='false'
-                     :show-file-list='false'
-                     :before-upload="((file)=>{beforeUpload(file, 'room')})"
-                     action=""
-                     accept=".xls,.xlsx"
-                     :http-request="(()=>{uploadFile( 'room')})">
-            <el-button style="margin-left:10px"
-                       size="small"
-                       class="diy-button--orange">导入房屋数据</el-button>
-          </el-upload>
+                       style="float:right"
+                       class="diy-button--white"
+                       slot="reference">导入<i class="el-icon-arrow-down el-icon--right"></i></el-button>
+          </el-popover>
 
         </div>
+        <el-button style="margin-left:10px"
+                   class="diy-button--white"
+                   size="small"
+                   @click="handleExportOpen">导出</el-button>
 
         <el-button style="margin-left:10px"
-                   class="diy-button--red"
+                   class="diy-button--white"
                    size="small"
                    @click="deleteBatch">批量删除</el-button>
 
@@ -74,7 +94,7 @@
                     placement="bottom"
                     style="margin-left: 10px"
                     width="20"
-                    trigger="hover">
+                    trigger="click">
           <div v-if="showImportBtn"
                class="table-more-btn">
             <el-button class="diy-button--other"
@@ -134,7 +154,7 @@
           <el-button size="small"
                      style="float:right"
                      class="diy-button--white"
-                     slot="reference">更多操作<i class="el-icon-caret-bottom"></i></el-button>
+                     slot="reference">更多<i class="el-icon-arrow-down el-icon--right"></i></el-button>
         </el-popover>
       </div>
     </div>
@@ -145,7 +165,6 @@
                 border
                 :height="tableHeight"
                 v-loading="tableLoading"
-                :header-cell-style="tableHeaderStyle"
                 style="width: 100%"
                 :show-overflow-tooltip="true"
                 @select-all="selectAll"
@@ -309,7 +328,6 @@ export default {
       pageSize: 20,
       pageNo: 0,
       tableLoading: true,
-      // tableHeaderStyle: { background: 'linear-gradient(0deg, #005EB3 0%, #0083F0 100%)', color: '#FFFFFF', padding: '6px' },
 
       showImportBtn: false,//是否显示操作按钮，根据登录人所属组织判断
       roleList: [],//角色列表
diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue
index 51535f2f6..921b0b2b7 100644
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@@ -4,37 +4,55 @@
       <div class="div_btn_left">
         <el-button v-if="agencyObj.level === 'building' || source !== 'search'"
                    v-show="btnAuths.ic_house_add"
-                   class="diy-button--purple"
+                   class="diy-button--blue"
+                   icon="el-icon-plus"
                    size="small"
                    @click="handleAdd">新增房屋</el-button>
 
-        <el-button style="float: left; margin-left: 10px"
-                   v-if="btnAuths.ic_house_export"
-                   class="diy-button--green"
-                   size="small"
-                   @click="handleExport">导出</el-button>
         <div class="btn_upload"
              v-if="showImportBtn">
 
-          <el-upload ref="upload"
-                     v-if="btnAuths.ic_house_import"
-                     :multiple="false"
-                     :show-file-list="false"
-                     :before-upload="beforeUpload"
-                     action=""
-                     accept=".xls,.xlsx"
-                     :limit="1"
-                     :on-exceed="handleExceed"
-                     :http-request="uploadFile">
-            <el-button style=""
-                       size="small"
-                       class="diy-button--orange">导入房屋数据</el-button>
-          </el-upload>
+          <el-popover popper-class="btn-popper"
+                      placement="bottom"
+                      width="20"
+                      trigger="hover">
+
+            <div class="table-more-btn">
+
+              <el-upload ref="upload"
+                         v-if="btnAuths.ic_house_import"
+                         :multiple="false"
+                         style="text-align: center"
+                         :show-file-list="false"
+                         :before-upload="beforeUpload"
+                         action=""
+                         accept=".xls,.xlsx"
+                         :limit="1"
+                         :on-exceed="handleExceed"
+                         :http-request="uploadFile">
+                <el-button style=""
+                           size="small"
+                           type="text"
+                           class="diy-button--other">导入房屋数据</el-button>
+              </el-upload>
+            </div>
+
+            <el-button size="small"
+                       style="float:right"
+                       class="diy-button--white"
+                       slot="reference">导入<i class="el-icon-arrow-down el-icon--right"></i></el-button>
+          </el-popover>
+
         </div>
+        <el-button style="float: left; margin-left: 10px"
+                   v-if="btnAuths.ic_house_export"
+                   class="diy-button--white"
+                   size="small"
+                   @click="handleExport">导出</el-button>
 
         <el-button style="float: left; margin-left: 10px"
                    v-if="btnAuths.ic_house_batch_del"
-                   class="diy-button--red"
+                   class="diy-button--white"
                    size="small"
                    @click="deleteBatch">批量删除</el-button>
 
@@ -78,7 +96,7 @@
           <el-button size="small"
                      style="float:right"
                      class="diy-button--white"
-                     slot="reference">更多操作<i class="el-icon-caret-bottom"></i></el-button>
+                     slot="reference">更多<i class="el-icon-arrow-down el-icon--right"></i></el-button>
         </el-popover>
       </div>
     </div>