Commit 864e5927 authored by 郭铭瑶's avatar 郭铭瑶 🤘

重设楼宇搜索参数

parent d60876f6
...@@ -19,7 +19,9 @@ ...@@ -19,7 +19,9 @@
<p class="name">{{ path.join('') }}</p> <p class="name">{{ path.join('') }}</p>
<div v-if="showBuildingDetail" class="building"> <div v-if="showBuildingDetail" class="building">
<div class="nav"> <div class="nav">
<p>{{ curBuilding['小区名称'] + curBuilding['楼宇名称'] }}</p> <p :title="curBuilding['小区名称'] + curBuilding['楼宇名称']">
{{ curBuilding['小区名称'] + curBuilding['楼宇名称'] }}
</p>
<span @click="showBuildingDetail = false"> <span @click="showBuildingDetail = false">
返回 返回
<n-icon size=".09rem"> <n-icon size=".09rem">
...@@ -80,7 +82,7 @@ ...@@ -80,7 +82,7 @@
}" }"
@click="setBuilding(item)" @click="setBuilding(item)"
> >
<p> <p :title="item['楼宇名称']">
<n-icon class="dot" size=".08rem"> <n-icon class="dot" size=".08rem">
<svg-icon :data="dot" /> <svg-icon :data="dot" />
</n-icon> </n-icon>
...@@ -160,16 +162,23 @@ const getRooms = async (query: string) => { ...@@ -160,16 +162,23 @@ const getRooms = async (query: string) => {
) )
} }
const getFloors = async (data: any) => { const getFloors = async (data: any) => {
console.log('123', data)
return Promise.all( return Promise.all(
( (
await useFetchRoom({ await useFetchRoom({
a: 'id,count', a: 'id,count',
keys: '层数', keys: '层数',
q: `paths @ "所属小区" && string == "${data['小区名称']}", paths @ "所属楼宇" string @ "${data['号']}"`, q: `paths @ "所属小区" && string == "${
props.path[props.path.length - 1]
}", paths @ "所属楼宇" string @ "${data['号']}"`,
}) })
).map(async (item: any) => { ).map(async (item: any) => {
const rooms = await getRooms( const rooms = await getRooms(
`paths @ "所属小区" && string == "${data['小区名称']}", paths @ "所属楼宇" && string @ "${data['号']}",paths @ "层数" && number == ${item['层数']}`, `paths @ "所属小区" && string == "${
props.path[props.path.length - 1]
}", paths @ "所属楼宇" && string @ "${
data['号']
}",paths @ "层数" && number == ${item['层数']}`,
) )
let memberAmount = 0 let memberAmount = 0
rooms.forEach((item: any) => (memberAmount += item.members.length)) rooms.forEach((item: any) => (memberAmount += item.members.length))
...@@ -255,10 +264,14 @@ const selectMember = (data: any) => { ...@@ -255,10 +264,14 @@ const selectMember = (data: any) => {
box-shadow 0 0.02rem .05rem rgba(0,0,0,0.1) box-shadow 0 0.02rem .05rem rgba(0,0,0,0.1)
p p
font-family $font-ping-medium font-family $font-ping-medium
flex 1
$text-overflow()
span span
color $red color $red
font-size .09rem font-size .09rem
cursor pointer cursor pointer
width .3rem
white-space nowrap
.floors .floors
padding .08rem padding .08rem
background $light-gray background $light-gray
......
...@@ -219,7 +219,6 @@ const getCommittees = async (name?: string) => { ...@@ -219,7 +219,6 @@ const getCommittees = async (name?: string) => {
const query = name ? `paths @ "所属社区" && string == "${name}"` : undefined const query = name ? `paths @ "所属社区" && string == "${name}"` : undefined
committees.value = ( committees.value = (
await useFetchCommittee({ await useFetchCommittee({
a: 'id,count',
keys: '所属居委', keys: '所属居委',
q: query, q: query,
}) })
...@@ -231,7 +230,6 @@ const getCommunities = async (name?: string) => { ...@@ -231,7 +230,6 @@ const getCommunities = async (name?: string) => {
const query = name ? `paths @ "所属居委" && string == "${name}"` : undefined const query = name ? `paths @ "所属居委" && string == "${name}"` : undefined
communities.value = ( communities.value = (
await useFetchCommunity({ await useFetchCommunity({
a: 'id,count',
keys: '居住区名称', keys: '居住区名称',
q: query, q: query,
}) })
...@@ -359,7 +357,7 @@ const buildingList = ref([]) ...@@ -359,7 +357,7 @@ const buildingList = ref([])
const getBuildings = async (name: string) => { const getBuildings = async (name: string) => {
buildingList.value = ( buildingList.value = (
await useFetchBuilding({ await useFetchBuilding({
q: `paths @ "小区名称" && string == "${name}"`, q: `paths @ "楼宇名称" && string @ "${name}"`,
}) })
).map((item: any) => item.extra) ).map((item: any) => item.extra)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment