From cfc635a5ca0d9206985869bf62bf72535ee45e14 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 26 Jan 2022 09:30:03 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/school-web
---
src/store/modules/mobile.js | 128 ++++++++++++++++++++++++++++--------------
1 files changed, 85 insertions(+), 43 deletions(-)
diff --git a/src/store/modules/mobile.js b/src/store/modules/mobile.js
index a6d6a20..360b0e0 100644
--- a/src/store/modules/mobile.js
+++ b/src/store/modules/mobile.js
@@ -68,9 +68,12 @@
isendPosition: false, //传送终点经纬度--感应数据
routerS: [], //所有路径
choiceRouterS: 0, //当前选择路径
+
showActivity: false, //是否显示活动弹窗
+ showActivityData: {}, //活动内容
drawALineLayerMany: null, //活动路线图层
+ drawAPointLayerMany: null, //活动点图层
isOpenDrawALineMany: null, //是否开启活动
},
mutations: {
@@ -294,6 +297,15 @@
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) {
@@ -307,6 +319,13 @@
//活动窗口是否显示
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];
@@ -449,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);
@@ -774,7 +794,8 @@
commit("removerPolyLineIcon");
state.drawALineLayerIcon = new global.DC.VectorLayer("pointLayer");
state.mviewer.addLayer(state.drawALineLayerIcon);
- let post = Str.split(";")[0].split(",");
+ 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,
@@ -831,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("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,
});
@@ -867,49 +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,
- 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 }, //偏移像素
- });
+ `
+ <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];
@@ -921,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