diff --git a/.env.development b/.env.development
index f3d7c10c1..f7a1145d0 100644
--- a/.env.development
+++ b/.env.development
@@ -1,6 +1,7 @@
 NODE_ENV=development
 # VUE_APP_API_SERVER =  http://epmet-dev.elinkservice.cn:41080/api
 VUE_APP_API_SERVER =  http://192.168.1.140/api
+# VUE_APP_API_SERVER =   https://epmet-cloud.elinkservice.cn/api
 
 #家中开发连级的后端服务
 # VUE_APP_API_SERVER =  https://epmet-dev.elinkservice.cn:41080/api
diff --git a/src/assets/scss/modules/management/epidemic.scss b/src/assets/scss/modules/management/epidemic.scss
index 644e30acb..5de15397e 100644
--- a/src/assets/scss/modules/management/epidemic.scss
+++ b/src/assets/scss/modules/management/epidemic.scss
@@ -42,7 +42,7 @@
   }
 
   .list_item_width_1 {
-    width: 170px;
+    width: 185px;
   }
 }
 
diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue
index 0f201362a..290d53a43 100644
--- a/src/views/modules/base/community/buildTable.vue
+++ b/src/views/modules/base/community/buildTable.vue
@@ -69,27 +69,15 @@
                          :selectable="checkSelect"
                          width="55">
         </el-table-column>
-        <el-table-column prop="sort"
-                         sortable="custom"
-                         min-width="140"
-                         label="序号">
-          <template slot-scope="scope">
-            <div @click="handleEditSort(scope.row)">
-              <span v-if="!scope.row.isChange">{{scope.row.sort}}</span>
-              <el-input-number v-else
-                               @change="handleChangeSort(scope.row)"
-                               v-model="scope.row.sort"
-                               class="item_width_4"
-                               :precision="2"
-                               size="small"
-                               :min="0"
-                               :max="9999"
-                               label="描述文字"></el-input-number>
-            </div>
-
-          </template>
+        <el-table-column fixed="left"
+                         width="55"
+                         type="index"
+                         label="序号"
+                         :index="indexMethod">
         </el-table-column>
+
         <el-table-column prop="buildingName"
+                         fixed="left"
                          label="楼栋名称"
                          min-width="180">
           <template slot-scope="scope">
@@ -127,6 +115,26 @@
         <el-table-column prop="totalHouseNum"
                          label="总户数">
         </el-table-column>
+        <el-table-column prop="sort"
+                         sortable="custom"
+                         min-width="140"
+                         label="排序">
+          <template slot-scope="scope">
+            <div @click="handleEditSort(scope.row)">
+              <span v-if="!scope.row.isChange">{{scope.row.sort}}</span>
+              <el-input-number v-else
+                               @change="handleChangeSort(scope.row)"
+                               v-model="scope.row.sort"
+                               class="item_width_4"
+                               :precision="2"
+                               size="small"
+                               :min="0"
+                               :max="9999"
+                               label="描述文字"></el-input-number>
+            </div>
+
+          </template>
+        </el-table-column>
 
         <el-table-column label="操作"
                          fixed="right"
