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 | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/components/orgNavBar/index.vue b/src/components/orgNavBar/index.vue
index 2b68ba0..c750100 100644
--- a/src/components/orgNavBar/index.vue
+++ b/src/components/orgNavBar/index.vue
@@ -5,7 +5,7 @@
<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" />
+ <img class="close deblurring" src="/img/navicon/close.png" alt @click="closeModel" />
</template>
<template slot="public-box-content">
<ul>
@@ -31,7 +31,6 @@
},
computed: {
...mapGetters([
- 'viewer',
'popupBgUrl',
'pupupQRUrl',
// 点信息
@@ -53,9 +52,9 @@
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),
@@ -74,7 +73,7 @@
}
this.newPopup(item)
- this.viewer.flyToPosition(
+ global.viewer.flyToPosition(
new global.DC.Position(
Number(item.longitude),
Number(item.latitude),
@@ -97,7 +96,7 @@
)
)
// eslint-disable-next-line no-unused-vars
- var popup = new global.DC.DivForms(this.viewer, {
+ var popup = new global.DC.DivForms(global.viewer, {
domId: 'divFormsDomBox',
position: [position]
})
@@ -115,10 +114,12 @@
}
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)
}
}
}
--
Gitblit v1.9.3