From 0d060e635e89b0502af0acad0a9e857f218715e2 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Wed, 3 Apr 2024 19:43:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=BC=80=E9=80=80=E5=87=BA=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95,=E6=88=BF=E5=B1=8B=E7=94=BB=E5=83=8F=E5=8D=A0?=
 =?UTF-8?q?=E4=BD=8D=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/mine/mine.wxml                                   |  4 ++--
 pages/resiAndHouse/resiAndHouse.js                     | 10 ++++++----
 pages/resiAndHouse/resiAndHouse.wxml                   |  4 ++--
 subpages/house/pages/housePortrait/housePortrait.json  |  4 +++-
 subpages/house/pages/housePortrait/housePortrait.wxml  |  7 +++++--
 .../pages/resiInfo/component/graph/graph.js            |  2 ++
 6 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/pages/mine/mine.wxml b/pages/mine/mine.wxml
index 4bc9a0b..4e4f6c6 100644
--- a/pages/mine/mine.wxml
+++ b/pages/mine/mine.wxml
@@ -51,13 +51,13 @@
                 </view>
                 <view class="right"> <image src="../../images/right.png" mode=""/></view>
             </view> -->
-            <!-- <view class="item no-pseudo" bind:tap="toSettings" >
+            <view class="item no-pseudo" bind:tap="toSettings" >
                 <view class="left">
                         <image src="../../images/mine/sz.png" mode=""/>
                         <view>设置</view>
                     </view>
                     <view class="right"> <image src="../../images/right.png" mode=""/></view>
-            </view> -->
+            </view>
             <view class="item no-pseudo" bind:tap="toSettings" >
                 <view class="left"  bind:tap="toChangePassword">
                         <image src="../../images/login/password.png" mode=""/>
diff --git a/pages/resiAndHouse/resiAndHouse.js b/pages/resiAndHouse/resiAndHouse.js
index d79305b..a43ef5e 100644
--- a/pages/resiAndHouse/resiAndHouse.js
+++ b/pages/resiAndHouse/resiAndHouse.js
@@ -72,7 +72,7 @@ Page({
             "searchKey": "",
             "pageSize": 50,
             "pageNo": 1,
-            "searchOrgIdPath": "7b6f9a9f9f38d5f9fa7ce94a93d6eb28",
+            "searchOrgIdPath": "",
         },
         activeFwType: 0,
         fwTypes: [
@@ -99,7 +99,7 @@ Page({
             },
             params1: {
                 ...this.data.params1,
-                searchOrgIdPath:App.globalData.user.agencyId,
+                // searchOrgIdPath:App.globalData.user.agencyId,
             }
         })
         this.getAgencygridtree()
@@ -264,15 +264,17 @@ Page({
             params: {
                 ...this.data.params,
                 orgId: value,
-                level,
+                level:level == 'grid'?'grid':'agency',
+                agencyId:App.globalData.user.agencyId
             },
             params1: {
                 pageNo: 1,
                 ...this.data.params1,
                 searchOrgIdPath: value,
-                orgId: value,
+                // orgId: value,
                 level,
             },
+            tableFwData:[]
         });
         this.getTableFwData()
     },
diff --git a/pages/resiAndHouse/resiAndHouse.wxml b/pages/resiAndHouse/resiAndHouse.wxml
index e217444..0f7de26 100644
--- a/pages/resiAndHouse/resiAndHouse.wxml
+++ b/pages/resiAndHouse/resiAndHouse.wxml
@@ -15,10 +15,10 @@
             </view>
         </view>
         <view class="inout_box">
-            <image src="../../images/work/search.png" mode="" class="search_img" />
+            <image src="../../images/work/search.png" mode="" class="search_img"/>
             <input type="text" placeholder="姓名/手机/身份证" bindinput="handelBlurKeyWord" bindblur="handelBlurKeyWord" value="{{keyWord}}" />
             <view class="btn_box" bind:tap="handelClickSearch">
-                <image src="../../images/cardIcon.png" mode="" class="OCR_img" bind:tap="handelClickToOcr" />
+                <image src="../../images/cardIcon.png" mode=""  wx:if="{{selectVale == 'resi'}}"  class="OCR_img" bind:tap="handelClickToOcr" />
                 <text>搜索</text>
             </view>
         </view>
diff --git a/subpages/house/pages/housePortrait/housePortrait.json b/subpages/house/pages/housePortrait/housePortrait.json
index 6a8473f..d67c763 100644
--- a/subpages/house/pages/housePortrait/housePortrait.json
+++ b/subpages/house/pages/housePortrait/housePortrait.json
@@ -2,6 +2,8 @@
     "navigationBarTitleText": "房屋详情",
     "usingComponents": {
         "BusinessRecord": "../../../businessRecord/businessRecord",
-        "no-data": "../../../../components/noData/nodata"
+        "no-data": "../../../../components/noData/nodata",
+        "resi-graph":"./component/graph/graph"
+
     }
 }
\ No newline at end of file
diff --git a/subpages/house/pages/housePortrait/housePortrait.wxml b/subpages/house/pages/housePortrait/housePortrait.wxml
index 3bb2204..730bfc2 100644
--- a/subpages/house/pages/housePortrait/housePortrait.wxml
+++ b/subpages/house/pages/housePortrait/housePortrait.wxml
@@ -22,7 +22,7 @@
         </view>
     </view>
 
-    <view class="card">
+    <!-- <view class="card">
         <view class="title">
             <text>关系图谱</text>
             <view class="view" bind:tap="gotopage" data-url="/subpages/statistics/pages/problemList/problemList?type={{tabValue}}">
@@ -30,7 +30,10 @@
                 <image mode="widthFix" src="../../../../images/right.png"></image>
             </view>
         </view>
-    </view>
+    <resi-graph resiId="{{houseId}}"></resi-graph>
+    
+
+    </view> -->
 
     <view class="card">
         <view class="title">
diff --git a/subpages/searchResult/pages/resiInfo/component/graph/graph.js b/subpages/searchResult/pages/resiInfo/component/graph/graph.js
index 6dd2576..da6b480 100644
--- a/subpages/searchResult/pages/resiInfo/component/graph/graph.js
+++ b/subpages/searchResult/pages/resiInfo/component/graph/graph.js
@@ -81,6 +81,8 @@ Component({
                                     item.age > 60 ?
                                     'image://https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/internal/20240402/2465ff7633a94413bf4ed2aa778c2765.png' :
                                     '';
+                            }else{
+                                symbolUrl = 'image://https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/internal/20240402/1e21790833b04e9abe61e2a8f40446cb.png'
                             }
                         }
                         return {