From ddbe04737d2721fe619976dbfc2821857749c4bd Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Thu, 26 Oct 2023 18:13:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E5=B7=A6=E4=BE=A7=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=EF=BC=8C=E5=8F=B3=E4=B8=8A=E5=88=97=E8=A1=A8=E7=88=B6?=
 =?UTF-8?q?=E5=AD=90=E4=BC=A0=E5=8F=82=E9=97=AE=E9=A2=98=EF=BC=8C=E6=BB=A1?=
 =?UTF-8?q?=E6=84=8F=E5=BA=A6=E6=8C=89=E9=92=AE=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/js/store/modules/huaXiang.js              |  15 ++-
 src/router/index.js                           |  18 ++-
 .../modules/portrayal/fangwu/cpts/leftTop.vue |  80 ++++++++++++
 src/views/modules/portrayal/fangwu/index.vue  | 120 +++++++++++++++++
 .../{ => portrayal}/jumin/cpts/leftBto.vue    |  32 ++++-
 .../{ => portrayal}/jumin/cpts/leftTop.vue    |   0
 .../jumin/cpts/pointsRecord.vue               |   0
 .../{ => portrayal}/jumin/cpts/rightBto.vue   |   0
 .../{ => portrayal}/jumin/cpts/rightTop.vue   | 121 ++++++++++++------
 .../jumin/cpts/table/complain.vue             |   0
 .../{ => portrayal}/jumin/cpts/table/fuwu.vue |   0
 .../jumin/cpts/table/sheng.vue                |   4 +-
 .../jumin/cpts/table/shequ.vue                |   0
 .../jumin/cpts/table/shijian.vue              |   0
 .../jumin/cpts/table/xuqiu.vue                |   0
 .../jumin/cpts/xiangshoufuwu.vue              |   0
 .../jumin/index.vue}                          |  26 ++--
 .../satisfaction/communitySelfInsp/index.vue  |  11 +-
 src/views/modules/shequ/chaxun.vue            |  10 +-
 19 files changed, 359 insertions(+), 78 deletions(-)
 create mode 100644 src/views/modules/portrayal/fangwu/cpts/leftTop.vue
 create mode 100644 src/views/modules/portrayal/fangwu/index.vue
 rename src/views/modules/{ => portrayal}/jumin/cpts/leftBto.vue (71%)
 rename src/views/modules/{ => portrayal}/jumin/cpts/leftTop.vue (100%)
 rename src/views/modules/{ => portrayal}/jumin/cpts/pointsRecord.vue (100%)
 rename src/views/modules/{ => portrayal}/jumin/cpts/rightBto.vue (100%)
 rename src/views/modules/{ => portrayal}/jumin/cpts/rightTop.vue (74%)
 rename src/views/modules/{ => portrayal}/jumin/cpts/table/complain.vue (100%)
 rename src/views/modules/{ => portrayal}/jumin/cpts/table/fuwu.vue (100%)
 rename src/views/modules/{ => portrayal}/jumin/cpts/table/sheng.vue (95%)
 rename src/views/modules/{ => portrayal}/jumin/cpts/table/shequ.vue (100%)
 rename src/views/modules/{ => portrayal}/jumin/cpts/table/shijian.vue (100%)
 rename src/views/modules/{ => portrayal}/jumin/cpts/table/xuqiu.vue (100%)
 rename src/views/modules/{ => portrayal}/jumin/cpts/xiangshoufuwu.vue (100%)
 rename src/views/modules/{jumin/huaxiang.vue => portrayal/jumin/index.vue} (73%)

diff --git a/src/js/store/modules/huaXiang.js b/src/js/store/modules/huaXiang.js
index aa4cbc5e1..ef86d9932 100644
--- a/src/js/store/modules/huaXiang.js
+++ b/src/js/store/modules/huaXiang.js
@@ -1,19 +1,26 @@
 
 const huaXiang ={
   state: {
-    userInfo:null || JSON.parse(localStorage.getItem('huaX')) 
+    userInfo:null || JSON.parse(localStorage.getItem('resiPort')) ,
+    houseInfo:null || JSON.parse(localStorage.getItem('housePort')) 
   },
   mutations: {
     setData(state, payload) {
       state.userInfo = payload;
+    },
+    sethouseData(state, payload){
+      state.houseInfo = payload;
     }
   },
   actions: {
     saveData({ commit }, payload) {
-        console.log(payload,'vueX接参');
       commit('setData', payload);
-      localStorage.setItem('huaX', JSON.stringify(payload));
-    }
+      localStorage.setItem('resiPort', JSON.stringify(payload));
+    },
+    saveDataH({ commit }, payload) {
+    commit('sethouseData', payload);
+    localStorage.setItem('housePort', JSON.stringify(payload));
+  }
   }
 };
 
