From 81f54040c2cb65537c6c6e1db8358a39a57dea0d Mon Sep 17 00:00:00 2001
From: mayisheng <admin>
Date: Mon, 15 Aug 2022 16:14:01 +0800
Subject: [PATCH] 1
---
src/components/map/components/campusBuildingSearch.vue | 349 ++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 207 insertions(+), 142 deletions(-)
diff --git a/src/components/map/components/campusBuildingSearch.vue b/src/components/map/components/campusBuildingSearch.vue
index 2129ee6..2dab424 100644
--- a/src/components/map/components/campusBuildingSearch.vue
+++ b/src/components/map/components/campusBuildingSearch.vue
@@ -1,41 +1,38 @@
<template>
<div>
- <div class="map-campus-search"
- id="CampusSearchPanel">
- <el-input class="search-input"
- placeholder="社区搜索…"
- v-model="searchInput"
- @input="searchValueChange"
- @focus="shortcutFlag = true">
- </el-input>
+ <div class="map-campus-search" id="CampusSearchPanel">
+ <el-input
+ class="search-input"
+ placeholder="校区搜索…"
+ v-model="searchInput"
+ @input="searchValueChange"
+ @focus="shortcutFlag = true"
+ ></el-input>
<el-button-group>
- <el-button @click="navigationShow"
- class="deblurring"
- icon="el-icon-my-path"></el-button>
- <el-button class="deblurring"
- type="primary"
- icon="el-icon-my-search"></el-button>
+ <el-button @click="navigationShow" class="deblurring" icon="el-icon-my-path"></el-button>
+ <el-button
+ @click="fuzzyQuery"
+ class="deblurring"
+ type="primary"
+ icon="el-icon-my-search"
+ ></el-button>
</el-button-group>
- <div v-show="searchValShow"
- class="search-value-box">
+ <div v-show="searchValShow" class="search-value-box">
<ul>
- <li v-for="(item, index) in searchValList"
+ <li
+ v-for="(item, index) in searchValList"
:key="index"
- @click="loadPopup(item)">
- {{item.name}}
- </li>
+ @click="loadPopup(item)"
+ >{{ item.mechanismname }}</li>
</ul>
</div>
- <div class="map-campus-shortcut"
- v-show="shortcutFlag">
+ <div class="map-campus-shortcut" v-show="shortcutFlag">
<div class="shortcut-box">
<ul>
- <li v-for="(item, index) in shortcutList"
- :key="index">
+ <li v-for="(item, index) in shortcutList" :key="index">
<el-button @click="openModelPopup(item)">
- <img :src="item.bgimg"
- alt="">
- <span>{{item.title}}</span>
+ <img :src="item.bgimg" alt />
+ <span>{{ item.title }}</span>
</el-button>
</li>
</ul>
@@ -46,7 +43,6 @@
</template>
<script>
-
import { mapGetters } from 'vuex'
import { getList } from '@/api/pc/orgnav/index'
@@ -56,50 +52,57 @@
name: 'campusBuildingSearch',
data () {
return {
- DC: null,
shortcutList: [
{
bgimg: '/img/search/org.png',
- title: '党群机构',
+ title: '其他机构',
type: 'orgnav',
- path: '/pcLayout/default/orgnav/masses',
- code: 1
+ path: '/pcLayout/default/orgnav/rest',
+ code: 5
},
- {
- 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/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: '社区宿舍',
+ bgimg: '/img/search/floor.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
+ path: '/pcLayout/default/arc/rest',
+ code: 7
}
+ // {
+ // 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: '',
@@ -109,24 +112,32 @@
},
computed: {
...mapGetters([
- 'viewer',
- // 社区内导航的显示关闭
+ // 校区内导航的显示关闭
'campusNavFlag',
'orgNavBarFlag',
- 'arcNavBarFlag'
+ 'arcNavBarFlag',
+ 'twoOrThree'
])
},
created () {
- this.DC = global.DC
},
methods: {
+ coordinate (item) {
+ const arr = item.split(',')
+
+ return {
+ lng: arr[0],
+ lat: arr[1]
+ }
+ },
+
searchValueChange () {
if (this.searchInput == '') {
this.searchValList = []
this.searchValShow = false
return
}
- getSearchList({ mechanismName: this.searchInput }).then(res => {
+ getSearchList({ mechanismName: this.searchInput }).then((res) => {
if (res.data.data.length > 0) {
this.searchValList = res.data.data
this.searchValShow = true
@@ -140,36 +151,39 @@
}
},
+ fuzzyQuery () {
+ if (this.searchInput == '') {
+ this.searchValList = []
+ this.searchValShow = false
+
+ this.$message({
+ message: '请输入关键字',
+ type: 'warning',
+ duration: 1000
+ })
+ 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.searchInput = ''
+ this.searchValList = []
+ 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) {
- this.$store.dispatch('delVisitedViews', this.$route)
- this.$router.push('/pcLayout/default')
- this.$store.commit('SET_ARCNAVBARTITLE', '')
- this.$store.commit('SET_ARCNAVBARCODE', '')
- this.$store.commit('SET_ARCNAVBARFLAG', false)
- }
-
- if (this.arcNavBarFlag == true) {
- this.$store.commit('SET_ARCNAVBARTITLE', '')
- this.$store.commit('SET_ARCNAVBARCODE', '')
- this.$store.commit('SET_ARCNAVBARFLAG', false)
- }
-
this.$store.commit('SET_ORGNAVBARTITLE', param.title)
this.$store.commit('SET_ORGNAVBARLIST', [])
-
this.$store.commit('SET_ORGNAVBARFLAG', true)
- getList({ type: param.code }).then(res => {
- res.data.data.records.forEach(item => {
+ getList({ type: param.code }).then((res) => {
+ res.data.data.records.forEach((item) => {
list.push({
navTitle: item.mechanismname,
icon: '/img/navicon/tag.png',
@@ -191,31 +205,20 @@
this.$store.commit('SET_ORGNAVBARLIST', list)
})
} else if (param.type == 'arc') {
- if (this.$route.path.indexOf('/orgnav') != -1) {
- this.$store.dispatch('delVisitedViews', this.$route)
- this.$router.push('/pcLayout/default')
- this.$store.commit('SET_ORGNAVBARTITLE', '')
- this.$store.commit('SET_ORGNAVBARLIST', [])
- this.$store.commit('SET_ORGNAVBARFLAG', false)
- }
-
- if (this.orgNavBarFlag == true) {
- this.$store.commit('SET_ORGNAVBARTITLE', '')
- this.$store.commit('SET_ORGNAVBARLIST', [])
- this.$store.commit('SET_ORGNAVBARFLAG', false)
- }
-
this.$store.commit('SET_ARCNAVBARTITLE', param.title)
this.$store.commit('SET_ARCNAVBARCODE', param.code)
this.$store.commit('SET_ARCNAVBARFLAG', true)
}
+
+ this.$router.push(param.path)
},
shortcutShow (event) {
var sp = document.getElementById('CampusSearchPanel')
if (sp) {
- if (!sp.contains(event.target)) { // 这句是说如果我们点击到了id为myPanel以外的区域
+ if (!sp.contains(event.target)) {
+ // 这句是说如果我们点击到了id为myPanel以外的区域
this.shortcutFlag = false
}
}
@@ -224,62 +227,119 @@
loadPopup (param) {
var that = this
+ let obj = {}
+
+ if (param.x && param.x != '') {
+ const position = this.coordinate(param.x)
+ obj = {
+ lng: position.lng, lat: position.lat
+ }
+ } else {
+ obj = {
+ lng: param.longitude, lat: param.latitude
+ }
+ }
+
that.searchInput = ''
that.searchValList = []
that.searchValShow = false
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_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 && 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.viewer.flyToPosition(
- new this.DC.Position(Number(result.jd), Number(result.wd), 300, Number(result.heading), Number(result.pitch), Number(result.roll)),
- () => {
+ this.newPopup(param, obj)
+ if (this.twoOrThree == '三 维') {
+ this.$store.commit('SET_POINTPOSITION', [
+ Number(obj.lng),
+ Number(obj.lat),
+ Number(param.gd),
+ Number(param.heading),
+ Number(param.pitch),
+ Number(param.roll)
+ ])
- },
- 3
- )
+ global.viewer.flyToPosition(
+ new global.DC.Position(
+ Number(obj.lng),
+ Number(obj.lat),
+ 300,
+ Number(param.heading),
+ Number(param.pitch),
+ Number(param.roll)
+ ),
+ () => { },
+ 0.5
+ )
+ } else {
+ this.$store.commit('SET_POINTPOSITION', [
+ Number(param.jd),
+ Number(param.wd),
+ Number(50),
+ Number(param.heading),
+ Number(param.pitch),
+ Number(param.roll)
+ ])
+
+ global.viewer.flyToPosition(
+ new global.DC.Position(
+ Number(param.jd),
+ Number(param.wd),
+ 300,
+ Number(param.heading),
+ Number(param.pitch),
+ Number(param.roll)
+ ),
+ () => { },
+ 0.5
+ )
+ }
},
- newPopup (item) {
- const position = this.DC.Transform.transformWGS84ToCartesian(new this.DC.Position(Number(item.jd), Number(item.wd), Number(item.gd)))
+ newPopup (item, obj) {
+ let position
+ if (this.twoOrThree == '三 维') {
+ position = global.DC.Transform.transformWGS84ToCartesian(
+ new global.DC.Position(Number(obj.lng), Number(obj.lat), Number(item.gd))
+ )
+ } else {
+ position = global.DC.Transform.transformWGS84ToCartesian(
+ new global.DC.Position(Number(item.jd), Number(item.wd), Number(50))
+ )
+ }
+
// eslint-disable-next-line no-unused-vars
- var popup = new this.DC.DivForms(this.viewer, {
+ var popup = new global.DC.DivForms(global.viewer, {
domId: 'divFormsDomBox',
- position: [
- position
- ]
+ position: [position]
})
this.$store.commit('SET_PANORAMAPOPUP', false)
@@ -287,11 +347,10 @@
this.$store.commit('SET_DETAILSPOPUP', true)
}
}
-
}
</script>
-<style lang='scss' scope>
+<style lang="scss" scope>
.map-campus-search {
position: fixed;
top: 100px;
@@ -299,7 +358,7 @@
right: 0;
bottom: auto;
margin: auto;
- width: 320px;
+ width: 330px;
min-height: 40px;
max-height: 360px;
height: auto;
@@ -309,7 +368,7 @@
.search-input {
float: left;
- width: 240px;
+ width: 250px;
height: 40px;
border-radius: 5px 0 0 5px;
@@ -359,7 +418,7 @@
top: 41px;
left: 0;
width: auto;
- min-width: 240px;
+ min-width: 250px;
max-height: 520px;
background: #fff;
overflow-y: auto;
@@ -381,24 +440,26 @@
}
.map-campus-shortcut {
- margin-top: 20px;
+ margin-top: 40px;
width: 100%;
- height: 320px;
+ // height: 330px;
+ height: auto;
background: #fff;
border-radius: 5px;
.shortcut-box {
- padding-top: 36px;
+ height: auto;
ul {
display: flex;
width: 100%;
- height: 120px;
- justify-content: space-around;
+ height: auto;
+ // justify-content: space-around;
flex-wrap: wrap;
li {
- width: 84px;
- height: 76px;
+ margin: 22.5px 0 0 22.5px;
+ width: 80px;
+ height: 70px;
.el-button {
width: 80px;
@@ -432,6 +493,10 @@
border: 1px solid #000;
}
}
+
+ li:last-child {
+ margin-bottom: 22.5px;
+ }
}
}
}
--
Gitblit v1.9.3