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/serviceNavBar/index.vue | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/components/serviceNavBar/index.vue b/src/components/serviceNavBar/index.vue
index 4a76bf5..90c57d2 100644
--- a/src/components/serviceNavBar/index.vue
+++ b/src/components/serviceNavBar/index.vue
@@ -5,7 +5,7 @@
<img class="icon deblurring" :src="headerLog" alt />
<span>{{ title }}</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">
<div class="tab" v-show="false">
@@ -57,7 +57,6 @@
},
computed: {
...mapGetters([
- 'viewer',
'popupBgUrl',
'pupupQRUrl',
// 点信息
@@ -113,7 +112,7 @@
this.ourLayer.clear()
} else {
this.ourLayer = new global.DC.HtmlLayer('Layer' + this.arcCode)
- this.viewer.addLayer(this.ourLayer)
+ global.viewer.addLayer(this.ourLayer)
}
// console.log(this.ourLayer, "see");
getLifeList({ lifetype: this.arcCode, campus: campus }).then((res) => {
@@ -184,7 +183,7 @@
}
this.newPopup(result)
- this.viewer.flyToPosition(
+ global.viewer.flyToPosition(
new global.DC.Position(
Number(result.jd),
Number(result.wd),
@@ -202,7 +201,7 @@
new global.DC.Position(Number(item.jd), Number(item.wd), Number(item.gd))
)
// 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]
})
@@ -217,7 +216,10 @@
this.ourLayer.remove()
this.ourLayer = null
}
+
this.$store.commit('SET_DETAILSPOPUP', false)
+ this.$store.commit('SET_PANORAMAPOPUP', false)
+ this.$store.commit('SET_MONITORPOPUP', false)
}
}
</script>
--
Gitblit v1.9.3