From 0e461a232cce6e52fbfd071788bdd7294d51e397 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 21 Dec 2021 16:43:00 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/school-web
---
src/store/modules/mobile.js | 53 +++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 43 insertions(+), 10 deletions(-)
diff --git a/src/store/modules/mobile.js b/src/store/modules/mobile.js
index 9842189..3cca045 100644
--- a/src/store/modules/mobile.js
+++ b/src/store/modules/mobile.js
@@ -3,16 +3,20 @@
state: {
mviewer: null,//地图实体类
mBigPopup: false,//全屏弹窗
+ popupOurOpenData: [],//全屏弹窗中下拉菜单数据
+ popupTableName: [],//全屏弹窗标签页数据
mBigPopupAfter: false,////全屏弹窗之前的弹窗
ips: '',//获取的ip
iconHide: false,//右侧伸缩状态
- DC: '',//DC全局保存
+ // DC: '',//DC全局保存
MobileWindowsHide: true,//改变点击窗口的显示状态
MobileWindowChangeData: false,//改变点击窗口的数据
popupsDom: '',//mobileDivForms的实体类
query: {},//传输数据
openmobileGoTo: false,//测试
openmobilePanorama: false,//实景显影
+ MobileWindowsHideFixed: true,//改变点击窗口的显示状态--固定窗口
+ MobileWindowChangeDataFixed: false,//改变点击窗口的数据--固定窗口
},
mutations: {
MSET_VIEWER(state, viewer) {
@@ -26,13 +30,16 @@
state.mBigPopupAfter = viewer;
$store.dispatch("closeMobileWindowsDom"); //关闭弹窗
},
+ MSET_POPUPOUROPENDATA(state, viewer) {
+ state.popupOurOpenData = viewer;
+ },
MSET_ICONHIDE(state, viewer) {
state.iconHide = viewer
},
- MSET_DC(state, viewer) {
- state.DC = viewer
+ MSET_POPUPTABLENAME(state, viewer) {
+ state.popupTableName = viewer
},
- MSET_MOBILEWINDOWSHIDE(state, viewer) {
+ MSET_MOBILEWINDOWSHIDE(state, viewer) {//随地图移动窗口
state.MobileWindowChangeData = !state.MobileWindowChangeData;
state.MobileWindowsHide = viewer
},
@@ -47,13 +54,18 @@
},
MSET_OPENMOBILEPANORAMA(state, viewer) {
state.openmobilePanorama = viewer
- }
+ },
+ MSET_MOBILEWINDOWSHIDEFIXED(state, viewer) {//固定窗口
+ state.MobileWindowChangeDataFixed = !state.MobileWindowChangeDataFixed;
+ state.MobileWindowsHideFixed = viewer
+ console.log(state.MobileWindowChangeDataFixed);
+ },
},
actions: {
- setMobileWindows({ state, commit, }, data) {
+ setMobileWindows({ state, commit, }, data) {//打开随地图移动窗口，暂不使用
if (data.useJWD) {
var ellipsoid = state.mviewer.scene.globe.ellipsoid;
- var cartographic = state.DC.Namespace.Cesium.Cartographic.fromDegrees(
+ var cartographic = global.DC.Namespace.Cesium.Cartographic.fromDegrees(
data.lntLat[0],
data.lntLat[1] - 0.00006,
"90.648862227"
@@ -63,7 +75,7 @@
// 传递响应数据
commit("MSET_QUERY", data);
// 定制化窗体
- let popupsDom = new state.DC.mobileDivForms(state.mviewer, {
+ let popupsDom = new global.DC.mobileDivForms(state.mviewer, {
domId: "mobilePopup",
title: data.query.name || "成教楼 ",
className: "mobilePopup",
@@ -72,7 +84,7 @@
});
commit("MSET_MOBILEWINDOWSHIDE", false)
state.mviewer.zoomToPosition(
- new state.DC.Position(data.lntLat[0], data.lntLat[1] - 0.012, 1530, 0, -45)
+ new global.DC.Position(data.lntLat[0], data.lntLat[1] - 0.012, 1530, 0, -45)
);
commit("MSET_POPUPDOM", popupsDom)
},
@@ -84,13 +96,34 @@
},
CHANGETOC3({ state, commit }, data) {// //转换经纬度坐标 成世界坐标cartesian3
var ellipsoid = state.mviewer.scene.globe.ellipsoid;
- var cartographic = state.DC.Namespace.Cesium.Cartographic.fromDegrees(
+ var cartographic = global.DC.Namespace.Cesium.Cartographic.fromDegrees(
data.lnt,
data.lat - 0.0004,
data.alt || "90.648862227"
);
var position = ellipsoid.cartographicToCartesian(cartographic);
return position;
+ },
+ SET_OPENWIDOWFIXED({ state, commit }, data) {
+ // 传递响应数据
+ commit("MSET_QUERY", data);
+ //显示窗口
+ commit("MSET_MOBILEWINDOWSHIDEFIXED", false)
+ //移动地图位置
+ state.mviewer.zoomToPosition(
+ new global.DC.Position(data.lntLat[0], data.lntLat[1] - 0.012, 1530, 0, -45)
+ );
+ },
+ CLOSE_WIDOWFIXED({ state, commit }) {
+ //隐藏窗口
+ if (!state.MobileWindowsHideFixed) {
+ console.log(state.MobileWindowsHideFixed)
+ commit("MSET_MOBILEWINDOWSHIDEFIXED", true)
+ }
+ },
+ //加入当时的选点
+ JOIN_POINT({ state, commit }, data) {
+
}
}
}
--
Gitblit v1.9.3