From e8e7b70168d5cc8a465c92da28bdcce52e8bf3cc Mon Sep 17 00:00:00 2001
From: liuyg <liuyg@qq.com>
Date: Thu, 10 Mar 2022 14:48:21 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/school-web
---
src/store/getters.js | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/src/store/getters.js b/src/store/getters.js
index 9f54707..ea7b2b6 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -21,12 +21,23 @@
dimensionData: (state) => state.mobile.dimensionData, // 维度镜头数据
perspectiveControl: (state) => state.mobile.perspectiveControl, /// 视角控制：高度、角度 ()=>{}
audioState: (state) => state.mobile.audioState, // 文字转语音状态
+ areaLayer: (state) => state.mobile.areaLayer, // 文字转语音状态
+ areaLayerSelect: (state) => state.mobile.select, // 文字转语音状态
isOpenDrawALine: (state) => state.mobile.isOpenDrawALine, // 是否开启路线
isendPosition: (state) => state.mobile.isendPosition, // 路线导航终点数据改变
endPosition: (state) => state.mobile.endPosition, // 路线导航终点数据
routerS: (state) => state.mobile.routerS, // 所有路径
- choiceRouterS: (state) => state.mobile.choiceRouterS // 当前选择路径
+ choiceRouterS: (state) => state.mobile.choiceRouterS, // 当前选择路径
+
+ showActivity: (state) => state.mobile.showActivity, // 显影活动弹窗
+ showActivityData: (state) => state.mobile.showActivityData, // 活动弹窗数据
+ isOpenDrawALineMany: (state) => state.mobile.isOpenDrawALineMany, // 显影活动弹窗
+ seeRight: (state) => state.mobile.seeRight, // 右侧控制栏显影
+
+ urlParameterData: (state) => state.mobile.urlParameterData, // url参数
+
+
}
const navigation = {
@@ -41,7 +52,9 @@
orgNavBarList: (state) => state.search.orgNavBarList,
arcNavBarFlag: (state) => state.search.arcNavBarFlag,
arcNavBarTitle: (state) => state.search.arcNavBarTitle,
- arcNavBarCode: (state) => state.search.arcNavBarCode
+ arcNavBarCode: (state) => state.search.arcNavBarCode,
+ searchPopupFlag: (state) => state.search.searchPopupFlag,
+ searchPopupList: (state) => state.search.searchPopupList
}
const getters = {
@@ -66,6 +79,18 @@
detailsPopup: (state) => state.popupParams.detailsPopup,
popupImgAtlas: (state) => state.popupParams.popupImgAtlas,
teachList: (state) => state.popupParams.teachList,
- liveList: (state) => state.popupParams.liveList
+ liveList: (state) => state.popupParams.liveList,
+ addTagPopup: (state) => state.popupParams.addTagPopup,
+ addTagPosition: (state) => state.popupParams.addTagPosition,
+
+ addSignList: (state) => state.popupParams.addSignList,
+
+ nowlabelLayerData: (state) => state.popupParams.nowlabelLayerData, // 自定义标签数据
+ labelLayerDataShow: (state) => state.popupParams.labelLayerDataShow, // 自定义标签弹窗显示
+ closeMapClick: (state) => state.popupParams.closeMapClick, // 关闭地图点击，防止新增标签误触
+
+
+ addIconsLayerIconPopup: (state) => state.popupParams.addIconsLayerIconPopup, // 自定义标签编辑窗口
+ addIconsLayerIconPosition: (state) => state.popupParams.addIconsLayerIconPosition, // 自定义标签编辑窗口
}
-export default getters
+export default getters
\ No newline at end of file
--
Gitblit v1.9.3