冲突合并
This commit is contained in:
BianLzhaoMin
commit
9692141e45
|
|
@ -9,7 +9,6 @@
|
|||
<meta name="apple-mobile-web-app-status-bar-style" content="black">
|
||||
<meta name="apple-mobile-web-app-capable" content="yes">
|
||||
<meta name="format-detection" content="telephone=no">
|
||||
<!-- <title>后台管理系统</title> -->
|
||||
<title>项目一体化作战动态管控平台</title>
|
||||
<link rel="stylesheet" href="css/font-awesome/css/font-awesome.css" media="all" />
|
||||
<link rel="stylesheet" href="css/index2.css" media="all" />
|
||||
|
|
@ -39,78 +38,66 @@
|
|||
<a class="logo" style="left: 0;" href="javascript:void(0)">
|
||||
<span style="font-size: 22px;color: #fff;letter-spacing: 2px;">项目一体化作战动态管控平台</span>
|
||||
</a>
|
||||
<div class="admin-side-toggle" style="display: none;">
|
||||
<i class="fa fa-bars" aria-hidden="true"></i>
|
||||
</div>
|
||||
<dl class="layui-nav-child">
|
||||
<!-- <dd>-->
|
||||
<!-- <a href='javascript:;' lay-id="-999" data-url="pages/user/updateMyself.html"><i class="fa fa-user-circle" aria-hidden="true"></i> 个人信息</a>-->
|
||||
<!-- </dd>-->
|
||||
<dd>
|
||||
<a href='javascript:;' lay-id="-998" onclick="changeUserPwd()"><i class="fa fa-drupal"
|
||||
aria-hidden="true"></i> 修改密码</a>
|
||||
</dd>
|
||||
<dd>
|
||||
<a href="javascript:;" onclick="logout()"><i class="fa fa-sign-out" aria-hidden="true"></i>
|
||||
退出</a>
|
||||
</dd>
|
||||
</dl>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<ul class="layui-nav" pc style="background-color: transparent !important;">
|
||||
<li class="layui-nav-item">
|
||||
<!-- <a href='javascript:;' lay-id="-997" data-url="pages/notice/noticePubList.html"><i class="fa fa-envelope-o" aria-hidden="true" title="公告" unreadNotice></i></a>-->
|
||||
</li>
|
||||
<li class="layui-nav-item" pc>
|
||||
<a href="javascript:;" style="color: #fff !important;" class="admin-header-user">
|
||||
<img />
|
||||
<span style="color: #fff !important;"></span>
|
||||
</a>
|
||||
<dl class="layui-nav-child">
|
||||
<!-- <dd>-->
|
||||
<!-- <a href='javascript:;' lay-id="-999" data-url="pages/user/updateMyself.html"><i class="fa fa-user-circle" aria-hidden="true"></i> 个人信息</a>-->
|
||||
<!-- </dd>-->
|
||||
<dd>
|
||||
<a href='javascript:;' lay-id="-998" onclick="changeUserPwd()"><i class="fa fa-drupal"
|
||||
aria-hidden="true"></i> 修改密码</a>
|
||||
</dd>
|
||||
<dd>
|
||||
<a href="javascript:;" onclick="logout()"><i class="fa fa-sign-out"
|
||||
aria-hidden="true"></i> 退出</a>
|
||||
</dd>
|
||||
</dl>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<!-- 菜单 -->
|
||||
<div class="layui-side layui-bg-black" id="admin-side">
|
||||
<div class="layui-side-scroll" id="admin-navbar-side" lay-filter="side">
|
||||
<ul id="menu" class="layui-nav layui-nav-tree" lay-filter="demo">
|
||||
<!-- 菜单 -->
|
||||
<div class="layui-side layui-bg-black" id="admin-side">
|
||||
<div class="layui-side-scroll" id="admin-navbar-side" lay-filter="side">
|
||||
<ul id="menu" class="layui-nav layui-nav-tree" lay-filter="demo">
|
||||
|
||||
</ul>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="layui-body" style="bottom: 0;border-left: solid 2px #eeecec;" id="admin-body">
|
||||
<div class="layui-tab admin-nav-card layui-tab-brief" lay-allowClose="true" lay-filter="admin-tab">
|
||||
<ul class="layui-tab-title">
|
||||
<li class="layui-this">
|
||||
<i class="fa fa-dashboard" aria-hidden="true"></i>
|
||||
<cite></cite>
|
||||
</li>
|
||||
</ul>
|
||||
<div class="layui-tab-content" style="min-height: 150px; padding: 5px 0 0 0;background-color: #F2F2F2;">
|
||||
<div class="layui-tab-item layui-show">
|
||||
<iframe id="sy" src=""></iframe>
|
||||
<div class="layui-body" style="bottom: 0;border-left: solid 2px #eeecec;" id="admin-body">
|
||||
<div class="layui-tab admin-nav-card layui-tab-brief" lay-allowClose="true" lay-filter="admin-tab">
|
||||
<ul class="layui-tab-title">
|
||||
<li class="layui-this">
|
||||
<i class="fa fa-dashboard" aria-hidden="true"></i>
|
||||
<cite></cite>
|
||||
</li>
|
||||
</ul>
|
||||
<div class="layui-tab-content"
|
||||
style="min-height: 150px; padding: 5px 0 0 0;background-color: #F2F2F2;">
|
||||
<div class="layui-tab-item layui-show">
|
||||
<iframe id="sy" src=""></iframe>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="layui-footer footer footer-demo" id="admin-footer">
|
||||
<div>
|
||||
<div class="layui-footer footer footer-demo" id="admin-footer">
|
||||
<div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="site-tree-mobile layui-hide">
|
||||
<i class="layui-icon"></i>
|
||||
</div>
|
||||
<div class="site-mobile-shade"></div>
|
||||
<div class="site-tree-mobile layui-hide">
|
||||
<i class="layui-icon"></i>
|
||||
</div>
|
||||
<div class="site-mobile-shade"></div>
|
||||
|
||||
<script src="js/layui-v2.6.8/layui.js" charset="UTF-8" type="text/javascript"></script>
|
||||
<script type="text/javascript" src="js/libs/jquery-3.7.0.min.js"></script>
|
||||
<script type="text/javascript" src="js/jq.js"></script>
|
||||
<script type="text/javascript" src="js/publicJs.js"></script>
|
||||
<script type="text/javascript" src="js/my/aes.js"></script>
|
||||
<script type="text/javascript" src="js/ajaxRequest.js"></script>
|
||||
<script type="text/javascript" src="js/main.js"></script>
|
||||
<script type="text/javascript" src="js/openIframe.js"></script>
|
||||
<script src="js/layui-v2.6.8/layui.js" charset="UTF-8" type="text/javascript"></script>
|
||||
<script type="text/javascript" src="js/libs/jquery-3.7.0.min.js"></script>
|
||||
<script type="text/javascript" src="js/jq.js"></script>
|
||||
<script type="text/javascript" src="js/publicJs.js"></script>
|
||||
<script type="text/javascript" src="js/my/aes.js"></script>
|
||||
<script type="text/javascript" src="js/ajaxRequest.js"></script>
|
||||
<script type="text/javascript" src="js/main.js"></script>
|
||||
<script type="text/javascript" src="js/openIframe.js"></script>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
|
|
@ -55,7 +55,7 @@ function initData() {
|
|||
let points = JSON.parse(objParams.points)
|
||||
intLng = points[0].lng;
|
||||
intLat = points[0].lat;
|
||||
}else{
|
||||
} else {
|
||||
intLng = list[0].proLon ? list[0].proLon : list[0].lon;
|
||||
intLat = list[0].proLat ? list[0].proLat : list[0].lat;
|
||||
}
|
||||
|
|
@ -74,13 +74,15 @@ function initMap(list) {
|
|||
// 以第一个点为中心初始化地图
|
||||
map.centerAndZoom(new BMapGL.Point(intLng, intLat), 16);
|
||||
|
||||
map.setTilt(60); //设置地图的倾斜角度
|
||||
map.setTilt(65); //设置地图的倾斜角度
|
||||
map.enableScrollWheelZoom(true); // 启用滚轮缩放
|
||||
// map.setTilt(60); // 设置地图倾斜角度
|
||||
|
||||
// map.setDisplayOptions({
|
||||
// building: true, // 显示3D建筑物
|
||||
// });
|
||||
// 设置显示3D建筑物
|
||||
map.setDisplayOptions({
|
||||
building: true, // 显示3D建筑物
|
||||
indoor: false,
|
||||
poi: true
|
||||
});
|
||||
var navigationControl = new BMapGL.NavigationControl3D();
|
||||
map.addControl(navigationControl);
|
||||
|
||||
|
|
@ -168,49 +170,51 @@ function initMap(list) {
|
|||
});
|
||||
}
|
||||
initTowerLine(list);
|
||||
// 点击地图添加标记
|
||||
map.addEventListener("click", function (e) {
|
||||
addMarker(e.latlng.lng, e.latlng.lat);
|
||||
});
|
||||
|
||||
if (objParams.points) {
|
||||
let points = JSON.parse(objParams.points)
|
||||
$.each(points, function (i, item) {
|
||||
addMarker(item.lng, item.lat)
|
||||
viewPointLine();
|
||||
})
|
||||
} else {
|
||||
// 点击地图添加标记
|
||||
map.addEventListener("click", function (e) {
|
||||
addMarker(e.latlng.lng, e.latlng.lat);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
function addMarker(lng, lat) {
|
||||
var point = new BMapGL.Point(lng, lat);
|
||||
// 创建点标记
|
||||
var marker = new BMapGL.Marker(point);
|
||||
// 添加到地图
|
||||
map.addOverlay(marker);
|
||||
// 创建标签
|
||||
var label = new BMapGL.Label("点" + (markerCount + 1), {
|
||||
position: point,
|
||||
offset: new BMapGL.Size(10, -30)
|
||||
});
|
||||
label.setStyle({
|
||||
color: "#333",
|
||||
fontSize: "12px",
|
||||
fontWeight: "bold",
|
||||
backgroundColor: "rgba(255,255,255,0.9)",
|
||||
border: "1px solid #ddd",
|
||||
borderRadius: "4px",
|
||||
padding: "2px 6px"
|
||||
});
|
||||
map.addOverlay(label);
|
||||
// 存储标记和标签
|
||||
markers.push({
|
||||
marker: marker,
|
||||
label: label,
|
||||
point: point
|
||||
});
|
||||
// 更新计数器
|
||||
markerCount++;
|
||||
}
|
||||
// 添加点坐标
|
||||
function addMarker(lng, lat) {
|
||||
var point = new BMapGL.Point(lng, lat);
|
||||
// 创建点标记
|
||||
var marker = new BMapGL.Marker(point);
|
||||
// 添加到地图
|
||||
map.addOverlay(marker);
|
||||
// 创建标签
|
||||
var label = new BMapGL.Label("点" + (markerCount + 1), {
|
||||
position: point,
|
||||
offset: new BMapGL.Size(10, -30)
|
||||
});
|
||||
label.setStyle({
|
||||
color: "#333",
|
||||
fontSize: "12px",
|
||||
fontWeight: "bold",
|
||||
backgroundColor: "rgba(255,255,255,0.9)",
|
||||
border: "1px solid #ddd",
|
||||
borderRadius: "4px",
|
||||
padding: "2px 6px"
|
||||
});
|
||||
map.addOverlay(label);
|
||||
// 存储标记和标签
|
||||
markers.push({
|
||||
marker: marker,
|
||||
label: label,
|
||||
point: point
|
||||
});
|
||||
console.log(markers)
|
||||
// 更新计数器
|
||||
markerCount++;
|
||||
}
|
||||
|
||||
// 杆塔连线
|
||||
|
|
@ -263,7 +267,7 @@ function initTowerLine(points) {
|
|||
);
|
||||
// 4. 设置3D参数
|
||||
var zoom = map.getZoom();
|
||||
var newTilt = 60;
|
||||
var newTilt = 65;
|
||||
var newHeading = 30;
|
||||
|
||||
// 5. 应用3D视角
|
||||
|
|
@ -315,6 +319,10 @@ function viewPointLine() {
|
|||
});
|
||||
polylineView = polyline;
|
||||
map.addOverlay(polyline);
|
||||
// 点击地图添加标记
|
||||
map.addEventListener("click", function (e) {
|
||||
addMarker(e.latlng.lng, e.latlng.lat);
|
||||
});
|
||||
}
|
||||
|
||||
// 保存点位数据
|
||||
|
|
@ -331,7 +339,7 @@ function saveData() {
|
|||
points.push({
|
||||
lng: item.point.lng,
|
||||
lat: item.point.lat,
|
||||
sort:index + 1
|
||||
sort: index + 1
|
||||
});
|
||||
})
|
||||
let frameId = parent.document.getElementById('addDataRopeway').getElementsByTagName("iframe")[0];
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@
|
|||
<body>
|
||||
|
||||
<div class="login">
|
||||
<!-- <div class="message">后台管理系统</div> -->
|
||||
<div class="message">项目一体化作战动态管控平台</div>
|
||||
<div id="darkbannerwrap"></div>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue