From 81331c3f8fbcad8b2f3c8462e9f7f8b40a3c2596 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Tue, 16 Apr 2024 18:24:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E8=B7=B3=E8=BD=AC=E5=B1=85?=
 =?UTF-8?q?=E6=B0=91,=E7=BC=96=E8=BE=91=E6=8B=93=E5=B1=95=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=BC=B9=E6=A1=86=E7=82=B9=E4=B8=8D=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 subpages/addResi/pages/addResi/addResi.js          | 11 +++++++++--
 .../pages/housePortrait/component/graph/graph.js   | 13 ++++++++++++-
 .../house/pages/housePortrait/housePortrait.js     | 14 ++++++++++++++
 .../house/pages/housePortrait/housePortrait.wxml   |  2 +-
 4 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/subpages/addResi/pages/addResi/addResi.js b/subpages/addResi/pages/addResi/addResi.js
index 5d7a8a7..0fd69ba 100644
--- a/subpages/addResi/pages/addResi/addResi.js
+++ b/subpages/addResi/pages/addResi/addResi.js
@@ -1342,7 +1342,6 @@ Page({
           console.error('Error fetching options:', error);
         }
       }
-      console.log(this.data.form);
       if(this.data.formType ==='edit'){
         if(item.itemType === 'select'){
           let obj = item.opction.find(itemC=>itemC.value ===  this.data.form[item.formNameP][item.formName]) || null
@@ -1350,7 +1349,15 @@ Page({
             item.selectLabel = obj.label || ''
           }
         }else{
-          item.selectLabel = this.data.form[item.formNameP][item.formName]
+          if(this.data.form[item.formNameP]){
+            item.selectLabel = this.data.form[item.formNameP][item.formName] || null
+          }else{
+            this.setData({
+              ['form.' +item.formNameP ]: {},
+            })
+          }
+          console.log(this.data.form);
+         
         }
       }
       return acc;
diff --git a/subpages/house/pages/housePortrait/component/graph/graph.js b/subpages/house/pages/housePortrait/component/graph/graph.js
index f8475da..d24d72f 100644
--- a/subpages/house/pages/housePortrait/component/graph/graph.js
+++ b/subpages/house/pages/housePortrait/component/graph/graph.js
@@ -47,6 +47,13 @@ Component({
                     height: height,
                     devicePixelRatio: dpr // 像素比
                 });
+                let than = this
+                chart.on('click', function (param) {
+                    if (param.dataType == 'node') {
+                        than.triggerEvent('clickGraphNode', {data: param.data.data });
+                    } else {
+                    }
+                })
                 canvas.setChart(chart);
                 let params = {
                     id: this.data.houseId
@@ -93,7 +100,11 @@ Component({
                             'symbol': symbolUrl,
                             label: {
                                 "position": "bottom"
-                            }
+                            },
+                            'data':{
+                                type:item.type,
+                                id:item.id
+                            },
                         };
                     });
                     
diff --git a/subpages/house/pages/housePortrait/housePortrait.js b/subpages/house/pages/housePortrait/housePortrait.js
index 6279557..3fc6576 100644
--- a/subpages/house/pages/housePortrait/housePortrait.js
+++ b/subpages/house/pages/housePortrait/housePortrait.js
@@ -217,6 +217,7 @@ Page({
                 })
             }
         })
+       
         await getfuwuList(params).then(res => {
             if (res.data && res.data.length > 0) {
                 let renamedArray = [];
@@ -271,4 +272,17 @@ Page({
             ywVisible: true
         })
     },
+    clickGraphNode(parm){
+        if(parm.detail.data.type === 0){
+            wx.navigateTo({
+                url: `/subpages/searchResult/pages/resiInfo/resiInfo?resiId=${parm.detail.data.id}`,
+              })
+           
+        }else{
+            this.setData({
+                houseId:parm.detail.data.id
+            })
+            this.getData()
+        }    
+    },
 })
\ No newline at end of file
diff --git a/subpages/house/pages/housePortrait/housePortrait.wxml b/subpages/house/pages/housePortrait/housePortrait.wxml
index 2fba860..02e81ea 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 houseId="{{houseId}}" houseName="{{houseName}}"></house-graph>
+    <house-graph houseId="{{houseId}}" bind:clickGraphNode="clickGraphNode" ></house-graph>
     </view>
 
     <view class="card">