xieshen
/
linbei
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

#修复同时点击bug

This commit is contained in:
Bob 2020-06-08 16:02:57 +08:00
parent 469c03105a
commit 45d7cae519
2 changed files with 28 additions and 236 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

246
.idea/workspace.xml
View File

@ -73,119 +73,14 @@
<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="443">
<caret line="73" column="27" selection-start-line="73" selection-start-column="27" selection-end-line="73" selection-end-column="27" />
<state relative-caret-position="228">
<caret line="6085" lean-forward="true" selection-start-line="6085" selection-end-line="6085" />
<folding>
<element signature="e#464#688#0" />
<element signature="e#752#795#0" />
<element signature="e#803#844#0" />
<element signature="e#885#924#0" />
<element signature="e#1170#1193#0" />
<element signature="e#2031#2338#0" />
<element signature="e#2405#2565#0" />
<element signature="e#2605#3069#0" />
<element signature="e#3136#3597#0" />
<element signature="e#3665#4130#0" />
<element signature="e#4197#4661#0" />
<element signature="e#4739#4876#0" />
<element signature="e#5228#5484#0" />
<element signature="e#5575#6036#0" />
<element signature="e#6081#6536#0" />
<element signature="e#6577#7031#0" />
<element signature="e#7073#7531#0" />
<element signature="e#7570#8023#0" />
<element signature="e#8030#8071#0" />
<element signature="e#8619#9080#0" />
<element signature="e#9124#9580#0" />
<element signature="e#9619#10072#0" />
<element signature="e#10112#10566#0" />
<element signature="e#10614#11075#0" />
<element signature="e#11119#11575#0" />
<element signature="e#11615#12069#0" />
<element signature="e#12108#12561#0" />
<element signature="e#12610#13071#0" />
<element signature="e#13115#13571#0" />
<element signature="e#13611#14065#0" />
<element signature="e#14104#14557#0" />
<element signature="e#14605#15066#0" />
<element signature="e#15110#15566#0" />
<element signature="e#15606#16060#0" />
<element signature="e#16099#16552#0" />
<element signature="e#16600#17061#0" />
<element signature="e#17105#17561#0" />
<element signature="e#17601#18055#0" />
<element signature="e#18094#18547#0" />
<element signature="e#18594#19055#0" />
<element signature="e#19099#19555#0" />
<element signature="e#19595#20049#0" />
<element signature="e#20088#20541#0" />
<element signature="e#20584#21048#0" />
<element signature="e#21091#21600#0" />
<element signature="e#21643#21890#0" />
<element signature="e#21933#22180#0" />
<element signature="e#22223#22470#0" />
<element signature="e#22546#23007#0" />
<element signature="e#23079#23535#0" />
<element signature="e#23602#24056#0" />
<element signature="e#24120#24573#0" />
<element signature="e#24650#25111#0" />
<element signature="e#25183#25639#0" />
<element signature="e#25706#26160#0" />
<element signature="e#26224#26677#0" />
<element signature="e#26755#27216#0" />
<element signature="e#27289#27745#0" />
<element signature="e#27813#28267#0" />
<element signature="e#28332#28785#0" />
<element signature="e#28861#29318#0" />
<element signature="e#29388#29843#0" />
<element signature="e#29910#30364#0" />
<element signature="e#30440#30901#0" />
<element signature="e#30973#31429#0" />
<element signature="e#31496#31950#0" />
<element signature="e#32014#32467#0" />
<element signature="e#32543#33004#0" />
<element signature="e#33076#33532#0" />
<element signature="e#33599#34053#0" />
<element signature="e#34117#34570#0" />
<element signature="e#34648#35109#0" />
<element signature="e#35182#35638#0" />
<element signature="e#35706#36160#0" />
<element signature="e#36225#36678#0" />
<element signature="e#36755#37216#0" />
<element signature="e#37288#37744#0" />
<element signature="e#37811#38265#0" />
<element signature="e#38329#38782#0" />
<element signature="e#38855#39093#0" />
<element signature="e#39159#39396#0" />
<element signature="e#39485#39729#0" />
<element signature="e#39798#40036#0" />
<element signature="e#40106#40344#0" />
<element signature="e#40430#40673#0" />
<element signature="e#40751#40991#0" />
<element signature="e#41074#41316#0" />
<element signature="e#41389#41627#0" />
<element signature="e#41688#41924#0" />
<element signature="e#41987#42223#0" />
<element signature="e#42283#42519#0" />
<element signature="e#42587#42825#0" />
<element signature="e#42894#43132#0" />
<element signature="e#43200#43438#0" />
<element signature="e#43512#43750#0" />
<element signature="e#43821#44059#0" />
<element signature="e#44126#44363#0" />
<element signature="e#44433#44671#0" />
<element signature="e#44746#44985#0" />
<element signature="e#45069#45310#0" />
<element signature="e#45378#45616#0" />
<element signature="e#45684#45922#0" />
<element signature="e#45991#46229#0" />
<element signature="e#46297#46535#0" />
<element signature="e#46603#46841#0" />
<element signature="e#46910#47148#0" />
<element signature="e#47216#47454#0" />
<element signature="e#47526#47764#0" />
<element signature="e#47843#48083#0" />
<element signature="e#48144#48380#0" />
<element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
</folding>
</state>
@ -276,7 +171,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>result-panel</find>
<find>setBearing</find>
<find>src</find>
<find>marker</find>
@ -306,6 +200,7 @@
<find>基站名称</find>
<find>ANL</find>
<find>ajax</find>
<find>map.removeInteraction(draw)</find>
</findStrings>
<dirStrings>
<dir>D:\python\p3\linbei</dir>
@ -644,14 +539,8 @@
<workItem from="1591268601699" duration="1623000" />
<workItem from="1591289116263" duration="1056000" />
<workItem from="1591318999695" duration="1227000" />
<workItem from="1591587017803" duration="232000" />
</task>
<task id="LOCAL-00013" summary="#index">
<created>1570519731363</created>
<option name="number" value="00013" />
<option name="presentableId" value="LOCAL-00013" />
<option name="project" value="LOCAL" />
<updated>1570519731363</updated>
<workItem from="1591587017803" duration="460000" />
<workItem from="1591602854501" duration="436000" />
</task>
<task id="LOCAL-00014" summary="#index">
<created>1570530689485</created>
@ -989,17 +878,24 @@
<option name="project" value="LOCAL" />
<updated>1591319629502</updated>
</task>
<option name="localTasksCounter" value="62" />
<task id="LOCAL-00062" summary="#图层替换">
<created>1591587349052</created>
<option name="number" value="00062" />
<option name="presentableId" value="LOCAL-00062" />
<option name="project" value="LOCAL" />
<updated>1591587349052</updated>
</task>
<option name="localTasksCounter" value="63" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="375264000" />
<option name="totallyTimeSpent" value="375928000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
<editor active="true" />
<layout>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.28168264" />
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.28434506" />
<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" />
@ -1038,7 +934,8 @@
<MESSAGE value="#更换室内数据" />
<MESSAGE value="#更换数据" />
<MESSAGE value="#人员点击" />
<option name="LAST_COMMIT_MESSAGE" value="#人员点击" />
<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$" />
@ -1242,119 +1139,14 @@
</entry>
<entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/js/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="443">
<caret line="73" column="27" selection-start-line="73" selection-start-column="27" selection-end-line="73" selection-end-column="27" />
<state relative-caret-position="228">
<caret line="6085" lean-forward="true" selection-start-line="6085" selection-end-line="6085" />
<folding>
<element signature="e#464#688#0" />
<element signature="e#752#795#0" />
<element signature="e#803#844#0" />
<element signature="e#885#924#0" />
<element signature="e#1170#1193#0" />
<element signature="e#2031#2338#0" />
<element signature="e#2405#2565#0" />
<element signature="e#2605#3069#0" />
<element signature="e#3136#3597#0" />
<element signature="e#3665#4130#0" />
<element signature="e#4197#4661#0" />
<element signature="e#4739#4876#0" />
<element signature="e#5228#5484#0" />
<element signature="e#5575#6036#0" />
<element signature="e#6081#6536#0" />
<element signature="e#6577#7031#0" />
<element signature="e#7073#7531#0" />
<element signature="e#7570#8023#0" />
<element signature="e#8030#8071#0" />
<element signature="e#8619#9080#0" />
<element signature="e#9124#9580#0" />
<element signature="e#9619#10072#0" />
<element signature="e#10112#10566#0" />
<element signature="e#10614#11075#0" />
<element signature="e#11119#11575#0" />
<element signature="e#11615#12069#0" />
<element signature="e#12108#12561#0" />
<element signature="e#12610#13071#0" />
<element signature="e#13115#13571#0" />
<element signature="e#13611#14065#0" />
<element signature="e#14104#14557#0" />
<element signature="e#14605#15066#0" />
<element signature="e#15110#15566#0" />
<element signature="e#15606#16060#0" />
<element signature="e#16099#16552#0" />
<element signature="e#16600#17061#0" />
<element signature="e#17105#17561#0" />
<element signature="e#17601#18055#0" />
<element signature="e#18094#18547#0" />
<element signature="e#18594#19055#0" />
<element signature="e#19099#19555#0" />
<element signature="e#19595#20049#0" />
<element signature="e#20088#20541#0" />
<element signature="e#20584#21048#0" />
<element signature="e#21091#21600#0" />
<element signature="e#21643#21890#0" />
<element signature="e#21933#22180#0" />
<element signature="e#22223#22470#0" />
<element signature="e#22546#23007#0" />
<element signature="e#23079#23535#0" />
<element signature="e#23602#24056#0" />
<element signature="e#24120#24573#0" />
<element signature="e#24650#25111#0" />
<element signature="e#25183#25639#0" />
<element signature="e#25706#26160#0" />
<element signature="e#26224#26677#0" />
<element signature="e#26755#27216#0" />
<element signature="e#27289#27745#0" />
<element signature="e#27813#28267#0" />
<element signature="e#28332#28785#0" />
<element signature="e#28861#29318#0" />
<element signature="e#29388#29843#0" />
<element signature="e#29910#30364#0" />
<element signature="e#30440#30901#0" />
<element signature="e#30973#31429#0" />
<element signature="e#31496#31950#0" />
<element signature="e#32014#32467#0" />
<element signature="e#32543#33004#0" />
<element signature="e#33076#33532#0" />
<element signature="e#33599#34053#0" />
<element signature="e#34117#34570#0" />
<element signature="e#34648#35109#0" />
<element signature="e#35182#35638#0" />
<element signature="e#35706#36160#0" />
<element signature="e#36225#36678#0" />
<element signature="e#36755#37216#0" />
<element signature="e#37288#37744#0" />
<element signature="e#37811#38265#0" />
<element signature="e#38329#38782#0" />
<element signature="e#38855#39093#0" />
<element signature="e#39159#39396#0" />
<element signature="e#39485#39729#0" />
<element signature="e#39798#40036#0" />
<element signature="e#40106#40344#0" />
<element signature="e#40430#40673#0" />
<element signature="e#40751#40991#0" />
<element signature="e#41074#41316#0" />
<element signature="e#41389#41627#0" />
<element signature="e#41688#41924#0" />
<element signature="e#41987#42223#0" />
<element signature="e#42283#42519#0" />
<element signature="e#42587#42825#0" />
<element signature="e#42894#43132#0" />
<element signature="e#43200#43438#0" />
<element signature="e#43512#43750#0" />
<element signature="e#43821#44059#0" />
<element signature="e#44126#44363#0" />
<element signature="e#44433#44671#0" />
<element signature="e#44746#44985#0" />
<element signature="e#45069#45310#0" />
<element signature="e#45378#45616#0" />
<element signature="e#45684#45922#0" />
<element signature="e#45991#46229#0" />
<element signature="e#46297#46535#0" />
<element signature="e#46603#46841#0" />
<element signature="e#46910#47148#0" />
<element signature="e#47216#47454#0" />
<element signature="e#47526#47764#0" />
<element signature="e#47843#48083#0" />
<element signature="e#48144#48380#0" />
<element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
</folding>
</state>

