From 2ffe3c4ef744deedb9ed1bc54a77ed79d65452d2 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sat, 11 Nov 2023 22:26:36 +0800
Subject: [PATCH] 场所网格数据接入，楼盘数据过滤
---
pages/home/index.vue | 3 ++-
subPackage/house/houseNumber/index.vue | 10 +++++-----
subPackage/workbench/views/cscj.vue | 8 +++++++-
subPackage/house/list/index.vue | 3 ++-
4 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/pages/home/index.vue b/pages/home/index.vue
index c44d4e6..aed57e0 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -456,7 +456,8 @@
async getHouseDataList(code) {
const param = {
type: 1,
- code: code
+ code: code,
+ roleName:uni.getStorageSync('activeRole').roleName
}
const res = await getHouseList(param)
res.data.forEach(item => {
diff --git a/subPackage/house/houseNumber/index.vue b/subPackage/house/houseNumber/index.vue
index d3c0417..a986b7e 100644
--- a/subPackage/house/houseNumber/index.vue
+++ b/subPackage/house/houseNumber/index.vue
@@ -100,22 +100,22 @@
],
gridData: [{
title: '社区名称',
- name: 'neiName',
+ name: 'communityName',
value: '未完善'
},
{
title: '网格名称',
- name: '',
+ name: 'gridName',
value: '未完善'
},
{
title: '网格员',
- name: '',
+ name: 'realName',
value: '未完善'
},
{
title: '联系电话',
- name: '',
+ name: 'gridPhone',
value: '未完善'
}
],
@@ -238,7 +238,7 @@
this.gridData.forEach(item => {
if (!data[item.name]) {
- item.value = data.doorplateAddressEntity[item.name] || '未完善'
+ item.value = data.grid[item.name] || '未完善'
} else {
item.value = data[item.name] || '未完善'
}
diff --git a/subPackage/house/list/index.vue b/subPackage/house/list/index.vue
index 07342bc..1051281 100644
--- a/subPackage/house/list/index.vue
+++ b/subPackage/house/list/index.vue
@@ -69,7 +69,8 @@
async getHouseInfo() {
const param = {
type: 2,
- code:this.currentId
+ code:this.currentId,
+ roleName:uni.getStorageSync('activeRole').roleName
}
const res = await getHouseList(param)
const aoiList = res.data.aoiList
diff --git a/subPackage/workbench/views/cscj.vue b/subPackage/workbench/views/cscj.vue
index e3b7237..8e2b421 100644
--- a/subPackage/workbench/views/cscj.vue
+++ b/subPackage/workbench/views/cscj.vue
@@ -236,19 +236,22 @@
comprehensiveData: {
basic: [{
label: "社区名称",
- name: 'neiName',
+ name: 'communityName',
value: "暂无数据"
},
{
label: "网格名称",
+ name: 'gridName',
value: "暂无数据"
},
{
label: "网格员",
+ name: 'realName',
value: "暂无数据"
},
{
label: "联系电话",
+ name: 'gridPhone',
value: "暂无数据"
}
],
@@ -460,6 +463,8 @@
return
}
const dpaEntity = data?.doorplateAddressEntity || {}
+
+ const gridEntity = data?.grid || {}
this.form.buildingCode = dpaEntity?.buildingCode || ''
@@ -492,6 +497,7 @@
this.comprehensiveData[key].forEach(item => {
if (!data[item.name]) {
item.value = dpaEntity[item.name] || '未完善'
+ item.value = gridEntity[item.name] || '未完善'
} else {
item.value = data[item.name] || '未完善'
}
--
Gitblit v1.9.3