From cfa95f03007b221f1e00f4bf5cd29c3ccea3a0a7 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 09 Feb 2022 10:26:00 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/school-web
---
src/store/modules/mobile.js | 222 +++++++++++++++++++++++++++++++++++++------------------
1 files changed, 150 insertions(+), 72 deletions(-)
diff --git a/src/store/modules/mobile.js b/src/store/modules/mobile.js
index 01217ab..360b0e0 100644
--- a/src/store/modules/mobile.js
+++ b/src/store/modules/mobile.js
@@ -46,6 +46,12 @@
tilesetLayer: null, //2.5d模型
usetowpointfive: null,
tilesetLayer: null, //瀑布流
+ areaLayer: null, //2.5d事件--绿色图层
+ select: {
+ //绿色图层控制显示
+ overlay: undefined,
+ color: undefined,
+ },
vecLayer: null, //3D底图
cvaLayer: null, //3D底图
@@ -56,14 +62,18 @@
navigationStartLngLat: "", //导航起点
navigationEndLngLat: "", //导航终点
drawALineLayer: null, //导航路径图层
+ drawALineLayerIcon: null, //导航路径图层图标
isOpenDrawALine: false, //是否开启路径
endPosition: "", //传送终点经纬度--
isendPosition: false, //传送终点经纬度--感应数据
routerS: [], //所有路径
choiceRouterS: 0, //当前选择路径
+
showActivity: false, //是否显示活动弹窗
+ showActivityData: {}, //活动内容
drawALineLayerMany: null, //活动路线图层
+ drawAPointLayerMany: null, //活动点图层
isOpenDrawALineMany: null, //是否开启活动
},
mutations: {
@@ -176,6 +186,7 @@
state.tilesetLayer.show = true; //显示3d图形
state.startPointFn(); //移动默认视角
// state.mviewer.flyTo(state.tileset);
+ state.areaLayer.show = false; //绿布
//3D视角不限制
state.mviewer.scene.screenSpaceCameraController.minimumZoomDistance = 80;
@@ -207,7 +218,7 @@
state.newLayer = state.usetowpointfive(); //添加2.5d图形贴片
state.wallLayer.show = false; //打开瀑布
state.startPointFn(); //移动默认视角
-
+ state.areaLayer.show = true; //绿布
//2.5D视角限制
state.mviewer.scene.screenSpaceCameraController.minimumZoomDistance = 0;
// 最大
@@ -223,6 +234,10 @@
// 视角旋转
state.mviewer.scene.screenSpaceCameraController.enableTilt = false;
}
+ },
+ //绿布
+ MSET_areaLayer(state, data) {
+ state.areaLayer = data;
},
//切换控制
MSET_PERSPECTIVECONTROL(state, data) {
@@ -270,12 +285,27 @@
state.isOpenDrawALine = false;
}
},
+ removerPolyLineIcon(state) {
+ if (state.drawALineLayerIcon) {
+ state.drawALineLayerIcon.remove();
+ state.drawALineLayerIcon = null;
+ }
+ },
removePolylineMany(state) {
if (state.drawALineLayerMany) {
state.drawALineLayerMany.remove();
state.drawALineLayerMany = null;
state.isOpenDrawALineMany = false;
}
+ if (state.drawAPointLayerMany) {
+ state.drawAPointLayerMany.remove();
+ state.drawAPointLayerMany = null;
+ state.isOpenDrawALineMany = false;
+ }
+ },
+ //显影线路或者点
+ showLineOrPoint(state, val) {
+ state[val.layer].show = val.flag;
},
//传送终点数据
set_endPosition(state, data) {
@@ -289,6 +319,17 @@
//活动窗口是否显示
set_showActivity(state, data) {
state.showActivity = data;
+ if (data.state) {
+ state.showActivityData = data.value;
+ state.showActivity = data.state;
+ } else {
+ state.showActivityData = {};
+ state.showActivity = data.state;
+ }
+ },
+ mset_changeSelect(state, data) {
+ state.select.overlay = data[0];
+ state.select.color = data[1];
},
},
actions: {
@@ -427,6 +468,7 @@
commit("MSET_POPUPDOM", popupsDom);
},
closeMobileWindowsDom({ state, commit, dispatch }) {
+ commit("CLOSE_NOWPOSITION"); //中断定位获取
if (!state.MobileWindowsHide && state.popupsDom) {
state.popupsDom.closeOur();
commit("MSET_MOBILEWINDOWSHIDE", true);
@@ -744,45 +786,54 @@
color: color,
speed: 10,
});
- let drawALineLayer = new global.DC.VectorLayer("layer");
- state.mviewer.addLayer(drawALineLayer);
- let polyline = new global.DC.Polyline(Str); //加入绘画点
+ state.drawALineLayer = new global.DC.VectorLayer("lineLayer");
+ state.mviewer.addLayer(state.drawALineLayer);
+
+ //如果是添加 给第一个点加入图标 和事件
+ if (value[1]) {
+ commit("removerPolyLineIcon");
+ state.drawALineLayerIcon = new global.DC.VectorLayer("pointLayer");
+ state.mviewer.addLayer(state.drawALineLayerIcon);
+ let useStr = Str.split(";");
+ let post = useStr[useStr.length - 1].split(",");
+ let position = new global.DC.Position(post[0], post[1]);
+ let billboard = new global.DC.Billboard(
+ position,
+ "img/dingwei/dingwei1.png"
+ ); //加入绘画点
+ billboard.setStyle({
+ pixelOffset: { x: 0, y: -17 }, //偏移像素
+ });
+ //订阅事件
+ billboard.on(global.DC.MouseEventType.CLICK, (e) => {
+ // console.log(e);
+ // return;
+ // 定制化窗体
+ let position = e.position,
+ lntLat = [e.overlay._position._lng, e.overlay._position._lat];
+ let windowData = {
+ position,
+ lntLat,
+ query: {
+ ...(value[1] || {}),
+ position,
+ lntLat,
+ notAddGoOn: "notAddGoOn",
+ },
+ useJWD: true, //仅使用经纬度
+ };
+ dispatch("setMobileWindows", windowData);
+ });
+ state.drawALineLayerIcon.addOverlay(billboard);
+ }
+ let polyline = new global.DC.Polyline(Str); //加入线
polyline.setStyle({
width: 3,
material: material,
clampToGround: true,
});
- drawALineLayer.addOverlay(polyline);
- //如果是添加 给第一个点加入图标 和事件
- // if (value[1]) {
- // let post = Str.split(";")[0].split(",");
- // let position = new global.DC.Position(post[0], post[1]);
- // let billboard = new global.DC.Billboard(
- // position,
- // "img/dingwei/dingwei4.png"
- // ); //加入绘画点
- // billboard.setStyle({
- // pixelOffset: { x: 0, y: -17 }, //偏移像素
- // });
- // //订阅事件
- // billboard.on(global.DC.MouseEventType.CLICK, (e) => {
- // // console.log(e);
- // // return;
- // // 定制化窗体
- // let position = e.position,
- // lntLat = [e.overlay._position._lng, e.overlay._position._lat];
- // let windowData = {
- // position,
- // lntLat,
- // query: { ...(value[1] || {}), position, lntLat },
- // useJWD: true, //仅使用经纬度
- // };
- // dispatch("setMobileWindows", windowData);
- // });
- // drawALineLayer.addOverlay(billboard);
- // }
+ state.drawALineLayer.addOverlay(polyline);
- state.drawALineLayer = drawALineLayer;
state.isOpenDrawALine = true;
// commit("cameraSetView", state.navigationStartLngLat); //移动
},
@@ -791,6 +842,7 @@
//检查是否存在路线
commit("removePolylineMany");
commit("removePolyline");
+ commit("removerPolyLineIcon");
let Strs = value[0];
let red = global.DC.Namespace.Cesium.Color.fromCssColorString("#FF0000");
let white = global.DC.Namespace.Cesium.Color.fromCssColorString("#fff");
@@ -800,18 +852,20 @@
speed: 10,
});
let material1 = new global.DC.PolylineImageTrailMaterialProperty({
- color: global.DC.Color(255, 0, 0),
+ color: red,
speed: 60,
image: "img/icon/right.png",
repeat: { x: 320, y: 1 },
});
- let drawALineLayerMany = new global.DC.VectorLayer("layer");
+ let drawALineLayerMany = new global.DC.VectorLayer("manyLinePointLayer");
state.mviewer.addLayer(drawALineLayerMany);
+ let drawAPointLayerMany = new global.DC.HtmlLayer("manyPointPointLayer");
+ state.mviewer.addLayer(drawAPointLayerMany);
//多条线
for (let k in Strs) {
let polyline = new global.DC.Polyline(Strs[k].value); //加入绘画点
polyline.setStyle({
- width: 3,
+ width: 6,
material: material1,
clampToGround: true,
});
@@ -836,44 +890,67 @@
let post = point[k].value;
let position = new global.DC.Position(post[0], post[1]);
- let billboard = new global.DC.Billboard(
+ // let billboard = new global.DC.Billboard(
+ // position,
+ // // "img/dingwei/dingwei1.png"
+ // "img/icon/activity.png"
+ // ); //加入绘画点
+ // billboard.setStyle({
+ // pixelOffset: { x: 0, y: -17 }, //偏移像素
+ // });
+ // //订阅事件
+ // billboard.on(global.DC.MouseEventType.CLICK, (e) => {
+ // // console.log(e);
+ // // return;
+ // // 定制化窗体
+ // let position = e.position,
+ // lntLat = [e.overlay._position._lng, e.overlay._position._lat];
+ // let windowData = {
+ // position,
+ // lntLat,
+ // query: {
+ // ...(value[2] || {}),
+ // position,
+ // lntLat,
+ // notAddGoOn: "notAddGoOn",
+ // },
+ // useJWD: true, //仅使用经纬度
+ // };
+ // dispatch("setMobileWindows", windowData);
+ // });
+ // drawALineLayerMany.addOverlay(billboard);
+ // let Labels = new global.DC.Label(position, point[k].name);
+ // Labels.setStyle({
+ // font: "16px sans-serif", // CSS 字体设置
+ // scale: 1, //比例
+ // fillColor: white, //文字颜色
+ // showBackground: true, //是否显示背景
+ // backgroundColor: blue, //背景颜色
+ // // outlineColor: white, //边框颜色
+ // // outlineWidth: 1, //边框大小，
+ // pixelOffset: { x: 0, y: -47 }, //偏移像素
+ // });
+ let Labels = new global.DC.DivIcon(
+ // new this.DC.Position(Number(item[0]), Number(item[1]), 0),
position,
- "img/dingwei/dingwei1.png"
- ); //加入绘画点
- billboard.setStyle({
- pixelOffset: { x: 0, y: -17 }, //偏移像素
- });
- //订阅事件
- billboard.on(global.DC.MouseEventType.CLICK, (e) => {
- // console.log(e);
- // return;
- // 定制化窗体
- let position = e.position,
- lntLat = [e.overlay._position._lng, e.overlay._position._lat];
- let windowData = {
- position,
- lntLat,
- query: { ...(value[2] || {}), position, lntLat },
- useJWD: true, //仅使用经纬度
- };
- dispatch("setMobileWindows", windowData);
- });
- drawALineLayerMany.addOverlay(billboard);
- let Labels = new global.DC.Label(position, point[k].name);
- Labels.setStyle({
- font: "16px sans-serif", // CSS 字体设置
- scale: 1, //比例
- fillColor: white, //文字颜色
- showBackground: true, //是否显示背景
- backgroundColor: blue, //背景颜色
- // outlineColor: white, //边框颜色
- // outlineWidth: 1, //边框大小，
- pixelOffset: { x: 0, y: -47 }, //偏移像素
- });
+ `
+ <div class="point-entitys-box">
+ <div class="point-logo">
+ <img src="/img/icon/activity.png">
+ </div>
+ <div class="point-title">
+ ${point[k].name}
+ </div>
+ </div>
+ `
+ );
//订阅事件
Labels.on(global.DC.MouseEventType.CLICK, (e) => {
// console.log(e);
// return;
+ if (value[3]) {
+ value[3]();
+ }
// 定制化窗体
let position = e.position,
lntLat = [e.overlay._position._lng, e.overlay._position._lat];
@@ -885,11 +962,12 @@
};
dispatch("setMobileWindows", windowData);
});
- drawALineLayerMany.addOverlay(Labels);
+ drawAPointLayerMany.addOverlay(Labels);
// console.log(point[k]);
}
state.drawALineLayerMany = drawALineLayerMany;
- state.isOpenDrawALineMany = value[2].name ? value[2].name : true;
+ state.drawAPointLayerMany = drawAPointLayerMany;
+ // state.isOpenDrawALineMany = value[2].name ? value[2].name : true;
// commit("cameraSetView", state.navigationStartLngLat); //移动
},
},
--
Gitblit v1.9.3