解开退出登录,房屋画像占位注释

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=""/>

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()
     },

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>

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"
+
     }
 }

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">

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 {