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

#更换室内数据

This commit is contained in:
Bob 2020-04-08 15:35:31 +08:00
parent d7b1518b9d
commit 3a56d3cfc0
2 changed files with 137 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

218
.idea/workspace.xml
View File

@ -2,14 +2,7 @@
<project version="4">
<component name="ChangeListManager">
<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" />
@ -79,8 +72,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="397">
<caret line="1731" column="31" selection-start-line="1731" selection-start-column="31" selection-end-line="1731" selection-end-column="31" />
<state relative-caret-position="392">
<caret line="1184" column="28" selection-start-line="1184" selection-end-line="1185" />
<folding>
<element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
</folding>
@ -89,21 +82,47 @@
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/js/vector.js">
<entry file="file://$PROJECT_DIR$/dashboard/templates/dashboard/vector.html">
<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 relative-caret-position="1599">
<caret line="119" column="44" selection-start-line="119" selection-start-column="43" selection-end-line="119" selection-end-column="45" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/fabfile.py">
<entry file="file://$PROJECT_DIR$/dashboard/templates/dashboard/index_2.html">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<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="198">
<caret line="10" selection-start-line="10" selection-end-line="10" />
<state relative-caret-position="195">
<caret line="21" column="8" selection-start-line="21" selection-start-column="8" selection-end-line="21" selection-end-column="8" />
<folding>
<element signature="e#0#29#0" expanded="true" />
<element signature="n#style#0;n#a#0;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#a#1;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/js/index_2.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-821" />
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/js/index_1.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1980">
<caret line="90" column="50" selection-start-line="90" selection-start-column="31" selection-end-line="90" selection-end-column="50" />
<folding>
<marker date="1574153156083" expanded="true" signature="1507:1533" ph="..." />
</folding>
</state>
</provider>
@ -112,8 +131,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="-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 relative-caret-position="-1803">
<caret line="165" lean-forward="true" selection-start-line="165" selection-end-line="165" />
</state>
</provider>
</entry>
@ -122,7 +141,7 @@
<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" />
<caret line="4" column="22" selection-start-line="4" selection-start-column="22" selection-end-line="4" selection-end-column="22" />
<folding>
<element signature="e#0#19#0" expanded="true" />
</folding>
@ -133,8 +152,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/dashboard/views.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="88">
<caret line="11" column="43" selection-start-line="11" selection-start-column="43" selection-end-line="11" selection-end-column="43" />
<state relative-caret-position="110">
<caret line="11" column="40" selection-start-line="11" selection-start-column="40" selection-end-line="11" selection-end-column="40" />
<folding>
<element signature="e#0#30#0" expanded="true" />
</folding>
@ -186,6 +205,7 @@
<find>jizhan</find>
<find>people_btn</find>
<find>historical_route</find>
<find>vector</find>
</findStrings>
<dirStrings>
<dir>D:\python\p3\linbei</dir>
@ -224,12 +244,12 @@
<option value="$PROJECT_DIR$/dashboard/static/dashboard/css/popup.css" />
<option value="$PROJECT_DIR$/dashboard/static/dashboard/js/popup.js" />
<option value="$PROJECT_DIR$/dashboard/templates/dashboard/vector.html" />
<option value="$PROJECT_DIR$/dashboard/static/dashboard/js/vector.js" />
<option value="$PROJECT_DIR$/dashboard/urls.py" />
<option value="$PROJECT_DIR$/dashboard/views.py" />
<option value="$PROJECT_DIR$/dashboard/templates/dashboard/results_by_keywords.html" />
<option value="$PROJECT_DIR$/../linbeitest/create_pyc.py" />
<option value="$PROJECT_DIR$/fabfile.py" />
<option value="$PROJECT_DIR$/dashboard/static/dashboard/js/vector.js" />
<option value="$PROJECT_DIR$/dashboard/templates/dashboard/index.html" />
<option value="$PROJECT_DIR$/dashboard/static/dashboard/js/index.js" />
</list>
@ -286,6 +306,14 @@
<item name="dashboard" type="462c0819:PsiDirectoryNode" />
<item name="img" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="linbei" type="b2602c69:ProjectViewProjectNode" />
<item name="linbei" type="462c0819:PsiDirectoryNode" />
<item name="dashboard" type="462c0819:PsiDirectoryNode" />
<item name="static" type="462c0819:PsiDirectoryNode" />
<item name="dashboard" type="462c0819:PsiDirectoryNode" />
<item name="js" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="linbei" type="b2602c69:ProjectViewProjectNode" />
<item name="linbei" type="462c0819:PsiDirectoryNode" />
@ -294,6 +322,19 @@
<item name="dashboard" type="462c0819:PsiDirectoryNode" />
<item name="json" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="linbei" type="b2602c69:ProjectViewProjectNode" />
<item name="linbei" type="462c0819:PsiDirectoryNode" />
<item name="dashboard" type="462c0819:PsiDirectoryNode" />
<item name="templates" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="linbei" type="b2602c69:ProjectViewProjectNode" />
<item name="linbei" type="462c0819:PsiDirectoryNode" />
<item name="dashboard" type="462c0819:PsiDirectoryNode" />
<item name="templates" type="462c0819:PsiDirectoryNode" />
<item name="dashboard" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="linbei" type="b2602c69:ProjectViewProjectNode" />
<item name="linbei" type="462c0819:PsiDirectoryNode" />
@ -478,20 +519,7 @@
<workItem from="1584934687799" duration="2464000" />
<workItem from="1585878860281" duration="2198000" />
<workItem from="1586222573140" duration="10286000" />
</task>
<task id="LOCAL-00004" summary="#creat">
<created>1567676248118</created>
<option name="number" value="00004" />
<option name="presentableId" value="LOCAL-00004" />
<option name="project" value="LOCAL" />
<updated>1567676248118</updated>
</task>
<task id="LOCAL-00005" summary="#creat">
<created>1567752880352</created>
<option name="number" value="00005" />
<option name="presentableId" value="LOCAL-00005" />
<option name="project" value="LOCAL" />
<updated>1567752880352</updated>
<workItem from="1586318626058" duration="2238000" />
</task>
<task id="LOCAL-00006" summary="#creat">
<created>1567754915679</created>
@ -822,17 +850,31 @@
<option name="project" value="LOCAL" />
<updated>1585879090260</updated>
</task>
<option name="localTasksCounter" value="53" />
<task id="LOCAL-00053" summary="#更换室内数据">
<created>1586318700729</created>
<option name="number" value="00053" />
<option name="presentableId" value="LOCAL-00053" />
<option name="project" value="LOCAL" />
<updated>1586318700730</updated>
</task>
<task id="LOCAL-00054" summary="#更换室内数据">
<created>1586330846977</created>
<option name="number" value="00054" />
<option name="presentableId" value="LOCAL-00054" />
<option name="project" value="LOCAL" />
<updated>1586330846977</updated>
</task>
<option name="localTasksCounter" value="55" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="314710000" />
<option name="totallyTimeSpent" value="316948000" />
</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.15388711" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.15548456" />
<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" />
@ -846,7 +888,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 active="true" anchor="bottom" id="Terminal" order="11" visible="true" weight="0.31533477" />
<window_info 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" />
@ -868,14 +910,13 @@
<MESSAGE value="#添加三层和四层" />
<MESSAGE value="#添加5层和67层" />
<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$" />
</component>
<component name="editorHistoryManager">
<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">
<provider selected="true" editor-type-id="text-editor">
<state>
@ -982,16 +1023,6 @@
<entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/css/popup.css">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/js/index_1.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1980">
<caret line="90" column="50" selection-start-line="90" selection-start-column="31" selection-end-line="90" selection-end-column="50" />
<folding>
<marker date="1574153156083" expanded="true" signature="1507:1533" ph="..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/json/BaseStation_C_ALL.json">
<provider selected="true" editor-type-id="text-editor" />
</entry>
@ -1015,13 +1046,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dashboard/templates/dashboard/vector.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-240">
<caret line="119" column="44" selection-start-line="119" selection-start-column="43" selection-end-line="119" selection-end-column="45" />
</state>
</provider>
</entry>
<entry file="das://26d98690-c6ef-4479-9128-3a8b28bfc2b3/database/linbei/schema/public/table/dashboard_points">
<provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
<state>
@ -1094,6 +1118,9 @@
<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/json/Linyou_station_0.json">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/fabfile.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
@ -1104,16 +1131,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dashboard/views.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="88">
<caret line="11" column="43" selection-start-line="11" selection-start-column="43" selection-end-line="11" selection-end-column="43" />
<folding>
<element signature="e#0#30#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dashboard/templates/dashboard/results_by_keywords.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="594">
@ -1121,37 +1138,74 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dashboard/urls.py">
<entry file="file://$PROJECT_DIR$/dashboard/templates/dashboard/index_2.html">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/dashboard/templates/dashboard/vector.html">
<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" />
<state relative-caret-position="1599">
<caret line="119" column="44" selection-start-line="119" selection-start-column="43" selection-end-line="119" selection-end-column="45" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/js/index_2.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-821" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/js/index_1.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1980">
<caret line="90" column="50" selection-start-line="90" selection-start-column="31" selection-end-line="90" selection-end-column="50" />
<folding>
<element signature="e#0#19#0" expanded="true" />
<marker date="1574153156083" expanded="true" signature="1507:1533" ph="..." />
</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 relative-caret-position="195">
<caret line="21" column="8" selection-start-line="21" selection-start-column="8" selection-end-line="21" selection-end-column="8" />
<folding>
<element signature="n#style#0;n#a#0;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#a#1;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
</folding>
</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 file="file://$PROJECT_DIR$/dashboard/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="88">
<caret line="4" column="22" selection-start-line="4" selection-start-column="22" selection-end-line="4" selection-end-column="22" />
<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="110">
<caret line="11" column="40" selection-start-line="11" selection-start-column="40" selection-end-line="11" selection-end-column="40" />
<folding>
<element signature="e#0#30#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dashboard/templates/dashboard/index.html">
<provider selected="true" editor-type-id="text-editor">
<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 relative-caret-position="-1803">
<caret line="165" lean-forward="true" selection-start-line="165" selection-end-line="165" />
</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="397">
<caret line="1731" column="31" selection-start-line="1731" selection-start-column="31" selection-end-line="1731" selection-end-column="31" />
<state relative-caret-position="392">
<caret line="1184" column="28" selection-start-line="1184" selection-end-line="1185" />
<folding>
<element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
</folding>

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

@ -1182,7 +1182,7 @@ $(function () {
map.addLayer(tianditu);
map.addLayer(w35Layer);
map.addLayer(w3132Layer);
map.addLayer(GeoJsonLayer);
// map.addLayer(GeoJsonLayer);
});