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 @@
热线接办
-
-
- 安检巡查
-
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 @@
-
+