#更换室内数据

This commit is contained in:
Bob 2020-04-08 12:05:00 +08:00
parent 4351f51a09
commit cf31f90e0d
8 changed files with 565 additions and 108 deletions

View File

@ -1,7 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="9cbc7ee8-e518-44ca-870c-9743cf0f1b98" name="Default Changelist" comment="" />
<list default="true" id="9cbc7ee8-e518-44ca-870c-9743cf0f1b98" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/dashboard/static/dashboard/json/Linyou_station_0.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/dashboard/static/dashboard/json/Linyou_station_1.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/dashboard/static/dashboard/json/Linyou_station_2.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/dashboard/static/dashboard/json/Linyou_station_3.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/dashboard/static/dashboard/json/Linyou_station_4.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/dashboard/static/dashboard/js/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/dashboard/static/dashboard/js/index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/dashboard/templates/dashboard/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/dashboard/templates/dashboard/index.html" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -70,8 +79,8 @@
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/js/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1713">
<caret line="269" column="38" selection-start-line="269" selection-start-column="38" selection-end-line="269" selection-end-column="38" />
<state relative-caret-position="397">
<caret line="1731" column="31" selection-start-line="1731" selection-start-column="31" selection-end-line="1731" selection-end-column="31" />
<folding>
<element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
</folding>
@ -82,7 +91,7 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/js/vector.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1232">
<state relative-caret-position="543">
<caret line="56" column="23" selection-start-line="56" selection-start-column="23" selection-end-line="56" selection-end-column="23" />
</state>
</provider>
@ -103,8 +112,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/dashboard/templates/dashboard/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="549">
<caret line="89" column="53" lean-forward="true" selection-start-line="89" selection-start-column="53" selection-end-line="89" selection-end-column="53" />
<state relative-caret-position="-249">
<caret line="208" column="20" lean-forward="true" selection-start-line="208" selection-start-column="20" selection-end-line="208" selection-end-column="20" />
</state>
</provider>
</entry>
@ -112,7 +121,7 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/dashboard/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="66">
<state relative-caret-position="88">
<caret line="4" column="23" selection-start-line="4" selection-start-column="23" selection-end-line="4" selection-end-column="23" />
<folding>
<element signature="e#0#19#0" expanded="true" />
@ -168,12 +177,15 @@
<find>addLayer</find>
<find>4326</find>
<find>38</find>
<find>connect_websocket</find>
<find>favicon</find>
<find>new WebSocket</find>
<find>-1</find>
<find>historical_route_submit</find>
<find>connect_websocket();</find>
<find>connect_websocket</find>
<find>jizhan</find>
<find>people_btn</find>
<find>historical_route</find>
</findStrings>
<dirStrings>
<dir>D:\python\p3\linbei</dir>
@ -230,10 +242,10 @@
<auto-save>true</auto-save>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="-1688" />
<option name="y" value="16" />
<option name="width" value="1696" />
<option name="height" value="1026" />
<option name="x" value="-8" />
<option name="y" value="-8" />
<option name="width" value="1936" />
<option name="height" value="1056" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectView">
@ -241,7 +253,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
@ -297,6 +308,7 @@
<select />
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
@ -306,7 +318,7 @@
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="database.console.LAST_STATE" value="false" />
<property name="editor.config.ad.shown" value="true" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/dashboard/static/dashboard/json" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
<property name="nodejs_package_manager_path" value="npm" />
@ -464,13 +476,8 @@
<workItem from="1584602918716" duration="4103000" />
<workItem from="1584609812758" duration="991000" />
<workItem from="1584934687799" duration="2464000" />
</task>
<task id="LOCAL-00003" summary="#creat">
<created>1567675840647</created>
<option name="number" value="00003" />
<option name="presentableId" value="LOCAL-00003" />
<option name="project" value="LOCAL" />
<updated>1567675840647</updated>
<workItem from="1585878860281" duration="2198000" />
<workItem from="1586222573140" duration="10286000" />
</task>
<task id="LOCAL-00004" summary="#creat">
<created>1567676248118</created>
@ -808,20 +815,28 @@
<option name="project" value="LOCAL" />
<updated>1584946676462</updated>
</task>
<option name="localTasksCounter" value="52" />
<task id="LOCAL-00052" summary="#更换一层数据">
<created>1585879090259</created>
<option name="number" value="00052" />
<option name="presentableId" value="LOCAL-00052" />
<option name="project" value="LOCAL" />
<updated>1585879090260</updated>
</task>
<option name="localTasksCounter" value="53" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="302226000" />
<option name="totallyTimeSpent" value="314710000" />
</component>
<component name="ToolWindowManager">
<frame x="-1688" y="16" width="1696" height="1026" extended-state="6" />
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
<editor active="true" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.17277168" />
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.15388711" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" weight="0.32937366" />
<window_info anchor="bottom" id="Find" order="1" weight="0.32924107" />
<window_info anchor="bottom" id="Run" order="2" weight="0.32937366" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
@ -831,7 +846,7 @@
<window_info anchor="bottom" id="Version Control" order="8" weight="0.32937366" />
<window_info anchor="bottom" id="Database Changes" order="9" />
<window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
<window_info anchor="bottom" id="Terminal" order="11" visible="true" weight="0.32589287" />
<window_info active="true" anchor="bottom" id="Terminal" order="11" visible="true" weight="0.31533477" />
<window_info anchor="bottom" id="Python Console" order="12" />
<window_info anchor="bottom" id="Database Console" order="13" weight="0.32937366" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
@ -852,19 +867,13 @@
<MESSAGE value="#添加一层和二层" />
<MESSAGE value="#添加三层和四层" />
<MESSAGE value="#添加5层和67层" />
<option name="LAST_COMMIT_MESSAGE" value="#添加5层和67层" />
<MESSAGE value="#更换一层数据" />
<option name="LAST_COMMIT_MESSAGE" value="#更换一层数据" />
</component>
<component name="com.intellij.coverage.CoverageDataManagerImpl">
<SUITE FILE_PATH="coverage/linbei$import_points.coverage" NAME="import_points Coverage Results" MODIFIED="1573780425219" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/js/index_2.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264">
<caret line="12" column="36" selection-start-line="12" selection-start-column="17" selection-end-line="12" selection-end-column="36" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/js/dashboard.js" />
<entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/js/map-height.js" />
<entry file="file://D:/2019/linbei/drawer-master/dist/js/drawer.min.js">
@ -1085,13 +1094,6 @@
<entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/img/jizhan.png">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/js/vector.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1232">
<caret line="56" column="23" selection-start-line="56" selection-start-column="23" selection-end-line="56" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/fabfile.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
@ -1102,16 +1104,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dashboard/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="66">
<caret line="4" column="23" selection-start-line="4" selection-start-column="23" selection-end-line="4" selection-end-column="23" />
<folding>
<element signature="e#0#19#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dashboard/views.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="88">
@ -1129,17 +1121,37 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dashboard/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="88">
<caret line="4" column="23" selection-start-line="4" selection-start-column="23" selection-end-line="4" selection-end-column="23" />
<folding>
<element signature="e#0#19#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/js/vector.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="543">
<caret line="56" column="23" selection-start-line="56" selection-start-column="23" selection-end-line="56" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/json/Linyou_station_0.json">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/dashboard/templates/dashboard/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="549">
<caret line="89" column="53" lean-forward="true" selection-start-line="89" selection-start-column="53" selection-end-line="89" selection-end-column="53" />
<state relative-caret-position="-249">
<caret line="208" column="20" lean-forward="true" selection-start-line="208" selection-start-column="20" selection-end-line="208" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/js/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1713">
<caret line="269" column="38" selection-start-line="269" selection-start-column="38" selection-end-line="269" selection-end-column="38" />
<state relative-caret-position="397">
<caret line="1731" column="31" selection-start-line="1731" selection-start-column="31" selection-end-line="1731" selection-end-column="31" />
<folding>
<element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
</folding>

