From 5421d1e2d9749d9193641139cbf3b3cbf2157ebb Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 11 Mar 2022 18:03:23 +0800
Subject: [PATCH] 部分更改

---
 src/store/modules/popupParams.js |   71 ++++++++++++++++++-----------------
 1 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/src/store/modules/popupParams.js b/src/store/modules/popupParams.js
index 782c9dc..6950f51 100644
--- a/src/store/modules/popupParams.js
+++ b/src/store/modules/popupParams.js
@@ -33,70 +33,70 @@
     },
     mutations: {
         ...leftNavsData.mutations,
-        SET_POPUPBGURL(state, popupBgUrl) {
+        SET_POPUPBGURL (state, popupBgUrl) {
             // console.log(popupBgUrl, "see33333")
             if (!popupBgUrl) {
                 return
             }
             state.popupBgUrl = popupBgUrl
         },
-        SET_POPUPQRURL(state, pupupQRUrl) {
+        SET_POPUPQRURL (state, pupupQRUrl) {
             state.pupupQRUrl = pupupQRUrl
         },
-        SET_TERMINUS(state, terminus) {
+        SET_TERMINUS (state, terminus) {
             state.terminus = terminus
         },
-        SET_STARTINGPOINT(state, startingPoint) {
+        SET_STARTINGPOINT (state, startingPoint) {
             state.startingPoint = startingPoint
         },
-        SET_POINTPOSITION(state, pointPosition) {
+        SET_POINTPOSITION (state, pointPosition) {
             state.pointPosition = pointPosition
         },
-        SET_STATENAME(state, stateName) {
+        SET_STATENAME (state, stateName) {
             state.stateName = stateName
         },
-        SET_SITENAME(state, siteName) {
+        SET_SITENAME (state, siteName) {
             state.siteName = siteName
         },
-        SET_TELEPHONE(state, telephone) {
+        SET_TELEPHONE (state, telephone) {
             state.telephone = telephone
         },
-        SET_INTRODUCETEXT(state, introduceText) {
+        SET_INTRODUCETEXT (state, introduceText) {
             state.introduceText = introduceText
         },
-        SET_PANORAMAURL(state, panoramaUrl) {
+        SET_PANORAMAURL (state, panoramaUrl) {
             state.panoramaUrl = panoramaUrl
         },
-        SET_PANORAMAPOPUP(state, panoramaPopup) {
+        SET_PANORAMAPOPUP (state, panoramaPopup) {
             state.panoramaPopup = panoramaPopup
         },
-        SET_MONITORURL(state, monitorUrl) {
+        SET_MONITORURL (state, monitorUrl) {
             state.monitorUrl = monitorUrl
         },
-        SET_MONITORPOPUP(state, monitorPopup) {
+        SET_MONITORPOPUP (state, monitorPopup) {
             state.monitorPopup = monitorPopup
         },
-        SET_DETAILSPOPUP(state, detailsPopup) {
+        SET_DETAILSPOPUP (state, detailsPopup) {
             state.detailsPopup = detailsPopup
         },
-        SET_POPUPIMGATLAS(state, popupImgAtlas) {
+        SET_POPUPIMGATLAS (state, popupImgAtlas) {
             state.popupImgAtlas = popupImgAtlas
         },
-        SET_TEACHLIST(state, teachList) {
+        SET_TEACHLIST (state, teachList) {
             state.teachList = teachList
         },
-        SET_LIVELIST(state, liveList) {
+        SET_LIVELIST (state, liveList) {
             state.liveList = liveList
         },
 
-        SET_ADDTAGPOPUP(state, addTagPopup) {
+        SET_ADDTAGPOPUP (state, addTagPopup) {
             state.addTagPopup = addTagPopup
         },
 
-        SET_ADDTAGPOSITION(state, addTagPosition) {
+        SET_ADDTAGPOSITION (state, addTagPosition) {
             state.addTagPosition = addTagPosition
         },
-        initLabelLayer(state, val) {
+        initLabelLayer (state, val) {
             if (!state.labelLayer) {
                 state.labelLayer = new global.DC.HtmlLayer('labelLayer')
                 val.addLayer(state.labelLayer)
@@ -104,12 +104,12 @@
             state.myviewer = val
         },
 
-        clearLabelLayerIcon(state, val) {
+        clearLabelLayerIcon (state, val) {
             if (state.labelLayer) {
                 state.labelLayer.clear()
             }
         },
-        openLabelLayer(state, val) {
+        openLabelLayer (state, val) {
             // console.log(val, "see")
             if (val.show) {
                 state.nowlabelLayerData = val.data
@@ -119,7 +119,7 @@
                 state.labelLayerDataShow = false
             }
         },
-        CLEAR_ALL(state, param) {
+        CLEAR_ALL (state, param) {
             state.siteName = param
             state.introduceText = param
             state.telephone = param
@@ -129,13 +129,13 @@
             state.teachList = []
             state.liveList = []
         },
-        set_closeMapClick(state, val) {
+        set_closeMapClick (state, val) {
             state.closeMapClick = val
         }
     },
     actions: {
         ...leftNavsData.actions,
-        openPopups({
+        openPopups ({
             state,
             commit,
             dispatch
@@ -168,7 +168,7 @@
                 viewer: this.viewer
             })
         },
-        setOurDataInPoput({
+        setOurDataInPoput ({
             state,
             commit,
             dispatch
@@ -176,7 +176,8 @@
             // 弹窗使用方法
 
             commit('CLEAR_ALL', null)
-
+            commit('SET_MONITORPOPUP', false)
+            commit('SET_PANORAMAPOPUP', false)
             commit('SET_STATENAME', value.item.mechanismname)
             commit('SET_PANORAMAURL', value.item.panoramaurl)
             commit('SET_INTRODUCETEXT', value.item.introduce)
@@ -197,7 +198,7 @@
             ])
             commit('SET_DETAILSPOPUP', true)
         },
-        pcMoveView({
+        pcMoveView ({
             state,
             commit,
             dispatch
@@ -219,18 +220,18 @@
                 }
             })
         },
-        pcFlyView({
+        pcFlyView ({
             state,
             commit,
             dispatch
         }, val) {
             val.viewer.flyToPosition(
                 new global.DC.Position(Number(val.jd), Number(val.wd), Number(300), Number(0), Number(-90), Number(0)),
-                function () {},
+                function () { },
                 2
             )
         },
-        addLabelLayerIcon({
+        addLabelLayerIcon ({
             state,
             commit,
             dispatch
@@ -306,7 +307,7 @@
                 state.labelLayer.addOverlay(divIcon)
             }
         },
-        addLabelLayerIconMobelUse({
+        addLabelLayerIconMobelUse ({
             state,
             commit,
             dispatch
@@ -314,8 +315,8 @@
             const list = val.list
             if (!state.labelLayer) {
                 state.labelLayer = new global.DC.HtmlLayer('labelLayer')
-                val.mviewer.addLayer(state.labelLayer);
-                state.myviewer = val.mviewer;
+                val.mviewer.addLayer(state.labelLayer)
+                state.myviewer = val.mviewer
             }
             if (val.clear) {
                 //     state.labelLayer.remove();
@@ -390,4 +391,4 @@
     }
 }
 
-export default popupParams
\ No newline at end of file
+export default popupParams

--
Gitblit v1.9.3