From bf58722dfd03ea1513f3acc7331d4d4403fca76e Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 18 Mar 2022 11:48:37 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/school-web
---
src/components/orgNavBar/index.vue | 268 +++++++++-------------------------------------------
1 files changed, 49 insertions(+), 219 deletions(-)
diff --git a/src/components/orgNavBar/index.vue b/src/components/orgNavBar/index.vue
index 8b8c645..c750100 100644
--- a/src/components/orgNavBar/index.vue
+++ b/src/components/orgNavBar/index.vue
@@ -1,38 +1,21 @@
<template>
- <div class="public-org-nav-bar"
- ref="publicOrgNavBar">
- <div class="container">
- <div class="header"
- @mousedown="move"
- :class="{'move': moveFlag}">
- <div class="title">
- <img class="icon deblurring"
- src="/img/icon/jg.png"
- alt="">
- <span>
- {{orgNavBarTitle}}
- </span>
- </div>
- <img class="close"
- src="/img/navicon/close.png"
- alt=""
- @click="closeModel">
+ <public-box class="public-org-nav-bar">
+ <template slot="public-box-header">
+ <div class="title">
+ <img class="icon deblurring" src="/img/icon/jg.png" alt />
+ <span>{{ orgNavBarTitle }}</span>
</div>
- <div class="content">
- <ul>
- <li v-for="(item, index) in orgNavBarList"
- :key="index"
- @click="mapPopup(item)">
- <img :src="item.icon"
- alt="">
- <span>
- {{item.navTitle}}
- </span>
- </li>
- </ul>
- </div>
- </div>
- </div>
+ <img class="close deblurring" src="/img/navicon/close.png" alt @click="closeModel" />
+ </template>
+ <template slot="public-box-content">
+ <ul>
+ <li v-for="(item, index) in orgNavBarList" :key="index" @click="mapPopup(item)">
+ <img :src="item.icon" alt />
+ <span>{{ item.navTitle }}</span>
+ </li>
+ </ul>
+ </template>
+ </public-box>
</template>
<script>
@@ -42,16 +25,12 @@
name: 'OrgNavBar',
data () {
return {
- moveFlag: false,
- DC: null
}
},
created () {
- this.DC = global.DC
},
computed: {
...mapGetters([
- 'viewer',
'popupBgUrl',
'pupupQRUrl',
// 点信息
@@ -69,61 +48,21 @@
])
},
methods: {
- move (e) {
- const that = this
- const odiv = this.$refs.publicOrgNavBar // 获取目标元素
- // 算出鼠标相对元素的位置
- const disX = e.clientX - odiv.offsetLeft
- const disY = e.clientY - odiv.offsetTop
-
- const disH = odiv.offsetHeight
- const disW = odiv.offsetWidth
-
- document.onmousemove = (e) => {
- that.moveFlag = true
- // 鼠标按下并移动的事件
- // 用鼠标的位置减去鼠标相对元素的位置，得到元素的位置
- let left = e.clientX - disX
- let top = e.clientY - disY
-
- // 绑定元素位置到positionX和positionY上面
-
- if (left >= window.innerWidth - disW) {
- left = window.innerWidth - disW
- }
-
- if (left <= 0) {
- left = 0
- }
-
- if (top >= window.innerHeight - disH) {
- top = window.innerHeight - disH
- }
-
- if (top <= 60) {
- top = 60
- }
-
- // 移动当前元素
- odiv.style.left = (left) + 'px'
- odiv.style.top = (top) + 'px'
- odiv.style.bottom = 'auto'
- }
- document.onmouseup = (e) => {
- that.moveFlag = false
- document.onmousemove = null
- document.onmouseup = null
- }
- },
-
mapPopup (item) {
this.$store.commit('CLEAR_ALL', null)
var imgArr = item.bgImg.split(',')
-
this.$store.commit('SET_POPUPBGURL', imgArr[0])
this.$store.commit('SET_POPUPQRURL', item.QRImg)
- this.$store.commit('SET_POINTPOSITION', [Number(item.longitude), Number(item.latitude), Number(item.alt), Number(item.heading), Number(item.pitch), Number(item.roll)])
+
+ this.$store.commit('SET_POINTPOSITION', [
+ Number(item.longitude),
+ Number(item.latitude),
+ Number(item.alt),
+ Number(item.heading),
+ Number(item.pitch),
+ Number(item.roll)
+ ])
this.$store.commit('SET_STATENAME', item.navTitle)
this.$store.commit('SET_SITENAME', item.address)
this.$store.commit('SET_TELEPHONE', item.telephone)
@@ -134,22 +73,32 @@
}
this.newPopup(item)
- this.viewer.flyToPosition(
- new this.DC.Position(Number(item.longitude), Number(item.latitude), 300, Number(item.heading), Number(item.pitch), Number(item.roll)),
- function () {
- },
+ global.viewer.flyToPosition(
+ new global.DC.Position(
+ Number(item.longitude),
+ Number(item.latitude),
+ 300,
+ Number(item.heading),
+ Number(item.pitch),
+ Number(item.roll)
+ ),
+ function () { },
3
)
},
newPopup (item) {
- const position = this.DC.Transform.transformWGS84ToCartesian(new this.DC.Position(Number(item.longitude), Number(item.latitude), Number(item.alt)))
+ const position = global.DC.Transform.transformWGS84ToCartesian(
+ new global.DC.Position(
+ Number(item.longitude),
+ Number(item.latitude),
+ Number(item.alt)
+ )
+ )
// 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)
@@ -165,134 +114,15 @@
}
this.$store.commit('SET_ORGNAVBARTITLE', '')
-
this.$store.commit('SET_ORGNAVBARFLAG', false)
-
this.$store.commit('SET_ORGNAVBARLIST', [])
+
+ this.$store.commit('SET_DETAILSPOPUP', false)
+ this.$store.commit('SET_PANORAMAPOPUP', false)
+ this.$store.commit('SET_MONITORPOPUP', false)
}
}
}
</script>
-<style scoped lang='scss'>
-.public-org-nav-bar {
- position: fixed;
- width: 322px;
- height: auto;
- border-radius: 8px;
- top: 140px;
- left: 140px;
- background-color: transparent;
- z-index: 999;
- font-size: 14px;
-
- .container {
- .header {
- position: relative;
- border-radius: 8px 8px 0 0;
- width: 100%;
- height: 36px;
- line-height: 36px;
- background: rgba(0, 131, 176, 0.9); /* fallback for old browsers */
- background: -webkit-linear-gradient(
- to left,
- rgba(0, 180, 219, 0.9),
- rgba(0, 131, 176, 0.9)
- ); /* Chrome 10-25, Safari 5.1-6 */
- background: linear-gradient(
- to left,
- rgba(0, 180, 219, 0.9),
- rgba(0, 131, 176, 0.9)
- ); /* W3C, IE 10+/ Edge, Firefox 16+, Chrome 26+, Opera 12+, Safari 7+ */
-
- .title {
- padding-left: 10px;
-
- img {
- width: 20px;
- height: 20px;
- vertical-align: middle;
- }
-
- span {
- margin-left: 6px;
- display: inline-block;
- vertical-align: middle;
- color: #fff;
- }
- }
-
- .close {
- position: absolute;
- right: 6px;
- top: 0;
- left: auto;
- bottom: 0;
- margin: auto;
- width: 14px;
- height: 14px;
- cursor: pointer;
- }
- }
-
- .move {
- cursor: move;
- }
-
- .content {
- clear: both;
- width: 100%;
- height: 440px;
- margin-top: 0px;
- text-align: center;
- overflow-y: auto;
- background: rgba(0, 131, 176, 0.9); /* fallback for old browsers */
- background: -webkit-linear-gradient(
- to left,
- rgba(0, 180, 219, 0.9),
- rgba(0, 131, 176, 0.9)
- ); /* Chrome 10-25, Safari 5.1-6 */
- background: linear-gradient(
- to left,
- rgba(0, 180, 219, 0.9),
- rgba(0, 131, 176, 0.9)
- ); /* W3C, IE 10+/ Edge, Firefox 16+, Chrome 26+, Opera 12+, Safari 7+ */
- border-radius: 0 0 8px 8px;
-
- ul {
- padding: 15px;
- padding-top: 4px;
-
- li {
- padding-left: 24px;
- position: relative;
- height: 40px;
- line-height: 40px;
- list-style: none;
- border-bottom: 1px dashed #ccc;
- text-align: left;
-
- img {
- position: absolute;
- left: 0;
- right: auto;
- top: 0;
- bottom: 0;
- margin: auto;
- width: 14px;
- }
-
- span {
- color: #fff;
- cursor: pointer;
- }
-
- span:hover {
- text-decoration: underline;
- }
- }
- }
- }
- }
-}
-</style>
+<style scoped lang="scss"></style>
--
Gitblit v1.9.3