diff --git a/src/router/index.js b/src/router/index.js
index 6a1db845a..804dd9827 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -112,12 +112,22 @@ export const moduleRoutes = {
       path: "jumin-huaxiang",
       props: true,
       name: "jumin-huaxiang",
-      component: () => import("@/views/modules/jumin/huaxiang"),
+      component: () => import("@/views/modules/portrayal/jumin/index"),
         meta: {
           isTab: true,
           title: "",
         },
-      }
+      },
+      {
+        path: "fangwu-huaxiang",
+        props: true,
+        name: "fangwu-huaxiang",
+        component: () => import("@/views/modules/portrayal/fangwu/index"),
+          meta: {
+            isTab: true,
+            title: "",
+          },
+        }
   ],
 };
 // pc端菜单的 如果没有配置 默认的 或者配置了默认的 但没有权限 默认选中第一
@@ -710,6 +720,10 @@ router.beforeEach((to, from, next) => {
     to.meta.title = store.state.huaXiang.userInfo.name
     return next();
   }
+  if(to.name === 'fangwu-huaxiang'){
+    to.meta.title = store.state.huaXiang.houseInfo.doorName
+    return next();
+  }
   if (window.SITE_CONFIG["dynamicMenuRoutesHasAdded"] || fnCurrentRouteIsPageRoute(to, pageRoutes)) {
     return next();
   }
diff --git a/src/views/modules/portrayal/fangwu/cpts/leftTop.vue b/src/views/modules/portrayal/fangwu/cpts/leftTop.vue
new file mode 100644
index 000000000..95fb3f613
--- /dev/null
+++ b/src/views/modules/portrayal/fangwu/cpts/leftTop.vue
@@ -0,0 +1,80 @@
+<template>
+    <div class=''>
+        <div class="item f-font14">
+            <span class="label gray">房主姓名：</span><span class="value">{{ houseInfo.ownerName||"--" }}</span>
+        </div>
+        <div class="item f-font14">
+            <span class="label gray">联系电话：</span><span class="value">{{ houseInfo.ownerPhone||"--" }}</span>
+        </div>
+        <div class="item f-font14">
+            <span class="label gray">房屋类型：</span><span class="value">{{ houseInfo.houseTypeName||"--" }}</span>
+        </div>
+        <div class="item f-font14">
+            <span class="label gray">用途：</span><span class="value">{{ houseInfo.purposeName||"--" }}</span>
+        </div>
+        <div class="item f-font14">
+            <span class="label gray">家庭类别：</span><span class="value">{{ houseInfo.resideSituation || "--" }}</span>
+        </div>
+        <div class="item f-font14">
+            <span class="label gray">房屋状态：</span><span class="value">{{ houseInfo.rentName||"--" }}</span>
+        </div>
+        <div class="item f-font14">
+            <span class="label gray">家庭预警：</span>
+            <span class="value">{{houseInfo.riskFlag === '1' ? '满意度风险家庭' : '--'}}</span>
+        </div>
+    </div>
+</template>
+
+<script>
+import { requestPost, requestGet } from '@/js/dai/request'
+export default {
+    //数据
+    data() {
+        return {
+            houseInfo: {}
+        };
+    },
+    //创建前
+    created() {
+    },
+    mounted() {
+        this.getPersonalFile()
+    },
+    props: {
+        houseId: {
+            type: String,
+            default: ''
+        },
+    },
+    watch: {
+        houseId: {
+            handler(newVal, oldVal) {
+                this.getPersonalFile()
+            }
+        }
+    },
+    //方法
+    methods: {
+        async getPersonalFile() {
+            let url = `/actual/base/communityHouse/getMaskedHouseDeatilById/` + this.houseId
+            let { code, data, msg } = await requestPost(url)
+            if (code == 0) {
+                this.houseInfo = data
+            } else {
+                this.$message.error(msg)
+            }
+        }
+    },
+    //子组件注册
+    components: {},
+    //计算
+    computed: {},
+    //监听
+    watch: {},
+}
+</script>
+
+<style lang="scss" scoped>
+@import "@/assets/scss/pages/huaxiang";
+@import "@/assets/scss/modules/management/list-main.scss";
+</style>
diff --git a/src/views/modules/portrayal/fangwu/index.vue b/src/views/modules/portrayal/fangwu/index.vue
new file mode 100644
index 000000000..5c0d14d73
--- /dev/null
+++ b/src/views/modules/portrayal/fangwu/index.vue
@@ -0,0 +1,120 @@
+<template>
+    <div class='g-main'>
+        <div class="top">
+            <div class="left">
+                <div class="card">
+                    <div class="title">
+                        <div><img src="../../../../assets/images/index/title-icon-sqzl.png" alt="">家庭标签</div>
+                    </div>
+                    <div class="f-top12">
+                        <img src="../../../../assets/images/index/house.png" alt="" width="56px"> {{ houseInfo.fullName }}
+                    </div>
+                    <section class="bgC">
+                        <left-top :houseId="houseInfo.houseId" :key="houseInfo.houseId"></left-top>
+                    </section>
+                </div>
+            </div>
+            <div class="right">
+                <div class="card">
+                    <div class="title">
+                        <div><img src="../../../../assets/images/index/title-icon-ywjl.png" alt="">各项业务记录</div>
+                    </div>
+                    <right-top :houseInfo="houseInfo" :familyResiList="familyResiList" :type="'1'"  :key="houseInfo.houseId"></right-top>
+                </div>
+            </div>
+        </div>
+        <div class="bottom">
+            <div class="left">
+                <div class="card">
+                    <div class="title">
+                        <div><img src="../../../../assets/images/index/title-icon-jtgx.png" alt="">家庭关系</div>
+                    </div>
+                    <section class="bgC" style="padding: 0;">
+                        <left-bto :houseInfo="houseInfo" :type="'1'" :key="houseInfo.houseId"></left-bto>
+                    </section>
+                </div>
+            </div>
+            <div class="right">
+                <div class="card  f-w50 right16">
+                    <div class="title">
+                        <div><img src="../../../../assets/images/index/title-icon-xsfw.png" alt="">享受服务次数统计</div>
+                    </div>
+                    <div>
+                        <!-- <xiangshoufuwu :key="houseInfo.houseId"/> -->
+                    </div>
+                </div>
+                <div class="card" style="width: calc(50% - 16px);">
+                    <div class="title">
+                        <div><img src="../../../../assets/images/index/title-icon-jfjl.png" alt="">积分记录</div>
+                    </div>
+                    <div class="card">
+                        <!-- <pointsRecord :houseId="houseInfo.houseId" :key="houseInfo.houseId" /> -->
+                    </div>
+                </div>
+            </div>
+        </div>
+        <resi-info v-if="showedResiInfo && houseInfo.houseId" :resi-id="houseInfo.houseId" @close="showedResiInfo = false" />
+    </div>
+</template>
+<script>
+import { requestPost, requestGet } from '@/js/dai/request'
+import leftTop from "./cpts/leftTop";
+import leftBto from "../jumin/cpts/leftBto";
+import rightTop from "../jumin/cpts/rightTop";
+// import rightBto from "./cpts/rightBto";
+import resiInfo from "@/views/modules/cpts/resi/info";
+import nextTick from "dai-js/tools/nextTick";
+// import pointsRecord from "./cpts/pointsRecord";
+// import xiangshoufuwu from "./cpts/xiangshoufuwu";
+
+
+export default {
+    //数据
+    data() {
+        return {
+            houseInfo: {},
+            showedResiInfo: false,
+            familyResiList:[]
+        };
+    },
+    //创建前
+    async created() {
+        this.houseInfo = this.$store.state.huaXiang.houseInfo
+        await this.getFamilyRelationshipList()
+    },
+    mounted() {
+    },
+    activated() {
+        this.houseInfo = this.$store.state.huaXiang.houseInfo
+    },
+    //方法
+    methods: {
+        async getFamilyRelationshipList() {
+            let url = `/actual/base/peopleRoomOverview/getFamilyRelationshipList?type=1&resid=` + this.houseInfo.houseId
+            let { code, data, msg } = await requestPost(url)
+            if (code == 0) {
+                this.familyResiList = data.map(item=>item.id)
+                console.log(this.familyResiList,'父组件传递')
+            } else {
+                this.$message.error(msg)
+            }
+        },
+       
+        changeTotal(val) {
+            this.total = val.total
+        },
+    },
+    //子组件注册
+    // leftTop, leftBto, resiInfo, rightTop, pointsRecord, rightBto, xiangshoufuwu
+    components: {leftTop,leftBto,rightTop },
+    //计算
+    computed: {},
+    //监听
+    watch: {},
+}
+</script>
+
+<style lang="scss" scoped>
+@import "@/assets/scss/pages/huaxiang";
+@import "@/assets/scss/modules/management/list-main.scss";
+</style>
diff --git a/src/views/modules/jumin/cpts/leftBto.vue b/src/views/modules/portrayal/jumin/cpts/leftBto.vue
similarity index 71%
rename from src/views/modules/jumin/cpts/leftBto.vue
rename to src/views/modules/portrayal/jumin/cpts/leftBto.vue
index 74b77ba06..a932a21f8 100644
--- a/src/views/modules/jumin/cpts/leftBto.vue
+++ b/src/views/modules/portrayal/jumin/cpts/leftBto.vue
@@ -3,9 +3,9 @@
         <div v-for="(item, index) in familyList" :key="index" class="familylist">
             <div :class="['item', {'bgf':index== 0 }] ">
                 <div>
-                    <img v-if="index == 0 && userInfo.gender == '1'" src="../../../../assets/images/index/nan.png" alt=""
+                    <img v-if="index == 0 && item.gender == '1'" src="../../../../../assets/images/index/nan.png" alt=""
                         width="56px">
-                    <img v-if="index == 0 && userInfo.gender == '2'" src="../../../../assets/images/index/nv.png" alt=""
+                    <img v-if="index == 0 && item.gender == '2'" src="../../../../../assets/images/index/nv.png" alt=""
                         width="56px">
                     <span class="name">{{ item.name }}</span>（{{ item.houseHolderRel == "本人" ? "户主" : item.houseHolderRel ? item.houseHolderRel : '--'
                     }}）
@@ -33,24 +33,42 @@ export default {
     //创建前
     created() {
     },
-    mounted() {
-        console.log(this.userInfo);
-        this.getFamilyRelationshipList()
+   async mounted() {
+        await this.getFamilyRelationshipList()
     },
     props: {
         userInfo: {
             type: Object,
             default: () => { }
+        },
+        houseInfo:{
+            type: Object,
+            default: () => { }
+        },
+        type:{
+            type: String,
+            default: '0'
         }
     },
     //方法
     methods: {
         async getFamilyRelationshipList() {
-            let url = `/actual/base/peopleRoomOverview/getFamilyRelationshipList?type=0&resid=` + this.userInfo.resiId
+            let id = ''
+            if(this.type == '0'){
+                id = this.userInfo.resiId
+            }else if(this.type == '1'){
+                id = this.houseInfo.houseId
+            }
+            let url = `/actual/base/peopleRoomOverview/getFamilyRelationshipList?type=${this.type}&resid=` + id
             let { code, data, msg } = await requestPost(url)
             if (code == 0) {
                 // 找到符合条件的对象的索引
-                const index = data.findIndex(item => item.name == this.userInfo.name);
+                let index = ''
+                if(this.type == '0'){
+                  index = data.findIndex(item => item.name == this.userInfo.name);
+                }else{
+                  index = data.findIndex(item => item.houseHolderRel == '本人');
+                }
                 // 如果找到符合条件的对象
                 if (index !== -1) {
                     // 移除这个对象并将其放到数组的第一个位置
diff --git a/src/views/modules/jumin/cpts/leftTop.vue b/src/views/modules/portrayal/jumin/cpts/leftTop.vue
similarity index 100%
rename from src/views/modules/jumin/cpts/leftTop.vue
rename to src/views/modules/portrayal/jumin/cpts/leftTop.vue
diff --git a/src/views/modules/jumin/cpts/pointsRecord.vue b/src/views/modules/portrayal/jumin/cpts/pointsRecord.vue
similarity index 100%
rename from src/views/modules/jumin/cpts/pointsRecord.vue
rename to src/views/modules/portrayal/jumin/cpts/pointsRecord.vue
diff --git a/src/views/modules/jumin/cpts/rightBto.vue b/src/views/modules/portrayal/jumin/cpts/rightBto.vue
similarity index 100%
rename from src/views/modules/jumin/cpts/rightBto.vue
rename to src/views/modules/portrayal/jumin/cpts/rightBto.vue
diff --git a/src/views/modules/jumin/cpts/rightTop.vue b/src/views/modules/portrayal/jumin/cpts/rightTop.vue
similarity index 74%
rename from src/views/modules/jumin/cpts/rightTop.vue
rename to src/views/modules/portrayal/jumin/cpts/rightTop.vue
index 222226069..42dcbee5a 100644
--- a/src/views/modules/jumin/cpts/rightTop.vue
+++ b/src/views/modules/portrayal/jumin/cpts/rightTop.vue
@@ -2,7 +2,7 @@
     <div class=''>
         <el-tabs v-model="topTabs" @tab-click="tabClick">
             <el-tab-pane :label="complainLabel" name="12345">
-                <complain :tableData="complainList" />
+                <complain :tableData="complainList" :key="resiId[0]" />
                 <el-row type="flex">
                     <el-col :span="12" align="left">
                         <div style="margin-top: 25px;">共{{ complainTotal }}条</div>
@@ -15,7 +15,7 @@
                 </el-row>
             </el-tab-pane>
             <el-tab-pane :label="shengLabel" name="sheng">
-                <sheng :tableData="shengList" />
+                <sheng :tableData="shengList" :key="resiId[0]" />
                 <el-row type="flex">
                     <el-col :span="12" align="left">
                         <div style="margin-top: 25px;">共{{ shengTotal }}条</div>
@@ -28,7 +28,7 @@
                 </el-row>
             </el-tab-pane>
             <el-tab-pane :label="shequLabel" name="shequ">
-                <shequ :tableData="shequList" />
+                <shequ :tableData="shequList" :key="resiId[0]" />
                 <el-row type="flex">
                     <el-col :span="12" align="left">
                         <div style="margin-top: 25px;">共{{ shequTotal }}条</div>
@@ -41,7 +41,7 @@
                 </el-row>
             </el-tab-pane>
             <el-tab-pane :label="shijianLabel" name="shijian">
-                <shijian :tableData="shijianList" />
+                <shijian :tableData="shijianList" :key="resiId[0]" />
                 <el-row type="flex">
                     <el-col :span="12" align="left">
                         <div style="margin-top: 25px;">共{{ shijianTotal }}条</div>
@@ -54,7 +54,7 @@
                 </el-row>
             </el-tab-pane>
             <el-tab-pane :label="xuqiuLabel" name="xuqiu">
-                <xuqiu :tableData="xuqiuList" />
+                <xuqiu :tableData="xuqiuList" :key="resiId[0]" />
                 <el-row type="flex">
                     <el-col :span="12" align="left">
                         <div style="margin-top: 25px;">共{{ xuqiuTotal }}条</div>
@@ -67,23 +67,21 @@
                 </el-row>
             </el-tab-pane>
             <el-tab-pane :label="fuwuLabel" name="fuwu">
-    <div style="display: flex; flex-direction: column; height: 100%;">
-        <!-- 你的表格组件将填充所有可用空间 -->
-        <fuwu :tableData="fuwuList" style="flex: 1; overflow: auto;" />
-        <!-- 你的页码部分保持恒定的高度 -->
-        <el-row type="flex">
-            <el-col :span="12" align="left">
-                <div style="margin-top: 25px;">共{{ fuwuTotal }}条</div>
-            </el-col>
-            <el-col :span="12" align="right">
-                <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-                    :current-page.sync="pageNo" :page-size="pageSize" layout="prev, pager, next, jumper"
-                    :total="fuwuTotal">
-                </el-pagination>
-            </el-col>
-        </el-row>
-    </div>
-</el-tab-pane>
+                <div style="display: flex; flex-direction: column; height: 100%;">
+                    <fuwu :tableData="fuwuList" :key="resiId[0]" style="flex: 1; overflow: auto;" />
+                    <el-row type="flex">
+                        <el-col :span="12" align="left">
+                            <div style="margin-top: 25px;">共{{ fuwuTotal }}条</div>
+                        </el-col>
+                        <el-col :span="12" align="right">
+                            <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                                :current-page.sync="pageNo" :page-size="pageSize" layout="prev, pager, next, jumper"
+                                :total="fuwuTotal">
+                            </el-pagination>
+                        </el-col>
+                    </el-row>
+                </div>
+            </el-tab-pane>
 
         </el-tabs>
     </div>
@@ -131,21 +129,34 @@ export default {
         };
     },
     //创建前
-    created() { },
-    mounted() {
-        this.getComplainList()
-        this.getShengList()
-        this.getShequList()
-        this.getshijianList()
-        this.getxuqiuList()
-        this.getfuwuList()
+    created() {
+        if (this.type == '0') {
+            this.resiId = [this.userInfo.resiId]
+        } else if (this.type == '1') {
+            this.resiId = this.familyResiList
+        }
+        console.log(this.resiId, '子组件获取');
+    },
+    async mounted() {
+        await this.getComplainList()
+        await this.getShengList()
+        await this.getShequList()
+        await this.getshijianList()
+        await this.getxuqiuList()
+        await this.getfuwuList()
     },
     props: {
-        userInfo: {
+    userInfo: {
             type: Object,
-            default: {
-                resiId: ''
-            }
+            default: () => { }
+        },
+        familyResiList: {
+            type: Array,
+            default: () => []
+        },
+        type: {
+            type: String,
+            default: '0'
         }
     },
     //方法
@@ -160,8 +171,13 @@ export default {
 
         },
         getComplainList() {
+            if (this.resiId.length == 0) {
+                this.complainList = []
+                this.complainLabel = `12345投诉（0）`
+                return
+            }
             let parm = {
-                residList: [this.userInfo.resiId],
+                residList: this.resiId,
                 pageNo: this.pageNo,
                 pageSize: this.pageSize
             }
@@ -186,8 +202,13 @@ export default {
             });
         },
         getShengList() {
+            if (this.resiId.length == 0) {
+                this.shengList = []
+                this.shengLabel = `省满意度调查（0）`
+                return
+            }
             let parm = {
-                residList: [this.userInfo.resiId],
+                residList: this.resiId,
                 pageNo: this.pageNo,
                 pageSize: this.pageSize
             }
@@ -199,8 +220,13 @@ export default {
             });
         },
         getShequList() {
+            if (this.resiId.length == 0) {
+                this.shequList = []
+                this.shequLabel = `社区满意度自查（0）`
+                return
+            }
             let parm = {
-                residList: [this.userInfo.resiId],
+                residList: this.resiId,
                 pageNo: this.pageNo,
                 pageSize: this.pageSize
             }
@@ -222,8 +248,13 @@ export default {
             });
         },
         getshijianList() {
+            if (this.resiId.length == 0) {
+                this.shijianList = []
+                this.shijianLabel = `上报事件（0）`
+                return
+            }
             let parm = {
-                residList: [this.userInfo.resiId],
+                residList: this.resiId,
                 pageNo: this.pageNo,
                 pageSize: this.pageSize
             }
@@ -241,8 +272,13 @@ export default {
             });
         },
         getxuqiuList() {
+            if (this.resiId.length == 0) {
+                this.xuqiuList = []
+                this.xuqiuLabel = `居民需求（0）`
+                return
+            }
             let parm = {
-                residList: [this.userInfo.resiId],
+                residList: this.resiId,
                 pageNo: this.pageNo,
                 pageSize: this.pageSize
             }
@@ -258,8 +294,13 @@ export default {
             });
         },
         getfuwuList() {
+            if (this.resiId.length == 0) {
+                this.fuwuList = []
+                this.fuwuLabel = `社区服务（0）`
+                return
+            }
             let parm = {
-                residList: [this.userInfo.resiId],
+                residList: this.resiId,
                 pageNo: this.pageNo,
                 pageSize: this.pageSize
             }
diff --git a/src/views/modules/jumin/cpts/table/complain.vue b/src/views/modules/portrayal/jumin/cpts/table/complain.vue
similarity index 100%
rename from src/views/modules/jumin/cpts/table/complain.vue
rename to src/views/modules/portrayal/jumin/cpts/table/complain.vue
diff --git a/src/views/modules/jumin/cpts/table/fuwu.vue b/src/views/modules/portrayal/jumin/cpts/table/fuwu.vue
similarity index 100%
rename from src/views/modules/jumin/cpts/table/fuwu.vue
rename to src/views/modules/portrayal/jumin/cpts/table/fuwu.vue
diff --git a/src/views/modules/jumin/cpts/table/sheng.vue b/src/views/modules/portrayal/jumin/cpts/table/sheng.vue
similarity index 95%
rename from src/views/modules/jumin/cpts/table/sheng.vue
rename to src/views/modules/portrayal/jumin/cpts/table/sheng.vue
index f9462965d..689697e2c 100644
--- a/src/views/modules/jumin/cpts/table/sheng.vue
+++ b/src/views/modules/portrayal/jumin/cpts/table/sheng.vue
@@ -26,9 +26,7 @@ export default {
     },
     data() {
         return {
-            queryParams: {
-                residList: [],
-            },
+            
             list: [],
             total: 0,
             rowId: null,
diff --git a/src/views/modules/jumin/cpts/table/shequ.vue b/src/views/modules/portrayal/jumin/cpts/table/shequ.vue
similarity index 100%
rename from src/views/modules/jumin/cpts/table/shequ.vue
rename to src/views/modules/portrayal/jumin/cpts/table/shequ.vue
diff --git a/src/views/modules/jumin/cpts/table/shijian.vue b/src/views/modules/portrayal/jumin/cpts/table/shijian.vue
similarity index 100%
rename from src/views/modules/jumin/cpts/table/shijian.vue
rename to src/views/modules/portrayal/jumin/cpts/table/shijian.vue
diff --git a/src/views/modules/jumin/cpts/table/xuqiu.vue b/src/views/modules/portrayal/jumin/cpts/table/xuqiu.vue
similarity index 100%
rename from src/views/modules/jumin/cpts/table/xuqiu.vue
rename to src/views/modules/portrayal/jumin/cpts/table/xuqiu.vue
diff --git a/src/views/modules/jumin/cpts/xiangshoufuwu.vue b/src/views/modules/portrayal/jumin/cpts/xiangshoufuwu.vue
similarity index 100%
rename from src/views/modules/jumin/cpts/xiangshoufuwu.vue
rename to src/views/modules/portrayal/jumin/cpts/xiangshoufuwu.vue
diff --git a/src/views/modules/jumin/huaxiang.vue b/src/views/modules/portrayal/jumin/index.vue
similarity index 73%
rename from src/views/modules/jumin/huaxiang.vue
rename to src/views/modules/portrayal/jumin/index.vue
index f540f90b3..303358a19 100644
--- a/src/views/modules/jumin/huaxiang.vue
+++ b/src/views/modules/portrayal/jumin/index.vue
@@ -4,11 +4,11 @@
             <div class="left">
                 <div class="card">
                     <div class="title">
-                        <div><img src="../../../assets/images/index/title-icon-sqzl.png" alt="">居民档案</div>
+                        <div><img src="../../../../assets/images/index/title-icon-sqzl.png" alt="">居民档案</div>
                         <span class="title f-font14 gray" style="cursor: pointer;" @click="handlerUserInfo">详情 ></span>
                     </div>
                     <div class="f-top12">
-                        <img src="../../../assets/images/index/resi.png" alt="" width="56px"> {{ userInfo.name }}
+                        <img src="../../../../assets/images/index/resi.png" alt="" width="56px"> {{ userInfo.name }}
                     </div>
                     <section class="bgC">
                         <left-top :resiId="userInfo.resiId" :key="userInfo.resiId"></left-top>
@@ -18,9 +18,9 @@
             <div class="right">
                 <div class="card">
                     <div class="title">
-                        <div><img src="../../../assets/images/index/title-icon-ywjl.png" alt="">各项业务记录</div>
+                        <div><img src="../../../../assets/images/index/title-icon-ywjl.png" alt="">各项业务记录</div>
                     </div>
-                    <right-top :userInfo="userInfo" :key="userInfo.resiId"></right-top>
+                    <right-top :userInfo="userInfo" :key="userInfo.resiId" :type="'0'"></right-top>
                 </div>
             </div>
         </div>
@@ -28,17 +28,17 @@
             <div class="left">
                 <div class="card">
                     <div class="title">
-                        <div><img src="../../../assets/images/index/title-icon-jtgx.png" alt="">家庭关系</div>
+                        <div><img src="../../../../assets/images/index/title-icon-jtgx.png" alt="">家庭关系</div>
                     </div>
                     <section class="bgC" style="padding: 0;">
-                        <left-bto :userInfo="userInfo" :key="userInfo.resiId"></left-bto>
+                        <left-bto :userInfo="userInfo" :key="userInfo.resiId" :type="'0'"></left-bto>
                     </section>
                 </div>
             </div>
             <div class="right">
                 <div class="card  f-w50 right16">
                     <div class="title">
-                        <div><img src="../../../assets/images/index/title-icon-xsfw.png" alt="">享受服务次数统计</div>
+                        <div><img src="../../../../assets/images/index/title-icon-xsfw.png" alt="">享受服务次数统计</div>
                     </div>
                     <div>
                         <xiangshoufuwu :key="userInfo.resiId"/>
@@ -46,7 +46,7 @@
                 </div>
                 <div class="card" style="width: calc(50% - 16px);">
                     <div class="title">
-                        <div><img src="../../../assets/images/index/title-icon-jfjl.png" alt="">积分记录</div>
+                        <div><img src="../../../../assets/images/index/title-icon-jfjl.png" alt="">积分记录</div>
                     </div>
                     <div class="card">
                         <pointsRecord :resiId="userInfo.resiId" :key="userInfo.resiId" />
@@ -81,7 +81,6 @@ export default {
     //创建前
     async created() {
         this.userInfo = this.$store.state.huaXiang.userInfo
-        await this.getFamilyRelationshipList()
     },
     mounted() {
     },
@@ -90,15 +89,6 @@ export default {
     },
     //方法
     methods: {
-        async getFamilyRelationshipList() {
-            let url = `/actual/base/peopleRoomOverview/getFamilyRelationshipList?type=0&resid=` + this.userInfo.resiId
-            let { code, data, msg } = await requestPost(url)
-            if (code == 0) {
-                this.familyList = data
-            } else {
-                this.$message.error(msg)
-            }
-        },
         async handlerUserInfo() {
             await nextTick();
             this.showedResiInfo = true;
diff --git a/src/views/modules/satisfaction/communitySelfInsp/index.vue b/src/views/modules/satisfaction/communitySelfInsp/index.vue
index 5cb7b1db5..c8afc75f8 100644
--- a/src/views/modules/satisfaction/communitySelfInsp/index.vue
+++ b/src/views/modules/satisfaction/communitySelfInsp/index.vue
@@ -20,7 +20,7 @@
             </div>
 
             <div class="m-table">
-                <div class="div_btn">
+                <div class="div_btn" v-if="btnFlag">
                     <el-button type="primary" size="small" class="diy-button--white el-button--default"
                         @click="handleCreateMonthlySurvey">生成本月社区自查问卷表</el-button>
                 </div>
@@ -53,7 +53,7 @@
                 </div>
             </div>
         </div>
-        <el-dialog v-if="showFormList" :visible.sync="showFormList" :close-on-click-modal="false"
+        <el-dialog v-if="showFormList && user.level == 'community'" :visible.sync="showFormList" :close-on-click-modal="false"
             :close-on-press-escape="false" title="社区自查" :modal-append-to-body="false" width="820px" top="5vh"
             class="dialog-h" @closed="showFormList = false">
             <form-list ref="ref_add_form" @handleClose="handleClose" :satisfactionCategoryStr="satisfactionCategoryStr"
@@ -212,7 +212,9 @@ export default {
             synthesisScore: '',
             personQty: '',
 
-            inspResultId:""
+            inspResultId:"",
+
+            btnFlag:true
         };
     },
 
@@ -228,6 +230,9 @@ export default {
     async mounted() {
         this.user = this.$store.state.user;
         this.agencyId = this.user.agencyId;
+        if(this.user.level != 'community'){
+            this.btnFlag = false
+        }
         await this.getDicts();
         await this.getTableData();
         await this.initEcharts();
diff --git a/src/views/modules/shequ/chaxun.vue b/src/views/modules/shequ/chaxun.vue
index bef494a3f..a3f2208fb 100644
--- a/src/views/modules/shequ/chaxun.vue
+++ b/src/views/modules/shequ/chaxun.vue
@@ -607,7 +607,15 @@ export default {
       // this.currentHouseId = item.id;
       // await nextTick();
       // this.showedHouseInfo = true;
-      console.log(this.searchFangwu.list[rowIndex]);
+      let { doorName,id,fullName } = this.searchFangwu.list[rowIndex]
+      this.$store.dispatch('saveDataH', {  doorName,houseId:id,fullName });
+      this.$router.push({ name: 'fangwu-huaxiang' });
+      this.$store.state.contentTabs = this.$store.state.contentTabs.map(item => {
+        if (item.name === "fangwu-huaxiang") {
+          return {...item, title: doorName };
+        }
+        return item;
+      });
     },
 
     getApiData() {},