From 8e45e6f8ade857c56becc369142c98ceb88d498d Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Sun, 7 Apr 2024 18:04:50 +0800
Subject: [PATCH 1/6] =?UTF-8?q?bug#1071=E5=B1=85=E6=B0=91=E5=B9=B4?=
 =?UTF-8?q?=E9=BE=84=E6=8F=90=E7=A4=BA=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/resiSearch.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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('结束年龄不能小于开始年龄')
         }

From 62e44f37c0172761160dd84236c81e1fcaa69e98 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Sun, 7 Apr 2024 18:10:41 +0800
Subject: [PATCH 2/6] =?UTF-8?q?#bug1060=E5=B1=85=E6=B0=91=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E4=B8=AD=E7=A4=BE=E5=8C=BA=E8=87=AA=E6=9F=A5=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E4=B8=8D=E6=98=BE=E7=A4=BA=20#bug1077=E5=B1=85?=
 =?UTF-8?q?=E5=A7=94=E6=9E=B6=E6=9E=84=E7=82=B9=E5=87=BB=E5=B1=85=E6=B0=91?=
 =?UTF-8?q?=E7=94=BB=E5=83=8F=E6=97=A0=E6=95=B0=E6=8D=AE=20#bug1076?=
 =?UTF-8?q?=E6=8C=87=E6=8C=A5=E8=B0=83=E5=BA=A6=E4=B8=AD=E9=97=B4=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E6=9F=A5=E7=9C=8B=E6=9B=B4=E5=A4=9A=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=87=8D=E5=A4=8D=20#bug1070=E6=94=BF?=
 =?UTF-8?q?=E7=AD=96=E6=89=BE=E4=BA=BA=E6=8C=87=E6=B4=BE=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B9=B1=E7=A0=81=20#bug1062=E5=B1=85?=
 =?UTF-8?q?=E6=B0=91=E8=AF=A6=E6=83=85=E7=BC=BA=E5=B0=91=E4=BD=8E=E4=BF=9D?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/JwTree/nodeWrap.vue                              | 2 +-
 src/views/dataBoard/overview/components/MapResourceInfoMore.vue | 2 +-
 src/views/modules/communityService/policy/addPolicy.vue         | 2 +-
 src/views/modules/portrayal/jumin/cpts/businessRecord.vue       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

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/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();

From c85c70101b5a5a9c33a9b4ece28cb4289af61081 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Sun, 7 Apr 2024 19:49:34 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E5=B1=85=E6=B0=91=E5=9B=BE=E8=B0=B1?=
 =?UTF-8?q?=E5=85=B3=E7=B3=BB=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/portrayal/jumin/cpts/graph.vue | 2 +-
 src/views/modules/portrayal/jumin/index.vue      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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..645d85409 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

From d5032c3795d3f57d5441352fdfbe525038a06045 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Tue, 9 Apr 2024 14:47:06 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E4=BA=BA=E5=91=98=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AEbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/images/index/头像/叔叔.png     | Bin 6078 -> 0 bytes
 src/assets/images/index/头像/阿姨.png     | Bin 8710 -> 0 bytes
 .../modules/workSys/setResiUpdate/index.vue   | 209 ++++++++++++++++++
 3 files changed, 209 insertions(+)
 delete mode 100644 src/assets/images/index/头像/叔叔.png
 delete mode 100644 src/assets/images/index/头像/阿姨.png
 create mode 100644 src/views/modules/workSys/setResiUpdate/index.vue

diff --git a/src/assets/images/index/头像/叔叔.png b/src/assets/images/index/头像/叔叔.png
deleted file mode 100644
index 52d1baf256860c34f3782b2b01b33b8b2c5aa848..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6078
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
S^8P=6)YX-Blqw$D1pg1VfdZ}o

diff --git a/src/assets/images/index/头像/阿姨.png b/src/assets/images/index/头像/阿姨.png
deleted file mode 100644
index 6e3c6d441b8fed243aaa42df63ebe3bf04501f5a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8710
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
BfL{Or

diff --git a/src/views/modules/workSys/setResiUpdate/index.vue b/src/views/modules/workSys/setResiUpdate/index.vue
new file mode 100644
index 000000000..74ae3619c
--- /dev/null
+++ b/src/views/modules/workSys/setResiUpdate/index.vue
@@ -0,0 +1,209 @@
+<!-- 列表页模板V5 -->
+<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

From cb7b9ef357bfa21eb584337b28d38c1dfe54adfc Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Tue, 9 Apr 2024 17:04:35 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E5=B1=85=E6=B0=91=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=B7=A6=E4=BE=A7=E8=8F=9C=E5=8D=95=E6=BB=91?=
 =?UTF-8?q?=E5=8A=A8=E5=AF=B9=E5=BA=94=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/portrayal/jumin/index.vue       | 12 ++++++++----
 src/views/modules/workSys/setResiUpdate/index.vue |  2 --
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/views/modules/portrayal/jumin/index.vue b/src/views/modules/portrayal/jumin/index.vue
index 645d85409..15f680a63 100644
--- a/src/views/modules/portrayal/jumin/index.vue
+++ b/src/views/modules/portrayal/jumin/index.vue
@@ -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>
@@ -1313,11 +1313,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
index 74ae3619c..fb575db07 100644
--- a/src/views/modules/workSys/setResiUpdate/index.vue
+++ b/src/views/modules/workSys/setResiUpdate/index.vue
@@ -1,4 +1,3 @@
-<!-- 列表页模板V5 -->
 <template>
   <div class="g-main">
     <div>
@@ -81,7 +80,6 @@ import { mapGetters } from "vuex";
 
 export default {
   components: {},
-
   data() {
     return {
       tableLoading: false,

From d8abf58f6b191f8702e9644c0cadda5e4a6d1038 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Tue, 9 Apr 2024 20:48:40 +0800
Subject: [PATCH 6/6] 1

---
 src/views/modules/portrayal/jumin/index.vue | 23 +++------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

diff --git a/src/views/modules/portrayal/jumin/index.vue b/src/views/modules/portrayal/jumin/index.vue
index 15f680a63..ad326e899 100644
--- a/src/views/modules/portrayal/jumin/index.vue
+++ b/src/views/modules/portrayal/jumin/index.vue
@@ -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