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] =?UTF-8?q?#bug1060=E5=B1=85=E6=B0=91=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E4=B8=AD=E7=A4=BE=E5=8C=BA=E8=87=AA=E6=9F=A5=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=20#bug1077=E5=B1=85=E5=A7=94?=
 =?UTF-8?q?=E6=9E=B6=E6=9E=84=E7=82=B9=E5=87=BB=E5=B1=85=E6=B0=91=E7=94=BB?=
 =?UTF-8?q?=E5=83=8F=E6=97=A0=E6=95=B0=E6=8D=AE=20#bug1076=E6=8C=87?=
 =?UTF-8?q?=E6=8C=A5=E8=B0=83=E5=BA=A6=E4=B8=AD=E9=97=B4=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=9B=B4=E5=A4=9A=E9=A1=B5=E9=9D=A2=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E9=87=8D=E5=A4=8D=20#bug1070=E6=94=BF=E7=AD=96?=
 =?UTF-8?q?=E6=89=BE=E4=BA=BA=E6=8C=87=E6=B4=BE=E6=9C=8D=E5=8A=A1=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=B9=B1=E7=A0=81=20#bug1062=E5=B1=85=E6=B0=91?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E7=BC=BA=E5=B0=91=E4=BD=8E=E4=BF=9D=E4=BF=A1?=
 =?UTF-8?q?=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();