View File

@ -15,6 +15,7 @@ $(function () {
});
var tianditu = new ol.layer.Tile({
title: "天地图路网",
source: new ol.source.XYZ({
@ -27,10 +28,30 @@ $(function () {
source: new ol.source.OSM()
});
// map.addControl(new ol.control.Rotate({
// autoHide: false
// }));
// $(".ol-compass").click(function () {
//
// map.getView().setRotation(Math.PI * -37.5 / 180)
// })
//--------------------------------------------------------
//===================================页面加载完毕默认打开websocket======================================
// console.log("6666");
// var str = "ws://111.21.80.34:9004";
//
// // if (window.s) {
// // window.s.close()
// // }
// /*创建socket连接*/
// socket = new WebSocket(str);
//
// socket.onopen = function () {
// console.log('WebSocket open');//成功连接上Websocket
// };
//============================================================================================================================
var w3132Layer = new ol.layer.Tile({
source: new ol.source.TileWMS({
url: 'http://210.77.68.250:8080/geoserver/linbei/gwc/service/wms',
@ -69,8 +90,6 @@ $(function () {
});
var road = new ol.layer.Vector({
source: new ol.source.Vector({
projection: 'EPSG:4326',
@ -148,7 +167,7 @@ $(function () {
// map.addLayer(pipe);
var iconStyle_jizhan = new ol.style.Style({
var iconStyle_jizhan = new ol.style.Style({
image: new ol.style.Icon({
// opacity: 0.75,
src: "static/dashboard/img/jizhan.png",
@ -166,7 +185,18 @@ $(function () {
});
map.addLayer(GeoJsonLayer);
var GeoJsonLayer_0 = new ol.layer.Vector({
source: new ol.source.Vector({
projection: projection,
url: 'static/dashboard/json/Linyou_station_0.json',
format: new ol.format.GeoJSON()
}),
style: style,
maxZoom: 20
});
// map.addLayer(GeoJsonLayer);
//图层切换
var daxingshebei1 = new ol.layer.Vector({
@ -673,6 +703,73 @@ $(function () {
})
})
});
var station_0 = new ol.layer.Vector({
source: new ol.source.Vector({
projection: 'EPSG:4326',
url: '/static/dashboard/json/Linyou_station_0.json',
format: new ol.format.GeoJSON()
}),
maxZoom: 20,
style: new ol.style.Style({
stroke: new ol.style.Stroke({
color: 'rgb(250,24,11)'
}),
fill: new ol.style.Fill({
color: 'rgb(250,24,11)'
})
})
});
var station_1 = new ol.layer.Vector({
source: new ol.source.Vector({
projection: 'EPSG:4326',
url: '/static/dashboard/json/Linyou_station_1.json',
format: new ol.format.GeoJSON()
}),
maxZoom: 20,
style: style
// style: new ol.style.Style({
// stroke: new ol.style.Stroke({
// color: 'rgb(250,24,11)'
// }),
// fill: new ol.style.Fill({
// color: 'rgb(250,24,11)'
// })
// })
});
var station_2 = new ol.layer.Vector({
source: new ol.source.Vector({
projection: 'EPSG:4326',
url: '/static/dashboard/json/Linyou_station_2.json',
format: new ol.format.GeoJSON()
}),
maxZoom: 20,
style: style
});
var station_3 = new ol.layer.Vector({
source: new ol.source.Vector({
projection: 'EPSG:4326',
url: '/static/dashboard/json/Linyou_station_3.json',
format: new ol.format.GeoJSON()
}),
maxZoom: 20,
style: style
});
var station_4 = new ol.layer.Vector({
source: new ol.source.Vector({
projection: 'EPSG:4326',
url: '/static/dashboard/json/Linyou_station_4.json',
format: new ol.format.GeoJSON()
}),
maxZoom: 20,
style: style
});
//======变量=================
var draw;
@ -754,6 +851,9 @@ $(function () {
map.removeLayer(jianzhuwu7);
map.removeLayer(louti7);
map.removeLayer(door7);
map.removeLayer(station_2);
map.removeLayer(station_3);
map.removeLayer(station_4);
map.addLayer(menchuang1);
map.addLayer(weiqiang1);
@ -761,6 +861,9 @@ $(function () {
map.addLayer(louti1);
map.addLayer(shebei1);
map.addLayer(door1);
map.addLayer(station_1);
} else if (value == '2') {
map.removeLayer(weiqiang1);
map.removeLayer(daxingshebei1);
@ -788,11 +891,15 @@ $(function () {
map.removeLayer(jianzhuwu7);
map.removeLayer(louti7);
map.removeLayer(door7);
map.removeLayer(station_1);
map.removeLayer(station_3);
map.removeLayer(station_4);
map.addLayer(daxingshebei2);
map.addLayer(jianzhuwu2);
map.addLayer(louti2);
map.addLayer(door2);
map.addLayer(station_2);
} else if (value == '3') {
map.removeLayer(weiqiang1);
map.removeLayer(daxingshebei1);
@ -824,11 +931,15 @@ $(function () {
map.removeLayer(jianzhuwu7);
map.removeLayer(louti7);
map.removeLayer(door7);
map.removeLayer(station_1);
map.removeLayer(station_2);
map.removeLayer(station_3);
map.addLayer(daxingshebei3);
map.addLayer(jianzhuwu3);
map.addLayer(louti3);
map.addLayer(door3);
map.addLayer(station_3);
} else if (value == '4') {
map.removeLayer(weiqiang1);
map.removeLayer(daxingshebei1);
@ -856,13 +967,17 @@ $(function () {
map.removeLayer(jianzhuwu7);
map.removeLayer(louti7);
map.removeLayer(door7);
map.removeLayer(station_1);
map.removeLayer(station_2);
map.removeLayer(station_3);
map.addLayer(daxingshebei4);
map.addLayer(jianzhuwu4);
map.addLayer(louti4);
map.addLayer(door4);
map.addLayer(station_4);
}else if (value == '5') {
} else if (value == '5') {
map.removeLayer(weiqiang1);
map.removeLayer(daxingshebei1);
map.removeLayer(louti1);
@ -895,7 +1010,7 @@ $(function () {
map.addLayer(louti5);
map.addLayer(door5);
}else if (value == '6') {
} else if (value == '6') {
map.removeLayer(weiqiang1);
map.removeLayer(daxingshebei1);
map.removeLayer(louti1);
@ -928,7 +1043,7 @@ $(function () {
map.addLayer(louti6);
map.addLayer(door6);
}else if (value == '7') {
} else if (value == '7') {
map.removeLayer(weiqiang1);
map.removeLayer(daxingshebei1);
map.removeLayer(louti1);
@ -1025,7 +1140,7 @@ $(function () {
map.removeLayer(louti7);
map.removeLayer(door7);
$("#selectLayer").val("0");
$("#selectLayer").val("0");
}
})
@ -1101,16 +1216,17 @@ $(function () {
});
$("#people_btn").click(function () {
connect_websocket();
function base_people() {
// connect_websocket();
map.removeInteraction(draw);
$("#box").show();
$("#realtime_positioning").show();
$("#people_query").show();
$("#historical_route").hide();
$("#zone_setting").hide();
$("#site_query").hide();
$("#coordinate_measurement").hide();
// $("#box").show();
// $("#realtime_positioning").show();
// $("#people_query").show();
// $("#historical_route").hide();
// $("#zone_setting").hide();
// $("#site_query").hide();
// $("#coordinate_measurement").hide();
connect_websocket()
socket.onmessage = function (e) {
// console.log('message: ' + e.data);//打印出服务端返回过来的数据
var i = e.data[0] + e.data[1] + e.data[2];
@ -1143,7 +1259,8 @@ $(function () {
window.s = socket;
}
});
}
$("#people_btn").click(base_people);
$("#site_btn").click(function () {
map.removeInteraction(draw);
$("#box").show();
@ -1167,7 +1284,7 @@ $(function () {
});
$("#historical_route_submit").click(function () {
connect_websocket();
// connect_websocket();
map.removeInteraction(draw);
var peoinfo = $("#peoinfo").val();
var peopleid = $("#peopleid").val();
@ -1278,12 +1395,12 @@ $(function () {
}
$('#close_websocket').click(function () {
function colsewebsocket() {
if (window.s) {
window.s.close();//关闭websocket
console.log('websocket已关闭');
}
});
};
//点图层
@ -1299,6 +1416,7 @@ $(function () {
}),
});
function addMarker(marker) {
markVectorSource.clear();
@ -1316,6 +1434,10 @@ $(function () {
}
function removeMarker() {
markVectorSource.clear();
}
function addLine(routeCoords) {
//console.log(routeCoords);
@ -1495,11 +1617,15 @@ $(function () {
if (flag[i].checked == true) {
console.log(flag[i].checked);
map.addLayer(GeoJsonLayer);
map.addLayer(GeoJsonLayer_0);
} else {
map.removeLayer(GeoJsonLayer)
map.removeLayer(GeoJsonLayer_0)
}
}
});
$(".base-station-2").click(function () {
var flag = document.getElementsByClassName('base-station-2');
for (var i = 0; i < flag.length; i++) {
@ -1507,8 +1633,11 @@ $(function () {
if (flag[i].checked == true) {
console.log(flag[i].checked);
map.addLayer(GeoJsonLayer);
map.addLayer(GeoJsonLayer_0);
} else {
map.removeLayer(GeoJsonLayer)
map.removeLayer(GeoJsonLayer_0)
}
}
});
@ -1519,8 +1648,11 @@ $(function () {
if (flag[i].checked == true) {
console.log(flag[i].checked);
map.addLayer(GeoJsonLayer);
map.addLayer(GeoJsonLayer_0);
} else {
map.removeLayer(GeoJsonLayer)
map.removeLayer(GeoJsonLayer_0)
}
}
});
@ -1531,8 +1663,75 @@ $(function () {
if (flag[i].checked == true) {
console.log(flag[i].checked);
map.addLayer(GeoJsonLayer);
map.addLayer(GeoJsonLayer_0);
} else {
map.removeLayer(GeoJsonLayer)
map.removeLayer(GeoJsonLayer_0)
}
}
});
$(".base-people-1").click(function () {
var flag = document.getElementsByClassName('base-people-1');
for (var i = 0; i < flag.length; i++) {
console.log(flag[i].checked);
if (flag[i].checked == true) {
console.log(flag[i].checked);
connect_websocket()
base_people()
} else {
removeMarker()
colsewebsocket()
// map.removeInteraction(draw);
}
}
});
$(".base-people-2").click(function () {
var flag = document.getElementsByClassName('base-people-2');
for (var i = 0; i < flag.length; i++) {
console.log(flag[i].checked);
if (flag[i].checked == true) {
console.log(flag[i].checked);
connect_websocket()
base_people()
} else {
removeMarker()
colsewebsocket()
// map.removeInteraction(draw);
}
}
});
$(".base-people-3").click(function () {
var flag = document.getElementsByClassName('base-people-3');
for (var i = 0; i < flag.length; i++) {
console.log(flag[i].checked);
if (flag[i].checked == true) {
console.log(flag[i].checked);
connect_websocket()
base_people()
} else {
removeMarker()
colsewebsocket()
// map.removeInteraction(draw);
}
}
});
$(".base-people-4").click(function () {
var flag = document.getElementsByClassName('base-people-4');
for (var i = 0; i < flag.length; i++) {
console.log(flag[i].checked);
if (flag[i].checked == true) {
console.log(flag[i].checked);
connect_websocket()
base_people()
} else {
removeMarker();
colsewebsocket()
// map.removeInteraction(draw);
}
}
});

View File

@ -0,0 +1,142 @@
{"type":"GeometryCollection", "geometries": [
{"type":"Point","coordinates":[107.5503922,34.90829226]},
{"type":"Point","coordinates":[107.5508187,34.90801262]},
{"type":"Point","coordinates":[107.5514449,34.90771088]},
{"type":"Point","coordinates":[107.5516433,34.90746653]},
{"type":"Point","coordinates":[107.5520487,34.90751787]},
{"type":"Point","coordinates":[107.5522946,34.90703392]},
{"type":"Point","coordinates":[107.5526896,34.9070969]},
{"type":"Point","coordinates":[107.5526493,34.9068009]},
{"type":"Point","coordinates":[107.5531342,34.90650604]},
{"type":"Point","coordinates":[107.5533777,34.90686579]},
{"type":"Point","coordinates":[107.5537705,34.90716184]},
{"type":"Point","coordinates":[107.5541248,34.90752147]},
{"type":"Point","coordinates":[107.554146,34.9077012]},
{"type":"Point","coordinates":[107.5544459,34.90796625]},
{"type":"Point","coordinates":[107.5554239,34.91142783]},
{"type":"Point","coordinates":[107.5550109,34.91162199]},
{"type":"Point","coordinates":[107.5546772,34.90827155]},
{"type":"Point","coordinates":[107.5551285,34.90867105]},
{"type":"Point","coordinates":[107.5556238,34.90913089]},
{"type":"Point","coordinates":[107.5555931,34.90951729]},
{"type":"Point","coordinates":[107.5555541,34.90997704]},
{"type":"Point","coordinates":[107.5555067,34.91051455]},
{"type":"Point","coordinates":[107.5554649,34.91098636]},
{"type":"Point","coordinates":[107.5553915,34.91179917]},
{"type":"Point","coordinates":[107.5547846,34.91205912]},
{"type":"Point","coordinates":[107.5544168,34.91241148]},
{"type":"Point","coordinates":[107.5541408,34.91211542]},
{"type":"Point","coordinates":[107.5546684,34.91194603]},
{"type":"Point","coordinates":[107.5548032,34.91139639]},
{"type":"Point","coordinates":[107.554536,34.91094592]},
{"type":"Point","coordinates":[107.5551005,34.91063098]},
{"type":"Point","coordinates":[107.554301,34.91109504]},
{"type":"Point","coordinates":[107.5539234,34.911863]},
{"type":"Point","coordinates":[107.5536285,34.91155709]},
{"type":"Point","coordinates":[107.5533553,34.91127595]},
{"type":"Point","coordinates":[107.5531035,34.91101332]},
{"type":"Point","coordinates":[107.5527538,34.91065059]},
{"type":"Point","coordinates":[107.552414,34.91029952]},
{"type":"Point","coordinates":[107.5521197,34.90999279]},
{"type":"Point","coordinates":[107.5526852,34.90955581]},
{"type":"Point","coordinates":[107.5528867,34.90934559]},
{"type":"Point","coordinates":[107.5531868,34.90922719]},
{"type":"Point","coordinates":[107.5538604,34.90888934]},
{"type":"Point","coordinates":[107.5541881,34.90858805]},
{"type":"Point","coordinates":[107.5548349,34.90871259]},
{"type":"Point","coordinates":[107.5547331,34.90860443]},
{"type":"Point","coordinates":[107.5546737,34.90853935]},
{"type":"Point","coordinates":[107.5531228,34.91002424]},
{"type":"Point","coordinates":[107.5534361,34.91034584]},
{"type":"Point","coordinates":[107.5537679,34.91059668]},
{"type":"Point","coordinates":[107.552385,34.90992122]},
{"type":"Point","coordinates":[107.5526007,34.91015304]},
{"type":"Point","coordinates":[107.552729,34.91005812]},
{"type":"Point","coordinates":[107.5519976,34.90954507]},
{"type":"Point","coordinates":[107.5524931,34.90919901]},
{"type":"Point","coordinates":[107.5525627,34.90900656]},
{"type":"Point","coordinates":[107.5526466,34.90869224]},
{"type":"Point","coordinates":[107.5534696,34.9082521]},
{"type":"Point","coordinates":[107.553144,34.90789472]},
{"type":"Point","coordinates":[107.5535647,34.90838338]},
{"type":"Point","coordinates":[107.5538037,34.90863178]},
{"type":"Point","coordinates":[107.5520877,34.9085677]},
{"type":"Point","coordinates":[107.552069,34.90810812]},
{"type":"Point","coordinates":[107.5516842,34.90811021]},
{"type":"Point","coordinates":[107.552053,34.90878306]},
{"type":"Point","coordinates":[107.5521622,34.90889809]},
{"type":"Point","coordinates":[107.5519204,34.90884036]},
{"type":"Point","coordinates":[107.5517127,34.90891941]},
{"type":"Point","coordinates":[107.5515197,34.90910984]},
{"type":"Point","coordinates":[107.5516274,34.90919797]},
{"type":"Point","coordinates":[107.5517057,34.9092204]},
{"type":"Point","coordinates":[107.5517252,34.90932913]},
{"type":"Point","coordinates":[107.5517448,34.90920545]},
{"type":"Point","coordinates":[107.5518828,34.90935372]},
{"type":"Point","coordinates":[107.5519908,34.90891256]},
{"type":"Point","coordinates":[107.5516829,34.9091069]},
{"type":"Point","coordinates":[107.5517602,34.9096946]},
{"type":"Point","coordinates":[107.5513626,34.90934581]},
{"type":"Point","coordinates":[107.551293,34.90906062]},
{"type":"Point","coordinates":[107.5507299,34.90868312]},
{"type":"Point","coordinates":[107.5437633,34.89571048]},
{"type":"Point","coordinates":[107.543365,34.89535502]},
{"type":"Point","coordinates":[107.5430463,34.89501696]},
{"type":"Point","coordinates":[107.5426303,34.89476252]},
{"type":"Point","coordinates":[107.542048,34.89442697]},
{"type":"Point","coordinates":[107.5417212,34.8942318]},
{"type":"Point","coordinates":[107.5412997,34.89395689]},
{"type":"Point","coordinates":[107.5410196,34.89366993]},
{"type":"Point","coordinates":[107.5412731,34.89352924]},
{"type":"Point","coordinates":[107.5412047,34.89357018]},
{"type":"Point","coordinates":[107.5413927,34.89365774]},
{"type":"Point","coordinates":[107.5415611,34.89383722]},
{"type":"Point","coordinates":[107.5414739,34.89389052]},
{"type":"Point","coordinates":[107.5413069,34.89370961]},
{"type":"Point","coordinates":[107.5412953,34.89356674]},
{"type":"Point","coordinates":[107.5412338,34.89370628]},
{"type":"Point","coordinates":[107.5411864,34.89360375]},
{"type":"Point","coordinates":[107.5412134,34.89363669]},
{"type":"Point","coordinates":[107.5413559,34.89354129]},
{"type":"Point","coordinates":[107.5412132,34.89363718]},
{"type":"Point","coordinates":[107.5413396,34.89353165]},
{"type":"Point","coordinates":[107.5414108,34.89331728]},
{"type":"Point","coordinates":[107.5418575,34.89305189]},
{"type":"Point","coordinates":[107.542125,34.89285124]},
{"type":"Point","coordinates":[107.5419618,34.89293754]},
{"type":"Point","coordinates":[107.5420537,34.89276859]},
{"type":"Point","coordinates":[107.5421181,34.89284145]},
{"type":"Point","coordinates":[107.542741,34.89274226]},
{"type":"Point","coordinates":[107.5425821,34.89283335]},
{"type":"Point","coordinates":[107.5426289,34.89272344]},
{"type":"Point","coordinates":[107.5427493,34.89282617]},
{"type":"Point","coordinates":[107.5425617,34.89280313]},
{"type":"Point","coordinates":[107.5427248,34.89272245]},
{"type":"Point","coordinates":[107.5430745,34.89310607]},
{"type":"Point","coordinates":[107.5432315,34.89329754]},
{"type":"Point","coordinates":[107.5428798,34.89351549]},
{"type":"Point","coordinates":[107.5430833,34.89333868]},
{"type":"Point","coordinates":[107.5430499,34.89329306]},
{"type":"Point","coordinates":[107.5434044,34.89376834]},
{"type":"Point","coordinates":[107.543354,34.89371166]},
{"type":"Point","coordinates":[107.5432589,34.89377941]},
{"type":"Point","coordinates":[107.5436262,34.89454691]},
{"type":"Point","coordinates":[107.5435634,34.89487535]},
{"type":"Point","coordinates":[107.5437261,34.89480998]},
{"type":"Point","coordinates":[107.544037,34.89490827]},
{"type":"Point","coordinates":[107.5439575,34.89543167]},
{"type":"Point","coordinates":[107.5443246,34.89556917]},
{"type":"Point","coordinates":[107.5531868,34.90922719]},
{"type":"Point","coordinates":[107.5521698,34.90806244]},
{"type":"Point","coordinates":[107.552363,34.90790155]},
{"type":"Point","coordinates":[107.5525922,34.90775629]},
{"type":"Point","coordinates":[107.5528413,34.90759886]},
{"type":"Point","coordinates":[107.5530804,34.9074476]},
{"type":"Point","coordinates":[107.5533357,34.90728635]},
{"type":"Point","coordinates":[107.5530183,34.91035913]},
{"type":"Point","coordinates":[107.5528188,34.91042091]},
{"type":"Point","coordinates":[107.5526718,34.91031436]},
{"type":"Point","coordinates":[107.5541404,34.90893458]},
{"type":"Point","coordinates":[107.5539291,34.90898452]},
{"type":"Point","coordinates":[107.5539991,34.9091162]}
]}

View File

@ -0,0 +1,67 @@
{"type":"GeometryCollection", "geometries": [
{"type":"Point","coordinates":[107.5521351,34.90806254]},
{"type":"Point","coordinates":[107.5523048,34.90800743]},
{"type":"Point","coordinates":[107.5520643,34.90782883]},
{"type":"Point","coordinates":[107.5521169,34.90775705]},
{"type":"Point","coordinates":[107.5525421,34.90753991]},
{"type":"Point","coordinates":[107.5526738,34.90754229]},
{"type":"Point","coordinates":[107.5526898,34.90769499]},
{"type":"Point","coordinates":[107.5525344,34.90780821]},
{"type":"Point","coordinates":[107.5525835,34.90788342]},
{"type":"Point","coordinates":[107.5523819,34.90790544]},
{"type":"Point","coordinates":[107.5529895,34.90755336]},
{"type":"Point","coordinates":[107.5529538,34.90758594]},
{"type":"Point","coordinates":[107.5532698,34.90707284]},
{"type":"Point","coordinates":[107.553517,34.90717768]},
{"type":"Point","coordinates":[107.5534064,34.90725236]},
{"type":"Point","coordinates":[107.5533228,34.90736652]},
{"type":"Point","coordinates":[107.5532791,34.90738775]},
{"type":"Point","coordinates":[107.5533162,34.90737082]},
{"type":"Point","coordinates":[107.5531758,34.90739926]},
{"type":"Point","coordinates":[107.5534641,34.90732923]},
{"type":"Point","coordinates":[107.5533994,34.90748219]},
{"type":"Point","coordinates":[107.5534062,34.90748924]},
{"type":"Point","coordinates":[107.5535062,34.90755557]},
{"type":"Point","coordinates":[107.5531243,34.90754935]},
{"type":"Point","coordinates":[107.5533138,34.90767984]},
{"type":"Point","coordinates":[107.5532883,34.90777251]},
{"type":"Point","coordinates":[107.5533083,34.90779933]},
{"type":"Point","coordinates":[107.5533297,34.90782177]},
{"type":"Point","coordinates":[107.5539315,34.90778782]},
{"type":"Point","coordinates":[107.5538494,34.90770992]},
{"type":"Point","coordinates":[107.5530921,34.90762687]},
{"type":"Point","coordinates":[107.5530075,34.90768169]},
{"type":"Point","coordinates":[107.5528827,34.90776245]},
{"type":"Point","coordinates":[107.5527319,34.90780303]},
{"type":"Point","coordinates":[107.5529017,34.90791019]},
{"type":"Point","coordinates":[107.5526294,34.90786911]},
{"type":"Point","coordinates":[107.5528278,34.90799441]},
{"type":"Point","coordinates":[107.5524302,34.90799785]},
{"type":"Point","coordinates":[107.5525802,34.90815433]},
{"type":"Point","coordinates":[107.5527335,34.90844089]},
{"type":"Point","coordinates":[107.5527727,34.90847951]},
{"type":"Point","coordinates":[107.5532186,34.90824017]},
{"type":"Point","coordinates":[107.5530981,34.9081203]},
{"type":"Point","coordinates":[107.5540714,34.91141643]},
{"type":"Point","coordinates":[107.55394,34.91150163]},
{"type":"Point","coordinates":[107.5538653,34.91154797]},
{"type":"Point","coordinates":[107.5542599,34.91129022]},
{"type":"Point","coordinates":[107.5543987,34.91120144]},
{"type":"Point","coordinates":[107.5544574,34.91219628]},
{"type":"Point","coordinates":[107.5547467,34.91200941]},
{"type":"Point","coordinates":[107.5531744,34.9105745]},
{"type":"Point","coordinates":[107.5530412,34.91059643]},
{"type":"Point","coordinates":[107.553026,34.91068469]},
{"type":"Point","coordinates":[107.5531656,34.91078566]},
{"type":"Point","coordinates":[107.5532508,34.91064908]},
{"type":"Point","coordinates":[107.5531144,34.9095082]},
{"type":"Point","coordinates":[107.5530104,34.90970003]},
{"type":"Point","coordinates":[107.5534689,34.90928447]},
{"type":"Point","coordinates":[107.5532952,34.90939496]},
{"type":"Point","coordinates":[107.5531648,34.90947747]},
{"type":"Point","coordinates":[107.5535405,34.90936]},
{"type":"Point","coordinates":[107.5533662,34.90947045]},
{"type":"Point","coordinates":[107.5532365,34.90955291]},
{"type":"Point","coordinates":[107.5526027,34.90917748]},
{"type":"Point","coordinates":[107.5525056,34.90919576]}
]}

View File

@ -0,0 +1,15 @@
{"type":"GeometryCollection", "geometries": [
{"type":"Point","coordinates":[107.5526621,34.90936018]},
{"type":"Point","coordinates":[107.5521381,34.90806579]},
{"type":"Point","coordinates":[107.5524592,34.90785636]},
{"type":"Point","coordinates":[107.552793,34.90767939]},
{"type":"Point","coordinates":[107.5531695,34.90739331]},
{"type":"Point","coordinates":[107.5533557,34.90732564]},
{"type":"Point","coordinates":[107.5535091,34.90716546]},
{"type":"Point","coordinates":[107.5531324,34.9070974]},
{"type":"Point","coordinates":[107.5528276,34.90729643]},
{"type":"Point","coordinates":[107.5524266,34.90755791]},
{"type":"Point","coordinates":[107.5521866,34.90771386]},
{"type":"Point","coordinates":[107.5526843,34.90751712]},
{"type":"Point","coordinates":[107.5526238,34.9074544]}
]}

View File

@ -0,0 +1,22 @@
{"type":"GeometryCollection", "geometries": [
{"type":"Point","coordinates":[107.5521149,34.9080514]},
{"type":"Point","coordinates":[107.5523004,34.90794499]},
{"type":"Point","coordinates":[107.5522837,34.90792945]},
{"type":"Point","coordinates":[107.5525331,34.90779771]},
{"type":"Point","coordinates":[107.5525174,34.90778172]},
{"type":"Point","coordinates":[107.5527416,34.90775528]},
{"type":"Point","coordinates":[107.5527809,34.90764177]},
{"type":"Point","coordinates":[107.5527659,34.90762533]},
{"type":"Point","coordinates":[107.5529122,34.90764771]},
{"type":"Point","coordinates":[107.5530168,34.90749017]},
{"type":"Point","coordinates":[107.5529997,34.90747503]},
{"type":"Point","coordinates":[107.5532498,34.90734179]},
{"type":"Point","coordinates":[107.5532352,34.90732507]},
{"type":"Point","coordinates":[107.5534033,34.90724397]},
{"type":"Point","coordinates":[107.5533881,34.90722757]},
{"type":"Point","coordinates":[107.5531392,34.90709454]},
{"type":"Point","coordinates":[107.5528971,34.9072486]},
{"type":"Point","coordinates":[107.5524228,34.90755079]},
{"type":"Point","coordinates":[107.5521821,34.90770288]},
{"type":"Point","coordinates":[107.5520339,34.90779717]}
]}

View File

@ -0,0 +1,8 @@
{"type":"GeometryCollection", "geometries": [
{"type":"Point","coordinates":[107.5522516,34.90801663]},
{"type":"Point","coordinates":[107.5524581,34.90784568]},
{"type":"Point","coordinates":[107.5526917,34.9076962]},
{"type":"Point","coordinates":[107.5529376,34.90753895]},
{"type":"Point","coordinates":[107.5531256,34.90741822]},
{"type":"Point","coordinates":[107.5533684,34.90731499]}
]}

View File

@ -23,22 +23,23 @@
margin-right: 50px;
}
.layer-select{
.layer-select {
position: absolute;
{#background-color: rgba(225,225,225,0.5);#}
height: 100px;
{#background-color: rgba(225,225,225,0.5);#} height: 100px;
width: 100px;
z-index: 9999;
right: 60px;
top:60px;
top: 60px;
text-align: center;
}
.checkbox-inline{
.checkbox-inline {
color: white;
font-size: 18px;
line-height: 50px;
margin-right: 20px;
}
.scoket {
position: absolute;
bottom: 10px;
@ -65,6 +66,11 @@
color: black;
content: "✖";
}
.ol-control {
display: none;
}
{#==========================================================================#}
</style>
@ -119,11 +125,12 @@
<h6 class="panel-title">坐标测量</h6>
</div>
<div class="panel-body">
<p><input type="checkbox" name="item"><span class="glyphicon glyphicon-user"
aria-hidden="true"
style="background-color: green;margin-left: 10px"></span><label
<p><input type="checkbox" name="item" class="base-people-1"><span
class="glyphicon glyphicon-user"
aria-hidden="true"
style="background-color: green;margin-left: 10px"></span><label
style="color: black">人员</label></p>
<p><input type="checkbox" name="item" class="base-station-1" checked="checked"><span
<p><input type="checkbox" name="item" class="base-station-1"><span
class="glyphicon glyphicon-tower"
aria-hidden="true"
style="background-color: green;margin-left: 10px"></span><label
@ -153,33 +160,18 @@
{# ws<input type="text" name="ws" class="wsurl" id="ws"><br>#}
{# <button class="btn btn-primary btn-sm connect_websocket" type="button" id="">连接服务器#}
{# </button>#}
<button class="btn btn-primary btn-sm" type="button" id="people_btn">连接服务器</button>
<button class="btn btn-primary btn-sm" type="button" id="people_btn">人员位置</button>
<button class="btn btn-primary btn-sm" type="button" id="site_btn">位置查询</button>
</div>
{# <div class="panel-body" id="people_query" hidden>#}
{# <form class="form-inline">#}
{# <div class="form-group">#}
{# <div class="input-group">#}
{# <div class="input-group-addon">G_ID000004</div>#}
{# <input type="text" class="form-control" id="people_query_text"#}
{# placeholder="ID">#}
{# </div>#}
{# </div>#}
{# <button type="button" class="btn btn-primary btn-sm"#}
{# style="margin-top: 20px;margin-left: 200px" id="people_query_submit">查询#}
{# </button>#}
{# </form>#}
{# </div>#}
<div class="panel-body" id="site_query" hidden>
<p><input type="checkbox" name="item"><span class="glyphicon glyphicon-user"
<p><input type="checkbox" name="item" class="base-people-2"><span class="glyphicon glyphicon-user"
aria-hidden="true"
style="background-color: green;margin-left: 10px"></span><label
style="color: black">人员</label></p>
<p><input type="checkbox" name="item" class="base-station-2" checked="checked"><span
<p><input type="checkbox" name="item" class="base-station-2"><span
class="glyphicon glyphicon-tower"
aria-hidden="true"
style="background-color: green;margin-left: 10px"></span><label
@ -219,11 +211,11 @@
<h6 class="panel-title">历史轨迹</h6>
</div>
<div class="panel-body">
<p><input type="checkbox" name="item"><span class="glyphicon glyphicon-user"
<p><input type="checkbox" name="item" class="base-people-3"><span class="glyphicon glyphicon-user"
aria-hidden="true"
style="background-color: green;margin-left: 10px"></span><label
style="color: black">人员</label></p>
<p><input type="checkbox" name="item" class="base-station-3" checked="checked"><span
<p><input type="checkbox" name="item" class="base-station-3"><span
class="glyphicon glyphicon-tower"
aria-hidden="true"
style="background-color: green;margin-left: 10px"></span><label
@ -255,11 +247,11 @@
<h6 class="panel-title">区域设置</h6>
</div>
<div class="panel-body">
<p><input type="checkbox" name="item"><span class="glyphicon glyphicon-user"
<p><input type="checkbox" name="item" class="base-people-4"><span class="glyphicon glyphicon-user"
aria-hidden="true"
style="background-color: green;margin-left: 10px"></span><label
style="color: black">人员</label></p>
<p><input type="checkbox" name="item" class="base-station-4" checked="checked"><span
<p><input type="checkbox" name="item" class="base-station-4"><span
class="glyphicon glyphicon-tower"
aria-hidden="true"
style="background-color: green;margin-left: 10px"></span><label