From b5f8881176bcb44928758e25d7d7a6fc140840c5 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 17 Dec 2021 15:06:23 +0800
Subject: [PATCH] 弹框完善

---
 src/components/arcNavBar/index.vue |   32 +++++++++++++++++++++++---------
 1 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/src/components/arcNavBar/index.vue b/src/components/arcNavBar/index.vue
index 8aa667e..dfc747a 100644
--- a/src/components/arcNavBar/index.vue
+++ b/src/components/arcNavBar/index.vue
@@ -7,7 +7,7 @@
                  :class="{'move': moveFlag}">
                 <div class="title">
                     <img class="icon"
-                         src="/img/icon/jg.png"
+                         src="/img/icon/xyjz.png"
                          alt="">
                     <span>
                         {{title}}
@@ -46,6 +46,9 @@
 <script>
 import { mapGetters } from 'vuex'
 import { getList, getChildNavList, getChildNavDetail } from '@/api/pc/public/arc'
+
+var $ = window.$
+
 export default {
     name: 'ArcNavBar',
     data () {
@@ -71,7 +74,13 @@
             // 点信息
             'pointPosition',
             // 点名称
-            'stateName'
+            'stateName',
+            // 地址
+            'siteName',
+            // 介绍
+            'introduceText',
+            // 全景地址
+            'panoramaUrl'
         ])
     },
     created () {
@@ -164,10 +173,15 @@
         mapPopup (param) {
             getChildNavDetail({ id: param.id }).then(res => {
                 var result = res.data.data[0].list
+                this.$store.commit('CLEAR_ALL', null)
+
                 this.$store.commit('SET_POPUPBGURL', result.tpUrl)
                 this.$store.commit('SET_POPUPQRURL', result.codeUrl)
-                this.$store.commit('SET_POINTPOSITION', [result.jd, result.wd, result.gd, result.heading, result.pitch, result.roll])
+                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_INTRODUCETEXT', result.introduce)
+                this.$store.commit('SET_PANORAMAURL', result.panoramaurl)
 
                 var that = this
                 // item.alt, item.heading, item.pitch, item.roll
@@ -182,16 +196,16 @@
         },
         newPopup (item) {
             const position = this.DC.Transform.transformWGS84ToCartesian(new this.DC.Position(item.jd, item.wd, item.gd, item.heading, item.pitch, item.roll))
-            // eslint-disable-next-line new-cap
-            var popup = new this.DC.divForms(this.viewer, {
-                domId: 'div1',
-                title: item.mechanismName,
-                className: 'divForms-dom',
-                content: document.getElementById('mapChildContent'),
+            // eslint-disable-next-line no-unused-vars
+            var popup = new this.DC.DivForms(this.viewer, {
+                domId: 'divFormsDomBox',
                 position: [
                     position
                 ]
             })
+
+            this.$store.commit('SET_PANORAMAPOPUP', false)
+            this.$store.commit('SET_DETAILSPOPUP', true)
         }
     }
 }

--
Gitblit v1.9.3