From 1c4128cad8e55e983245b5fa6a45de7e984b3079 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Fri, 28 Mar 2025 14:36:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=B0=E8=AE=BF=E6=89=93=E5=8D=A1=E4=B8=8D?=
 =?UTF-8?q?=E7=94=9F=E6=95=88=E9=97=AE=E9=A2=98=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/work2/work2.wxml                                     | 4 ----
 .../pages/dissatisfied/demandCheck/demandCheck.js          | 6 +++---
 .../house/pages/housePortrait/component/graph/graph.js     | 3 +++
 subpages/house/pages/housePortrait/housePortrait.js        | 7 ++++++-
 subpages/house/pages/housePortrait/housePortrait.wxml      | 2 +-
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/pages/work2/work2.wxml b/pages/work2/work2.wxml
index 640a8a2..7d77527 100644
--- a/pages/work2/work2.wxml
+++ b/pages/work2/work2.wxml
@@ -84,10 +84,6 @@
             <image src="/images/work2/12345.png" class="image_13-21" style="margin-left: 25px;" bind:tap="onHotlineCompletion"></image>
             <text lines="1" class="text_4-0">热线接办</text>
           </view>
-          <view> 
-            <image src="/images/work2/review.png" class="image_12-0" bind:tap="toReview"></image>
-            <text lines="1" class="text_3-0" >安检巡查</text>
-          </view>
         
           </view>
         </view>
diff --git a/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.js b/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.js
index d686f8a..1ba2ca8 100644
--- a/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.js
+++ b/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.js
@@ -20,9 +20,9 @@ Page({
     optionsId: '',
     isDisabled: false,  // 默认不禁用
     defaultMeasureNames: {
-      label: 'categoryName',
-      value: 'categoryCode',
-      children: 'childCateList'
+      label: 'label',
+      value: 'id',
+      children: 'children'
     },
     fmData: {
       gridId: '',
diff --git a/subpages/house/pages/housePortrait/component/graph/graph.js b/subpages/house/pages/housePortrait/component/graph/graph.js
index ad91403..c36a549 100644
--- a/subpages/house/pages/housePortrait/component/graph/graph.js
+++ b/subpages/house/pages/housePortrait/component/graph/graph.js
@@ -62,6 +62,9 @@ Component({
                     data
                 }) => {
                     data = data.filter(item=>item.id!=this.data.houseId);
+                    if(data && data.length>0){
+                        this.triggerEvent('getResiId', data[0].id);
+                    }
                     const rootNode = {};
                     rootNode["id"] = this.data.houseId;
                     rootNode["name"] = this.data.houseName;
diff --git a/subpages/house/pages/housePortrait/housePortrait.js b/subpages/house/pages/housePortrait/housePortrait.js
index 1417f1a..083ee97 100644
--- a/subpages/house/pages/housePortrait/housePortrait.js
+++ b/subpages/house/pages/housePortrait/housePortrait.js
@@ -29,6 +29,11 @@ Page({
             this.getData()
         }
     },
+    handleGetResiId(item){
+        this.setData({
+            "detail.residentId":item.detail
+        })
+    },
     getData() {
         api.getClearHouseDeatilById(this.data.houseId).then((res) => {
             this.setData({
@@ -112,7 +117,7 @@ Page({
      * 生命周期函数--监听页面显示
      */
     onShow() {
-
+        this.getTabData();
     },
 
     /**
diff --git a/subpages/house/pages/housePortrait/housePortrait.wxml b/subpages/house/pages/housePortrait/housePortrait.wxml
index 5aefa1d..61f512c 100644
--- a/subpages/house/pages/housePortrait/housePortrait.wxml
+++ b/subpages/house/pages/housePortrait/housePortrait.wxml
@@ -30,7 +30,7 @@
                 <image mode="widthFix" src="../../../../images/right.png"></image>
             </view>
         </view>
-    <house-graph wx:if="{{detail}}" houseId="{{houseId}}" bind:clickGraphNode="clickGraphNode" ></house-graph>
+    <house-graph wx:if="{{detail}}" bind:getResiId="handleGetResiId" houseId="{{houseId}}" bind:clickGraphNode="clickGraphNode" ></house-graph>
     </view>
 
     <view class="card">