From 0fa88f9c2e3c8ce335e7cd6dfc6c8e5641950735 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Wed, 09 Feb 2022 15:53:24 +0800
Subject: [PATCH] +弹窗图片可点击，列表展示文字区域点击是定位，图片可点击，+活动打开后隐藏右侧控制栏，+操作方式更改
---
src/components/map/components/campusBuildingSearch.vue | 154 +++++++++++++++++++++++++++++++--------------------
1 files changed, 93 insertions(+), 61 deletions(-)
diff --git a/src/components/map/components/campusBuildingSearch.vue b/src/components/map/components/campusBuildingSearch.vue
index 3ddaea0..a934afd 100644
--- a/src/components/map/components/campusBuildingSearch.vue
+++ b/src/components/map/components/campusBuildingSearch.vue
@@ -3,7 +3,7 @@
<div class="map-campus-search"
id="CampusSearchPanel">
<el-input class="search-input"
- placeholder="校园搜索…"
+ placeholder="社区搜索…"
v-model="searchInput"
@input="searchValueChange"
@focus="shortcutFlag = true">
@@ -12,7 +12,8 @@
<el-button @click="navigationShow"
class="deblurring"
icon="el-icon-my-path"></el-button>
- <el-button class="deblurring"
+ <el-button @click="fuzzyQuery"
+ class="deblurring"
type="primary"
icon="el-icon-my-search"></el-button>
</el-button-group>
@@ -22,7 +23,7 @@
<li v-for="(item, index) in searchValList"
:key="index"
@click="loadPopup(item)">
- {{item.name}}
+ {{item.mechanismname}}
</li>
</ul>
</div>
@@ -58,42 +59,48 @@
return {
DC: null,
shortcutList: [
- {
- bgimg: '/img/search/org.png',
- title: '党群机构',
- type: 'orgnav',
- code: 1
- },
- {
- bgimg: '/img/search/ofc.png',
- title: '职能部处',
- type: 'orgnav',
- code: 2
- },
- {
- bgimg: '/img/search/teach.png',
- title: '教学科研',
- type: 'orgnav',
- code: 4
- },
+ // {
+ // bgimg: '/img/search/org.png',
+ // title: '党群机构',
+ // type: 'orgnav',
+ // path: '/pcLayout/default/orgnav/masses',
+ // code: 1
+ // },
+ // {
+ // bgimg: '/img/search/ofc.png',
+ // title: '职能部处',
+ // type: 'orgnav',
+ // path: '/pcLayout/default/orgnav/ofc',
+ // code: 2
+ // },
+ // {
+ // bgimg: '/img/search/teach.png',
+ // title: '教学科研',
+ // type: 'arc',
+ // path: '/pcLayout/default/arc/teaching',
+ // code: 2
+ // },
{
bgimg: '/img/search/venue.png',
- title: '校内场馆',
+ title: '社区场馆',
type: 'arc',
+ path: '/pcLayout/default/arc/venue',
code: 3
- },
- {
- bgimg: '/img/search/dorm.png',
- title: '学生宿舍',
- type: 'arc',
- code: 4
- },
- {
- bgimg: '/img/search/scenery.png',
- title: '文化风景',
- type: 'arc',
- code: 5
}
+ // {
+ // bgimg: '/img/search/dorm.png',
+ // title: '社区宿舍',
+ // type: 'arc',
+ // path: '/pcLayout/default/arc/dorm',
+ // code: 4
+ // },
+ // {
+ // bgimg: '/img/search/scenery.png',
+ // title: '文化风景',
+ // type: 'arc',
+ // path: '/pcLayout/default/arc/culture',
+ // code: 5
+ // }
],
shortcutFlag: false,
searchInput: '',
@@ -104,7 +111,7 @@
computed: {
...mapGetters([
'viewer',
- // 校内导航的显示关闭
+ // 社区内导航的显示关闭
'campusNavFlag',
'orgNavBarFlag',
'arcNavBarFlag'
@@ -134,8 +141,33 @@
}
},
+ fuzzyQuery () {
+ if (this.searchInput == '') {
+ this.searchValList = []
+ this.searchValShow = false
+
+ this.$message({
+ message: '请输入关键字',
+ type: 'warning'
+ })
+ return
+ }
+ getSearchList({ mechanismName: this.searchInput }).then(res => {
+ if (res.data.data.length > 0) {
+ this.$store.commit('SET_SEARCHPOPUPFLAG', true)
+ this.$store.commit('SET_SEARCHPOPUPLIST', res.data.data)
+ this.searchValShow = false
+ }
+ })
+ },
+
openModelPopup (param) {
var list = []
+ if (this.$route.path.indexOf('/service') != -1) {
+ this.$store.dispatch('delVisitedViews', this.$route)
+ this.$router.push('/pcLayout/default')
+ }
+
if (param.type == 'orgnav') {
var path = this.$route.path
if (path.indexOf('/arc') != -1) {
@@ -172,7 +204,8 @@
QRImg: item.codeurl,
address: item.address,
telephone: item.telephone,
- introduce: item.introduce
+ introduce: item.introduce,
+ videourl: item.videourl
})
})
@@ -218,41 +251,39 @@
this.$store.commit('CLEAR_ALL', null)
- var result = param.list
-
- var imgArr = result.tpurl.split(',')
- var tabOne = param.jx.split(',')
- var tabTwo = param.sh.split(',')
+ var imgArr = param.tpurl.split(',')
this.$store.commit('SET_POPUPBGURL', imgArr[0])
- this.$store.commit('SET_POPUPQRURL', result.codeurl)
- this.$store.commit('SET_POINTPOSITION', [Number(result.jd), Number(result.wd), Number(result.gd), Number(result.heading), Number(result.pitch), Number(result.roll)])
- this.$store.commit('SET_STATENAME', result.mechanismname)
- this.$store.commit('SET_SITENAME', result.address)
- this.$store.commit('SET_TELEPHONE', result.telephone)
- this.$store.commit('SET_INTRODUCETEXT', result.introduce)
- if (result.panoramaurl != '') {
- this.$store.commit('SET_PANORAMAURL', result.panoramaurl)
+ this.$store.commit('SET_POPUPQRURL', param.codeurl)
+ this.$store.commit('SET_POINTPOSITION', [Number(param.jd), Number(param.wd), Number(param.gd), Number(param.heading), Number(param.pitch), Number(param.roll)])
+ this.$store.commit('SET_STATENAME', param.mechanismname)
+ this.$store.commit('SET_SITENAME', param.address)
+ this.$store.commit('SET_TELEPHONE', param.telephone)
+ this.$store.commit('SET_INTRODUCETEXT', param.introduce)
+ if (param.panoramaurl != '') {
+ this.$store.commit('SET_PANORAMAURL', param.panoramaurl)
}
- if (result.videourl != '') {
- this.$store.commit('SET_MONITORURL', result.videourl)
+ if (param.videourl && param.videourl != '') {
+ this.$store.commit('SET_MONITORURL', param.videourl)
}
this.$store.commit('SET_POPUPIMGATLAS', imgArr)
- if (param.jx != '') {
+ if (param.jx != undefined && param.jx != '') {
+ var tabOne = param.jx.split(',')
this.$store.commit('SET_TEACHLIST', tabOne)
} else {
this.$store.commit('SET_TEACHLIST', [])
}
- if (param.sh != '') {
+ if (param.sh != undefined && param.sh != '') {
+ var tabTwo = param.sh.split(',')
this.$store.commit('SET_LIVELIST', tabTwo)
} else {
this.$store.commit('SET_LIVELIST', [])
}
- this.newPopup(result)
+ this.newPopup(param)
this.viewer.flyToPosition(
- new this.DC.Position(Number(result.jd), Number(result.wd), 3000, Number(result.heading), Number(result.pitch), Number(result.roll)),
+ new this.DC.Position(Number(param.jd), Number(param.wd), 300, Number(param.heading), Number(param.pitch), Number(param.roll)),
() => {
},
@@ -261,7 +292,7 @@
},
newPopup (item) {
- const position = this.DC.Transform.transformWGS84ToCartesian(new this.DC.Position(Number(item.jd), Number(item.wd), Number(item.gd), Number(item.heading), Number(item.pitch), Number(item.roll)))
+ const position = this.DC.Transform.transformWGS84ToCartesian(new this.DC.Position(Number(item.jd), Number(item.wd), Number(item.gd)))
// eslint-disable-next-line no-unused-vars
var popup = new this.DC.DivForms(this.viewer, {
domId: 'divFormsDomBox',
@@ -287,7 +318,7 @@
right: 0;
bottom: auto;
margin: auto;
- width: 320px;
+ width: 330px;
min-height: 40px;
max-height: 360px;
height: auto;
@@ -297,7 +328,7 @@
.search-input {
float: left;
- width: 240px;
+ width: 250px;
height: 40px;
border-radius: 5px 0 0 5px;
@@ -347,7 +378,7 @@
top: 41px;
left: 0;
width: auto;
- min-width: 240px;
+ min-width: 250px;
max-height: 520px;
background: #fff;
overflow-y: auto;
@@ -371,7 +402,7 @@
.map-campus-shortcut {
margin-top: 20px;
width: 100%;
- height: 320px;
+ height: 330px;
background: #fff;
border-radius: 5px;
@@ -381,10 +412,11 @@
display: flex;
width: 100%;
height: 120px;
- justify-content: space-around;
+ justify-content: flex-start;
flex-wrap: wrap;
li {
+ margin: 0 13px;
width: 84px;
height: 76px;
--
Gitblit v1.9.3