diff --git a/src/views/components/resiTransfer.vue b/src/views/components/resiTransfer.vue
index 4daef451..68dfc49e 100644
--- a/src/views/components/resiTransfer.vue
+++ b/src/views/components/resiTransfer.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div  class="dialog-h-content scroll-h">
+    <div class="dialog-h-content scroll-h">
       <el-form ref="ref_form"
                :inline="false"
                :model="dataForm"
@@ -119,13 +119,13 @@
                  @click="handleComfirm">确 定</el-button>
     </div> -->
     <div class="resi-btns">
-        <el-button size="small"
-                   @click="handleCancle">取消</el-button>
-        <el-button type="primary"
-                   size="small"
-                   :loading="btnDisable"
-                   @click="handleComfirm">提交</el-button>
-      </div>
+      <el-button size="small"
+                 @click="handleCancle">取消</el-button>
+      <el-button type="primary"
+                 size="small"
+                 :loading="btnDisable"
+                 @click="handleComfirm">提交</el-button>
+    </div>
   </div>
 </template>
 
@@ -368,7 +368,7 @@ export default {
 
 
             if (!this.dataForm.newBuildingId) {
-              this.$message.warning('请选择楼宇')
+              this.$message.warning('楼栋')
               return false
             }
             if (!this.dataForm.newBuildingUnitId) {
diff --git a/src/views/modules/base/collect.vue b/src/views/modules/base/collect.vue
index 155f675e..7a394a0c 100644
--- a/src/views/modules/base/collect.vue
+++ b/src/views/modules/base/collect.vue
@@ -1,91 +1,134 @@
 <template>
   <div class="resi-container">
-    <el-card ref="searchCard" class="search-card">
-         <el-form ref="searchForm" :inline="true" :model="fmData" class="demo-form-inline">
-           <el-form-item v-if="communityList.length > 0" label="所在社区" prop="orgId">
-            <el-select
-                  v-model.trim="fmData.orgId"
-                  placeholder="所在社区"
-                  size="small"
-                  clearable
-                  class="resi-cell-input"
-                >
-                  <el-option
-                    v-for="item in communityList"
-                    :key="item.orgId"
-                    :label="item.orgName"
-                    :value="item.orgId"
-                  >
-                  </el-option>
-                </el-select>
-          </el-form-item>
-          <el-form-item label="居住地址" prop="address">
-            <el-input
-              v-model="fmData.address"
-              class="resi-cell-input"
-              size="small"
-              clearable
-              placeholder="请输入"
-            >
-            </el-input>
-          </el-form-item>
-          <el-form-item label="填写时间" prop="startTime">
-            <el-date-picker
-              v-model="timeRange"
-              type="daterange"
-              clearable
-              size="small"
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              value-format="yyyy-MM-dd"
-            >
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item>
-            <el-button class="diy-button--search" size="small" @click="handleSearch">查询</el-button>
-            <el-button class="diy-button--reset" size="small" @click="resetForm('searchForm')">重置</el-button>
-          </el-form-item>
-        </el-form>
-      
-      </el-card>
+    <el-card ref="searchCard"
+             class="search-card">
+      <el-form ref="searchForm"
+               :inline="true"
+               :model="fmData"
+               class="demo-form-inline">
+        <el-form-item v-if="communityList.length > 0"
+                      label="所在社区"
+                      prop="orgId">
+          <el-select v-model.trim="fmData.orgId"
+                     placeholder="所在社区"
+                     size="small"
+                     clearable
+                     class="resi-cell-input">
+            <el-option v-for="item in communityList"
+                       :key="item.orgId"
+                       :label="item.orgName"
+                       :value="item.orgId">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="居住地址"
+                      prop="address">
+          <el-input v-model="fmData.address"
+                    class="resi-cell-input"
+                    size="small"
+                    clearable
+                    placeholder="请输入">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="填写时间"
+                      prop="startTime">
+          <el-date-picker v-model="timeRange"
+                          type="daterange"
+                          clearable
+                          size="small"
+                          range-separator="至"
+                          start-placeholder="开始日期"
+                          end-placeholder="结束日期"
+                          value-format="yyyy-MM-dd">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item>
+          <el-button class="diy-button--search"
+                     size="small"
+                     @click="handleSearch">查询</el-button>
+          <el-button class="diy-button--reset"
+                     size="small"
+                     @click="resetForm('searchForm')">重置</el-button>
+        </el-form-item>
+      </el-form>
+
+    </el-card>
     <el-card class="resi-card-table">
       <div class="resi-row-btn">
 
-        <el-button @click="handleChu" class="diy-button--reset" size="small"
-          >导出</el-button
-        >
+        <el-button @click="handleChu"
+                   class="diy-button--reset"
+                   size="small">导出</el-button>
       </div>
-      <el-table
-        :data="tableData"
-        border
-        style="width: 100%"
-        class="resi-table"
-        :height="tableHeight"
-        :span-method="arraySpanMethod"
-      >
-        <el-table-column label="序号" prop="desc" align="center" width="50" />
-        <el-table-column prop="houseHolderName" width="120" label="户主姓名" align="center" />
-        <el-table-column prop="address"  align="center" label="居住地址" :show-overflow-tooltip="true" />
-        <el-table-column prop="houseType" align="center" width="120" label="自有/租住" >
+      <el-table :data="tableData"
+                border
+                style="width: 100%"
+                class="resi-table"
+                :height="tableHeight"
+                :span-method="arraySpanMethod">
+        <el-table-column label="序号"
+                         prop="desc"
+                         align="center"
+                         width="50" />
+        <el-table-column prop="houseHolderName"
+                         width="100"
+                         label="户主姓名"
+                         align="center" />
+        <el-table-column prop="address"
+                         align="center"
+                         min-width="140"
+                         label="居住地址"
+                         :show-overflow-tooltip="true" />
+        <el-table-column prop="houseType"
+                         align="center"
+                         width="100"
+                         label="自有/租住">
           <template slot-scope="scope">
             <span>
               {{ scope.row.houseType == '1' ? '自有' : '租住' }}
             </span>
           </template>
         </el-table-column>
-        <el-table-column prop="totalResi" width="120" align="center" label="居住成员人数" />
-        <el-table-column prop="memberName" width="120" label="成员姓名" align="center" :show-overflow-tooltip="true" />
-        <el-table-column prop="memberIdNum" width="180" align="center" label="成员身份证" />
-        <el-table-column prop="memberMobile" width="140" align="center" label="成员手机号" />
-        <el-table-column prop="heSuanCount" width="140" align="center" label="参加几轮核酸检测 " />
-        <el-table-column prop="ymjz" width="140" align="center" label="疫苗接种情况">
+        <el-table-column prop="totalResi"
+                         width="80"
+                         align="center"
+                         label="居住人数" />
+        <el-table-column prop="memberName"
+                         width="100"
+                         label="成员姓名"
+                         align="center"
+                         :show-overflow-tooltip="true" />
+        <el-table-column prop="memberIdNum"
+                         width="180"
+                         align="center"
+                         label="成员身份证" />
+        <el-table-column prop="memberMobile"
+                         width="140"
+                         align="center"
+                         label="成员手机号" />
+        <el-table-column prop="heSuanCount"
+                         width="120"
+                         align="center"
+                         label="核酸检测次数" />
+
+        <el-table-column prop="ymjz"
+                         width="140"
+                         align="center"
+                         label="疫苗接种情况">
           <template slot-scope="scope">
             <span v-if="scope.row.ymjz == 1">全程接种</span>
             <span v-if="scope.row.ymjz == 2">未全程接种</span>
             <span v-if="scope.row.ymjz == 0">未接种</span>
           </template>
         </el-table-column>
+        <el-table-column prop="domicilePlace"
+                         min-width="140"
+                         align="center"
+                         label="户籍所在地 " />
+        <el-table-column prop="workPlace"
+                         min-width="120"
+                         align="center"
+                         label="单位或学校 " />
         <!-- <el-table-column prop="organizationCreatedTime" align="center" label="创建时间"> -->
         <!-- <el-table-column fixed="right" label="操作" align="center" width="100">
           <template slot-scope="scope">
@@ -123,30 +166,26 @@
         </el-table-column> -->
       </el-table>
       <div>
-        <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :current-page.sync="pageNo"
-          :page-sizes="[20, 50, 100, 200]"
-          :page-size="parseInt(pageSize)"
-          layout="sizes, prev, pager, next, total"
-          :total="total"
-        >
+        <el-pagination @size-change="handleSizeChange"
+                       @current-change="handleCurrentChange"
+                       :current-page.sync="pageNo"
+                       :page-sizes="[20, 50, 100, 200]"
+                       :page-size="parseInt(pageSize)"
+                       layout="sizes, prev, pager, next, total"
+                       :total="total">
         </el-pagination>
       </div>
     </el-card>
 
     <!-- 修改弹出框 -->
-    <el-dialog
-      :visible.sync="formShow"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      :title="formTitle"
-      width="850px"
-      top="5vh"
-      class="dialog-h"
-      @closed="handleClose"
-    >
+    <el-dialog :visible.sync="formShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="formTitle"
+               width="850px"
+               top="5vh"
+               class="dialog-h"
+               @closed="handleClose">
       <!-- <edit-form
         ref="eleEditForm"
         @dialogCancle="handleClose"
@@ -163,7 +202,7 @@ import { mapGetters } from "vuex";
 import axios from "axios";
 
 export default {
-  data() {
+  data () {
     return {
       openSearch: false,
 
@@ -190,14 +229,14 @@ export default {
   },
   computed: {
     ...mapGetters(['clientHeight', 'iframeHeight']),
-    tableHeight() {
+    tableHeight () {
       const h = this.clientHeight - 360 + this.iframeHeigh
       const _h = this.clientHeight - 360
       return this.$store.state.inIframe ? h : _h
     }
   },
   watch: {
-    timeRange(val) {
+    timeRange (val) {
       if (Array.isArray(val) && val.length == 2) {
         this.fmData.startTime = val[0];
         this.fmData.endTime = val[1];
@@ -207,12 +246,12 @@ export default {
       }
     },
   },
-  mounted() {
+  mounted () {
     this.getcommunityList()
     this.getTableData();
   },
   methods: {
-    arraySpanMethod({ row, column, rowIndex, columnIndex }) {
+    arraySpanMethod ({ row, column, rowIndex, columnIndex }) {
       // console.log('row-----r', row)
       // console.log('column-----c', column)
       if (columnIndex === 0 || columnIndex === 1 || columnIndex === 2 || columnIndex === 3 || columnIndex === 4) {
@@ -230,7 +269,7 @@ export default {
         }
       }
     },
-    async handleChu() {
+    async handleChu () {
       const url =
         "/epmetuser/icresicollect/export";
       const { pageSize, pageNo, fmData } = this;
@@ -265,49 +304,49 @@ export default {
           return this.$message.error("网络错误");
         });
     },
-    handleSizeChange(val) {
+    handleSizeChange (val) {
       console.log(`每页 ${val} 条`);
       this.pageSize = val;
       window.localStorage.setItem("pageSize", val);
       this.getTableData();
     },
-    handleCurrentChange(val) {
+    handleCurrentChange (val) {
       console.log(`当前页: ${val}`);
       this.pageNo = val;
       this.getTableData();
     },
 
-    handleClose() {
+    handleClose () {
       this.formShow = false;
     },
-    handleSearch(val) {
+    handleSearch (val) {
       console.log(this.fmData);
       this.pageNo = 1;
       this.getTableData();
     },
-    resetForm(formName) {
+    resetForm (formName) {
       this.$refs[formName].resetFields()
       this.timeRange = ''
       this.handleSearch()
     },
 
-    async handleWatch(rowIndex) {
+    async handleWatch (rowIndex) {
       this.formShow = true;
       await nextTick();
       this.$refs.eleEditForm.initForm("detail", this.tableData[rowIndex]);
     },
 
-    async handleEdit(rowIndex) {
+    async handleEdit (rowIndex) {
       this.formShow = true;
       await nextTick();
       this.$refs.eleEditForm.initForm("edit", this.tableData[rowIndex]);
     },
-    handleEditSuccess() {
+    handleEditSuccess () {
       this.handleClose();
       this.getTableData();
     },
 
-    async handleDel(rowData, rowIndex) {
+    async handleDel (rowData, rowIndex) {
       console.log(rowData, rowIndex);
       const url =
         "/heart/iccommunityselforganization/delcommunityselforganization";
@@ -324,7 +363,7 @@ export default {
         this.$message.success("操作失败！");
       }
     },
-    async getcommunityList() {
+    async getcommunityList () {
       const url =
         "/gov/org/agency/community-list";
       const { data, code, msg } = await requestPost(url);
@@ -334,7 +373,7 @@ export default {
       } else {
       }
     },
-    async getTableData() {
+    async getTableData () {
       const url =
         "/epmetuser/icresicollect/list";
       const { pageSize, pageNo, fmData } = this;
@@ -349,8 +388,8 @@ export default {
         let _i = 0
         let arr = []
         this.spanIndex = data.list && data.list.map((item, index) => {
-         if (index == 0) _i = 0
-         else _i = _i + data.list[index - 1].list.length
+          if (index == 0) _i = 0
+          else _i = _i + data.list[index - 1].list.length
           arr.push(_i)
           console.log('_i-----', _i, arr)
           // if (index === data.list.length - 1) firstIndex = _i - item.list.length
@@ -365,14 +404,14 @@ export default {
       }
     },
     // 数组扁平化
-    formatArr(arr) {
+    formatArr (arr) {
       let res = []
       let arr1 = arr.map((n, index) => {
         return {
           ...n,
-          list: n.list.length> 0 ? n.list.map(i => {
+          list: n.list.length > 0 ? n.list.map(i => {
             return {
-              
+
               ...n,
               ...i,
               desc: index + 1,
@@ -427,5 +466,4 @@ export default {
   position: relative;
   overflow: visible;
 }
-
 </style>
diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue
index 9f3b7da9..6fcb0779 100644
--- a/src/views/modules/base/community/community.vue
+++ b/src/views/modules/base/community/community.vue
@@ -96,7 +96,7 @@
                   ref="ref_buildingTable"
                   @refreshTree="refreshTree"></room-table>
 
-      <community-table v-if="(selTreeObj.level!=='building'||selTreeObj.level!=='neighborHood')&&!showRoomTable"
+      <community-table v-if="selTreeObj.level!=='building'&&selTreeObj.level!=='neighborHood'&&!showRoomTable"
                        @toNextLevel="toNextLevel"
                        :staffAgencyId="staffAgencyId"
                        ref="ref_communityTable"
@@ -195,7 +195,7 @@ export default {
       if (this.ownerName || this.ownerPhone || this.rentState) {
         this.showRoomTable = true
         this.$nextTick(() => {
-          this.$refs['ref_buildingTable'].loadTable(false, this.selTreeObj, this.ownerName, this.ownerPhone, this.rentState)
+          this.$refs['ref_buildingTable'].loadTable(true, this.selTreeObj, this.ownerName, this.ownerPhone, this.rentState)
         })
       } else {
         this.$message.warning('请输入查询条件')
diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue
index 671b61dd..db301ce2 100644
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@@ -227,9 +227,15 @@ export default {
       return isChecked
     },
 
+    loadTreeFromSearch () {
+
+    },
+
     async loadTable (fromTree, treeObj, ownerName, ownerPhone, rentFlag) {
+
       this.tableLoading = true
       let params
+
       if (fromTree) {
         this.agencyObj = treeObj
         // if (this.agencyObj.level === 'community') {//只有社区和网格显示操作按钮
@@ -247,28 +253,29 @@ export default {
         // } else {
         //   this.showImportBtn = false
         // }
-        params = {
-          pageSize: this.pageSize,
-          pageNo: this.pageNo,
-          level: this.agencyObj.level,
-          id: this.agencyObj.id,
-        }
-      } else {
-        params = {
-          pageSize: this.pageSize,
-          pageNo: this.pageNo,
-          level: this.agencyObj.level,
-          id: this.agencyObj.id,
-        }
+
+      }
+      params = {
+        pageSize: this.pageSize,
+        pageNo: this.pageNo,
+        level: this.agencyObj.level,
+        id: this.agencyObj.id,
+      }
+
+      if (ownerName) {
         params.ownerName = ownerName
+
+      }
+      if (ownerPhone) {
         params.ownerPhone = ownerPhone
+
+      }
+      if (rentFlag) {
         params.rentFlag = rentFlag
       }
 
       const url = "/gov/org/house/houselist"
 
-
-
       const { data, code, msg } = await requestPost(url, params)
 
       if (code === 0) {
diff --git a/src/views/modules/base/epidemic/natFocus/natFocusAdd.vue b/src/views/modules/base/epidemic/natFocus/natFocusAdd.vue
index 5e4861ac..f326af6f 100644
--- a/src/views/modules/base/epidemic/natFocus/natFocusAdd.vue
+++ b/src/views/modules/base/epidemic/natFocus/natFocusAdd.vue
@@ -127,8 +127,17 @@
                   </el-option>
                 </el-select>
               </el-form-item>
-
+              <el-form-item label="核酸检测次数小于"
+                            label-width="150px">
+                <el-input-number class="item_width_3"
+                                 v-model="formDataSearch.natCount"
+                                 size="mini"
+                                 :min="0"
+                                 :max="20"
+                                 label="核酸检测次数小于"></el-input-number>
+              </el-form-item>
               <el-form-item label="检测时间"
+                            label-width="80px"
                             prop="startTime">
                 <el-date-picker v-model="timeRange"
                                 size="mini"
@@ -142,15 +151,7 @@
                 </el-date-picker>
 
               </el-form-item>
-              <el-form-item label="核酸检测次数小于"
-                            label-width="150px">
-                <el-input-number class="item_width_3"
-                                 v-model="formDataSearch.natCount"
-                                 size="mini"
-                                 :min="0"
-                                 :max="20"
-                                 label="核酸检测次数小于"></el-input-number>
-              </el-form-item>
+
               <el-button style="margin-left:30px"
                          size="mini"
                          class="diy-button--search"
@@ -400,11 +401,11 @@ export default {
     },
 
     async initForm () {
-
+      this.tableData = []
       this.$refs['ref_form1'].resetFields();
       this.$refs['ref_form2'].resetFields();
 
-      await this.loadTable()
+      // await this.loadTable()
 
     },
 
diff --git a/src/views/modules/base/epidemic/natFocus/natFocusList.vue b/src/views/modules/base/epidemic/natFocus/natFocusList.vue
index 01619239..011cbc1b 100644
--- a/src/views/modules/base/epidemic/natFocus/natFocusList.vue
+++ b/src/views/modules/base/epidemic/natFocus/natFocusList.vue
@@ -211,33 +211,33 @@
                          header-align="center"
                          align="center"
                          label="身份证"
-                         min-width="170">
+                         width="170">
         </el-table-column>
         <el-table-column prop="allName"
                          header-align="center"
                          align="center"
                          label="所属房屋"
-                         min-width="170">
+                         min-width="200">
         </el-table-column>
         <el-table-column prop="reason"
                          header-align="center"
                          align="center"
                          label="关注原因"
-                         width="100">
+                         width="180">
         </el-table-column>
         <el-table-column prop="remark"
                          header-align="center"
                          align="center"
                          show-overflow-tooltip
                          label="备注"
-                         min-width="230">
+                         min-width="180">
         </el-table-column>
         <el-table-column prop="lastInformTime"
                          header-align="center"
                          align="center"
                          show-overflow-tooltip
                          label="最后一次通知时间"
-                         min-width="120">
+                         width="170">
         </el-table-column>
 
         <el-table-column label="操作"
diff --git a/src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue b/src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue
index fee1798f..578e0b10 100644
--- a/src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue
+++ b/src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue
@@ -384,11 +384,11 @@ export default {
       this.formData2.content = ''
     },
     async initForm () {
-
+      this.tableData = []
       this.$refs['ref_form1'].resetFields();
       this.$refs['ref_form2'].resetFields();
 
-      await this.loadTable()
+      // await this.loadTable()
 
     },
 
diff --git a/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue b/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
index 074761f4..20341268 100644
--- a/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
+++ b/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
@@ -205,40 +205,40 @@
                          header-align="center"
                          align="center"
                          label="身份证"
-                         min-width="170">
+                         width="170">
         </el-table-column>
         <el-table-column prop="allName"
                          header-align="center"
                          align="center"
                          label="所属房屋"
-                         min-width="170">
+                         min-width="200">
         </el-table-column>
         <el-table-column prop="vaccinationCount"
                          header-align="center"
                          align="center"
                          label="接种针次"
-                         width="100">
+                         width="90">
         </el-table-column>
         <el-table-column prop="reason"
                          header-align="center"
                          align="center"
                          show-overflow-tooltip
                          label="关注原因"
-                         min-width="230">
+                         min-width="180">
         </el-table-column>
         <el-table-column prop="remark"
                          header-align="center"
                          align="center"
                          show-overflow-tooltip
                          label="备注"
-                         min-width="200">
+                         min-width="180">
         </el-table-column>
         <el-table-column prop="lastInformTime"
                          header-align="center"
                          align="center"
                          show-overflow-tooltip
                          label="最后一次通知时间"
-                         min-width="120">
+                         width="160">
         </el-table-column>
 
         <el-table-column label="操作"
@@ -716,7 +716,8 @@ export default {
 
 
     addFormOk () {
-      this.sendNoticeFormShow = false
+      this.addFormShow = false
+      this.editFormShow = false
       this.loadTable()
 
     },
diff --git a/src/views/modules/workSys/resiCate.vue b/src/views/modules/workSys/resiCate.vue
index 4c1914b9..8deb8b7e 100644
--- a/src/views/modules/workSys/resiCate.vue
+++ b/src/views/modules/workSys/resiCate.vue
@@ -1,188 +1,198 @@
 <template>
-  <div v-if="pageLoading" class="resi-container">
-    <el-card ref="searchCard" class="search-card">
-      <div >
-        <el-form ref="searchForm" :inline="true" :model="form" class="demo-form-inline">
+  <div v-if="pageLoading"
+       class="resi-container">
+    <el-card ref="searchCard"
+             class="search-card">
+      <div>
+        <el-form ref="searchForm"
+                 :inline="true"
+                 :model="form"
+                 class="demo-form-inline">
           <el-form-item label="是否预警">
-            <el-select
-              v-model="isWarn"
-              placeholder="请选择"
-              size="small"
-              clearable
-            >
-              <el-option
-                v-for="item in options"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
-                </el-option>
+            <el-select v-model="isWarn"
+                       placeholder="请选择"
+                       size="small"
+                       clearable>
+              <el-option v-for="item in options"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="预警类型">
-            <el-select
-              v-model="level"
-              placeholder="请选择"
-              size="small"
-              clearable
-            >
-              <el-option
-                v-for="item in optionsType"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
-                </el-option>
+            <el-select v-model="level"
+                       placeholder="请选择"
+                       size="small"
+                       clearable>
+              <el-option v-for="item in optionsType"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
             </el-select>
           </el-form-item>
           <el-form-item>
-            <el-button class="diy-button--search" size="small" @click="handleSearch">查询</el-button>
+            <el-button class="diy-button--search"
+                       size="small"
+                       @click="handleSearch">查询</el-button>
           </el-form-item>
           <el-form-item>
-            <el-button class="diy-button--reset" size="small" @click="resetForm('searchForm')">重置</el-button>
+            <el-button class="diy-button--reset"
+                       size="small"
+                       @click="resetForm('searchForm')">重置</el-button>
           </el-form-item>
-          
+
         </el-form>
       </div>
     </el-card>
     <el-card class="resi-card-table">
-      
-      <el-table
-        :data="tableData"
-        row-key="id"
-        v-loading="tableLoading"
-        border
-        :height="tableHeight"
-        style="width: 100%"
-        class="resi-table"
-      >
-        <el-table-column label="序号" type="index" align="center" width="50">
+
+      <el-table :data="tableData"
+                row-key="id"
+                v-loading="tableLoading"
+                border
+                :height="tableHeight"
+                style="width: 100%"
+                class="resi-table">
+        <el-table-column label="序号"
+                         type="index"
+                         align="center"
+                         width="50">
         </el-table-column>
-        <el-table-column
-          v-for="item in tableHeader"
-          :key="item.columnName"
-          :prop="item.columnName"
-          :label="item.label"
-          align="center"
-          min-width="180"
-        >
+        <el-table-column v-for="item in tableHeader"
+                         :key="item.columnName"
+                         :prop="item.columnName"
+                         :label="item.label"
+                         align="center"
+                         min-width="180">
           <template slot-scope="scope">
-            <el-image
-            v-if="filterImage(item.columnName)"
-            style="width: 70px; height: 70px"
-            :src="handleFilterSpan(scope.row, item) "
-            fit="fill"></el-image>
+            <el-image v-if="filterImage(item.columnName)"
+                      style="width: 70px; height: 70px"
+                      :src="handleFilterSpan(scope.row, item) "
+                      fit="fill"></el-image>
             <span v-else>{{ handleFilterSpan(scope.row, item) }}</span>
           </template>
         </el-table-column>
-        <el-table-column fixed="right" label="操作" align="center" width="120">
+        <el-table-column fixed="right"
+                         label="操作"
+                         align="center"
+                         width="120">
           <template slot-scope="scope">
-            <el-button
-              @click="handleLook(scope.row)"
-              type="text"
-              size="small"
-              class="div-table-button--detail"
-              >{{(scope.row.status === 'show'&&'隐藏') || '显示'}}</el-button
-            >
-            <el-button
-                @click="handleEdit(scope.row)"
-                type="text"
-                size="small"
-                class="div-table-button--edit"
-                >修改</el-button
-              >
+            <el-button @click="handleLook(scope.row)"
+                       type="text"
+                       size="small"
+                       class="div-table-button--detail">{{(scope.row.status === 'show'&&'隐藏') || '显示'}}</el-button>
+            <el-button @click="handleEdit(scope.row)"
+                       type="text"
+                       size="small"
+                       class="div-table-button--edit">修改</el-button>
           </template>
         </el-table-column>
       </el-table>
       <div>
-        <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :current-page.sync="currentPage"
-          :page-sizes="[20, 50, 100, 200]"
-          :page-size="pageSize"
-          layout="sizes, prev, pager, next, total"
-          :total="total"
-        >
+        <el-pagination @size-change="handleSizeChange"
+                       @current-change="handleCurrentChange"
+                       :current-page.sync="currentPage"
+                       :page-sizes="[20, 50, 100, 200]"
+                       :page-size="pageSize"
+                       layout="sizes, prev, pager, next, total"
+                       :total="total">
         </el-pagination>
       </div>
     </el-card>
 
-    <el-dialog
-      title="居民类别配置"
-      :visible.sync="dialogVisible"
-      width="50%"
-      top="5vh"
-      append-to-body
-      class="dialog-h"
-      :close-on-click-modal="false"
-      :before-close="handlerCancle"
-    >
-      <el-form label-width="150px" :model="form" :rules="rules" ref="ruleForm" class="dialog-h-content scroll-h">
+    <el-dialog title="居民类别配置"
+               :visible.sync="dialogVisible"
+               width="50%"
+               top="5vh"
+               append-to-body
+               class="dialog-h"
+               :close-on-click-modal="false"
+               :before-close="handlerCancle">
+      <el-form label-width="150px"
+               :model="form"
+               :rules="rules"
+               ref="ruleForm"
+               class="dialog-h-content scroll-h">
         <el-form-item label="类别名称">
-          <el-input v-model="form.label" size="small" style="width: 180px;" disabled></el-input>
+          <el-input v-model="form.label"
+                    size="small"
+                    style="width: 180px;"
+                    disabled></el-input>
         </el-form-item>
-        <el-form-item label="管理平台图标" prop="managementIcon">
+        <el-form-item label="管理平台图标"
+                      prop="managementIcon">
           <el-upload class="avatar-uploader"
-            :action="uploadUlr"
-            :data="{customerId:customerId}"
-            :show-file-list="false"
-            :on-success="(response, file, fileList) => handleImgSuccess('managementIcon', response, file, fileList)"
-            :before-upload="beforeImgUpload">
+                     :action="uploadUlr"
+                     :data="{customerId:customerId}"
+                     :show-file-list="false"
+                     :on-success="(response, file, fileList) => handleImgSuccess('managementIcon', response, file, fileList)"
+                     :before-upload="beforeImgUpload">
             <img v-if="form.managementIcon"
-              :src="form.managementIcon"
-              style="width:70px;height:70px"
-              class="function-icon">
-            <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+                 :src="form.managementIcon"
+                 style="width:70px;height:70px"
+                 class="function-icon">
+            <i v-else
+               class="el-icon-plus avatar-uploader-icon"></i>
           </el-upload>
         </el-form-item>
-        <el-form-item label="数据平台图标" prop="dataIcon">
+        <el-form-item label="数据平台图标"
+                      prop="dataIcon">
           <el-upload class="avatar-uploader"
-            :action="uploadUlr"
-            :data="{customerId:customerId}"
-            :show-file-list="false"
-            :on-success="(response, file, fileList) => handleImgSuccess('dataIcon', response, file, fileList)"
-            :before-upload="beforeImgUpload">
+                     :action="uploadUlr"
+                     :data="{customerId:customerId}"
+                     :show-file-list="false"
+                     :on-success="(response, file, fileList) => handleImgSuccess('dataIcon', response, file, fileList)"
+                     :before-upload="beforeImgUpload">
             <img v-if="form.dataIcon"
-              :src="form.dataIcon"
-              style="width:70px;height:70px"
-              class="function-icon">
-            <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+                 :src="form.dataIcon"
+                 style="width:70px;height:70px"
+                 class="function-icon">
+            <i v-else
+               class="el-icon-plus avatar-uploader-icon"></i>
           </el-upload>
         </el-form-item>
-        <el-form-item label="房屋显示图标" prop="houseShowIcon">
+        <el-form-item label="房屋显示图标"
+                      prop="houseShowIcon">
           <el-upload class="avatar-uploader"
-            :action="uploadUlr"
-            :data="{customerId:customerId}"
-            :show-file-list="false"
-            :on-success="(response, file, fileList) => handleImgSuccess('houseShowIcon', response, file, fileList)"
-            :before-upload="beforeImgUpload">
+                     :action="uploadUlr"
+                     :data="{customerId:customerId}"
+                     :show-file-list="false"
+                     :on-success="(response, file, fileList) => handleImgSuccess('houseShowIcon', response, file, fileList)"
+                     :before-upload="beforeImgUpload">
             <img v-if="form.houseShowIcon"
-              :src="form.houseShowIcon"
-              style="width:70px;height:70px"
-              class="function-icon">
-            <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+                 :src="form.houseShowIcon"
+                 style="width:70px;height:70px"
+                 class="function-icon">
+            <i v-else
+               class="el-icon-plus avatar-uploader-icon"></i>
           </el-upload>
         </el-form-item>
         <el-form-item label="是否预警">
           <el-switch v-model="form.warn"></el-switch>
         </el-form-item>
         <el-form-item label="黄色预警">
-          <el-input-number v-model="form.level1" :min="0" size="small" label="描述文字" @change="handleLevelChange"></el-input-number> 人/楼宇
+          <el-input-number v-model="form.level1"
+                           :min="0"
+                           size="small"
+                           label="描述文字"
+                           @change="handleLevelChange"></el-input-number> 人楼栋
         </el-form-item>
         <el-form-item label="红色预警">
-          <el-input-number v-model="form.level2" :min="form.level1" size="small" label="描述文字" ></el-input-number> 人/楼宇
+          <el-input-number v-model="form.level2"
+                           :min="form.level1"
+                           size="small"
+                           label="描述文字"></el-input-number> 人/楼栋
         </el-form-item>
       </el-form>
       <div class="resi-btns">
-        <el-button size="small" @click="handlerCancle">取消</el-button>
-        <el-button
-          type="primary"
-          size="small"
-          :loading="btnLoading"
-          @click="handleSUbmit"
-          >提交</el-button
-        >
+        <el-button size="small"
+                   @click="handlerCancle">取消</el-button>
+        <el-button type="primary"
+                   size="small"
+                   :loading="btnLoading"
+                   @click="handleSUbmit">提交</el-button>
       </div>
     </el-dialog>
 
@@ -194,7 +204,7 @@ import axios from 'axios'
 import Sortable from 'sortablejs'
 import { mapGetters } from 'vuex'
 export default {
-  data() {
+  data () {
     return {
       tableLoading: false,
       btnLoading: false,
@@ -214,7 +224,7 @@ export default {
         {
           label: '是',
           value: 1
-        },{
+        }, {
           label: '否',
           value: 0
         }
@@ -223,7 +233,7 @@ export default {
         {
           label: '黄色预警',
           value: 1
-        },{
+        }, {
           label: '红色预警',
           value: 2
         }
@@ -296,12 +306,12 @@ export default {
 
     ...mapGetters(['clientHeight', 'iframeHeight'])
   },
-  async created() {
+  async created () {
     this.customerId = localStorage.getItem('customerId')
     this.getTableData()
     this.pageLoading = true
   },
-  mounted() {
+  mounted () {
     this.rowDrop()
     this.$nextTick(() => {
       this.sHeight = this.$refs.searchCard.$el.offsetHeight + 230
@@ -309,11 +319,11 @@ export default {
     })
   },
   methods: {
-    rowDrop() {
+    rowDrop () {
       const tbody = document.querySelector('.el-table__body-wrapper tbody')
       const _this = this
       Sortable.create(tbody, {
-        onEnd({ newIndex, oldIndex }) {
+        onEnd ({ newIndex, oldIndex }) {
           const currRow = _this.tableData.splice(oldIndex, 1)[0]
           _this.tableData.splice(newIndex, 0, currRow)
           console.log('rowdrap', newIndex, oldIndex)
@@ -322,25 +332,25 @@ export default {
         }
       })
     },
-    computedWidth(label) {
+    computedWidth (label) {
       const wd = 20 * label.length
       return wd > 80 ? wd : 80
     },
-    filterImage(item) {
+    filterImage (item) {
       const arr = ['managementIcon', 'dataIcon', 'houseShowIcon']
       return arr.includes(item)
     },
-    handleSizeChange(val) {
+    handleSizeChange (val) {
       console.log(`每页 ${val} 条`)
       this.pageSize = val
       this.getTableData()
     },
-    handleCurrentChange(val) {
+    handleCurrentChange (val) {
       console.log(`当前页: ${val}`)
       this.currentPage = val
       this.getTableData()
     },
-    handleFilterSpan(row, item) {
+    handleFilterSpan (row, item) {
       let _val = ''
       if (item.options && item.options.length > 0) {
         item.options.forEach((n) => {
@@ -349,23 +359,23 @@ export default {
       }
       return _val || row[item.columnName]
     },
-    resetForm(formName) {
-      
+    resetForm (formName) {
+
       this.isWarn = ''
       this.level = ''
       this.handleSearch();
     },
-    handleSearch(val) {
+    handleSearch (val) {
       console.log('searchhh--', val)
       this.currentPage = 1
       this.conditions = val
       this.getTableData()
     },
-    handleLevelChange(val) {
+    handleLevelChange (val) {
       if (val > this.form.level2) this.form.level2 = val
     },
-    
-    handlerCancle() {
+
+    handlerCancle () {
       this.dialogVisible = false
     },
     beforeImgUpload (file) {
@@ -391,7 +401,7 @@ export default {
         this.$message.error(res.msg)
       }
     },
-    async handleLook(row) {
+    async handleLook (row) {
       const _show = {
         show: 'hidden',
         hidden: 'show'
@@ -413,18 +423,18 @@ export default {
           return this.$message.error('网络错误')
         })
     },
-    async handleEdit(row) {
-      
-      this.form = { 
-        ...row, 
-        warn: row.warn == '1' ? true : false, 
-        level1: row.level1 || 0, 
+    async handleEdit (row) {
+
+      this.form = {
+        ...row,
+        warn: row.warn == '1' ? true : false,
+        level1: row.level1 || 0,
         level2: row.level2 || 0,
-        level3: row.level3 || 0 
+        level3: row.level3 || 0
       }
       this.dialogVisible = true
     },
-    async handleSUbmit() {
+    async handleSUbmit () {
       this.$refs.ruleForm.validate(async (valid) => {
         if (valid) {
           if (this.form.warn) {
@@ -443,20 +453,20 @@ export default {
               } else {
                 this.dialogVisible = false
                 this.getTableData()
-              } 
+              }
             })
             .catch(() => {
               return this.$message.error('网络错误')
             })
-            this.btnLoading = false
+          this.btnLoading = false
         } else {
           console.log('error submit!!');
           return false;
         }
       });
-      
+
     },
-    handleDel(row) {
+    handleDel (row) {
       let params = {
         formCode: 'resi_base_info',
         icResiUserId: row.icResiUserId
@@ -479,8 +489,8 @@ export default {
           return this.$message.error('网络错误')
         })
     },
-    sortData() {
-      const _data = this.tableData.map((item, index)=> {
+    sortData () {
+      const _data = this.tableData.map((item, index) => {
         return {
           id: item.id,
           sort: index
@@ -500,7 +510,7 @@ export default {
           return this.$message.error('网络错误')
         })
     },
-    getTableHeader() {
+    getTableHeader () {
       this.$http
         .post('/oper/customize/icform/tableheaders', {
           formCode: 'resi_base_info'
@@ -516,7 +526,7 @@ export default {
           return this.$message.error('网络错误')
         })
     },
-    async getTableData() {
+    async getTableData () {
       this.tableLoading = true
       let params = {
         // formCode: 'resi_base_info',
@@ -540,7 +550,7 @@ export default {
         })
       this.tableLoading = false
     }
-    
+
   }
 }
 </script>
@@ -580,14 +590,13 @@ export default {
   }
 }
 .avatar-uploader {
-  ::v-deep
-  .el-upload {
+  ::v-deep .el-upload {
     cursor: pointer;
     position: relative;
     overflow: hidden;
   }
   .el-upload:hover {
-    border-color: #409EFF;
+    border-color: #409eff;
   }
   .avatar {
     width: 70px;
@@ -605,8 +614,6 @@ export default {
     text-align: center;
   }
 }
-  
-  
 
 .resi-btns {
   margin-top: 20px;