From 4caa20a6a30f02f3b5fe97d2f112a755b7889b37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E7=B4=A0?= <66666@66.com>
Date: Wed, 10 Apr 2024 15:09:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E5=88=86=E7=B1=BB=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/base/community/community.vue      | 320 +++++---------
 .../modules/base/community/roomTable.vue      | 406 ++++++------------
 src/views/modules/base/resi.vue               |  46 +-
 src/views/modules/home/index.vue              |  38 +-
 4 files changed, 286 insertions(+), 524 deletions(-)

diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue
index 457e5796a..7731dac70 100644
--- a/src/views/modules/base/community/community.vue
+++ b/src/views/modules/base/community/community.vue
@@ -1,29 +1,14 @@
 <template>
   <div class="g-main">
-    <div :style="{ height: rowHeight }"
-         class="div_tree">
-      <el-input placeholder="输入关键字进行过滤"
-                v-model="filterText"
-                @keydown.native.enter="handleChangeSerch()">
+    <div :style="{ height: rowHeight }" class="div_tree">
+      <el-input placeholder="输入关键字进行过滤" v-model="filterText" @keydown.native.enter="handleChangeSerch()">
       </el-input>
-      <el-scrollbar :style="{ height: treeHeight }"
-                    class="scrollar">
-        <el-tree ref="ref_tree"
-                 v-loading="treeLoading"
-                 class="filter_tree"
-                 :data="treeData"
-                 :props="defaultProps"
-                 :highlight-current="true"
-                 node-key="id"
-                 :expand-on-click-node="false"
-                 :filter-node-method="filterNode"
-                 @node-click="handleNodeClick"
-                 lazy
-                 :auto-expand-parent="true"
-                 :default-expanded-keys="autoOpenArr"
-                 :load="lazyLoadTree">
-          <span slot-scope="{ node, data }"
-                class="custom-tree-node">
+      <el-scrollbar :style="{ height: treeHeight }" class="scrollar">
+        <el-tree ref="ref_tree" v-loading="treeLoading" class="filter_tree" :data="treeData" :props="defaultProps"
+          :highlight-current="true" node-key="id" :expand-on-click-node="false" :filter-node-method="filterNode"
+          @node-click="handleNodeClick" lazy :auto-expand-parent="true" :default-expanded-keys="autoOpenArr"
+          :load="lazyLoadTree">
+          <span slot-scope="{ node, data }" class="custom-tree-node">
             <!-- <img
               v-if="showIcons(data)"
               src="@/assets/images/index/abnormal.png"
@@ -42,107 +27,57 @@
               <span style="color: red">{{ data.showNum }}</span>
               <span>{{ ")" }}</span>
             </span> -->
-            <el-tooltip
-                    :content="tooltipTitle"
-                    :disabled="isShowTooltip"
-                    placement="top"
-                    effect="dark"
-                    >
-                    <span class="over-ellipsis" @mouseover="mouseOverNode($event)">
-                        {{ node.label }}
-                    </span>
-                    </el-tooltip>
+            <el-tooltip :content="tooltipTitle" :disabled="isShowTooltip" placement="top" effect="dark">
+              <span class="over-ellipsis" @mouseover="mouseOverNode($event)">
+                {{ node.label }}
+              </span>
+            </el-tooltip>
           </span>
         </el-tree>
       </el-scrollbar>
     </div>
 
     <div class="div_left">
-      <div class="m-search"
-           style="flex-direction: column">
+      <div class="m-search" style="flex-direction: column">
         <section :class="boxHeight ? 'm-form-box-height' : 'm-form-box-height-auto'">
-          <el-form :inline="true"
-                   class="communityHeight"
-                   ref="ref_searchform"
-                   :label-width="'100px'">
-            <el-form-item label="房主姓名"
-                          prop="ownerName">
-              <el-input v-model="ownerName"
-                        class="u-item-width-normal"
-                        size="small"
-                        clearable
-                        placeholder="请输入内容">
+          <el-form :inline="true" class="communityHeight" ref="ref_searchform" :label-width="'100px'">
+            <el-form-item label="房主姓名" prop="ownerName">
+              <el-input v-model="ownerName" class="u-item-width-normal" size="small" clearable placeholder="请输入内容">
               </el-input>
             </el-form-item>
-            <el-form-item label="联系电话"
-                          prop="ownerPhone">
-              <el-input v-model="ownerPhone"
-                        class="u-item-width-normal"
-                        size="small"
-                        clearable
-                        placeholder="请输入联系电话">
+            <el-form-item label="联系电话" prop="ownerPhone">
+              <el-input v-model="ownerPhone" class="u-item-width-normal" size="small" clearable placeholder="请输入联系电话">
               </el-input>
             </el-form-item>
 
-            <el-form-item label="房屋状态"
-                          prop="rentFlag">
-              <el-select class="u-item-width-normal"
-                         v-model="rentFlag"
-                         placeholder="请选择"
-                         size="small"
-                         clearable>
-                <el-option v-for="item in rentList"
-                           :key="item.value"
-                           :label="item.label"
-                           :value="item.value">
+            <el-form-item label="房屋状态" prop="rentFlag">
+              <el-select class="u-item-width-normal" v-model="rentFlag" placeholder="请选择" size="small" clearable>
+                <el-option v-for="item in rentList" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
             </el-form-item>
 
-            <el-form-item label="房屋用途"
-                          prop="purpose">
-              <el-select v-model="purpose"
-                         class="u-item-width-normal"
-                         placeholder="请选择"
-                         size="small"
-                         clearable>
-                <el-option v-for="item in purposeArr"
-                           :key="item.dictValue"
-                           :label="item.dictName"
-                           :value="item.dictValue">
+            <el-form-item label="房屋用途" prop="purpose">
+              <el-select v-model="purpose" class="u-item-width-normal" placeholder="请选择" size="small" clearable>
+                <el-option v-for="item in purposeArr" :key="item.dictValue" :label="item.dictName"
+                  :value="item.dictValue">
                 </el-option>
               </el-select>
             </el-form-item>
 
-            <el-form-item label="更新时间"
-                          prop="updateStartDate">
-              <el-date-picker v-model="updateStartDate"
-                              :picker-options="startPickerOptions"
-                              class="u-item-width-daterange"
-                              size="small"
-                              type="datetime"
-                              value-format="yyyy-MM-dd HH:mm:ss"
-                              value="yyyy-MM-dd"
-                              placeholder="开始时间">
+            <el-form-item label="更新时间" prop="updateStartDate">
+              <el-date-picker v-model="updateStartDate" :picker-options="startPickerOptions"
+                class="u-item-width-daterange" size="small" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                value="yyyy-MM-dd" placeholder="开始时间">
               </el-date-picker>
               <span class="u-data-tag">至</span>
-              <el-date-picker v-model="updateEndDate"
-                              :picker-options="endPickerOptions"
-                              class="u-item-width-daterange u-data-tag"
-                              size="small"
-                              type="datetime"
-                              value-format="yyyy-MM-dd HH:mm:ss"
-                              value="yyyy-MM-dd"
-                              placeholder="结束时间">
+              <el-date-picker v-model="updateEndDate" :picker-options="endPickerOptions"
+                class="u-item-width-daterange u-data-tag" size="small" type="datetime"
+                value-format="yyyy-MM-dd HH:mm:ss" value="yyyy-MM-dd" placeholder="结束时间">
               </el-date-picker>
             </el-form-item>
