From bf58722dfd03ea1513f3acc7331d4d4403fca76e Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 18 Mar 2022 11:48:37 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/school-web
---
src/store/getters.js | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/src/store/getters.js b/src/store/getters.js
index 58948d9..28da5f1 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -1,6 +1,6 @@
// 手机端
const mobile = {
- mviewer: (state) => state.mobile.mviewer,
+ // mviewer: (state) => state.mobile.mviewer,
mBigPopup: (state) => state.mobile.mBigPopup,
popupOurOpenData: (state) => state.mobile.popupOurOpenData,
popupTableName: (state) => state.mobile.popupTableName,
@@ -8,7 +8,7 @@
iconHide: (state) => state.mobile.iconHide,
MobileWindowsHide: (state) => state.mobile.MobileWindowsHide, // 随地图移动窗口
MobileWindowChangeData: (state) => state.mobile.MobileWindowChangeData, // 随地图移动窗口
- popupsDom: (state) => state.mobile.popupsDom,
+ // popupsDom: (state) => state.mobile.popupsDom,
query: (state) => state.mobile.query,
openmobileGoTo: (state) => state.mobile.openmobileGoTo, // 测试
ccDataState: (state) => state.mobile.ccDataState, // 测试
@@ -21,8 +21,8 @@
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, // 文字转语音状态
+ // areaLayer: (state) => state.mobile.areaLayer, //
+ // areaLayerSelect: (state) => state.mobile.select, //
isOpenDrawALine: (state) => state.mobile.isOpenDrawALine, // 是否开启路线
isendPosition: (state) => state.mobile.isendPosition, // 路线导航终点数据改变
@@ -33,7 +33,10 @@
showActivity: (state) => state.mobile.showActivity, // 显影活动弹窗
showActivityData: (state) => state.mobile.showActivityData, // 活动弹窗数据
isOpenDrawALineMany: (state) => state.mobile.isOpenDrawALineMany, // 显影活动弹窗
- seeRight: (state) => state.mobile.seeRight // 右侧控制栏显影
+ seeRight: (state) => state.mobile.seeRight, // 右侧控制栏显影
+
+ urlParameterData: (state) => state.mobile.urlParameterData // url参数
+
}
const navigation = {
@@ -57,7 +60,7 @@
...mobile,
...navigation,
...search,
- viewer: (state) => state.viewer.viewer,
+ viewerExist: (state) => state.viewer.viewerExist,
twoOrThree: (state) => state.viewer.twoOrThree,
popupBgUrl: (state) => state.popupParams.popupBgUrl,
pupupQRUrl: (state) => state.popupParams.pupupQRUrl,
@@ -79,7 +82,13 @@
addTagPopup: (state) => state.popupParams.addTagPopup,
addTagPosition: (state) => state.popupParams.addTagPosition,
- addSignList: (state) => state.popupParams.addSignList
+ 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
\ No newline at end of file
--
Gitblit v1.9.3