@@ -233,7 +241,9 @@ export default {
     ...mapGetters(['clientHeight', 'iframeHeight'])
   },
   methods: {
-
+    indexMethod (index) {
+      return index + 1;
+    },
     handleSortOrderChange (value) {
       console.log(value.column, value.prop, value.order)
       this.sortType = value.order === 'ascending' ? 'asc' : 'desc'
@@ -320,6 +330,7 @@ export default {
         this.validTableDataNum = 0
         this.total = data.total
         data.list.forEach(item => {
+          item.sort = parseInt(item.sort) || 0;
           item.sort = item.sort.toFixed(2)
           item.isChange = false
           if (item.agencyId === this.staffAgencyId) {
diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue
index dabbe267f..49574f4c8 100644
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@@ -52,28 +52,16 @@
                          :selectable="checkSelect"
                          width="55">
         </el-table-column>
-        <el-table-column prop="sort"
-                         sortable="custom"
-                         min-width="140"
-                         label="序号">
-          <template slot-scope="scope">
-            <div @click="handleEditSort(scope.row)">
-              <span v-if="!scope.row.isChange">{{scope.row.sort}}</span>
-              <el-input-number v-else
-                               @change="handleChangeSort(scope.row)"
-                               v-model="scope.row.sort"
-                               class="item_width_4"
-                               :precision="2"
-                               size="small"
-                               :min="0"
-                               :max="9999"
-                               label="描述文字"></el-input-number>
-            </div>
-
-          </template>
+        <el-table-column fixed="left"
+                         width="55"
+                         type="index"
+                         label="序号"
+                         :index="indexMethod">
         </el-table-column>
+
         <el-table-column prop="houseNameShow"
                          label="房屋名称"
+                         fixed="left"
                          min-width="160">
         </el-table-column>
         <el-table-column prop="neighborHoodName"
@@ -116,6 +104,27 @@
                          label="身份证"
                          width="170">
         </el-table-column>
+
+        <el-table-column prop="sort"
+                         sortable="custom"
+                         min-width="140"
+                         label="排序">
+          <template slot-scope="scope">
+            <div @click="handleEditSort(scope.row)">
+              <span v-if="!scope.row.isChange">{{scope.row.sort}}</span>
+              <el-input-number v-else
+                               @change="handleChangeSort(scope.row)"
+                               v-model="scope.row.sort"
+                               class="item_width_4"
+                               :precision="2"
+                               size="small"
+                               :min="0"
+                               :max="9999"
+                               label="描述文字"></el-input-number>
+            </div>
+
+          </template>
+        </el-table-column>
         <el-table-column label="操作"
                          fixed="right"
                          width="140"
@@ -242,6 +251,9 @@ export default {
     ...mapGetters(['clientHeight', 'iframeHeight'])
   },
   methods: {
+    indexMethod (index) {
+      return index + 1;
+    },
     handleSortOrderChange (value) {
       console.log(value.column, value.prop, value.order)
       this.sortType = value.order === 'ascending' ? 'asc' : 'desc'
@@ -345,6 +357,7 @@ export default {
         this.total = data.total
         this.validTableDataNum = 0
         data.list.forEach(item => {
+          item.sort = parseInt(item.sort) || 0;
           item.sort = item.sort.toFixed(2)
           item.isChange = false
           item.houseNameShow = item.neighborHoodName + item.buildingName + item.unitNum + item.doorName
diff --git a/src/views/modules/base/epidemic/antiInfo.vue b/src/views/modules/base/epidemic/antiInfo.vue
index 524f139d2..dc93596d1 100644
--- a/src/views/modules/base/epidemic/antiInfo.vue
+++ b/src/views/modules/base/epidemic/antiInfo.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="div_main">
-    <div ref="div_search" class="div_search">
+    <div ref="div_search"
+         class="div_search">
       <el-form :inline="true"
                :model="searchForm"
                ref="ref_searchform"
@@ -8,95 +9,75 @@
         <div>
           <el-form-item label="所属网格"
                         prop="gridId">
-            <el-select
-                  v-model.trim="searchForm.gridId"
-                  placeholder="请选择"
-                  size="small"
-                  clearable
-                  class="resi-cell-select"
-                  @change="handleChangeGrid"
-                >
-                  <el-option
-                    v-for="item in optionsG"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
-                  </el-option>
-                </el-select>
+            <el-select v-model.trim="searchForm.gridId"
+                       placeholder="请选择"
+                       size="small"
+                       clearable
+                       class="resi-cell-select"
+                       @change="handleChangeGrid">
+              <el-option v-for="item in optionsG"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
 
           </el-form-item>
           <el-form-item label="所属小区"
                         prop="neighborId">
-            <el-select
-                  v-model.trim="searchForm.neighborId"
-                  placeholder="请选择小区"
-                  size="small"
-                  clearable
-                  class="resi-cell-select"
-                  @clear="handleClearVillage"
-                  @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="searchForm.buildingId"
-                  placeholder="楼号"
-                  size="small"
-                  clearable
-                  style="width: 120px;"
-                  class="resi-cell-select"
-                  @clear="handleClearBuild"
-                  @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="searchForm.unitId"
-                  placeholder="单元"
-                  size="small"
-                  clearable
-                  style="width: 120px;"
-                  class="resi-cell-select"
-                  @click="handleClearDan"
-                  @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="searchForm.houseId"
-                  placeholder="房号"
-                  size="small"
-                  clearable
-                  style="width: 120px;"
-                  class="resi-cell-select"
-                >
-                  <el-option
-                    v-for="item in optionsH"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
-                  </el-option>
-                </el-select>
+            <el-select v-model.trim="searchForm.neighborId"
+                       placeholder="请选择小区"
+                       size="small"
+                       clearable
+                       class="resi-cell-select"
+                       @clear="handleClearVillage"
+                       @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="searchForm.buildingId"
+                       placeholder="楼号"
+                       size="small"
+                       clearable
+                       style="width: 120px;"
+                       class="resi-cell-select"
+                       @clear="handleClearBuild"
+                       @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="searchForm.unitId"
+                       placeholder="单元"
+                       size="small"
+                       clearable
+                       style="width: 120px;"
+                       class="resi-cell-select"
+                       @click="handleClearDan"
+                       @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="searchForm.houseId"
+                       placeholder="房号"
+                       size="small"
+                       clearable
+                       style="width: 120px;"
+                       class="resi-cell-select">
+              <el-option v-for="item in optionsH"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
 
           </el-form-item>
 
@@ -274,9 +255,9 @@
                @closed="handleCnalceForm">
       <div class="dialog-h-content scroll-h">
         <el-form :inline="true"
-               :model="formDetail"
-               ref="detail_form"
-               :label-width="'100px'">
+                 :model="formDetail"
+                 ref="detail_form"
+                 :label-width="'100px'">
           <div>
             <el-form-item label="姓名:"
                           prop="name">
@@ -301,7 +282,7 @@
             </el-form-item>
             <el-form-item label="所属房屋"
                           prop="houseName">
-              
+
               <el-input v-model="formDetail.houseName"
                         size="small"
                         class="list_item_width_1 min-w180"
@@ -350,7 +331,7 @@
               <!-- <span>{{ formDetail.vaccineCount }}</span> -->
 
             </el-form-item>
-            
+
           </div>
           <div>
             <el-form-item label="核酸检测次数"
@@ -368,116 +349,119 @@
         </el-form>
         <div style="padding: 0 20px;">
           <el-tabs v-model="activeName">
-            <el-tab-pane label="疫苗接种信息" name="first">
+            <el-tab-pane label="疫苗接种信息"
+                         name="first">
               <el-table class="table"
-                  :data="vaccineList"
-                  border
-                  height="400"
-                  :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
-                  style="width: 100%">
+                        :data="vaccineList"
+                        border
+                        height="400"
+                        :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                        style="width: 100%">
                 <el-table-column label="序号"
-                                header-align="center"
-                                align="center"
-                                type="index"
-                                width="50"></el-table-column>
+                                 header-align="center"
+                                 align="center"
+                                 type="index"
+                                 width="50"></el-table-column>
 
                 <el-table-column prop="vaccinateTime"
-                                header-align="center"
-                                align="center"
-                                label="接种时间"
-                                width="140">
+                                 header-align="center"
+                                 align="center"
+                                 label="接种时间"
+                                 width="140">
                 </el-table-column>
                 <el-table-column prop="address"
-                                header-align="center"
-                                align="center"
-                                label="接种地点"
-                                min-width="180">
+                                 header-align="center"
+                                 align="center"
+                                 label="接种地点"
+                                 min-width="180">
                 </el-table-column>
                 <el-table-column prop="manufactor"
-                                header-align="center"
-                                align="center"
-                                label="疫苗厂家"
-                                width="240">
+                                 header-align="center"
+                                 align="center"
+                                 label="疫苗厂家"
+                                 width="240">
                 </el-table-column>
               </el-table>
             </el-tab-pane>
-            <el-tab-pane label="核酸检测信息" name="second">
+            <el-tab-pane label="核酸检测信息"
+                         name="second">
               <el-table class="table"
-                  :data="natList"
-                  border
-                  height="400"
-                  :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
-                  style="width: 100%">
+                        :data="natList"
+                        border
+                        height="400"
+                        :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                        style="width: 100%">
                 <el-table-column label="序号"
-                                header-align="center"
-                                align="center"
-                                type="index"
-                                width="50"></el-table-column>
+                                 header-align="center"
+                                 align="center"
+                                 type="index"
+                                 width="50"></el-table-column>
 
                 <el-table-column prop="testTime"
-                                header-align="center"
-                                align="center"
-                                label="检测时间"
-                                width="150">
+                                 header-align="center"
+                                 align="center"
+                                 label="检测时间"
+                                 width="150">
                 </el-table-column>
                 <el-table-column prop="address"
-                                header-align="center"
-                                align="center"
-                                label="检测机构"
-                                min-width="180">
+                                 header-align="center"
+                                 align="center"
+                                 label="检测机构"
+                                 min-width="180">
                 </el-table-column>
                 <el-table-column prop="result"
-                                header-align="center"
-                                align="center"
-                                label="检测结果"
-                                width="240">
+                                 header-align="center"
+                                 align="center"
+                                 label="检测结果"
+                                 width="240">
                 </el-table-column>
               </el-table>
             </el-tab-pane>
-            <el-tab-pane label="行程信息" name="third">
+            <el-tab-pane label="行程信息"
+                         name="third">
               <el-table class="table"
-                  :data="tripList"
-                  border
-                  height="400"
-                  :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
-                  style="width: 100%">
+                        :data="tripList"
+                        border
+                        height="400"
+                        :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                        style="width: 100%">
                 <el-table-column label="序号"
-                                header-align="center"
-                                align="center"
-                                type="index"
-                                width="50"></el-table-column>
+                                 header-align="center"
+                                 align="center"
+                                 type="index"
+                                 width="50"></el-table-column>
 
                 <el-table-column prop="fromRegion"
-                                header-align="center"
-                                align="center"
-                                label="来自地区"
-                                show-overflow-tooltip
-                                min-width="100">
+                                 header-align="center"
+                                 align="center"
+                                 label="来自地区"
+                                 show-overflow-tooltip
+                                 min-width="100">
                 </el-table-column>
                 <el-table-column prop="arrivalTime"
-                                header-align="center"
-                                align="center"
-                                label="来到本地时间"
-                                width="140">
+                                 header-align="center"
+                                 align="center"
+                                 label="来到本地时间"
+                                 width="140">
                 </el-table-column>
                 <el-table-column prop="leaveTime"
-                                header-align="center"
-                                align="center"
-                                label="离开本地时间"
-                                width="140">
+                                 header-align="center"
+                                 align="center"
+                                 label="离开本地时间"
+                                 width="140">
                 </el-table-column>
                 <el-table-column prop="noticeTime"
-                                header-align="center"
-                                align="center"
-                                label="最近一次通知时间"
-                                width="140">
+                                 header-align="center"
+                                 align="center"
+                                 label="最近一次通知时间"
+                                 width="140">
                 </el-table-column>
                 <el-table-column prop="remark"
-                                header-align="center"
-                                align="center"
-                                label="备注"
-                                show-overflow-tooltip
-                                width="120">
+                                 header-align="center"
+                                 align="center"
+                                 label="备注"
+                                 show-overflow-tooltip
+                                 width="120">
                 </el-table-column>
               </el-table>
             </el-tab-pane>
@@ -490,7 +474,6 @@
       </div>
     </el-dialog>
 
-
   </div>
 </template>
 
@@ -528,13 +511,13 @@ export default {
         natCount: ''
       },
       formDetail: {
-        	name: '',
-          gridName: '',
-          houseName: '',
-          mobile: '',
-          idCard: '',
-          vaccineCount: '',
-          natCount: ''
+        name: '',
+        gridName: '',
+        houseName: '',
+        mobile: '',
+        idCard: '',
+        vaccineCount: '',
+        natCount: ''
       },
       vaccineList: [], // 疫苗接种
       natList: [], // 核酸检测
@@ -573,7 +556,7 @@ export default {
   },
 
   methods: {
-    handleCnalceForm() {
+    handleCnalceForm () {
       this.$refs.detail_form.resetFields()
       this.vaccineList = []
       this.natList = []
@@ -585,21 +568,21 @@ export default {
     handleSearch () {
       this.loadTable()
     },
-    handleClearVillage() {
+    handleClearVillage () {
       this.searchForm.buildingId = ''
       this.searchForm.unitId = ''
       this.searchForm.houseId = ''
     },
-    handleClearBuild() {
+    handleClearBuild () {
       this.searchForm.buildingId = ''
       this.searchForm.unitId = ''
       this.searchForm.houseId = ''
     },
-    handleClearDan() {
+    handleClearDan () {
       this.searchForm.unitId = ''
       this.searchForm.houseId = ''
     },
-    handleChangeGrid(val) {
+    handleChangeGrid (val) {
       console.log('val', val)
       this.searchForm.neighborId = ''
       this.searchForm.buildingId = ''
@@ -607,25 +590,25 @@ export default {
       this.searchForm.houseId = ''
       this.getValiheList()
     },
-    handleChangeV(val) {
+    handleChangeV (val) {
       console.log('val', val)
       this.searchForm.buildingId = ''
       this.searchForm.unitId = ''
       this.searchForm.houseId = ''
       this.getBuildList()
     },
-    handleChangeB(val) {
+    handleChangeB (val) {
       console.log('val', val)
       this.searchForm.unitId = ''
       this.searchForm.houseId = ''
       this.getUniList()
     },
-    handleChangeD(val) {
+    handleChangeD (val) {
       console.log('val', val)
       this.searchForm.houseId = ''
       this.getHouseList()
     },
-    getGridList() {
+    getGridList () {
       const { user } = this.$store.state
       this.$http
         .post('/gov/org/customergrid/gridoption', { agencyId: user.agencyId, purpose: 'query' })
@@ -641,7 +624,7 @@ export default {
           return this.$message.error('网络错误')
         })
     },
-    getValiheList() {
+    getValiheList () {
       const { user } = this.$store.state
       this.$http
         .post('/gov/org/icneighborhood/neighborhoodoption', {
@@ -661,7 +644,7 @@ export default {
           return this.$message.error('网络错误')
         })
     },
-    getBuildList() {
+    getBuildList () {
       this.$http
         .post('/gov/org/icbuilding/buildingoption', {
           neighborHoodId: this.searchForm.neighborId
@@ -678,7 +661,7 @@ export default {
           return this.$message.error('网络错误')
         })
     },
-    getUniList() {
+    getUniList () {
       this.$http
         .post('/gov/org/icbuildingunit/unitoption', {
           buildingId: this.searchForm.buildingId
@@ -695,7 +678,7 @@ export default {
           return this.$message.error('网络错误')
         })
     },
-    getHouseList() {
+    getHouseList () {
       this.$http
         .post('/gov/org/ichouse/houseoption', { unitId: this.searchForm.unitId })
         .then(({ data: res }) => {
@@ -780,7 +763,7 @@ export default {
 
 
     async handleDetail (row) {
-      
+
       await this.getDetailInfo(row.id)
       await this.getDetailList(row.id)
       this.formTitle = '详情'
@@ -884,22 +867,22 @@ export default {
 @import "@/assets/scss/modules/management/epidemic.scss";
 
 .resi-cell-select {
-    width: 170px;
-    box-sizing: border-box;
-    margin-right: 10px;
-    &-middle {
-      width: 130px;
-    }
-    &-small {
-      width: 88px;
-    }
-  }
-  .resi-cell-select:last-child {
-    margin-right: 0;
+  width: 170px;
+  box-sizing: border-box;
+  margin-right: 10px;
+  &-middle {
+    width: 130px;
   }
-  .min-w180 {
-    min-width: 170px;
+  &-small {
+    width: 88px;
   }
+}
+.resi-cell-select:last-child {
+  margin-right: 0;
+}
+.min-w180 {
+  min-width: 170px;
+}
 </style>
 
 
diff --git a/src/views/modules/base/epidemic/natFocus/natFocusList.vue b/src/views/modules/base/epidemic/natFocus/natFocusList.vue
index 8d7fbc47f..78b053941 100644
--- a/src/views/modules/base/epidemic/natFocus/natFocusList.vue
+++ b/src/views/modules/base/epidemic/natFocus/natFocusList.vue
@@ -670,23 +670,23 @@ export default {
       })
     },
 
-    async handleEdit(row) {
+    async handleEdit (row) {
       this.editFormTitle = "修改核酸检测关注名单";
       this.editFormShow = true;
-
-      let row2 = await this.getInfo(row);
+      const row1 = { ...row }
+      let row2 = await this.getInfo(row1);
       this.$refs.ref_form_edit.initForm("edit", row2);
     },
 
-    async handleDetail(row) {
+    async handleDetail (row) {
       this.editFormTitle = "查看核酸检测关注名单";
       this.editFormShow = true;
-
-      let row2 = await this.getInfo(row);
+      const row1 = { ...row }
+      let row2 = await this.getInfo(row1);
       this.$refs.ref_form_edit.initForm("detail", row2);
     },
 
-    async getInfo(row) {
+    async getInfo (row) {
       const url = "/epmetuser/icEpidemicSpecialAttention/detail";
 
       let params = {
diff --git a/src/views/modules/base/epidemic/vaccin.vue b/src/views/modules/base/epidemic/vaccin.vue
index 87d99e65d..ca0818ca1 100644
--- a/src/views/modules/base/epidemic/vaccin.vue
+++ b/src/views/modules/base/epidemic/vaccin.vue
@@ -1,110 +1,91 @@
 <template>
   <div class="div_main">
     <div class="div_search">
-      <el-form
-        :inline="true"
-        :model="formData"
-        ref="ref_searchform"
-        :label-width="'90px'"
-      >
+      <el-form :inline="true"
+               :model="formData"
+               ref="ref_searchform"
+               :label-width="'90px'">
         <div>
           <el-form-item label="信息范围">
-            <el-select
-              class="list_item_width_1"
-              size="small"
-              v-model.trim="formData.searchType"
-              placeholder="请选择"
-            >
-              <el-option
-                v-for="item in orgTypeList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
+            <el-select class="list_item_width_1"
+                       size="small"
+                       v-model.trim="formData.searchType"
+                       placeholder="请选择">
+              <el-option v-for="item in orgTypeList"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
               </el-option>
             </el-select>
           </el-form-item>
 
           <el-form-item label="本辖区居民">
-            <el-select
-              class="list_item_width_1"
-              size="small"
-              :disabled="formData.searchType != 'current'"
-              v-model.trim="formData.isResiUser"
-              placeholder="请选择"
-            >
-              <el-option
-                v-for="item in isResiUserList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
+            <el-select class="list_item_width_1"
+                       size="small"
+                       :disabled="formData.searchType != 'current'"
+                       v-model.trim="formData.isResiUser"
+                       placeholder="请选择">
+              <el-option v-for="item in isResiUserList"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
               </el-option>
             </el-select>
           </el-form-item>
 
-          <el-form-item label="接种时间" label-width="110px" prop="startTime">
-            <el-date-picker
-              v-model="timeRange"
-              size="small"
-              type="datetimerange"
-              @change="handleTimeChange"
-              format="yyyy-MM-dd HH:mm"
-              value-format="yyyy-MM-dd HH:mm"
-              range-separator="至"
-              start-placeholder="开始时间"
-              end-placeholder="结束时间"
-            >
+          <el-form-item label="接种时间"
+                        label-width="110px"
+                        prop="startTime">
+            <el-date-picker v-model="timeRange"
+                            size="small"
+                            type="datetimerange"
+                            @change="handleTimeChange"
+                            format="yyyy-MM-dd HH:mm"
+                            value-format="yyyy-MM-dd HH:mm"
+                            range-separator="至"
+                            start-placeholder="开始时间"
+                            end-placeholder="结束时间">
             </el-date-picker>
           </el-form-item>
 
           <div>
-            <el-form-item label="姓名" prop="name">
-              <el-input
-                v-model="formData.name"
-                size="small"
-                class="list_item_width_1"
-                clearable
-                placeholder="请输入姓名"
-              >
+            <el-form-item label="姓名"
+                          prop="name">
+              <el-input v-model="formData.name"
+                        size="small"
+                        class="list_item_width_1"
+                        clearable
+                        placeholder="请输入姓名">
               </el-input>
             </el-form-item>
 
-            <el-form-item label="手机号" prop="mobile">
-              <el-input
-                v-model="formData.mobile"
-                size="small"
-                class="list_item_width_1"
-                clearable
-                placeholder="请输入手机号"
-              >
+            <el-form-item label="手机号"
+                          prop="mobile">
+              <el-input v-model="formData.mobile"
+                        size="small"
+                        class="list_item_width_1"
+                        clearable
+                        placeholder="请输入手机号">
               </el-input>
             </el-form-item>
-            <el-form-item label="身份证" prop="idCard">
-              <el-input
-                v-model="formData.idCard"
-                size="small"
-                class="list_item_width_1"
-                clearable
-                placeholder="请输入身份证"
-              >
+            <el-form-item label="身份证"
+                          prop="idCard">
+              <el-input v-model="formData.idCard"
+                        size="small"
+                        class="list_item_width_1"
+                        clearable
+                        placeholder="请输入身份证">
               </el-input>
             </el-form-item>
 
-            <el-button
-              style="margin-left: 30px"
-              size="small"
-              class="diy-button--search"
-              @click="handleSearch"
-              >查询</el-button
-            >
-            <el-button
-              style="margin-left: 10px"
-              size="small"
-              class="diy-button--reset"
-              @click="resetSearch"
-              >重置</el-button
-            >
+            <el-button style="margin-left: 30px"
+                       size="small"
+                       class="diy-button--search"
+                       @click="handleSearch">查询</el-button>
+            <el-button style="margin-left: 10px"
+                       size="small"
+                       class="diy-button--reset"
+                       @click="resetSearch">重置</el-button>
           </div>
         </div>
       </el-form>
@@ -115,191 +96,145 @@
                    size="small"
                    @click="handleAdd">新增</el-button> -->
 
-        <el-button
-          style="float: left"
-          class="diy-button--export"
-          size="small"
-          @click="handleExportModule"
-          >下载模板</el-button
-        >
-        <el-upload
-          ref="upload"
-          :multiple="false"
-          :show-file-list="false"
-          :before-upload="beforeUpload"
-          action=""
-          accept=".xlsx,.xls"
-          :limit="1"
-          :on-exceed="handleExceed"
-          :http-request="uploadFile"
-        >
-          <el-button
-            style="margin-left: 10px"
-            size="small"
-            class="diy-button--delete"
-            >导入</el-button
-          >
+        <el-button style="float: left"
+                   class="diy-button--export"
+                   size="small"
+                   @click="handleExportModule">下载模板</el-button>
+        <el-upload ref="upload"
+                   :multiple="false"
+                   :show-file-list="false"
+                   :before-upload="beforeUpload"
+                   action=""
+                   accept=".xlsx,.xls"
+                   :limit="1"
+                   :on-exceed="handleExceed"
+                   :http-request="uploadFile">
+          <el-button style="margin-left: 10px"
+                     size="small"
+                     class="diy-button--delete">导入</el-button>
         </el-upload>
 
-        <el-button
-          style="float: left; margin-left: 10px"
-          class="diy-button--reset"
-          size="small"
-          @click="handleExport"
-          >导出</el-button
-        >
+        <el-button style="float: left; margin-left: 10px"
+                   class="diy-button--reset"
+                   size="small"
+                   @click="handleExport">导出</el-button>
       </div>
 
-      <el-table
-        class="table"
-        ref="ref_table"
-        :data="tableData"
-        border
-        :height="tableHeight"
-        v-loading="tableLoading"
-        :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
-        style="width: 100%"
-      >
-        <el-table-column
-          label="序号"
-          header-align="center"
-          align="center"
-          type="index"
-          width="50"
-        ></el-table-column>
-
-        <el-table-column
-          prop="name"
-          header-align="center"
-          align="center"
-          label="姓名"
-          width="180"
-        >
+      <el-table class="table"
+                ref="ref_table"
+                :data="tableData"
+                border
+                :height="tableHeight"
+                v-loading="tableLoading"
+                :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
+                style="width: 100%">
+        <el-table-column label="序号"
+                         header-align="center"
+                         align="center"
+                         type="index"
+                         width="50"></el-table-column>
+
+        <el-table-column prop="name"
+                         header-align="center"
+                         align="center"
+                         label="姓名"
+                         width="180">
         </el-table-column>
-        <el-table-column
-          prop="mobile"
-          header-align="center"
-          align="center"
-          label="手机号"
-          width="180"
-        >
+        <el-table-column prop="mobile"
+                         header-align="center"
+                         align="center"
+                         label="手机号"
+                         width="180">
         </el-table-column>
-        <el-table-column
-          prop="idCard"
-          header-align="center"
-          align="center"
-          label="身份证"
-          width="180"
-        >
+        <el-table-column prop="idCard"
+                         header-align="center"
+                         align="center"
+                         label="身份证"
+                         width="180">
         </el-table-column>
-        <el-table-column
-          prop="inoculateTime"
-          header-align="center"
-          align="center"
-          label="接种时间"
-          width="180"
-        >
+        <el-table-column prop="inoculateTime"
+                         header-align="center"
+                         align="center"
+                         label="接种时间"
+                         width="180">
         </el-table-column>
-        <el-table-column
-          prop="inoculateAddress"
-          header-align="center"
-          align="center"
-          show-overflow-tooltip
-          label="接种地点"
-          min-width="230"
-        >
+        <el-table-column prop="inoculateAddress"
+                         header-align="center"
+                         align="center"
+                         show-overflow-tooltip
+                         label="接种地点"
+                         min-width="230">
         </el-table-column>
-        <el-table-column
-          prop="manufacturer"
-          header-align="center"
-          align="center"
-          show-overflow-tooltip
-          label="疫苗厂家"
-          min-width="180"
-        >
+        <el-table-column prop="manufacturer"
+                         header-align="center"
+                         align="center"
+                         show-overflow-tooltip
+                         label="疫苗厂家"
+                         min-width="180">
         </el-table-column>
-        <el-table-column
-          v-if="isResiUser"
-          prop="isResiUserShow"
-          header-align="center"
-          align="center"
-          show-overflow-tooltip
-          label="本辖区居民"
-          width="120"
-        >
+        <el-table-column v-if="isResiUser"
+                         prop="isResiUserShow"
+                         header-align="center"
+                         align="center"
+                         show-overflow-tooltip
+                         label="本辖区居民"
+                         width="120">
         </el-table-column>
 
-        <el-table-column
-          label="操作"
-          fixed="right"
-          width="140"
-          header-align="center"
-          align="center"
-          class="operate"
-        >
+        <el-table-column label="操作"
+                         fixed="right"
+                         width="140"
+                         header-align="center"
+                         align="center"
+                         class="operate">
           <template slot-scope="scope">
-            <el-button
-              type="text"
-              class="div-table-button--detail"
-              size="small"
-              @click="handleDetail(scope.row)"
-              >查看</el-button
-            >
-
-            <el-button
-              v-if="!isResiUser"
-              type="text"
-              class="div-table-button--edit"
-              size="small"
-              @click="handleAttention(scope.row)"
-              >同步</el-button
-            >
-
-            <el-button
-              v-if="
+            <el-button type="text"
+                       class="div-table-button--detail"
+                       size="small"
+                       @click="handleDetail(scope.row)">查看</el-button>
+
+            <el-button v-if="!isResiUser"
+                       type="text"
+                       class="div-table-button--edit"
+                       size="small"
+                       @click="handleAttention(scope.row)">同步</el-button>
+
+            <el-button v-if="
                 isResiUser &&
                 scope.row.userType === 'synchro' &&
                 scope.row.agencyId === agencyId
               "
-              type="text"
-              class="div-table-button--delete"
-              size="small"
-              @click="handleCancelAttention(scope.row)"
-              >取消同步</el-button
-            >
+                       type="text"
+                       class="div-table-button--delete"
+                       size="small"
+                       @click="handleCancelAttention(scope.row)">取消同步</el-button>
           </template>
         </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="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="pageSize"
+                       layout="sizes, prev, pager, next, total"
+                       :total="total">
         </el-pagination>
       </div>
     </div>
 
     <!-- 修改弹出框 -->
-    <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="diaClose"
-    >
-      <vaccinForm
-        ref="ref_form"
-        @dialogCancle="diaClose"
-        @dialogOk="addFormOk"
-      ></vaccinForm>
+    <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="diaClose">
+      <vaccinForm ref="ref_form"
+                  @dialogCancle="diaClose"
+                  @dialogOk="addFormOk"></vaccinForm>
     </el-dialog>
   </div>
 </template>
@@ -314,7 +249,7 @@ import { Loading } from "element-ui"; // 引入Loading服务
 
 let loading; // 加载动画
 export default {
-  data() {
+  data () {
     return {
       loading: false,
       total: 0,
@@ -367,8 +302,8 @@ export default {
     vaccinForm,
     natForm,
   },
-  async created() {},
-  async mounted() {
+  async created () { },
+  async mounted () {
     //获取场所类型
 
     const { user } = this.$store.state;
@@ -378,7 +313,7 @@ export default {
   },
 
   methods: {
-    async handleSearch() {
+    async handleSearch () {
       this.isResiUser = this.formData.searchType === "current";
 
       await this.loadTable();
@@ -388,7 +323,7 @@ export default {
       });
     },
 
-    async loadTable() {
+    async loadTable () {
       this.tableLoading = true;
 
       const url = "/epmetuser/icVaccine/vaccine-list";
@@ -421,7 +356,7 @@ export default {
       this.tableLoading = false;
     },
 
-    handleTimeChange(time) {
+    handleTimeChange (time) {
       if (time) {
         this.formData.startTime = time[0];
         this.formData.endTime = time[1];
@@ -431,19 +366,20 @@ export default {
       }
     },
 
-    diaClose() {
+    diaClose () {
       this.$refs.ref_form.resetData();
       this.formShow = false;
     },
 
-    async handleDetail(row) {
+    async handleDetail (row) {
       this.formTitle = "详情";
       this.formShow = true;
-      let row2 = await this.getInfo(row);
+      const row1 = { ...row }
+      let row2 = await this.getInfo(row1);
       this.$refs.ref_form.initForm("detail", row2);
     },
 
-    handleAdd() {
+    handleAdd () {
       this.formTitle = "新增";
       this.formShow = true;
       this.$nextTick(() => {
@@ -451,7 +387,7 @@ export default {
       });
     },
 
-    handleEdit(row) {
+    handleEdit (row) {
       this.formTitle = "修改";
       this.formShow = true;
       this.$nextTick(() => {
@@ -459,12 +395,12 @@ export default {
       });
     },
 
-    addFormOk() {
+    addFormOk () {
       this.formShow = false;
       this.loadTable();
     },
 
-    async getInfo(row) {
+    async getInfo (row) {
       const url = "/epmetuser/icVaccine/detail";
 
       let params = {
@@ -480,7 +416,7 @@ export default {
       return row;
     },
 
-    async handleDelete(row) {
+    async handleDelete (row) {
       let message = "确认删除?";
 
       this.$confirm(message, "提示", {
@@ -491,10 +427,10 @@ export default {
         .then(() => {
           this.deleteNat(row);
         })
-        .catch((err) => {});
+        .catch((err) => { });
     },
 
-    async deleteNat(row) {
+    async deleteNat (row) {
       const url = "/epmetuser/icNat/del";
       // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icNat/del"
 
@@ -516,7 +452,7 @@ export default {
       }
     },
 
-    async handleCancelAttention(row) {
+    async handleCancelAttention (row) {
       let message =
         "取消同步后将不能在本辖区居民检测记录中查看，确认取消同步？";
 
@@ -528,10 +464,10 @@ export default {
         .then(() => {
           this.cancelAttention(row);
         })
-        .catch((err) => {});
+        .catch((err) => { });
     },
 
-    async cancelAttention(row) {
+    async cancelAttention (row) {
       const url = "/epmetuser/icVaccine/cancelsynchro";
 
       let params = {
@@ -552,7 +488,7 @@ export default {
       }
     },
 
-    async handleAttention(row) {
+    async handleAttention (row) {
       this.$confirm("确认将信息同步到本辖区核酸检测信息中心?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -567,7 +503,7 @@ export default {
         });
     },
 
-    async attentionNat(row) {
+    async attentionNat (row) {
       const url = "/epmetuser/icVaccine/synchro";
       // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icNat/synchro"
 
@@ -590,7 +526,7 @@ export default {
     },
 
     //重置搜索条件
-    resetSearch() {
+    resetSearch () {
       this.formData = {
         searchType: "current", //当前组织:current 根组织：all
         name: "", //姓名
@@ -605,18 +541,18 @@ export default {
       // this.loadTable()
     },
 
-    handleSizeChange(val) {
+    handleSizeChange (val) {
       this.pageSize = val;
       this.pageNo = 1;
       this.loadTable();
     },
-    handleCurrentChange(val) {
+    handleCurrentChange (val) {
       this.pageNo = val;
       this.loadTable();
     },
 
     //导出表格
-    async handleExport() {
+    async handleExport () {
       let title = "核酸检测信息";
 
       const url = "/epmetuser/icVaccine/export";
@@ -656,7 +592,7 @@ export default {
     },
 
     // 下载文件
-    download(data, fileName) {
+    download (data, fileName) {
       if (!data) {
         return;
       }
@@ -680,7 +616,7 @@ export default {
       }
     },
 
-    async handleExportModule() {
+    async handleExportModule () {
       let title = "核酸检测信息导入模板";
 
       const url = "/epmetuser/icVaccine/import-template-download";
@@ -721,7 +657,7 @@ export default {
     },
 
     // 上传文件之前的钩子
-    beforeUpload(file) {
+    beforeUpload (file) {
       const array = file.name.split(".");
       const extension = array[array.length - 1];
       // const isLt1M = (file.size / 1024 / 1024) < 5
@@ -735,11 +671,11 @@ export default {
       }
     },
     // 上传文件个数超过定义的数量
-    handleExceed(files, fileList) {
+    handleExceed (files, fileList) {
       this.$message.warning(`当前限制选择 1 个文件，请删除后继续上传`);
     },
 
-    async uploadFile() {
+    async uploadFile () {
       if (this.fileName == "") {
         this.$message.warning("请选择要上传的文件！");
         return false;
@@ -776,13 +712,13 @@ export default {
             this.$message.error(rspMsg);
           }
         },
-        (rspMsg, data) => {},
+        (rspMsg, data) => { },
         { headers: { "Content-Type": "multipart/form-data" } }
       );
     },
 
     // 开启加载动画
-    startLoading() {
+    startLoading () {
       loading = Loading.service({
         lock: true, // 是否锁定
         text: "正在加载……", // 加载中需要显示的文字
@@ -790,7 +726,7 @@ export default {
       });
     },
     // 结束加载动画
-    endLoading() {
+    endLoading () {
       // clearTimeout(timer);
       if (loading) {
         loading.close();
@@ -798,7 +734,7 @@ export default {
     },
   },
   computed: {
-    tableHeight() {
+    tableHeight () {
       return this.$store.state.inIframe
         ? this.clientHeight - 420 + this.iframeHeight
         : this.clientHeight - 420;
diff --git a/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue b/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
index 435382800..5dd83f001 100644
--- a/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
+++ b/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
@@ -1,58 +1,50 @@
 <template>
   <div class="div_main">
     <div class="div_search">
-      <el-form
-        :inline="true"
-        :model="formData"
-        ref="ref_searchform"
-        :label-width="'90px'"
-      >
+      <el-form :inline="true"
+               :model="formData"
+               ref="ref_searchform"
+               :label-width="'90px'">
         <div>
-          <el-form-item label="姓名" prop="name">
-            <el-input
-              v-model="formData.name"
-              size="small"
-              class="list_item_width_1"
-              clearable
-              placeholder="请输入姓名"
-            >
+          <el-form-item label="姓名"
+                        prop="name">
+            <el-input v-model="formData.name"
+                      size="small"
+                      class="list_item_width_1"
+                      clearable
+                      placeholder="请输入姓名">
             </el-input>
           </el-form-item>
-          <el-form-item label="手机号" prop="mobile">
-            <el-input
-              v-model="formData.mobile"
-              size="small"
-              class="list_item_width_1"
-              clearable
-              placeholder="请输入手机号"
-            >
+          <el-form-item label="手机号"
+                        prop="mobile">
+            <el-input v-model="formData.mobile"
+                      size="small"
+                      class="list_item_width_1"
+                      clearable
+                      placeholder="请输入手机号">
             </el-input>
           </el-form-item>
 
-          <el-form-item label="身份证" prop="mobile">
-            <el-input
-              v-model="formData.idCard"
-              size="small"
-              class="list_item_width_1"
-              clearable
-              placeholder="请输入身份证"
-            >
+          <el-form-item label="身份证"
+                        prop="mobile">
+            <el-input v-model="formData.idCard"
+                      size="small"
+                      class="list_item_width_1"
+                      clearable
+                      placeholder="请输入身份证">
             </el-input>
           </el-form-item>
 
-          <el-form-item label="接种针次" prop="vaccinationCount">
-            <el-select
-              class="list_item_width_1"
-              v-model.trim="formData.vaccinationCount"
-              placeholder="请选择"
-              clearable
-            >
-              <el-option
-                v-for="item in veroNumList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
+          <el-form-item label="接种针次"
+                        prop="vaccinationCount">
+            <el-select class="list_item_width_1"
+                       v-model.trim="formData.vaccinationCount"
+                       placeholder="请选择"
+                       clearable>
+              <el-option v-for="item in veroNumList"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
               </el-option>
             </el-select>
           </el-form-item>
@@ -62,412 +54,313 @@
             <div class="resi-cell-value">
               <div class="resi-cell-col">
                 <el-form-item prop="villageId">
-                  <el-select
-                    v-model.trim="formData.villageId"
-                    placeholder="小区"
-                    size="small"
-                    clearable
-                    class="resi-cell-select"
-                    @change="handleChangeV"
-                  >
-                    <el-option
-                      v-for="item in optionsV"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    >
+                  <el-select v-model.trim="formData.villageId"
+                             placeholder="小区"
+                             size="small"
+                             clearable
+                             class="resi-cell-select"
+                             @change="handleChangeV">
+                    <el-option v-for="item in optionsV"
+                               :key="item.value"
+                               :label="item.label"
+                               :value="item.value">
                     </el-option>
                   </el-select>
                 </el-form-item>
                 <el-form-item prop="buildId">
-                  <el-select
-                    v-model.trim="formData.buildId"
-                    placeholder="楼号"
-                    :disabled="!this.formData.villageId"
-                    size="small"
-                    clearable
-                    class="
+                  <el-select v-model.trim="formData.buildId"
+                             placeholder="楼号"
+                             :disabled="!this.formData.villageId"
+                             size="small"
+                             clearable
+                             class="
                       resi-cell-select resi-cell-select-middle
                       list_item_width_1
                     "
-                    @change="handleChangeB"
-                  >
-                    <el-option
-                      v-for="item in optionsB"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    >
+                             @change="handleChangeB">
+                    <el-option v-for="item in optionsB"
+                               :key="item.value"
+                               :label="item.label"
+                               :value="item.value">
                     </el-option>
                   </el-select>
                 </el-form-item>
                 <el-form-item prop="unitId">
-                  <el-select
-                    v-model.trim="formData.unitId"
-                    placeholder="单元"
-                    size="small"
-                    :disabled="!this.formData.buildId"
-                    clearable
-                    class="
+                  <el-select v-model.trim="formData.unitId"
+                             placeholder="单元"
+                             size="small"
+                             :disabled="!this.formData.buildId"
+                             clearable
+                             class="
                       resi-cell-select resi-cell-select-middle
                       list_item_width_1
                     "
-                    @change="handleChangeD"
-                  >
-                    <el-option
-                      v-for="item in optionsD"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    >
+                             @change="handleChangeD">
+                    <el-option v-for="item in optionsD"
+                               :key="item.value"
+                               :label="item.label"
+                               :value="item.value">
                     </el-option>
                   </el-select>
                 </el-form-item>
                 <el-form-item prop="homeId">
-                  <el-select
-                    v-model.trim="formData.homeId"
-                    placeholder="房号"
-                    :disabled="!this.formData.unitId"
-                    size="small"
-                    clearable
-                    class="
+                  <el-select v-model.trim="formData.homeId"
+                             placeholder="房号"
+                             :disabled="!this.formData.unitId"
+                             size="small"
+                             clearable
+                             class="
                       resi-cell-select resi-cell-select-middle
                       list_item_width_1
-                    "
-                  >
-                    <el-option
-                      v-for="item in optionsH"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    >
+                    ">
+                    <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>
           </el-form-item>
-          <el-button
-            style="margin-left: 30px"
-            size="small"
-            class="diy-button--search"
-            @click="handleSearch"
-            >查询</el-button
-          >
-          <el-button
-            style="margin-left: 10px"
-            size="small"
-            class="diy-button--reset"
-            @click="resetSearch"
-            >重置</el-button
-          >
+          <el-button style="margin-left: 30px"
+                     size="small"
+                     class="diy-button--search"
+                     @click="handleSearch">查询</el-button>
+          <el-button style="margin-left: 10px"
+                     size="small"
+                     class="diy-button--reset"
+                     @click="resetSearch">重置</el-button>
         </div>
       </el-form>
     </div>
     <div class="div_table">
       <div class="div_btn">
-        <el-button class="diy-button--add" size="small" @click="handleAdd"
-          >新增</el-button
-        >
-
-        <el-button
-          style="float: left"
-          class="diy-button--export"
-          size="small"
-          @click="handleExportModule"
-          >下载模板</el-button
-        >
-        <el-upload
-          ref="upload"
-          :multiple="false"
-          :show-file-list="false"
-          :before-upload="beforeUpload"
-          action=""
-          accept=".xlsx"
-          :limit="1"
-          :on-exceed="handleExceed"
-          :http-request="uploadFile"
-        >
-          <el-button
-            style="margin-left: 10px"
-            size="small"
-            class="diy-button--delete"
-            >导入</el-button
-          >
+        <el-button class="diy-button--add"
+                   size="small"
+                   @click="handleAdd">新增</el-button>
+
+        <el-button style="float: left"
+                   class="diy-button--export"
+                   size="small"
+                   @click="handleExportModule">下载模板</el-button>
+        <el-upload ref="upload"
+                   :multiple="false"
+                   :show-file-list="false"
+                   :before-upload="beforeUpload"
+                   action=""
+                   accept=".xlsx"
+                   :limit="1"
+                   :on-exceed="handleExceed"
+                   :http-request="uploadFile">
+          <el-button style="margin-left: 10px"
+                     size="small"
+                     class="diy-button--delete">导入</el-button>
         </el-upload>
 
-        <el-button
-          style="float: left; margin-left: 10px"
-          class="diy-button--reset"
-          size="small"
-          @click="handleExport"
-          >导出</el-button
-        >
-
-        <el-button
-          style="margin-left: 15px"
-          class="diy-button--more"
-          size="small"
-          @click="handleSendNotice"
-          >发送通知</el-button
-        >
-        <el-button
-          style="margin-left: 15px"
-          class="diy-button--more"
-          size="small"
-          @click="handleDelete"
-          >取消关注</el-button
-        >
+        <el-button style="float: left; margin-left: 10px"
+                   class="diy-button--reset"
+                   size="small"
+                   @click="handleExport">导出</el-button>
+
+        <el-button style="margin-left: 15px"
+                   class="diy-button--more"
+                   size="small"
+                   @click="handleSendNotice">发送通知</el-button>
+        <el-button style="margin-left: 15px"
+                   class="diy-button--more"
+                   size="small"
+                   @click="handleDelete">取消关注</el-button>
       </div>
 
-      <el-table
-        ref="ref_table"
-        class="table"
-        :data="tableData"
-        border
-        :height="tableHeight"
-        v-loading="tableLoading"
-        :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
-        @select="handleSelectTable"
-        @select-all="handleSelAll"
-        style="width: 100%"
-      >
-        <el-table-column type="selection" width="55"></el-table-column>
-        <el-table-column
-          label="序号"
-          header-align="center"
-          align="center"
-          type="index"
-          width="50"
-        ></el-table-column>
-
-        <el-table-column
-          prop="name"
-          header-align="center"
-          align="center"
-          label="姓名"
-          width="90"
-        >
+      <el-table ref="ref_table"
+                class="table"
+                :data="tableData"
+                border
+                :height="tableHeight"
+                v-loading="tableLoading"
+                :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
+                @select="handleSelectTable"
+                @select-all="handleSelAll"
+                style="width: 100%">
+        <el-table-column type="selection"
+                         width="55"></el-table-column>
+        <el-table-column label="序号"
+                         header-align="center"
+                         align="center"
+                         type="index"
+                         width="50"></el-table-column>
+
+        <el-table-column prop="name"
+                         header-align="center"
+                         align="center"
+                         label="姓名"
+                         width="90">
         </el-table-column>
-        <el-table-column
-          prop="mobile"
-          header-align="center"
-          align="center"
-          label="手机号"
-          width="110"
-        >
+        <el-table-column prop="mobile"
+                         header-align="center"
+                         align="center"
+                         label="手机号"
+                         width="110">
         </el-table-column>
-        <el-table-column
-          prop="idCard"
-          header-align="center"
-          align="center"
-          label="身份证"
-          width="170"
-        >
+        <el-table-column prop="idCard"
+                         header-align="center"
+                         align="center"
+                         label="身份证"
+                         width="170">
         </el-table-column>
-        <el-table-column
-          prop="allName"
-          header-align="center"
-          align="center"
-          label="所属房屋"
-          min-width="200"
-        >
+        <el-table-column prop="allName"
+                         header-align="center"
+                         align="center"
+                         label="所属房屋"
+                         min-width="200">
         </el-table-column>
-        <el-table-column
-          prop="vaccinationCount"
-          header-align="center"
-          align="center"
-          label="接种针次"
-          width="90"
-        >
+        <el-table-column prop="vaccinationCount"
+                         header-align="center"
+                         align="center"
+                         label="接种针次"
+                         width="90">
         </el-table-column>
-        <el-table-column
-          prop="reason"
-          header-align="center"
-          align="center"
-          show-overflow-tooltip
-          label="关注原因"
-          min-width="180"
-        >
+        <el-table-column prop="reason"
+                         header-align="center"
+                         align="center"
+                         show-overflow-tooltip
+                         label="关注原因"
+                         min-width="180">
         </el-table-column>
-        <el-table-column
-          prop="remark"
-          header-align="center"
-          align="center"
-          show-overflow-tooltip
-          label="备注"
-          min-width="180"
-        >
+        <el-table-column prop="remark"
+                         header-align="center"
+                         align="center"
+                         show-overflow-tooltip
+                         label="备注"
+                         min-width="180">
         </el-table-column>
-        <el-table-column
-          prop="lastInformTime"
-          header-align="center"
-          align="center"
-          show-overflow-tooltip
-          label="最后一次通知时间"
-          width="160"
-        >
+        <el-table-column prop="lastInformTime"
+                         header-align="center"
+                         align="center"
+                         show-overflow-tooltip
+                         label="最后一次通知时间"
+                         width="160">
         </el-table-column>
 
-        <el-table-column
-          label="操作"
-          fixed="right"
-          width="140"
-          header-align="center"
-          align="center"
-          class="operate"
-        >
+        <el-table-column label="操作"
+                         fixed="right"
+                         width="140"
+                         header-align="center"
+                         align="center"
+                         class="operate">
           <template slot-scope="scope">
-            <el-button
-              type="text"
-              class="div-table-button--detail"
-              size="small"
-              @click="handleDetail(scope.row)"
-              >查看</el-button
-            >
-            <el-button
-              type="text"
-              class="div-table-button--edit"
-              size="small"
-              @click="handleEdit(scope.row)"
-              >修改</el-button
-            >
-
-            <el-popover
-              popper-class="btn-popper"
-              placement="bottom"
-              style="margin-left: 10px"
-              width="20"
-              trigger="hover"
-            >
+            <el-button type="text"
+                       class="div-table-button--detail"
+                       size="small"
+                       @click="handleDetail(scope.row)">查看</el-button>
+            <el-button type="text"
+                       class="div-table-button--edit"
+                       size="small"
+                       @click="handleEdit(scope.row)">修改</el-button>
+
+            <el-popover popper-class="btn-popper"
+                        placement="bottom"
+                        style="margin-left: 10px"
+                        width="20"
+                        trigger="hover">
               <div class="table-more-btn">
-                <el-button
-                  type="text"
-                  class="div-table-button--detail--noline"
-                  size="small"
-                  @click="handleNoticeList(scope.row)"
-                  >通知记录</el-button
-                >
+                <el-button type="text"
+                           class="div-table-button--detail--noline"
+                           size="small"
+                           @click="handleNoticeList(scope.row)">通知记录</el-button>
               </div>
 
               <div class="table-more-btn">
-                <el-button
-                  type="text"
-                  class="div-table-button--detail--noline"
-                  size="small"
-                  @click="handleVisiteList(scope.row)"
-                  >随访记录</el-button
-                >
+                <el-button type="text"
+                           class="div-table-button--detail--noline"
+                           size="small"
+                           @click="handleVisiteList(scope.row)">随访记录</el-button>
               </div>
 
-              <el-button
-                type="text"
-                size="small"
-                class="div-table-button--more"
-                slot="reference"
-                >更多<i class="el-icon-caret-bottom"></i
-              ></el-button>
+              <el-button type="text"
+                         size="small"
+                         class="div-table-button--more"
+                         slot="reference">更多<i class="el-icon-caret-bottom"></i></el-button>
             </el-popover>
           </template>
         </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="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="pageSize"
+                       layout="sizes, prev, pager, next, total"
+                       :total="total">
         </el-pagination>
       </div>
     </div>
 
     <!-- 新增弹出框 -->
-    <el-dialog
-      :visible.sync="addFormShow"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      :destroy-on-close="true"
-      title="新增疫苗接种关注名单"
-      width="1050px"
-      top="5vh"
-      class="dialog-h"
-      @closed="diaClose"
-    >
-      <vero-focus-add
-        ref="ref_form_add"
-        @dialogCancle="diaClose"
-        @dialogOk="addFormOk"
-      ></vero-focus-add>
+    <el-dialog :visible.sync="addFormShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :destroy-on-close="true"
+               title="新增疫苗接种关注名单"
+               width="1050px"
+               top="5vh"
+               class="dialog-h"
+               @closed="diaClose">
+      <vero-focus-add ref="ref_form_add"
+                      @dialogCancle="diaClose"
+                      @dialogOk="addFormOk"></vero-focus-add>
     </el-dialog>
     <!-- 修改弹出框 -->
-    <el-dialog
-      :visible.sync="editFormShow"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      :title="editFormTitle"
-      width="1050px"
-      top="5vh"
-      class="dialog-h"
-      @closed="diaClose"
-    >
-      <vero-focus-edit
-        ref="ref_form_edit"
-        @dialogCancle="diaClose"
-        @dialogOk="addFormOk"
-      ></vero-focus-edit>
+    <el-dialog :visible.sync="editFormShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="editFormTitle"
+               width="1050px"
+               top="5vh"
+               class="dialog-h"
+               @closed="diaClose">
+      <vero-focus-edit ref="ref_form_edit"
+                       @dialogCancle="diaClose"
+                       @dialogOk="addFormOk"></vero-focus-edit>
     </el-dialog>
     <!-- 发送通知弹出框 -->
-    <el-dialog
-      :visible.sync="sendNoticeFormShow"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      title="发送通知"
-      width="850px"
-      top="5vh"
-      class="dialog-h"
-      @closed="diaClose"
-    >
-      <vf-send-notice
-        ref="ref_sendnotice"
-        @dialogCancle="diaClose"
-        @dialogOk="sendNoticeOk"
-      ></vf-send-notice>
+    <el-dialog :visible.sync="sendNoticeFormShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               title="发送通知"
+               width="850px"
+               top="5vh"
+               class="dialog-h"
+               @closed="diaClose">
+      <vf-send-notice ref="ref_sendnotice"
+                      @dialogCancle="diaClose"
+                      @dialogOk="sendNoticeOk"></vf-send-notice>
     </el-dialog>
     <!-- 通知记录弹出框 -->
-    <el-dialog
-      :visible.sync="noticeListFormShow"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      title="通知记录"
-      width="1050px"
-      top="5vh"
-      class="dialog-h"
-      @closed="diaClose"
-    >
-      <vf-notice-list
-        ref="ref_noticelist"
-        @dialogCancle="diaClose"
-      ></vf-notice-list>
+    <el-dialog :visible.sync="noticeListFormShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               title="通知记录"
+               width="1050px"
+               top="5vh"
+               class="dialog-h"
+               @closed="diaClose">
+      <vf-notice-list ref="ref_noticelist"
+                      @dialogCancle="diaClose"></vf-notice-list>
     </el-dialog>
     <!-- 随访记录弹出框 -->
-    <el-dialog
-      :visible.sync="visiteListFormShow"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      title="随访记录"
-      width="1050px"
-      top="5vh"
-      class="dialog-h"
-      @closed="diaClose"
-    >
-      <vf-visite-list
-        ref="ref_visitelist"
-        @dialogCancle="diaClose"
-      ></vf-visite-list>
+    <el-dialog :visible.sync="visiteListFormShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               title="随访记录"
+               width="1050px"
+               top="5vh"
+               class="dialog-h"
+               @closed="diaClose">
+      <vf-visite-list ref="ref_visitelist"
+                      @dialogCancle="diaClose"></vf-visite-list>
     </el-dialog>
   </div>
 </template>
@@ -485,7 +378,7 @@ import { Loading } from "element-ui"; // 引入Loading服务
 
 let loading; // 加载动画
 export default {
-  data() {
+  data () {
     return {
       loading: false,
       total: 0,
@@ -534,11 +427,11 @@ export default {
     vfSendNotice,
     vfVisiteList,
   },
-  async created() {},
-  activated() {
+  async created () { },
+  activated () {
     this.$refs["ref_table"].doLayout();
   },
-  async mounted() {
+  async mounted () {
     const { user } = this.$store.state;
     this.agencyId = user.agencyId;
     for (let i = 0; i < 11; i++) {
@@ -553,12 +446,12 @@ export default {
   },
 
   methods: {
-    handleSearch() {
+    handleSearch () {
       this.selectionAll = [];
       this.loadTable();
     },
 
-    async loadTable() {
+    async loadTable () {
       this.tableLoading = true;
 
       const url = "/epmetuser/icEpidemicSpecialAttention/list";
@@ -610,7 +503,7 @@ export default {
       this.tableLoading = false;
     },
 
-    handleChangeV(val) {
+    handleChangeV (val) {
       console.log("val", val);
       this.formData.buildId = "";
       this.formData.unitId = "";
@@ -619,19 +512,19 @@ export default {
       this.getUniList();
       this.getHouseList();
     },
-    handleChangeB(val) {
+    handleChangeB (val) {
       console.log("val", val);
       this.formData.unitId = "";
       this.formData.homeId = "";
       this.getUniList();
       this.getHouseList();
     },
-    handleChangeD() {
+    handleChangeD () {
       this.formData.homeId = "";
       this.getHouseList();
     },
 
-    getValiheList() {
+    getValiheList () {
       const { user } = this.$store.state;
       this.$http
         .post("/gov/org/icneighborhood/neighborhoodoption", {
@@ -651,7 +544,7 @@ export default {
         });
     },
 
-    getBuildList() {
+    getBuildList () {
       this.$http
         .post("/gov/org/icbuilding/buildingoption", {
           neighborHoodId: this.formData.villageId,
@@ -668,7 +561,7 @@ export default {
           return this.$message.error("网络错误");
         });
     },
-    getUniList() {
+    getUniList () {
       this.$http
         .post("/gov/org/icbuildingunit/unitoption", {
           buildingId: this.formData.buildId,
@@ -685,7 +578,7 @@ export default {
           return this.$message.error("网络错误");
         });
     },
-    getHouseList() {
+    getHouseList () {
       this.$http
         .post("/gov/org/ichouse/houseoption", { unitId: this.formData.unitId })
         .then(({ data: res }) => {
@@ -701,7 +594,7 @@ export default {
         });
     },
 
-    handleSelectTable(selection, row) {
+    handleSelectTable (selection, row) {
       row.isSel = !row.isSel;
 
       if (row.isSel) {
@@ -717,7 +610,7 @@ export default {
       }
     },
 
-    handleSelAll(selection) {
+    handleSelAll (selection) {
       let selFlag = selection.length > 0; //全选选中 还是 全选不选中
       for (let i = 0; i < this.tableData.length; i++) {
         let tableItem = this.tableData[i];
@@ -741,7 +634,7 @@ export default {
     },
 
     //回显列表选中的行
-    analysisTableSelection() {
+    analysisTableSelection () {
       this.$nextTick(() => {
         this.tableData.forEach((tableItem) => {
           for (let j = 0; j < this.selectionAll.length; j++) {
@@ -759,7 +652,7 @@ export default {
       });
     },
 
-    diaClose() {
+    diaClose () {
       this.addFormShow = false;
       this.editFormShow = false;
       this.sendNoticeFormShow = false;
@@ -767,30 +660,30 @@ export default {
       this.visiteListFormShow = false;
     },
 
-    handleAdd() {
+    handleAdd () {
       this.addFormShow = true;
       this.$nextTick(() => {
         this.$refs.ref_form_add.initForm(null, this.agencyId);
       });
     },
 
-    async handleEdit(row) {
+    async handleEdit (row) {
       this.editFormTitle = "修改疫苗接种关注名单";
       this.editFormShow = true;
-
-      let row2 = await this.getInfo(row);
+      const row1 = { ...row }
+      let row2 = await this.getInfo(row1);
       this.$refs.ref_form_edit.initForm("edit", row2);
     },
 
-    async handleDetail(row) {
+    async handleDetail (row) {
       this.editFormTitle = "查看疫苗接种关注名单";
       this.editFormShow = true;
-
-      let row2 = await this.getInfo(row);
+      const row1 = { ...row }
+      let row2 = await this.getInfo(row1);
       this.$refs.ref_form_edit.initForm("detail", row2);
     },
 
-    async getInfo(row) {
+    async getInfo (row) {
       const url = "/epmetuser/icEpidemicSpecialAttention/detail";
 
       let params = {
@@ -806,7 +699,7 @@ export default {
       return row;
     },
 
-    handleSendNotice() {
+    handleSendNotice () {
       if (this.selectionAll.length === 0) {
         this.$message.info("请选择要通知的人员");
         return false;
@@ -817,31 +710,31 @@ export default {
       });
     },
 
-    handleNoticeList(row) {
+    handleNoticeList (row) {
       this.noticeListFormShow = true;
       this.$nextTick(() => {
         this.$refs.ref_noticelist.initTable(row.idCard);
       });
     },
-    handleVisiteList(row) {
+    handleVisiteList (row) {
       this.visiteListFormShow = true;
       this.$nextTick(() => {
         this.$refs.ref_visitelist.initTable(row);
       });
     },
 
-    addFormOk() {
+    addFormOk () {
       this.addFormShow = false;
       this.editFormShow = false;
       this.loadTable();
     },
-    sendNoticeOk() {
+    sendNoticeOk () {
       this.sendNoticeFormShow = false;
       this.selectionAll = [];
       this.loadTable();
     },
 
-    async handleDelete(row) {
+    async handleDelete (row) {
       if (this.selectionAll.length === 0) {
         this.$message.info("请选择要取消关注的名单");
         return false;
@@ -860,7 +753,7 @@ export default {
         });
     },
 
-    async deleteFocus(row) {
+    async deleteFocus (row) {
       const url = "/epmetuser/icEpidemicSpecialAttention/cancel-attention";
       // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/del"
       let idCards = [];
@@ -888,7 +781,7 @@ export default {
     },
 
     //重置搜索条件
-    resetSearch() {
+    resetSearch () {
       this.formData = {
         attentionType: 1, //关注类型，核酸检测：2，疫苗接种：1
         name: "",
@@ -901,18 +794,18 @@ export default {
       // this.loadTable()
     },
 
-    handleSizeChange(val) {
+    handleSizeChange (val) {
       this.pageSize = val;
       this.pageNo = 1;
       this.loadTable();
     },
-    handleCurrentChange(val) {
+    handleCurrentChange (val) {
       this.pageNo = val;
       this.loadTable();
     },
 
     //导出表格
-    async handleExport() {
+    async handleExport () {
       let title = "疫苗接种关注名单";
 
       const url = "/epmetuser/icEpidemicSpecialAttention/vaccination-export";
@@ -930,7 +823,7 @@ export default {
     },
 
     // 下载文件
-    download(data, fileName) {
+    download (data, fileName) {
       if (!data) {
         return;
       }
@@ -954,7 +847,7 @@ export default {
       }
     },
 
-    handleExportModule() {
+    handleExportModule () {
       let title = "疫苗接种关注名单模板";
 
       const url = "/epmetuser/icEpidemicSpecialAttention/export-template";
@@ -975,7 +868,7 @@ export default {
     },
 
     // 上传文件之前的钩子
-    beforeUpload(file) {
+    beforeUpload (file) {
       const array = file.name.split(".");
       const extension = array[array.length - 1];
       // const isLt1M = (file.size / 1024 / 1024) < 5
@@ -989,11 +882,11 @@ export default {
       }
     },
     // 上传文件个数超过定义的数量
-    handleExceed(files, fileList) {
+    handleExceed (files, fileList) {
       this.$message.warning(`当前限制选择 1 个文件，请删除后继续上传`);
     },
 
-    async uploadFile() {
+    async uploadFile () {
       if (this.fileName == "") {
         this.$message.warning("请选择要上传的文件！");
         return false;
@@ -1032,13 +925,13 @@ export default {
 
           // this.loadTable()
         },
-        (rspMsg, data) => {},
+        (rspMsg, data) => { },
         { headers: { "Content-Type": "multipart/form-data" } }
       );
     },
 
     // 开启加载动画
-    startLoading() {
+    startLoading () {
       loading = Loading.service({
         lock: true, // 是否锁定
         text: "正在加载……", // 加载中需要显示的文字
@@ -1046,7 +939,7 @@ export default {
       });
     },
     // 结束加载动画
-    endLoading() {
+    endLoading () {
       // clearTimeout(timer);
       if (loading) {
         loading.close();
@@ -1054,7 +947,7 @@ export default {
     },
   },
   computed: {
-    tableHeight() {
+    tableHeight () {
       return this.$store.state.inIframe
         ? this.clientHeight - 415 + this.iframeHeight
         : this.clientHeight - 415;
diff --git a/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue b/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue
index 944306dcf..25c1f970d 100644
--- a/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue
+++ b/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue
@@ -291,14 +291,17 @@ export default {
 
       this.housePieInitState = false
       this.userPieInitState = false
-      this.getHousechart()
-      this.getUserchart()
+      await this.getHousechart()
+      await this.getUserchart()
+      await this.getSubuserhouselist()
+      this.dataLoading = false
+
+      await nextTick(500)
 
       this.getHousePie()
       this.getUserPie()
 
-      await this.getSubuserhouselist()
-      this.dataLoading = false
+
 
     },
     housePieInitOk (dom) {
@@ -610,12 +613,13 @@ export default {
       this.runNum = this.runNum - cutNum
 
       let orgData = this.runAgencyArray[index]
+      console.log('----------------', orgData)
 
       for (let i = 0; i < cutNum; i++) {
         this.runAgencyArray.pop()
       }
 
-      this.orgId = orgData.id
+      this.orgId = orgData.orgId
       this.orgType = orgData.orgType
       this.orgName = orgData.orgName
 
diff --git a/src/views/modules/visual/communityParty/party.vue b/src/views/modules/visual/communityParty/party.vue
index 050753fd2..be0c958c1 100644
--- a/src/views/modules/visual/communityParty/party.vue
+++ b/src/views/modules/visual/communityParty/party.vue
@@ -149,7 +149,7 @@ export default {
       ],
       headerStyle: [
         {
-          width: '50px'
+          'max-width': '60px'
         },
         {
           'min-width': '100px'