From 5c7c3cc18ce38ec6897808d63359cf774b958a30 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 31 Dec 2021 09:05:59 +0800
Subject: [PATCH] 冲突
---
src/components/serviceNavBar/index.vue | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/components/serviceNavBar/index.vue b/src/components/serviceNavBar/index.vue
index f6898f4..68cd47b 100644
--- a/src/components/serviceNavBar/index.vue
+++ b/src/components/serviceNavBar/index.vue
@@ -190,6 +190,10 @@
this.$store.commit('SET_PANORAMAURL', result.panoramaurl)
this.$store.commit('SET_POPUPIMGATLAS', imgArr)
+ if (result.videourl && result.videourl != '') {
+ this.$store.commit('SET_MONITORURL', result.videourl)
+ }
+
this.newPopup(result)
this.viewer.flyToPosition(
new this.DC.Position(Number(result.jd), Number(result.wd), 3000, Number(result.heading), Number(result.pitch), Number(result.roll)),
--
Gitblit v1.9.3