From e40ee62d3e9b71ffe3432d32a53a00c4097b5708 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 31 Dec 2021 09:03:28 +0800
Subject: [PATCH] +3d  2.5d

---
 src/store/getters.js |   39 +++++++++++++++++++++++++++++++++------
 1 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/src/store/getters.js b/src/store/getters.js
index bae0997..df7ad6d 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -2,18 +2,41 @@
 const mobile = {
     mviewer: state => state.mobile.mviewer,
     mBigPopup: state => state.mobile.mBigPopup,
+    popupOurOpenData: state => state.mobile.popupOurOpenData,
+    popupTableName: state => state.mobile.popupTableName,
     mBigPopupAfter: state => state.mobile.mBigPopupAfter,
     iconHide: state => state.mobile.iconHide,
-    DC: state => state.mobile.DC,
-    MobileWindowsHide: state => state.mobile.MobileWindowsHide,
-    MobileWindowChangeData: state => state.mobile.MobileWindowChangeData,
+    MobileWindowsHide: state => state.mobile.MobileWindowsHide, // 随地图移动窗口
+    MobileWindowChangeData: state => state.mobile.MobileWindowChangeData, // 随地图移动窗口
     popupsDom: state => state.mobile.popupsDom,
     query: state => state.mobile.query,
-    openmobileGoTo: state => state.mobile.openmobileGoTo,
-    openmobilePanorama: state => state.mobile.openmobilePanorama
+    openmobileGoTo: state => state.mobile.openmobileGoTo, // 测试
+    ccDataState: state => state.mobile.ccDataState, // 测试
+    openmobilePanorama: state => state.mobile.openmobilePanorama,
+    MobileWindowsHideFixed: state => state.mobile.MobileWindowsHideFixed, // 固定窗口
+    MobileWindowChangeDataFixed: state => state.mobile.MobileWindowChangeDataFixed, // 固定窗口
+    startPointFn: state => state.mobile.startPointFn,// 默认起始点位置
+    dimension: state => state.mobile.dimension,// 维度
+    dimensionData: state => state.mobile.dimensionData,// 维度镜头数据
+    perspectiveControl: state => state.mobile.perspectiveControl,///视角控制:高度、角度  ()=>{}
 }
+
+const navigation = {
+    campusNavFlag: state => state.navigation.campusNavFlag,
+    comeName: state => state.navigation.comeName,
+    getToName: state => state.navigation.getToName
+}
+
+const search = {
+    orgNavBarFlag: state => state.search.orgNavBarFlag,
+    orgNavBarTitle: state => state.search.orgNavBarTitle,
+    orgNavBarList: state => state.search.orgNavBarList
+}
+
 const getters = {
     ...mobile,
+    ...navigation,
+    ...search,
     viewer: state => state.viewer.viewer,
     popupBgUrl: state => state.popupParams.popupBgUrl,
     pupupQRUrl: state => state.popupParams.pupupQRUrl,
@@ -22,9 +45,13 @@
     startingPoint: state => state.popupParams.startingPoint,
     stateName: state => state.popupParams.stateName,
     siteName: state => state.popupParams.siteName,
+    telephone: state => state.popupParams.telephone,
     introduceText: state => state.popupParams.introduceText,
     panoramaUrl: state => state.popupParams.panoramaUrl,
     detailsPopup: state => state.popupParams.detailsPopup,
-    panoramaPopup: state => state.popupParams.panoramaPopup
+    panoramaPopup: state => state.popupParams.panoramaPopup,
+    popupImgAtlas: state => state.popupParams.popupImgAtlas,
+    teachList: state => state.popupParams.teachList,
+    liveList: state => state.popupParams.liveList
 }
 export default getters

--
Gitblit v1.9.3