Commit f5a0fb23 authored by xingyuji's avatar xingyuji

Merge branch 'develop' into 'master'

fix: 查询板块时 直接查出全部区域以及板块 防止点击区域时发生卡顿现象

See merge request !31
parents 220c4492 e3cce8b4
...@@ -345,6 +345,14 @@ ...@@ -345,6 +345,14 @@
this.detailShow = true this.detailShow = true
}, },
setShowToPlate (item) { setShowToPlate (item) {
if(this.dataType.plate.length > 0) {
this.showType = 'plate'
this.regionClickId = item.businessId
this.map.center.lng = item.longitude
this.map.center.lat = item.latitude
this.map.setZoom = this.zoomType['plate']
return
}
queryAllPLate().then(res => { queryAllPLate().then(res => {
const plate = res.data.data const plate = res.data.data
this.regionClickId = item.businessId this.regionClickId = item.businessId
...@@ -437,7 +445,6 @@ ...@@ -437,7 +445,6 @@
this.dataType.plateRegion.resultBnsLandDTOS = [] this.dataType.plateRegion.resultBnsLandDTOS = []
} }
}).catch(e => { }).catch(e => {
console.log(e)
this.$message({ this.$message({
type: 'error', type: 'error',
message: e.msg message: e.msg
...@@ -545,8 +552,13 @@ ...@@ -545,8 +552,13 @@
} }
// 有搜索传递值 先渲染搜索到的楼盘 || 板块 再查询全部区域及其下属数目信息 // 有搜索传递值 先渲染搜索到的楼盘 || 板块 再查询全部区域及其下属数目信息
this.queryAllRegion() this.queryAllRegion()
queryAllPLate().then(res => {
const plate = res.data.data
if(plate && plate.length > 0) {
this.dataType['plate'] = plate
}
})
} else if(this.$route.query.plateId) { } else if(this.$route.query.plateId) {
console.log(this.$route.query)
this.queryAllRegion() this.queryAllRegion()
queryAllPLate().then(res => { queryAllPLate().then(res => {
const plate = res.data.data const plate = res.data.data
...@@ -608,7 +620,6 @@ ...@@ -608,7 +620,6 @@
this.dataType.plateRegion.resultBnsLandDTOS = [] this.dataType.plateRegion.resultBnsLandDTOS = []
} }
}).catch(e => { }).catch(e => {
console.log(e)
this.$message({ this.$message({
type: 'error', type: 'error',
message: e.msg message: e.msg
...@@ -618,6 +629,12 @@ ...@@ -618,6 +629,12 @@
} else { } else {
// 若无传递值 则查询全部区域及其下属数目信息 // 若无传递值 则查询全部区域及其下属数目信息
this.queryAllRegion() this.queryAllRegion()
queryAllPLate().then(res => {
const plate = res.data.data
if(plate && plate.length > 0) {
this.dataType['plate'] = plate
}
})
} }
window.eventBus.$on('searchParamChange', (searchResult) => { window.eventBus.$on('searchParamChange', (searchResult) => {
if(searchResult.type === 'plateRegion') { if(searchResult.type === 'plateRegion') {
...@@ -803,12 +820,17 @@ ...@@ -803,12 +820,17 @@
position: relative; position: relative;
} }
.dealWidth { .dealWidth {
width: calc(100% - 20px); width: 100%
padding 0 20px
overflow: hidden; overflow: hidden;
box-sizing border-box;
margin: auto; margin: auto;
height 100% height 100%
overflow-y auto overflow-y auto
} }
.dealWidth::-webkit-scrollbar {
width 0
}
.tools{ .tools{
background-color rgb(235,237,242); background-color rgb(235,237,242);
box-shadow 0 2px 12px 0 rgba(0,0,0,.1) box-shadow 0 2px 12px 0 rgba(0,0,0,.1)
...@@ -906,6 +928,7 @@ ...@@ -906,6 +928,7 @@
height 100% height 100%
.dealWidth { .dealWidth {
.el-radio-group{ .el-radio-group{
white-space nowrap
.el-radio-button__orig-radio:checked+.el-radio-button__inner { .el-radio-button__orig-radio:checked+.el-radio-button__inner {
background-color #3974CA background-color #3974CA
border-color #3974CA border-color #3974CA
...@@ -913,7 +936,7 @@ ...@@ -913,7 +936,7 @@
} }
.el-radio-button { .el-radio-button {
.el-radio-button__inner{ .el-radio-button__inner{
padding 12px 26px padding 12px 23px
} }
} }
} }
...@@ -977,6 +1000,7 @@ ...@@ -977,6 +1000,7 @@
cursor: pointer; cursor: pointer;
} }
.infomationContainer{ .infomationContainer{
width 100%;
margin-left 20px margin-left 20px
p { p {
margin 5px 0 margin 5px 0
...@@ -995,6 +1019,7 @@ ...@@ -995,6 +1019,7 @@
.plateDetailShow::-webkit-scrollbar{ .plateDetailShow::-webkit-scrollbar{
width 3px width 3px
} }
// 百度地图 隐藏左下水印
.anchorBL{ .anchorBL{
a,span { a,span {
display none!important display none!important
......
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