18
dashboard/static/dashboard/js/index.js
View File

@ -5875,7 +5875,7 @@ $(function () {
function base_people() {
// connect_websocket();
map.removeInteraction(draw);
// map.removeInteraction(draw);
// $("#box").show();
// $("#realtime_positioning").show();
// $("#people_query").show();
@ -6084,8 +6084,8 @@ $(function () {
function addMarker(marker) {
markVectorSource.clear();
removestationMarker();
// markVectorSource.clear();
// removestationMarker();
for (var i = 0; i < marker.length; i++) {
var iconFeature = new ol.Feature({
@ -6295,8 +6295,8 @@ $(function () {
function addstationMarker(stationmarker) {
stationVectorSource.clear();
removeMarker();
// stationVectorSource.clear();
// removeMarker();
for (var i = 0; i < stationmarker.length; i++) {
// data = new Array(stationmarker[i][0], stationmarker[i][1])
@ -6325,7 +6325,7 @@ $(function () {
console.log(flag[i].checked);
if (flag[i].checked == true) {
console.log(flag[i].checked);
map.removeInteraction(draw);
// map.removeInteraction(draw);
// map.addLayer(GeoJsonLayer);
// map.addLayer(GeoJsonLayer_0);
connect_websocket()
@ -6368,7 +6368,7 @@ $(function () {
} else {
colsewebsocket()
removestationMarker()
// removestationMarker()
// map.removeLayer(GeoJsonLayer)
// map.removeLayer(GeoJsonLayer_0)
}
@ -6431,9 +6431,9 @@ $(function () {
base_people()
} else {
removeMarker()
// removeMarker()
colsewebsocket()
removestationMarker()
// removestationMarker()
// map.removeInteraction(draw);
}
}