-            <el-form-item label="备注"
-                          prop="remark">
-              <el-input v-model="remark"
-                        class="u-item-width-normal"
-                        size="small"
-                        clearable
-                        placeholder="请输入备注">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="remark" class="u-item-width-normal" size="small" clearable placeholder="请输入备注">
               </el-input>
             </el-form-item>
 
@@ -232,15 +167,9 @@
           </el-form>
         </section>
         <el-row>
-          <el-col :span="24"
-                  align="right">
-            <el-button style="margin-left: 10px"
-                       size="small"
-                       type="primary"
-                       @click="handleSearch">查询</el-button>
-            <el-button size="small"
-                       class="diy-button--white"
-                       @click="resetSearch">重置</el-button>
+          <el-col :span="24" align="right">
+            <el-button style="margin-left: 10px" size="small" type="primary" @click="handleSearch">查询</el-button>
+            <el-button size="small" class="diy-button--white" @click="resetSearch">重置</el-button>
             <!-- <el-button style="margin: 0 6px 0 10px"
                        size="small"
                        class="div-table-button--blue"
@@ -252,54 +181,24 @@
       </div>
 
       <div class="">
-        <build-table v-if="selTreeObj.level === 'neighborHood' && !showRoomTable"
-                     ref="ref_neighTable"
-                     :staffAgencyId="staffAgencyId"
-                     :showImportBtn="showImportBtn"
-                     :ownerName="ownerName"
-                     :ownerPhone="ownerPhone"
-                     :rentFlag="rentFlag"
-                     :purpose="purpose"
-                     :remark="remark"
-                     :updateStartDate="updateStartDate"
-                     :updateEndDate="updateEndDate"
-                     :searchHeight="searchHeight"
-                     @toNextLevel="toNextLevel"
-                     @refreshTree="refreshTree"></build-table>
-
-        <room-table v-if="showRoomTable || selTreeObj.level === 'building'"
-                    :staffAgencyId="staffAgencyId"
-                    :showImportBtn="showImportBtn"
-                    :ownerName="ownerName"
-                    :ownerPhone="ownerPhone"
-                    :rentFlag="rentFlag"
-                    :purpose="purpose"
-                    :neighborHoodId="neighborHoodId"
-                    :buildingId="buildingId"
-                    :buildingUnitId="buildingUnitId"
-                    :houseId="houseId"
-                    :remark="remark"
-                    :updateStartDate="updateStartDate"
-                    :updateEndDate="updateEndDate"
-                    ref="ref_buildingTable"
-                    @refreshTree="refreshTree"></room-table>
-
-        <community-table v-if="
-            selTreeObj.level !== 'building' &&
-            selTreeObj.level !== 'neighborHood' &&
-            !showRoomTable
-          "
-                         @toNextLevel="toNextLevel"
-                         :staffAgencyId="staffAgencyId"
-                         :ownerName="ownerName"
-                         :ownerPhone="ownerPhone"
-                         :rentFlag="rentFlag"
-                         :purpose="purpose"
-                         :remark="remark"
-                         :updateStartDate="updateStartDate"
-                         :updateEndDate="updateEndDate"
-                         ref="ref_communityTable"
-                         @refreshTree="refreshTree"></community-table>
+        <build-table v-if="selTreeObj.level === 'neighborHood' && !showRoomTable" ref="ref_neighTable"
+          :staffAgencyId="staffAgencyId" :showImportBtn="showImportBtn" :ownerName="ownerName" :ownerPhone="ownerPhone"
+          :rentFlag="rentFlag" :purpose="purpose" :remark="remark" :updateStartDate="updateStartDate"
+          :updateEndDate="updateEndDate" :searchHeight="searchHeight" @toNextLevel="toNextLevel"
+          @refreshTree="refreshTree"></build-table>
+
+        <room-table v-if="showRoomTable || selTreeObj.level === 'building'" :staffAgencyId="staffAgencyId"
+          :showImportBtn="showImportBtn" :ownerName="ownerName" :ownerPhone="ownerPhone" :rentFlag="rentFlag"
+          :purpose="purpose" :neighborHoodId="neighborHoodId" :buildingId="buildingId" :buildingUnitId="buildingUnitId"
+          :houseId="houseId" :remark="remark" :updateStartDate="updateStartDate" :updateEndDate="updateEndDate"
+          ref="ref_buildingTable" @refreshTree="refreshTree"></room-table>
+
+        <community-table v-if="selTreeObj.level !== 'building' &&
+      selTreeObj.level !== 'neighborHood' &&
+      !showRoomTable
+      " @toNextLevel="toNextLevel" :staffAgencyId="staffAgencyId" :ownerName="ownerName" :ownerPhone="ownerPhone"
+          :rentFlag="rentFlag" :purpose="purpose" :remark="remark" :updateStartDate="updateStartDate"
+          :updateEndDate="updateEndDate" ref="ref_communityTable" @refreshTree="refreshTree"></community-table>
       </div>
     </div>
   </div>
