From 5e47738f99e307bab1c8a5ee9ecd96d8c7f4a968 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Sat, 08 Jan 2022 10:43:01 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/school-web
---
src/store/getters.js | 71 +++++++++++++++++++++++++++++++----
1 files changed, 63 insertions(+), 8 deletions(-)
diff --git a/src/store/getters.js b/src/store/getters.js
index a7e07d6..a7bfdf5 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -1,9 +1,64 @@
+// 手机端
+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,
+ 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, // 测试
+ 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, ///视角控制：高度、角度 ()=>{}
+ audioState: (state) => state.mobile.audioState, //文字转语音状态
+};
+
+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,
+ arcNavBarFlag: (state) => state.search.arcNavBarFlag,
+ arcNavBarTitle: (state) => state.search.arcNavBarTitle,
+ arcNavBarCode: (state) => state.search.arcNavBarCode,
+};
+
const getters = {
- viewer: state => state.viewer.viewer,
- popupBgUrl: state => state.popupParams.popupBgUrl,
- pupupQRUrl: state => state.popupParams.pupupQRUrl,
- mviewer: state => state.mobile.mviewer,
- mBigPopup: state => state.mobile.mBigPopup,
- mBigPopupAfter: state => state.mobile.mBigPopupAfter
-}
-export default getters
+ ...mobile,
+ ...navigation,
+ ...search,
+ viewer: (state) => state.viewer.viewer,
+ popupBgUrl: (state) => state.popupParams.popupBgUrl,
+ pupupQRUrl: (state) => state.popupParams.pupupQRUrl,
+ pointPosition: (state) => state.popupParams.pointPosition,
+ terminus: (state) => state.popupParams.terminus,
+ 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,
+ panoramaPopup: (state) => state.popupParams.panoramaPopup,
+ monitorUrl: (state) => state.popupParams.monitorUrl,
+ monitorPopup: (state) => state.popupParams.monitorPopup,
+ detailsPopup: (state) => state.popupParams.detailsPopup,
+ popupImgAtlas: (state) => state.popupParams.popupImgAtlas,
+ teachList: (state) => state.popupParams.teachList,
+ liveList: (state) => state.popupParams.liveList,
+};
+export default getters;
--
Gitblit v1.9.3