diff --git a/src/assets/images/index/头像/叔叔.png b/src/assets/images/index/头像/叔叔.png
deleted file mode 100644
index 52d1baf25..000000000
Binary files a/src/assets/images/index/头像/叔叔.png and /dev/null differ
diff --git a/src/assets/images/index/头像/阿姨.png b/src/assets/images/index/头像/阿姨.png
deleted file mode 100644
index 6e3c6d441..000000000
Binary files a/src/assets/images/index/头像/阿姨.png and /dev/null differ
diff --git a/src/components/JwTree/nodeWrap.vue b/src/components/JwTree/nodeWrap.vue
index f7ef6ef24..1fd567fc1 100644
--- a/src/components/JwTree/nodeWrap.vue
+++ b/src/components/JwTree/nodeWrap.vue
@@ -101,7 +101,7 @@ export default {
 
     gotoPersonnel(id, name) {
       if (id) {
-        this.$router.push(`/organizational/orgPersonnel/${name}`);
+        this.$router.push({ path: `/organizational/orgPersonnel/${name}`, query: { user_id: id } });
       } else {
         this.$message({
           message: "无法跳转",
diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue
index 8b4829ccf..a8fd2463a 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -106,7 +106,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="居民年龄">
-          <el-input v-model="form.ageStart" class="u-item-width-daterange" placeholder="请输入" clearable size="small">
+          <el-input v-model="form.ageStart" @change="handleAgeChange" class="u-item-width-daterange" placeholder="请输入" clearable size="small">
           </el-input>
           <span class="u-data-tag">至</span>
           <el-input v-model="form.ageEnd" @change="handleAgeChange" class="u-item-width-daterange u-data-tag"
@@ -713,7 +713,7 @@ export default {
 
     // },
     handleAgeChange() {
-      if (this.form.ageStart) {
+      if (this.form.ageStart&&this.form.ageEnd) {
         if (this.form.ageStart > this.form.ageEnd) {
           this.$message.warning('结束年龄不能小于开始年龄')
         }
diff --git a/src/views/dataBoard/overview/components/MapResourceInfoMore.vue b/src/views/dataBoard/overview/components/MapResourceInfoMore.vue
index 1c6c1d7d0..4313af220 100644
--- a/src/views/dataBoard/overview/components/MapResourceInfoMore.vue
+++ b/src/views/dataBoard/overview/components/MapResourceInfoMore.vue
@@ -22,7 +22,7 @@
                 <div class="value">{{ typesList[types] }}</div>
               </div>
             </el-col>
-            <template v-if="types === 2 || types === 3">
+            <template v-if="types === 2">
               <el-col :span="12">
 
                 <div class="items">
diff --git a/src/views/modules/communityService/policy/addPolicy.vue b/src/views/modules/communityService/policy/addPolicy.vue
index 1bad55b85..efb566b1d 100644
--- a/src/views/modules/communityService/policy/addPolicy.vue
+++ b/src/views/modules/communityService/policy/addPolicy.vue
@@ -200,7 +200,7 @@
             <el-option
               v-for="item in serviceOptiondList"
               :key="item.id"
-              :label="item.name"
+              :label="item.label"
               :value="item.id"
             >
             </el-option>
diff --git a/src/views/modules/portrayal/jumin/cpts/businessRecord.vue b/src/views/modules/portrayal/jumin/cpts/businessRecord.vue
index 3f4f4f449..0c16e9cd2 100644
--- a/src/views/modules/portrayal/jumin/cpts/businessRecord.vue
+++ b/src/views/modules/portrayal/jumin/cpts/businessRecord.vue
@@ -108,7 +108,6 @@ export default {
       };
       const marktypes = ["普通事件", "难点读点", "矛盾纠纷", "自身问题"];
 
-      // 省满意度列表
       this.$http
         .post("/actual/base/peopleRoomOverview/eventPageList", parm)
         .then(({ data: res }) => {
@@ -269,6 +268,7 @@ export default {
         this.resiId = [this.userInfo.baseInfoDto.resiId];
         this.getComplainList();
         this.getShengList();
+        this.getShequList()
         this.getfuwuList();
         this.getshijianList();
         this.getxuqiuList();
diff --git a/src/views/modules/portrayal/jumin/cpts/graph.vue b/src/views/modules/portrayal/jumin/cpts/graph.vue
index 8b05a5101..f3aa9760a 100644
--- a/src/views/modules/portrayal/jumin/cpts/graph.vue
+++ b/src/views/modules/portrayal/jumin/cpts/graph.vue
@@ -69,7 +69,7 @@ export default {
                 let familyList = data.map((item, index) => ({
                     'id': `N${index + 1}`,
                     'text': item.name,
-                    'innerHTML': `<div class="c-my-node${index == 0 ? '1' : '2'}  c-my-node-${item.type == 1?'home':index == 0 ? item.gender == 1 ? 'father' : 'mother' : item.houseHolderRel == '配偶' ? item.gender == '1' ? 'mother' : 'father' : item.houseHolderRel == '女儿' ? 'girl' : item.houseHolderRel == '儿子' ? 'gon' : item.houseHolderRel == '父亲' || item.houseHolderRel == '祖父母' ? item.gender == 1 ? 'grandpa' : 'grandma' : item.houseHolderRel == '母亲' ? 'grandma' : 'father'}"><div class="c-node-name${index == 0 ? '1' : '2'}" style="color:#000">${item.type == 1?`${item.name}`:item.name.length === 2 ?
+                    'innerHTML': `<div class="c-my-node${index == 0 ? '1' : '2'}  c-my-node-${item.type == 1?'home':item.gender==='1'?item.age>18&&item.age<60?'father':item.age<18?'son':'grandpa':item.gender === '2'?item.age>18&&item.age<60?'mother':item.age<18?'girl':'grandma':'father'}"><div class="c-node-name${index == 0 ? '1' : '2'}" style="color:#000">${item.type == 1?`${item.name}`:item.name.length === 2 ?
                         item.name.substring(0, 1) + '*' :
                         item.name.substring(0, 1) + '*' + item.name.substring(2)} ${item.age?`（${item.age}）岁`:''}</div></div>`,
                     'data':{id: item.id,type:item.type,name:item.name},
diff --git a/src/views/modules/portrayal/jumin/index.vue b/src/views/modules/portrayal/jumin/index.vue
index d69777d93..ad326e899 100644
--- a/src/views/modules/portrayal/jumin/index.vue
+++ b/src/views/modules/portrayal/jumin/index.vue
@@ -3,7 +3,7 @@
     <div class="left">
       <div class="user">
         <div v-if="resiDetailObj.baseInfoDto">
-          <img :src="require(`@/assets/images/index/${familyStatus}.png`)" alt="" v-if="resiDetailObj.baseInfoDto.gender==='1'"/>
+          <img :src="require(`@/assets/images/index/${familyStatus}.png`)" alt="" />
         </div>
         <span v-if="resiDetailObj.baseInfoDto">
           {{ resiDetailObj.baseInfoDto.name }}（{{ resiDetailObj.baseInfoDto.age }}岁）</span
@@ -229,7 +229,7 @@
             >
           </div>
       </div>
-      <div class="title-small">居住信息</div>
+      <div class="title-small" id="reside">居住信息</div>
       <section
         v-for="(item, indexK) in resiDetailObj.resideInfoDtos"
         :key="indexK"
@@ -244,7 +244,7 @@
             <div class="f-flex" style="width: 600px">
               <div class="f-label"><b>所属房屋：</b></div>
               <span class="f-left8 f-font-color">
-                {{ item.agencyName?item.agencyName:'' + item.homeName || "--" }}
+                {{ item.agencyName + item.homeName  }}
               </span>
             </div>
         </div>
@@ -270,7 +270,7 @@
               }}</span>
             </div>
           <div  class="f-flex">
-            <div class="f-label"><b>户籍所在地：</b></div>
+            <div class="f-label">户籍所在地：</div>
             <div class="f-left8 f-font-color">
               {{ item.placeOfDomicile || "--" }}
             </div>
@@ -463,7 +463,7 @@
           (resiDetailObj.workInfoDto.careerStatus == 0 ||
             resiDetailObj.workInfoDto.careerStatus == 6)
         ">
-          <div class="f-label" style="width: 113px">再就业优惠证号：</div>
+          <div class="f-label" style="width: 113px">技术特长：</div>
           <span class="f-left8 f-font-color">{{
             resiDetailObj.unemployedDto
               ? resiDetailObj.unemployedDto.specialSkill
@@ -527,24 +527,7 @@
           </span>
         </div>
      
-        <div  class="f-flex"  v-if="
-          resiDetailObj.workInfoDto &&
-          (resiDetailObj.workInfoDto.careerStatus == 0 ||
-            resiDetailObj.workInfoDto.careerStatus == 6)
-        ">
-          <div class="f-label">有无赡养人：</div>
-          <div class="f-left8 f-font-color">
-            {{
-              resiDetailObj.familyInfoDto &&
-              resiDetailObj.familyInfoDto.elderlyFlag == 1
-                ? "有"
-                : resiDetailObj.familyInfoDto &&
-                  resiDetailObj.familyInfoDto.elderlyFlag == 0
-                ? "无"
-                : "--"
-            }}
-          </div>
-        </div>
+        
           </section>
       <div class="title-small">关系图谱</div>
       <graph
@@ -1313,11 +1296,15 @@ export default {
       }
     },
 
-    handelCLickMenu(id, index) {
+      handelCLickMenu(id, index) {
       this.active = index;
       const bottomElement = document.getElementById(`${id}`);
-      bottomElement.scrollIntoView({ behavior: "smooth", block: "start" });
+      const topOffset = -120; // 减少的高度值
+      const topPos = bottomElement.getBoundingClientRect().top + window.pageYOffset + topOffset;
+      window.scrollTo({ top: topPos, behavior: "smooth" });
     },
+
+
     handelCLickShowCheckPassword(type) {
       this.form.password = "";
       this.checkType = "view";
diff --git a/src/views/modules/workSys/setResiUpdate/index.vue b/src/views/modules/workSys/setResiUpdate/index.vue
new file mode 100644
index 000000000..fb575db07
--- /dev/null
+++ b/src/views/modules/workSys/setResiUpdate/index.vue
@@ -0,0 +1,207 @@
+<template>
+  <div class="g-main">
+    <div>
+      <div class="m-table">
+        <div class="div_btn_left">
+          <el-button size="small" type="primary" @click="submit"
+            >保存设置</el-button
+          >
+          <el-button style="margin-left: 10px" size="small" @click="resetSearch"
+            >重置</el-button
+          >
+        </div>
+        <el-table
+          :data="tableData"
+          border
+          v-loading="tableLoading"
+          class="m-table-item"
+          style="width: 100%"
+          :height="maxTableHeight"
+        >
+          <el-table-column
+            prop="residentCategoryName"
+            align="center"
+            label="居民分类"
+            :show-overflow-tooltip="true"
+          >
+          </el-table-column>
+          <el-table-column
+            align="center"
+            label="更新周期"
+            :show-overflow-tooltip="true"
+          >
+            <template slot-scope="scope">
+              <el-select
+                v-model="scope.row.updatePeriod"
+                clearable
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in updatePeriodOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+          <!--  -->
+          <el-table-column
+            prop="staffId"
+            align="center"
+            label="更新负责人"
+            :show-overflow-tooltip="true"
+          >
+            <template slot-scope="scope">
+              <el-select
+                v-model="scope.row.userId"
+                placeholder="请选择"
+                clearable
+              >
+                <el-option
+                  v-for="item in dicts.stafflist"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.staffId"
+                ></el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </div>
+  </div>
+</template>
+    
+      <script>
+import { requestPost } from "@/js/dai/request";
+import nextTick from "dai-js/tools/nextTick";
+import { mapGetters } from "vuex";
+
+export default {
+  components: {},
+  data() {
+    return {
+      tableLoading: false,
+      user: {},
+      tableData: [],
+      updatePeriodOptions: [
+        {
+          label: "每周",
+          value: "week",
+        },
+        {
+          label: "每自然月",
+          value: "month",
+        },
+      ],
+      dicts: {
+        stafflist: [],
+      }, //字典对象
+    };
+  },
+  computed: {
+    maxTableHeight() {
+      const h = this.clientHeight - 250 + this.iframeHeight;
+      const _h = this.clientHeight - 250;
+      return this.$store.state.inIframe ? h : _h;
+    },
+    ...mapGetters(["clientHeight", "iframeHeight"]),
+  },
+  watch: {},
+  created() {},
+  mounted() {
+    this.user = this.$store.state.user;
+    this.agencyId = this.user.agencyId;
+    this.getStafflist();
+    this.getTableData();
+  },
+  methods: {
+    // --------------------------------------字典------------------------------------------
+    getStafflist() {
+      let parms = {
+        orgId: this.user.agencyId,
+        orgType: "agency",
+        pageNo: 1,
+        pageSize: 100,
+      };
+      this.$http.post("data/aggregator/org/stafflist", parms).then((resp) => {
+        this.dicts.stafflist = resp.data.data.staffList;
+        console.log("stafflist", resp.data);
+      });
+    },
+    // ------------------------------------事件------------------------------------------
+
+    //   获取列表
+    async getTableData() {
+      this.tableLoading = true;
+      const url = "/actual/base/residentCategoryUpdateInfo/upadteSettingList";
+
+      const { data, code, msg } = await requestPost(url, {
+        orgId: this.user.agencyId,
+        orgType: this.user.level,
+        pageNo: 1,
+        pageSize: 1000,
+      });
+      this.tableLoading = false;
+      if (code === 0) {
+        this.tableData = data;
+      } else {
+        this.$message.error(msg);
+      }
+    },
+    async submit() {
+      let url = "/actual/base/residentCategoryUpdateInfo/updateList";
+      let params = this.tableData.map((item) => {
+        return {
+          id: item.id,
+          updatePeriod: item.updatePeriod,
+          userId: item.userId,
+        };
+      });
+      const { data, code, msg } = await requestPost(url, params);
+      if (code === 0) {
+        this.$message.success("操作成功");
+        this.getTableData();
+      } else {
+        this.$message.error(msg);
+      }
+    },
+    //   重置
+    resetSearch() {
+      this.$confirm("重置之后无法恢复，确认重置？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.tableData = this.tableData.map((item) => {
+            return {
+              ...item,
+              updatePeriod: '',
+              userId: '',
+            };
+          });
+          this.submit();
+          this.getTableData();
+        })
+        .catch((err) => {
+          console.error(err);
+          //   this.$message.error("删除失败");
+        });
+    },
+  },
+
+  props: {},
+};
+</script>
+  <style lang="scss" scoped>
+@import "@/assets/scss/buttonstyle.scss";
+@import "@/assets/scss/modules/management/list-main.scss";
+@import "@/assets/scss/modules/shequzhili/event-info.scss";
+.div_btn_left > * {
+  margin-right: 10px;
+}
+</style>
+    
+    
\ No newline at end of file