@@ -317,7 +216,7 @@ import nextTick from "dai-js/tools/nextTick";
 import debounce from "lodash/debounce";
 let loading; // 加载动画
 export default {
-  data () {
+  data() {
     let endDisabledDate = (time) => {
       //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
       let nowData = Date.now();
@@ -441,8 +340,8 @@ export default {
 
       treeIsOk: true,//树点击是否加载完成
 
-      isShowTooltip:false,
-      tooltipTitle:null,
+      isShowTooltip: false,
+      tooltipTitle: null,
     };
   },
   components: {
@@ -451,11 +350,8 @@ export default {
     buildTable,
     roomTable,
   },
-  async mounted () {
- 
-    // console.log("看看传过来什么",this.$route.query.param1)
+  async mounted() {
     this.searchHeight = this.$refs.ref_searchform.offsetHeight;
-
     this.treeLoading = true;
 
     await this.loadOrgData();
@@ -471,20 +367,34 @@ export default {
       });
     }
     this.treeLoading = false;
+
+    if (this.$route.query.param1 === 'zizhuM') {
+      this.rentFlag = '0';
+    } else if (this.$route.query.param1 === 'chuzuM') {
+      this.rentFlag = '1';
+    } else if (this.$route.query.param1 === 'xianzhiM') {
+      this.rentFlag = '2';
+    }
+    if (this.rentFlag !== '') {
+      this.handleSearch()
+      // console.log("this.rentFlag", this.rentFlag)
+    }
+
+
   },
   computed: {
-    rowHeight () {
+    rowHeight() {
       return this.$store.state.inIframe
         ? this.clientHeight - 140 + this.iframeHeight + "px"
         : this.clientHeight - 140 + "px";
     },
-    treeHeight () {
+    treeHeight() {
       return this.$store.state.inIframe
         ? this.clientHeight - 245 + this.iframeHeight + "px"
         : this.clientHeight - 245 + "px";
     },
     ...mapGetters(["clientHeight", "iframeHeight"]),
-    showIcons () {
+    showIcons() {
       return function (data) {
         if (data.level == "building") {
           let arr = data.showNum.split("/");
@@ -502,14 +412,14 @@ export default {
     // filterText (val) {
     //   this.$refs.ref_tree.filter(val);
     // },
-    updateStartDate () { }
+    updateStartDate() { }
   },
   methods: {
-    mouseOverNode(event){
+    mouseOverNode(event) {
       var target = event.target;
       let textLength = target.clientWidth;
       let containerLength = target.scrollWidth;
-   
+
       if (textLength < containerLength) {
         this.tooltipTitle = event.target.innerText;
         this.isShowTooltip = false;
@@ -517,7 +427,7 @@ export default {
         this.isShowTooltip = true;
       }
     },
-    handleChangeV (val) {
+    handleChangeV(val) {
       this.buildingId = "";
       this.buildingUnitId = "";
       this.houseId = "";
@@ -526,17 +436,17 @@ export default {
       // this.getHouseList();
     },
 
-    handleChangeB (val) {
+    handleChangeB(val) {
       this.buildingUnitId = "";
       this.houseId = "";
       this.getUniList();
       // this.getHouseList();
     },
-    handleChangeD () {
+    handleChangeD() {
       this.houseId = "";
       this.getHouseList();
     },
-    async lazyLoadTree (node, resolve) {
+    async lazyLoadTree(node, resolve) {
 
       const url = `/actual/base/communityBuilding/tree/nextTreeNode?id=${node.data.id}&level=${node.data.level}`;
       const { data, code, msg } = await requestGet(url);
@@ -552,7 +462,7 @@ export default {
       }
       // }
     },
-    async getValiheList () {
+    async getValiheList() {
       const { user } = this.$store.state;
       if (!this.selGridId) {
         this.selAgencyId = this.selAgencyId ? this.selAgencyId : user.agencyId;
@@ -577,7 +487,7 @@ export default {
         this.$message.error(msg);
       }
     },
-    async getBuildList () {
+    async getBuildList() {
       const url = "/actual/base/communityBuilding/buildingoption";
       let params = {
         quartersId: this.neighborHoodId,
@@ -594,7 +504,7 @@ export default {
       }
     },
     //回车搜索组织
-    async handleChangeSerch () {
+    async handleChangeSerch() {
       this.startLoading();
       this.$refs.ref_tree.$data.store.lazy = !this.filterText;
       if (this.filterText.length > 0 && this.filterText != "") {
@@ -620,7 +530,7 @@ export default {
       }
       this.endLoading();
     },
-    startLoading () {
+    startLoading() {
       loading = Loading.service({
         lock: true, // 是否锁定
         text: "正在加载……", // 加载中需要显示的文字
@@ -628,13 +538,13 @@ export default {
       });
     },
     // 结束加载动画
-    endLoading () {
+    endLoading() {
       // clearTimeout(timer);
       if (loading) {
         loading.close();
       }
     },
-    async getUniList () {
+    async getUniList() {
       const url = "/actual/base/communityBuildingUnit/unitoption";
       // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/epidemicPrevention/page"
       let params = {
@@ -651,7 +561,7 @@ export default {
         this.$message.error(msg);
       }
     },
-    getHouseList () {
+    getHouseList() {
       let params = {
         buildingId: this.buildingId,
         unitId: this.buildingUnitId,
@@ -671,7 +581,7 @@ export default {
         });
     },
 
-    handleSearch () {
+    handleSearch() {
       console.log(this.selTreeObj)
       this.showRoomTable = true;
       this.$nextTick(() => {
@@ -681,7 +591,7 @@ export default {
     },
 
     //重置搜索条件
-    resetSearch () {
+    resetSearch() {
       this.ownerName = "";
       this.ownerPhone = "";
       this.rentFlag = "";
@@ -702,7 +612,7 @@ export default {
       });
     },
 
-    async loadOpenNode () {
+    async loadOpenNode() {
       const url = "/gov/org/building/tree-ids";
       let params = {};
 
@@ -714,7 +624,7 @@ export default {
         this.$message.error(msg);
       }
     },
-    async loadTree (isRefresh) {
+    async loadTree(isRefresh) {
       const url = "/actual/base/communityBuilding/tree/initTree";
       const { data, code, msg } = await requestGet(url);
       if (code === 0) {
@@ -738,7 +648,7 @@ export default {
       }
     },
 
-    handleTreeData (treeData) {
+    handleTreeData(treeData) {
       for (let i in treeData) {
         treeData[i].showIcon = false;
         if (treeData[i].level === "building") {
@@ -758,7 +668,7 @@ export default {
     },
 
     //加载组织数据
-    async loadOrgData () {
+    async loadOrgData() {
       const url = "/gov/org/agency/maporg";
       // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/agency/maporg"
       let params = {};
@@ -775,7 +685,8 @@ export default {
       }
     },
 
-    async handleNodeClick (obj) {
+    async handleNodeClick(obj) {
+
       if (!this.treeIsOk) {
         setTimeout(() => {
           this.handleNodeClick(obj);
@@ -842,7 +753,7 @@ export default {
     },
 
     //添加小区结束
-    async refreshTree () {
+    async refreshTree() {
       this.treeLoading = true;
       await this.loadTree(this.selTreeObj.id);
       this.$nextTick(() => {
@@ -853,7 +764,7 @@ export default {
     },
 
     //进入下一级
-    async toNextLevel (row, level) {
+    async toNextLevel(row, level) {
 
       this.autoOpenArr = [];
 
@@ -914,7 +825,7 @@ export default {
     },
 
     //解析树数据
-    getTreeObj (obj) {
+    getTreeObj(obj) {
       if (!obj.latitude) {
         obj.latitude = this.centerPoint[0];
       }
@@ -926,13 +837,13 @@ export default {
 
     },
 
-    filterNode (value, data) {
+    filterNode(value, data) {
       if (!value) return true;
       return data.label.indexOf(value) !== -1;
     },
 
     // 开启加载动画
-    startLoading () {
+    startLoading() {
       loading = Loading.service({
         lock: true, // 是否锁定
         text: "正在加载……", // 加载中需要显示的文字
@@ -940,7 +851,7 @@ export default {
       });
     },
     // 结束加载动画
-    endLoading () {
+    endLoading() {
       // clearTimeout(timer);
       if (loading) {
         loading.close();
@@ -959,23 +870,24 @@ export default {
 .m-search ::v-deep .el-row {
   margin-right: 0;
 }
+
 .g-main {
   display: flex;
 }
+
 .scrollar {
   margin-top: 30px;
-  /deep/
-    .el-tree--highlight-current
-    .el-tree-node.is-current
-    > .el-tree-node__content {
+
+  /deep/ .el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content {
     background: #e6f0ff;
     border-radius: 2px;
   }
 
-  /deep/ .el-tree-node:focus > .el-tree-node__content {
+  /deep/ .el-tree-node:focus>.el-tree-node__content {
     color: #0056d6;
     // background-color: #e6f0ff;
   }
+
   // /deep/ .el-tree-node__expand-icon {
   //   color: #0043c8;
   //   border: 1px solid #e1ecff;
@@ -1036,20 +948,24 @@ export default {
     0px 3px 6px -4px rgba(0, 0, 0, 0.12);
   // border-radius: 5px;
   overflow-y: hidden;
+
   /deep/ .el-scrollbar__wrap {
     overflow-x: hidden !important;
   }
-  /deep/ .el-scrollbar__bar{
+
+  /deep/ .el-scrollbar__bar {
     right: -2px;
   }
+
   //搜索输入框样式
   /deep/ .el-input--medium .el-input__inner {
     height: 32px;
     background: rgba(0, 0, 0, 0.05);
     border-radius: 4px;
   }
-  
+
 }
+
 .custom-tree-node {
   flex: 1;
   display: flex;
@@ -1067,6 +983,7 @@ export default {
   white-space: nowrap;
   -webkit-line-clamp: 1;
 }
+
 .filter_tree {
   overflow-x: auto;
   // background-color: #f6f6f6;
@@ -1077,6 +994,7 @@ export default {
   // flex: 1;
   width: calc(100% - 200px);
 }
+
 ::v-deep .el-dialog__body {
   padding: 0;
 }
diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue
index f1e376faf..1f321bfbb 100644
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@@ -3,130 +3,74 @@
     <div class="u-table-btn2">
       <div class="u-table-btn2-left">
         <!--    v-show="btnAuths.ic_house_add" -->
-        <el-button v-if="agencyObj.level === 'building' || source !== 'search'"
-                   class="diy-button--blue"
-                   icon="el-icon-plus"
-                   size="small"
-                   :disabled="addDisabled"
-                   @click="handleAdd">新增房屋</el-button>
+        <el-button v-if="agencyObj.level === 'building' || source !== 'search'" class="diy-button--blue"
+          icon="el-icon-plus" size="small" :disabled="addDisabled" @click="handleAdd">新增房屋</el-button>
 
-        <div class="u-btn-upload"
-             v-if="showImportBtn">
+        <div class="u-btn-upload" v-if="showImportBtn">
 
-          <el-popover popper-class="btn-popper"
-                      placement="bottom"
-                      width="20"
-                      trigger="hover">
+          <el-popover popper-class="btn-popper" placement="bottom" width="20" trigger="hover">
 
             <div class="table-more-btn">
               <!--  v-if="btnAuths.ic_house_import" -->
-              <el-upload ref="upload"
-                         :multiple="false"
-                         style="text-align: center"
-                         :show-file-list="false"
-                         :before-upload="beforeUpload"
-                         action=""
-                         accept=".xls,.xlsx"
-                         :limit="1"
-                         :on-exceed="handleExceed"
-                         :http-request="uploadFile">
-                <el-button style=""
-                           size="small"
-                           type="text"
-                           class="diy-button--other">导入房屋数据</el-button>
+              <el-upload ref="upload" :multiple="false" style="text-align: center" :show-file-list="false"
+                :before-upload="beforeUpload" action="" accept=".xls,.xlsx" :limit="1" :on-exceed="handleExceed"
+                :http-request="uploadFile">
+                <el-button style="" size="small" type="text" class="diy-button--other">导入房屋数据</el-button>
               </el-upload>
             </div>
 
-            <el-button size="small"
-                       style="float:right"
-                       class="diy-button--white"
-                       slot="reference">导入<i class="el-icon-arrow-down el-icon--right"></i></el-button>
+            <el-button size="small" style="float:right" class="diy-button--white" slot="reference">导入<i
+                class="el-icon-arrow-down el-icon--right"></i></el-button>
           </el-popover>
 
         </div>
         <!-- v-if="btnAuths.ic_house_export" -->
-        <el-button style="float: left; margin-left: 10px"
-                   class="diy-button--white"
-                   size="small"
-                   @click="handleExport">导出</el-button>
+        <el-button style="float: left; margin-left: 10px" class="diy-button--white" size="small"
+          @click="handleExport">导出</el-button>
         <!-- v-if="btnAuths.ic_house_batch_del" -->
-        <el-button style="float: left; margin-left: 10px"
-                   class="diy-button--white"
-                   size="small"
-                   @click="deleteBatch">批量删除</el-button>
+        <el-button style="float: left; margin-left: 10px" class="diy-button--white" size="small"
+          @click="deleteBatch">批量删除</el-button>
 
       </div>
 
       <div>
-        <el-popover popper-class="btn-popper"
-                    placement="bottom"
-                    style="margin-left: 10px"
-                    width="20"
-                    trigger="hover">
+        <el-popover popper-class="btn-popper" placement="bottom" style="margin-left: 10px" width="20" trigger="hover">
           <div class="table-more-btn">
             <!-- v-if="btnAuths.ic_house_import" -->
-            <el-button :headers="$getElUploadHeaders()"
-                       class="diy-button--other"
-                       size="small"
-                       type="text"
-                       @click="handleExportModule('community')">下载小区模板</el-button>
+            <el-button :headers="$getElUploadHeaders()" class="diy-button--other" size="small" type="text"
+              @click="handleExportModule('community')">下载小区模板</el-button>
           </div>
           <div class="table-more-btn">
             <!-- v-if="btnAuths.ic_house_import" -->
-            <el-button :headers="$getElUploadHeaders()"
-                       class="diy-button--other"
-                       size="small"
-                       type="text"
-                       @click="handleExportModule('building')">下载楼栋模板</el-button>
+            <el-button :headers="$getElUploadHeaders()" class="diy-button--other" size="small" type="text"
+              @click="handleExportModule('building')">下载楼栋模板</el-button>
           </div>
           <div class="table-more-btn">
             <!-- v-if="btnAuths.ic_house_import" -->
-            <el-button :headers="$getElUploadHeaders()"
-                       class="diy-button--other"
-                       size="small"
-                       type="text"
-                       @click="handleExportModule('room')">下载房屋模板</el-button>
+            <el-button :headers="$getElUploadHeaders()" class="diy-button--other" size="small" type="text"
+              @click="handleExportModule('room')">下载房屋模板</el-button>
           </div>
           <!-- v-if="btnAuths.ic_house_export_yhyd" -->
           <div class="table-more-btn">
-            <el-button style=""
-                       class="diy-button--other"
-                       size="small"
-                       type="text"
-                       :disabled="yihuyidangDisabled"
-                       @click="handleExportYihuyidang()">导出一户一档</el-button>
+            <el-button style="" class="diy-button--other" size="small" type="text" :disabled="yihuyidangDisabled"
+              @click="handleExportYihuyidang()">导出一户一档</el-button>
 
           </div>
           <!-- btnAuths.ic_house_smart_import && -->
-          <div v-if="displayedBaobiaoBtn"
-               class="table-more-btn">
-            <el-button size="small"
-                       class="diy-button--other"
-                       type="text"
-                       @click="reportForm">智能填报</el-button>
+          <div v-if="displayedBaobiaoBtn" class="table-more-btn">
+            <el-button size="small" class="diy-button--other" type="text" @click="reportForm">智能填报</el-button>
           </div>
 
-          <el-button size="small"
-                     style="float:right"
-                     class="diy-button--white"
-                     slot="reference">更多<i class="el-icon-arrow-down el-icon--right"></i></el-button>
+          <el-button size="small" style="float:right" class="diy-button--white" slot="reference">更多<i
+              class="el-icon-arrow-down el-icon--right"></i></el-button>
         </el-popover>
       </div>
     </div>
 
     <div class="m-table-item">
-      <el-table ref="ref_table"
-                :data="tableData"
-                v-loading="tableLoading"
-                @sort-change="handleSortOrderChange"
-                border
-                :height="tableHeight"
-                style="width: 100%"
-                @select-all="selectAll"
-                @selection-change="selectionChange">
-        <el-table-column type="selection"
-                         :selectable="checkSelect"
-                         width="55">
+      <el-table ref="ref_table" :data="tableData" v-loading="tableLoading" @sort-change="handleSortOrderChange" border
+        :height="tableHeight" style="width: 100%" @select-all="selectAll" @selection-change="selectionChange">
+        <el-table-column type="selection" :selectable="checkSelect" width="55">
         </el-table-column>
         <!-- <el-table-column fixed="left"
                          width="70"
@@ -137,183 +81,84 @@
                          :index="indexMethod">
         </el-table-column> -->
 
-        <el-table-column prop="houseNameShow"
-                         header-align="left"
-                         align="left"
-                         label="房屋名称"
-                         fixed="left"
-                         min-width="160">
+        <el-table-column prop="houseNameShow" header-align="left" align="left" label="房屋名称" fixed="left"
+          min-width="160">
         </el-table-column>
-        <el-table-column prop="neighborHoodName"
-                         label="所属小区"
-                         header-align="left"
-                         align="left"
-                         min-width="150">
+        <el-table-column prop="neighborHoodName" label="所属小区" header-align="left" align="left" min-width="150">
         </el-table-column>
-        <el-table-column prop="buildingName"
-                         label="所属楼栋"
-                         header-align="left"
-                         align="left"
-                         width="90">
+        <el-table-column prop="buildingName" label="所属楼栋" header-align="left" align="left" width="90">
         </el-table-column>
-        <el-table-column prop="unitNum"
-                         label="单元号"
-                         header-align="left"
-                         align="left"
-                         width="80">
+        <el-table-column prop="unitNum" label="单元号" header-align="left" align="left" width="80">
         </el-table-column>
-        <el-table-column prop="doorName"
-                         label="门牌号"
-                         header-align="left"
-                         align="left"
-                         width="80">
+        <el-table-column prop="doorName" label="门牌号" header-align="left" align="left" width="80">
         </el-table-column>
-        <el-table-column prop="houseType"
-                         label="类型"
-                         header-align="left"
-                         align="left"
-                         width="70">
+        <el-table-column prop="houseType" label="类型" header-align="left" align="left" width="70">
         </el-table-column>
-        <el-table-column prop="purpose"
-                         label="用途"
-                         header-align="left"
-                         align="left"
-                         width="70">
+        <el-table-column prop="purpose" label="用途" header-align="left" align="left" width="70">
         </el-table-column>
-        <el-table-column prop="rentFlag"
-                         label="房屋状态"
-                         header-align="left"
-                         align="left"
-                         width="90">
+        <el-table-column prop="rentFlag" label="房屋状态" header-align="left" align="left" width="90">
         </el-table-column>
-        <el-table-column prop="ownerName"
-                         label="房主姓名"
-                         header-align="left"
-                         align="left"
-                         width="90">
+        <el-table-column prop="ownerName" label="房主姓名" header-align="left" align="left" width="90">
         </el-table-column>
-        <el-table-column prop="ownerPhone"
-                         label="联系方式"
-                         header-align="left"
-                         align="left"
-                         width="110">
+        <el-table-column prop="ownerPhone" label="联系方式" header-align="left" align="left" width="110">
         </el-table-column>
-        <el-table-column prop="ownerIdCard"
-                         label="证件号"
-                         header-align="left"
-                         align="left"
-                         width="170">
+        <el-table-column prop="ownerIdCard" label="证件号" header-align="left" align="left" width="170">
         </el-table-column>
-        <el-table-column prop="remark"
-                         label="备注"
-                         header-align="left"
-                         align="left"
-                         width="170">
+        <el-table-column prop="remark" label="备注" header-align="left" align="left" width="170">
         </el-table-column>
 
-        <el-table-column prop="sort"
-                         sortable="custom"
-                         min-width="100"
-                         header-align="left"
-                         align="left"
-                         label="排序">
+        <el-table-column prop="sort" sortable="custom" min-width="100" header-align="left" align="left" label="排序">
           <template slot-scope="scope">
             <div @click="handleEditSort(scope.row)">
               <span v-if="!scope.row.isChange">{{ scope.row.sort }}</span>
               <!-- :precision="2" -->
-              <el-input-number v-else
-                               @change="handleChangeSort(scope.row)"
-                               v-model="scope.row.sort"
-                               class="item_width_4"
-                               size="small"
-                               :min="0"
-                               :max="9999"
-                               label="描述文字"></el-input-number>
+              <el-input-number v-else @change="handleChangeSort(scope.row)" v-model="scope.row.sort"
+                class="item_width_4" size="small" :min="0" :max="9999" label="描述文字"></el-input-number>
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="操作"
-                         fixed="right"
-                         width="220"
-                         header-align="center"
-                         align="center"
-                         class="operate">
+        <el-table-column label="操作" fixed="right" width="220" header-align="center" align="center" class="operate">
           <template slot-scope="scope">
             <!-- v-if="btnAuths.ic_house_view" -->
-            <el-button type="text"
-                       class="div-table-button--blue"
-                       size="small"
-                       @click="handleDetail(scope.row)">查看</el-button>
+            <el-button type="text" class="div-table-button--blue" size="small"
+              @click="handleDetail(scope.row)">查看</el-button>
             <!-- btnAuths.ic_house_update && -->
-            <el-button type="text"
-                       class="div-table-button--blue"
-                       size="small"
-                       @click="handleEdit(scope.row)">编辑</el-button>
+            <el-button type="text" class="div-table-button--blue" size="small"
+              @click="handleEdit(scope.row)">编辑</el-button>
             <!-- btnAuths.ic_house_del && -->
-            <el-button type="text"
-                       class="div-table-button--blue"
-                       size="small"
-                       @click="handleDelete(scope.row)">删除</el-button>
+            <el-button type="text" class="div-table-button--blue" size="small"
+              @click="handleDelete(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="670px"
-               top="5vh"
-               class="dialog-h"
-               @closed="diaClose">
-      <room-form ref="ref_form"
-                 @dialogCancle="addFormCancle"
-                 @dialogOk="addFormOk"></room-form>
+    <el-dialog :visible.sync="formShow" :close-on-click-modal="false" :close-on-press-escape="false" :title="formTitle"
+      width="670px" top="5vh" class="dialog-h" @closed="diaClose">
+      <room-form ref="ref_form" @dialogCancle="addFormCancle" @dialogOk="addFormOk"></room-form>
     </el-dialog>
 
     <!-- 详情弹出框 -->
-    <el-dialog :visible.sync="detailShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               :title="'查看房屋'"
-               width="820px"
-               top="5vh"
-               class="dialog-h"
-               @closed="detailFormCancle">
+    <el-dialog :visible.sync="detailShow" :close-on-click-modal="false" :close-on-press-escape="false" :title="'查看房屋'"
+      width="820px" top="5vh" class="dialog-h" @closed="detailFormCancle">
       <!-- :view_real_data="btnAuths.ic_house_view_real_data" -->
-      <room-detail ref="ref_form_detail"
-                   @diaDetailClose="detailFormCancle"></room-detail>
+      <room-detail ref="ref_form_detail" @diaDetailClose="detailFormCancle"></room-detail>
     </el-dialog>
-    <el-dialog :visible.sync="diyDialog"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               width="1150px"
-               title="导出模板"
-               top="5vh"
-               class="dialog-h">
-      <community-export-info v-if="diyDialog"
-                             ref="ref_diy"
-                             :list="exportList"
-                             :search="{
-        formCode: 'community_info',
-        pageNo: pageNo,
-        pageSize: pageSize,
-        conditions:queryConditions
-      }"
-                             :orgId="agencyObj.id"
-                             @close="handleDiyClose"></community-export-info>
+    <el-dialog :visible.sync="diyDialog" :close-on-click-modal="false" :close-on-press-escape="false" width="1150px"
+      title="导出模板" top="5vh" class="dialog-h">
+      <community-export-info v-if="diyDialog" ref="ref_diy" :list="exportList" :search="{
+          formCode: 'community_info',
+          pageNo: pageNo,
+          pageSize: pageSize,
+          conditions: queryConditions
+        }" :orgId="agencyObj.id" @close="handleDiyClose"></community-export-info>
     </el-dialog>
     <baobiao ref="baobiao" />
   </div>
@@ -331,13 +176,13 @@ import util from "@/js/util";
 
 let loading; // 加载动画
 export default {
-  data () {
+  data() {
     return {
       searchHeight: 190,//搜索栏高度
       source: "tree", //来源
       importRoomLoading: false,
       total: 0,
-      pageSize:window.localStorage.getItem('pageSize') || 20,
+      pageSize: window.localStorage.getItem('pageSize') || 20,
       pageNo: 0,
       sortType: "asc", //asc：正，desc：倒
       tableLoading: true,
@@ -401,10 +246,9 @@ export default {
     roomDetail,
     communityExportInfo
   },
-  async mounted () {
+  async mounted() {
     this.updateBtnAuths();
     this.getQueryConditions()
-
     // this.displayedBaobiaoBtn = await this.$refs.baobiao.existsTemplate({
     //   elseParams: {
     //     categoryKeys: ["house_info"],
@@ -413,7 +257,7 @@ export default {
     // });
   },
   computed: {
-    tableHeight () {
+    tableHeight() {
       console.log(this.searchHeight)
       let height = this.searchHeight + 270
       return this.$store.state.inIframe ? this.clientHeight - height + this.iframeHeight : this.clientHeight - height
@@ -424,7 +268,7 @@ export default {
   },
   methods: {
     // 更新按钮权限
-    updateBtnAuths () {
+    updateBtnAuths() {
       let rot = this.$route;
       if (Array.isArray(rot.meta.btns)) {
         rot.meta.btns.forEach((item) => {
@@ -433,7 +277,7 @@ export default {
       }
     },
 
-    reportForm () {
+    reportForm() {
       let paramMap = {
         pageSize: this.pageSize,
         pageNo: this.pageNo,
@@ -461,25 +305,25 @@ export default {
       });
     },
 
-    indexMethod (index) {
+    indexMethod(index) {
       return index + 1;
     },
-    handleSortOrderChange (value) {
+    handleSortOrderChange(value) {
       this.sortType = value.order === "ascending" ? "asc" : "desc";
       this.loadTable();
     },
-    handleSortChange (value) {
+    handleSortChange(value) {
       this.sortType = value.order === "ascending" ? "asc" : "desc";
       this.loadTable();
     },
 
-    handleEditSort (row) {
+    handleEditSort(row) {
       if (!row.isChange) {
         row.isChange = true;
       }
     },
 
-    async handleChangeSort (row, index) {
+    async handleChangeSort(row, index) {
       // row.isChange = false
 
       let params = {
@@ -502,7 +346,7 @@ export default {
       }
     },
 
-    checkSelect (row, index) {
+    checkSelect(row, index) {
       let isChecked = true;
       // if (row.showBtn) {
       //   // 判断里面是否存在某个参数
@@ -513,9 +357,8 @@ export default {
       return isChecked;
     },
 
-    loadTreeFromSearch () { },
-
-    async loadTable (source, treeObj) {
+    loadTreeFromSearch() { },
+    async loadTable(source, treeObj) {
       this.source = source;
       this.tableLoading = true;
       this.addDisabled = true
@@ -528,7 +371,6 @@ export default {
         //来源于查询
         this.agencyObj = treeObj;
       }
-
       if (this.agencyObj.level === "grid") {
         this.agencyLevel = "grid";
       } else if (this.agencyObj.level === "neighborHood") {
@@ -541,7 +383,6 @@ export default {
 
       // if (fromTree) {
       //   this.agencyObj = treeObj
-
       // }
       // 接口在这里
       console.log(this.buildingId, '1111');
@@ -563,7 +404,6 @@ export default {
         buildingUnitId: this.buildingUnitId,
         houseId: this.houseId,
       };
-
       const url = "/actual/base/communityHouse/listHouses";
 
       const { data, code, msg } = await requestPost(url, params);
@@ -596,30 +436,30 @@ export default {
       this.tableLoading = false;
     },
 
-    diaClose () {
+    diaClose() {
       this.$refs.ref_form.resetData();
       this.formShow = false;
     },
 
-    handleDetail (row) {
+    handleDetail(row) {
       this.lookResiId = row.resiId;
-            let { agencyId, gridId, gridName, houseId, houseName} = row
-            this.$store.dispatch('saveDataH', { agencyId, gridId, gridName, houseId, houseName});
-            this.$router.push({ name: 'house-huaxiang' });
-            this.$store.state.contentTabs = this.$store.state.contentTabs.map(item => {
-                if (item.name === "house-huaxiang") {
-                    return { ...item, title: name };
-                }
-                return item;
-            });
+      let { agencyId, gridId, gridName, houseId, houseName } = row
+      this.$store.dispatch('saveDataH', { agencyId, gridId, gridName, houseId, houseName });
+      this.$router.push({ name: 'house-huaxiang' });
+      this.$store.state.contentTabs = this.$store.state.contentTabs.map(item => {
+        if (item.name === "house-huaxiang") {
+          return { ...item, title: name };
+        }
+        return item;
+      });
     },
 
-    detailFormCancle () {
+    detailFormCancle() {
       // this.$refs.ref_form_detail.diaDestroy()
       this.detailShow = false;
     },
 
-    handleAdd () {
+    handleAdd() {
       this.formTitle = "新增房屋";
       this.formShow = true;
       this.$nextTick(() => {
@@ -627,7 +467,7 @@ export default {
       });
     },
 
-    handleEdit (row) {
+    handleEdit(row) {
       this.formTitle = "修改房屋";
       this.formShow = true;
       this.$nextTick(() => {
@@ -635,24 +475,24 @@ export default {
       });
     },
 
-    addFormCancle () {
+    addFormCancle() {
       this.formShow = false;
     },
-    addFormOk () {
+    addFormOk() {
       this.formShow = false;
       this.loadTable();
       this.$emit('refreshTree')
     },
 
 
-    selectAll (selection) {
+    selectAll(selection) {
       this.selection = selection;
     },
-    selectionChange (selection) {
+    selectionChange(selection) {
       this.selection = selection;
     },
 
-    async handleDelete (row) {
+    async handleDelete(row) {
       this.$confirm("确认删除?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -674,7 +514,7 @@ export default {
         });
     },
 
-    deleteBatch () {
+    deleteBatch() {
       if (this.selection.length > 0) {
         this.$confirm("确认删除选择的房屋?", "提示", {
           confirmButtonText: "确定",
@@ -704,7 +544,7 @@ export default {
       }
     },
 
-    async deleteRoom (ids, forceDelete) {
+    async deleteRoom(ids, forceDelete) {
       const url = "/actual/base/communityHouse/deleteCommunityInfoByIds";
       let params = {
         forceDelete: forceDelete,
@@ -748,7 +588,7 @@ export default {
 
 
     //导出表格
-    async handleExport () {
+    async handleExport() {
       // let title = this.agencyObj.label;
       // title = title + "—房屋列表";
 
@@ -802,7 +642,7 @@ export default {
       // );
       await this.getExportList();
     },
-    async getExportList (type) {
+    async getExportList(type) {
       const url = "/oper/customize/icformitemgroup/list";
       let params = {
         formCode: "community_info",
@@ -826,7 +666,7 @@ export default {
         this.$message.error(msg);
       }
     },
-    async getQueryConditions () {
+    async getQueryConditions() {
       let params = {
         formCode: "community_info",
         customerId: this.$store.state.user.customerId,
@@ -849,11 +689,11 @@ export default {
         this.$message.error(data.msg);
       }
     },
-    handleDiyClose () {
+    handleDiyClose() {
       this.diyDialog = false;
     },
     // 下载文件
-    download (data, fileName) {
+    download(data, fileName) {
       if (!data) {
         return;
       }
@@ -877,7 +717,7 @@ export default {
       }
     },
 
-    handleExportModule (type) {
+    handleExportModule(type) {
 
       let title = ''
       let url = ""
@@ -910,7 +750,7 @@ export default {
     },
 
     //导出一户一档
-    handleExportYihuyidang () {
+    handleExportYihuyidang() {
       this.yihuyidangDisabled = true;
       let title = this.agencyObj.label;
       title = title + "-一户一档";
@@ -970,7 +810,7 @@ export default {
       );
     },
     // 上传文件之前的钩子
-    beforeUpload (file) {
+    beforeUpload(file) {
       this.files = file;
 
       const isText = file.type === "application/vnd.ms-excel";
@@ -987,11 +827,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;
@@ -1045,7 +885,7 @@ export default {
       );
     },
 
-    showMessage (msg) {
+    showMessage(msg) {
       this.$alert(msg, "操作结果", {
         confirmButtonText: "关闭",
         callback: (action) => {
@@ -1055,18 +895,18 @@ export default {
       });
     },
 
-    handleSizeChange (val) {
+    handleSizeChange(val) {
       this.pageSize = val;
       this.pageNo = 1;
       this.loadTable();
     },
-    handleCurrentChange (val) {
+    handleCurrentChange(val) {
       this.pageNo = val;
       this.loadTable();
     },
 
     // 开启加载动画
-    startLoading () {
+    startLoading() {
       loading = Loading.service({
         lock: true, // 是否锁定
         text: "正在加载……", // 加载中需要显示的文字
@@ -1074,7 +914,7 @@ export default {
       });
     },
     // 结束加载动画
-    endLoading () {
+    endLoading() {
       // clearTimeout(timer);
       if (loading) {
         loading.close();
@@ -1082,7 +922,7 @@ export default {
     },
   },
   watch: {
-    selection (val) {
+    selection(val) {
       if (val.length > 0) {
         this.showDeletBtn = true;
       } else {
@@ -1090,7 +930,7 @@ export default {
       }
     },
     '$store.state.sidebarFold': {
-      handler (newVal, oldVal) {
+      handler(newVal, oldVal) {
         if (newVal) {//收起
           this.searchHeight = 155
 
@@ -1160,7 +1000,7 @@ export default {
   },
 };
 </script>
-<style lang="scss" scoped >
+<style lang="scss" scoped>
 @import "@/assets/scss/modules/visual/communityManage.scss";
 @import "@/assets/scss/modules/management/list-main.scss";
 </style>
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 50550374c..91cbec2ab 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -502,69 +502,71 @@ export default {
       switch (this.valueb) {
         case '党员':
           _obj.partyFlag = 1
-          _obj.integrityScoreFrom = parseInt(0)
-          _obj.integrityScoreTo = parseInt(60)
+          _obj.integrityScoreFrom = 0
+          _obj.integrityScoreTo = 60
           this.getTableData(_obj);
           break;
         case '残疾人':
           _obj.healthStatus.push('DISABILITY_FLAG');
-          _obj.integrityScoreFrom = parseInt(0)
-          _obj.integrityScoreTo = parseInt(60)
+          // _obj.integrityScoreFrom = parseInt(0)
+          // _obj.integrityScoreTo = parseInt(60)
+          _obj.integrityScoreFrom = 0
+          _obj.integrityScoreTo = 60
           this.getTableData(_obj);
           break;
         case '退役军人':
           _obj.attentionCrowds.push('VETERAN_FLAG');
-          _obj.integrityScoreFrom = parseInt(0)
-          _obj.integrityScoreTo = parseInt(60)
+          _obj.integrityScoreFrom = 0
+          _obj.integrityScoreTo = 60
           _obj.partyFlag = 1;
           this.getTableData(_obj);
           break;
         case '失业人员':
           _obj.careerStatus = 0
+          _obj.integrityScoreFrom = 0
+          _obj.integrityScoreTo = 60
           this.getTableData(_obj);
-          _obj.integrityScoreFrom = parseInt(0)
-          _obj.integrityScoreTo = parseInt(60)
           break;
         case '低保人员':
           _obj.attentionCrowds.push('SUBSISTENCE_ALLOW');
-          _obj.integrityScoreFrom = parseInt(0)
-          _obj.integrityScoreTo = parseInt(60)
+          _obj.integrityScoreFrom = 0
+          _obj.integrityScoreTo = 60
           this.getTableData(_obj);
           break;
         case '保障房人员':
           _obj.attentionCrowds.push('ENSURE_HOUSE_FLAG');
-          _obj.integrityScoreFrom = parseInt(0)
-          _obj.integrityScoreTo = parseInt(60)
+          _obj.integrityScoreFrom = 0
+          _obj.integrityScoreTo = 60
           this.getTableData(_obj);
           break;
         case '特殊人员':
           _obj.attentionCrowds.push('ENSURE_HOUSE_FLAG');
-          _obj.integrityScoreFrom = parseInt(0)
-          _obj.integrityScoreTo = parseInt(60)
+          _obj.integrityScoreFrom = 0
+          _obj.integrityScoreTo = 60
           this.getTableData(_obj);
           break;
         case '大病人员':
           _obj.healthStatus.push('SERIOUS_ILLNESS_F');
-          _obj.integrityScoreFrom = parseInt(0)
-          _obj.integrityScoreTo = parseInt(60)
+          _obj.integrityScoreFrom = 0
+          _obj.integrityScoreTo = 60
           this.getTableData(_obj);
           break;
         case '慢病人员':
           _obj.healthStatus.push('CHRONIC_DISEASE_F');
-          _obj.integrityScoreFrom = parseInt(0)
-          _obj.integrityScoreTo = parseInt(60)
+          _obj.integrityScoreFrom = 0
+          _obj.integrityScoreTo = 60
           this.getTableData(_obj);
           break;
         case '老年人':
           _obj.attentionCrowds.push('OLD_PEOPLE_FLAG');
-          _obj.integrityScoreFrom = parseInt(0)
-          _obj.integrityScoreTo = parseInt(60)
+          _obj.integrityScoreFrom = 0
+          _obj.integrityScoreTo = 60
           this.getTableData(_obj);
           break;
         case '特扶人员':
           _obj.attentionCrowds.push('SPECIAL_SUPPORT_F');
-          _obj.integrityScoreFrom = parseInt(0)
-          _obj.integrityScoreTo = parseInt(60)
+          _obj.integrityScoreFrom = 0
+          _obj.integrityScoreTo = 60
           this.getTableData(_obj);
           break;
 
diff --git a/src/views/modules/home/index.vue b/src/views/modules/home/index.vue
index 3244ae0f9..ac237bc93 100644
--- a/src/views/modules/home/index.vue
+++ b/src/views/modules/home/index.vue
@@ -200,7 +200,7 @@
             <!-- <img src="@/assets/images/index/title-icon-zntx.png" /> -->
           </div>
           <div class="more" @click="toNoticePage">更多></div>
-          <div class="cnt" v-if="noticeData.length > 0">
+          <div class="cnt" v-if="noticeData.length > 0" style="margin-top: 0px;">
             <div @click="handleClickNotice(item)" class="item" :key="'notice' + item.targetId + index"
               v-for="(item, index) in noticeData">
               <!-- <div class="item_left">
@@ -213,11 +213,10 @@
                 </div>
                 <div class="item-title"
                   style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis; max-width: 450px;">
-                  <img class="thumbnail_1" referrerpolicy="no-referrer"
+                  <img  v-if="index === 0" class="thumbnail_1" referrerpolicy="no-referrer"
                     src="https://lanhu.oss-cn-beijing.aliyuncs.com/psjidpevo98fb607sd028bliakr139r25k82b2fbda-8291-4fe3-b190-bfe723a10036" />{{
-                item.content }}
+                  item.content }}
                 </div>
-
               </div>
               <div class="item_left">
                 <i class="i-tag" v-if="item.readFlag == 1">已读</i>
@@ -236,7 +235,7 @@
         <!-- <div class="white-box"> -->
         <div class="m-box m-tx" style="">
           <div class="noe-text"> <span style="margin-top: 10px;">居民分类更新情况</span> <span class="update-settings"
-              style="margin-top: 10px;"><img referrerpolicy="no-referrer"
+              style="margin-top: 10px;" v-show="showAll"><img referrerpolicy="no-referrer"
                 src="https://lanhu.oss-cn-beijing.aliyuncs.com/pskhmf0717eflwg54wn73s6spnsg6u48r0f69e94b-2bc8-4156-8330-902087b72e0b" />更新设置</span>
           </div>
           <el-tabs v-model="activeName" style="width:100%;">
@@ -247,7 +246,7 @@
                     <th>居民类别</th>
                     <th>总人数</th>
                     <th>分类信息不完整数</th>
-                    <th>更新负责人</th>
+                    <th v-show="showAll">更新负责人</th>
                     <th>更新周期</th>
                     <th>更新人数</th>
                   </tr>
@@ -257,8 +256,8 @@
                     <td style="opacity: 0.5;">{{ item.residentCategoryName }}</td>
                     <td style="color: #2683DB;">{{ item.total }}</td>
                     <td style="color: red;">{{ item.nonIntegratedNum }}</td>
+                    <td class="special-header" v-show="showAll">{{ item.userName }}</td>
                     <td class="special-header">{{ item.updatePeriodName }}</td>
-                    <td class="special-header">{{ item.updatedTime }}</td>
                     <td class="special-header">{{ item.updateResiNum }}</td>
                   </tr>
                 </tbody>
@@ -289,6 +288,7 @@ export default {
         type: "jumin",
         searchKey: "",
       },
+      showAll:false,
 
       typePlaceholder: {
         jumin: "请输入姓名或联系电话或证件号",
@@ -392,14 +392,12 @@ export default {
     },
   },
   created() {
-    
-
   },
   mounted() {
     // this.ehso();
     //图形
     this.initEcharts();
-    
+
 
     this.getApiData();
     this.$nextTick(() => {
@@ -410,7 +408,6 @@ export default {
       "dynamicMenuRoutes----------------------------",
       this.$store.state.sidebarMenuList
     );
-    
   },
   methods: {
     initChart() {
@@ -468,6 +465,12 @@ export default {
         window.addEventListener("resize", this.handleWindowResize);
       });
       this.borderH();
+      const level = localStorage.getItem('level');
+      console.log('Stored level:', level);
+      if(level == 'district'||'community'){
+        this.showAll = true
+      }
+
     },
 
 
@@ -512,6 +515,7 @@ export default {
       } else if (msgType == "resident_base_info") {
         this.$refs.fastcall.showResiInfo(targetId);
       }
+      this.getNoticeData()
     },
 
     toNoticePage() {
@@ -520,13 +524,12 @@ export default {
       });
     },
     //
-    jumpToHouse(e){
-      console.log("看看存进得什么",e)
+    jumpToHouse(e) {
       this.$router.push({
         path: "/main/base-community-community",
         query: {
-              param1: e,
-            }
+          param1: e,
+        }
       });
     },
 
@@ -599,10 +602,9 @@ export default {
       const url = "/message/intelligentMessage/list";
       let params = {
         last: "10",
+        readFlag:'0'
       };
-
       const { data, code, msg } = await requestGet(url, params);
-
       if (code === 0) {
         if (data) {
           this.noticeData = data;
@@ -684,7 +686,7 @@ export default {
           const nonIntegratedNum = Number(item.nonIntegratedNum);
           let ratio = '';
           if (total !== 0) {
-            ratio = 1 - (nonIntegratedNum / total);
+            ratio = nonIntegratedNum / total;
           }
           // console.log("nonIntegratedNum", nonIntegratedNum)
           // console.log("total", total)