This commit is contained in:
Bob 2019-12-02 14:54:19 +08:00
parent 8ec469b9c6
commit 79a123195c
2 changed files with 86 additions and 199 deletions

View File

@ -3,8 +3,7 @@
<component name="ChangeListManager">
<list default="true" id="9cbc7ee8-e518-44ca-870c-9743cf0f1b98" name="Default Changelist" comment="">
<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" />
<change beforePath="$PROJECT_DIR$/dashboard/static/dashboard/js/vector.js" beforeDir="false" afterPath="$PROJECT_DIR$/dashboard/static/dashboard/js/vector.js" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
@ -71,88 +70,11 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<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="220">
<caret line="10" column="4" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
<folding>
<element signature="e#0#30#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<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">
<caret line="4" column="10" selection-start-line="4" selection-start-column="10" selection-end-line="4" selection-end-column="10" />
<folding>
<element signature="e#0#19#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<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="352">
<caret line="238" column="37" lean-forward="true" selection-start-line="238" selection-start-column="37" selection-end-line="238" selection-end-column="37" />
<folding>
<element signature="e#4818#4851#0#HTML" expanded="true" />
<element signature="e#5085#5140#0#HTML" expanded="true" />
<element signature="e#6185#6360#0#HTML" expanded="true" />
<element signature="e#4083#4132#0#HTML" expanded="true" />
<element signature="e#4183#4203#0#HTML" expanded="true" />
<element signature="e#4488#4537#0#HTML" expanded="true" />
<element signature="e#4588#4608#0#HTML" expanded="true" />
<element signature="e#4781#4815#0#HTML" expanded="true" />
<element signature="e#6648#6672#0#HTML" expanded="true" />
<element signature="e#7980#8029#0#HTML" expanded="true" />
<element signature="e#7929#7949#0#HTML" expanded="true" />
<element signature="e#8204#8253#0#HTML" expanded="true" />
<element signature="e#8039#8059#0#HTML" expanded="true" />
<element signature="e#8339#8378#0#HTML" expanded="true" />
<element signature="e#8570#8632#0#HTML" expanded="true" />
<element signature="e#8683#8704#0#HTML" expanded="true" />
<element signature="e#12201#12250#0#HTML" expanded="true" />
<element signature="e#12301#12321#0#HTML" expanded="true" />
<element signature="e#12606#12655#0#HTML" expanded="true" />
<element signature="e#12706#12726#0#HTML" expanded="true" />
<element signature="e#11651#11689#0#HTML" expanded="true" />
<element signature="e#11770#11808#0#HTML" expanded="true" />
<element signature="e#11888#11926#0#HTML" expanded="true" />
<element signature="e#9913#9956#0#HTML" expanded="true" />
<element signature="e#10165#10208#0#HTML" expanded="true" />
<element signature="e#13042#13091#0#HTML" expanded="true" />
<element signature="e#13142#13162#0#HTML" expanded="true" />
<element signature="e#13447#13496#0#HTML" expanded="true" />
<element signature="e#13547#13567#0#HTML" expanded="true" />
<element signature="e#13867#13891#0#HTML" expanded="true" />
<element signature="e#13689#13709#0#HTML" expanded="true" />
<element signature="e#14000#14021#0#HTML" expanded="true" />
<element signature="e#14226#14269#0#HTML" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/dashboard/templates/dashboard/vector.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="354">
<caret line="119" column="45" selection-start-line="119" selection-start-column="45" selection-end-line="119" selection-end-column="45" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/js/vector.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="462">
<caret line="72" column="10" lean-forward="true" selection-start-line="65" selection-start-column="8" selection-end-line="72" selection-end-column="10" />
<state relative-caret-position="352">
<caret line="16" column="44" selection-start-line="16" selection-start-column="44" selection-end-line="16" selection-end-column="44" />
<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" />
@ -163,19 +85,10 @@
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/dashboard/templates/dashboard/results_by_keywords.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="484">
<caret line="22" column="64" selection-start-line="22" selection-start-column="64" selection-end-line="22" selection-end-column="64" />
</state>
</provider>
</entry>
</file>
<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="2">
<caret line="625" column="22" lean-forward="true" selection-start-line="625" selection-start-column="22" selection-end-line="625" selection-end-column="22" />
<state relative-caret-position="418">
<caret line="19" column="44" lean-forward="true" selection-start-line="19" selection-start-column="22" selection-end-line="19" selection-end-column="44" />
<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" />
@ -185,18 +98,6 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/linbei/settings.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="770">
<caret line="38" column="19" selection-start-line="38" selection-start-column="19" selection-end-line="38" selection-end-column="19" />
<folding>
<element signature="e#305#314#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
@ -224,7 +125,11 @@
<find>4326</find>
<find>38</find>
<find>connect_websocket</find>
<find>favicon</find>
</findStrings>
<dirStrings>
<dir>D:\python\p3\linbei</dir>
</dirStrings>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@ -263,9 +168,9 @@
<option value="$PROJECT_DIR$/dashboard/urls.py" />
<option value="$PROJECT_DIR$/dashboard/views.py" />
<option value="$PROJECT_DIR$/dashboard/templates/dashboard/vector.html" />
<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" />
<option value="$PROJECT_DIR$/dashboard/static/dashboard/js/vector.js" />
</list>
</option>
</component>
@ -276,10 +181,10 @@
<auto-save>true</auto-save>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="-149" />
<option name="y" value="418" />
<option name="width" value="1920" />
<option name="height" value="1040" />
<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">
@ -287,6 +192,7 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
@ -341,6 +247,14 @@
<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" />
<item name="dashboard" type="462c0819:PsiDirectoryNode" />
<item name="templates" type="462c0819:PsiDirectoryNode" />
<item name="dashboard" type="462c0819:PsiDirectoryNode" />
<item name="common" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="linbei" type="b2602c69:ProjectViewProjectNode" />
<item name="linbei" type="462c0819:PsiDirectoryNode" />
@ -361,7 +275,6 @@
<select />
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
@ -371,7 +284,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/js" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../bio/biodiversity" />
<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" />
@ -504,7 +417,8 @@
<workItem from="1574729919137" duration="15985000" />
<workItem from="1574762010253" duration="4934000" />
<workItem from="1574816525242" duration="21703000" />
<workItem from="1574902551900" duration="31444000" />
<workItem from="1574902551900" duration="32559000" />
<workItem from="1575251847234" duration="3110000" />
</task>
<task id="LOCAL-00001" summary="#creat">
<created>1567674653918</created>
@ -695,16 +609,31 @@
<option name="project" value="LOCAL" />
<updated>1574846317114</updated>
</task>
<option name="localTasksCounter" value="28" />
<task id="LOCAL-00028" summary="#index">
<created>1575017182483</created>
<option name="number" value="00028" />
<option name="presentableId" value="LOCAL-00028" />
<option name="project" value="LOCAL" />
<updated>1575017182483</updated>
</task>
<task id="LOCAL-00029" summary="#index">
<created>1575018167847</created>
<option name="number" value="00029" />
<option name="presentableId" value="LOCAL-00029" />
<option name="project" value="LOCAL" />
<updated>1575018167847</updated>
</task>
<option name="localTasksCounter" value="30" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="233501000" />
<option name="totallyTimeSpent" value="237726000" />
</component>
<component name="ToolWindowManager">
<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.2140575" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.21618743" />
<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" />
@ -741,7 +670,6 @@
<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$/graphic/templates/graphic/index.html" />
<entry file="file://D:/install/Lib/site-packages/django/core/wsgi.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="66">
@ -885,16 +813,7 @@
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Documents/Tencent Files/1397910458/FileRecv/001.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-7661">
<caret line="12" selection-start-line="12" selection-end-line="12" />
<folding>
<element signature="e#0#6#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Documents/Tencent Files/1397910458/FileRecv/001.html" />
<entry file="file://$PROJECT_DIR$/dashboard/models.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="286">
@ -905,13 +824,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dashboard/templates/dashboard/common/base.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="440">
<caret line="20" column="86" selection-start-line="20" selection-start-column="86" selection-end-line="20" selection-end-column="86" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/css/dashboard.css">
<provider selected="true" editor-type-id="text-editor" />
</entry>
@ -978,6 +890,23 @@
<entry file="file://$PROJECT_DIR$/requirements.txt">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/flow/bom.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="206">
<caret line="492" column="4" selection-start-line="492" selection-start-column="4" selection-end-line="492" selection-end-column="4" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dashboard/views.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="66">
<caret line="10" column="4" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
<folding>
<element signature="e#0#30#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dashboard/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="66">
@ -1005,34 +934,34 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dashboard/views.py">
<entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/css/chart.css">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/dashboard/templates/dashboard/common/base.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220">
<caret line="10" column="4" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
<folding>
<element signature="e#0#30#0" expanded="true" />
</folding>
<state relative-caret-position="484">
<caret line="22" column="44" lean-forward="true" selection-start-line="22" selection-start-column="44" selection-end-line="22" selection-end-column="44" />
</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="1748">
<caret line="304" lean-forward="true" selection-start-line="304" selection-end-line="304" />
</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="354">
<caret line="119" column="45" selection-start-line="119" selection-start-column="45" selection-end-line="119" selection-end-column="45" />
<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="file://$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/flow/bom.js">
<entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/js/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="206">
<caret line="492" column="4" selection-start-line="492" selection-start-column="4" selection-end-line="492" selection-end-column="4" />
</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="462">
<caret line="72" column="10" lean-forward="true" selection-start-line="65" selection-start-column="8" selection-end-line="72" selection-end-column="10" />
<state relative-caret-position="418">
<caret line="19" column="44" lean-forward="true" selection-start-line="19" selection-start-column="22" selection-end-line="19" selection-end-column="44" />
<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" />
@ -1041,52 +970,10 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dashboard/templates/dashboard/index.html">
<entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/js/vector.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="352">
<caret line="238" column="37" lean-forward="true" selection-start-line="238" selection-start-column="37" selection-end-line="238" selection-end-column="37" />
<folding>
<element signature="e#4818#4851#0#HTML" expanded="true" />
<element signature="e#5085#5140#0#HTML" expanded="true" />
<element signature="e#6185#6360#0#HTML" expanded="true" />
<element signature="e#4083#4132#0#HTML" expanded="true" />
<element signature="e#4183#4203#0#HTML" expanded="true" />
<element signature="e#4488#4537#0#HTML" expanded="true" />
<element signature="e#4588#4608#0#HTML" expanded="true" />
<element signature="e#4781#4815#0#HTML" expanded="true" />
<element signature="e#6648#6672#0#HTML" expanded="true" />
<element signature="e#7980#8029#0#HTML" expanded="true" />
<element signature="e#7929#7949#0#HTML" expanded="true" />
<element signature="e#8204#8253#0#HTML" expanded="true" />
<element signature="e#8039#8059#0#HTML" expanded="true" />
<element signature="e#8339#8378#0#HTML" expanded="true" />
<element signature="e#8570#8632#0#HTML" expanded="true" />
<element signature="e#8683#8704#0#HTML" expanded="true" />
<element signature="e#12201#12250#0#HTML" expanded="true" />
<element signature="e#12301#12321#0#HTML" expanded="true" />
<element signature="e#12606#12655#0#HTML" expanded="true" />
<element signature="e#12706#12726#0#HTML" expanded="true" />
<element signature="e#11651#11689#0#HTML" expanded="true" />
<element signature="e#11770#11808#0#HTML" expanded="true" />
<element signature="e#11888#11926#0#HTML" expanded="true" />
<element signature="e#9913#9956#0#HTML" expanded="true" />
<element signature="e#10165#10208#0#HTML" expanded="true" />
<element signature="e#13042#13091#0#HTML" expanded="true" />
<element signature="e#13142#13162#0#HTML" expanded="true" />
<element signature="e#13447#13496#0#HTML" expanded="true" />
<element signature="e#13547#13567#0#HTML" expanded="true" />
<element signature="e#13867#13891#0#HTML" expanded="true" />
<element signature="e#13689#13709#0#HTML" expanded="true" />
<element signature="e#14000#14021#0#HTML" expanded="true" />
<element signature="e#14226#14269#0#HTML" expanded="true" />
</folding>
</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="2">
<caret line="625" column="22" lean-forward="true" selection-start-line="625" selection-start-column="22" selection-end-line="625" selection-end-column="22" />
<caret line="16" column="44" selection-start-line="16" selection-start-column="44" selection-end-line="16" selection-end-column="44" />
<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" />

View File

@ -11,10 +11,10 @@ $(function () {
],
view: new ol.View({
projection: 'EPSG:4326',
center: [107.55375, 34.91028],
projection: 'EPSG:3857',
center: ol.proj.transform([107.55375, 34.91028], 'EPSG:4326', 'EPSG:3857'),
zoom: 17,
rotation: Math.PI / -5,
rotation: Math.PI * -37.5 / 180,
maxZoom: 20
}),