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

#index

This commit is contained in:
Bob 2019-10-30 19:30:56 +08:00
parent 46f118f448
commit 793830ad4d
3 changed files with 66 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

119
.idea/workspace.xml
View File

@ -17,8 +17,8 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/dashboard/templates/dashboard/common/base.html"> <entry file="file://$PROJECT_DIR$/dashboard/templates/dashboard/common/base.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="354"> <state relative-caret-position="968">
<caret line="44" column="40" lean-forward="true" selection-start-line="44" selection-start-column="40" selection-end-line="44" selection-end-column="40" /> <caret line="44" column="40" selection-start-line="44" selection-start-column="40" selection-end-line="44" selection-end-column="40" />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -26,7 +26,7 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/dashboard/templates/dashboard/index_1.html"> <entry file="file://$PROJECT_DIR$/dashboard/templates/dashboard/index_1.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420"> <state relative-caret-position="616">
<caret line="28" column="45" selection-start-line="28" selection-start-column="45" selection-end-line="28" selection-end-column="45" /> <caret line="28" column="45" selection-start-line="28" selection-start-column="45" selection-end-line="28" selection-end-column="45" />
</state> </state>
</provider> </provider>
@ -44,10 +44,10 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/js/index_1.js"> <entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/js/index_1.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="486"> <state relative-caret-position="332">
<caret line="55" column="25" lean-forward="true" selection-start-line="49" selection-start-column="4" selection-end-line="55" selection-end-column="25" /> <caret line="50" column="37" lean-forward="true" selection-start-line="50" selection-start-column="17" selection-end-line="50" selection-end-column="37" />
<folding> <folding>
<marker date="1570592600885" expanded="true" signature="1253:1279" ph="..." /> <marker date="1572434780140" expanded="true" signature="1253:1279" ph="..." />
</folding> </folding>
</state> </state>
</provider> </provider>
@ -56,8 +56,8 @@
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/js/index_2.js"> <entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/js/index_2.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="530"> <state relative-caret-position="398">
<caret line="54" column="25" selection-start-line="54" selection-start-column="25" selection-end-line="54" selection-end-column="25" /> <caret line="49" column="37" selection-start-line="49" selection-start-column="37" selection-end-line="49" selection-end-column="37" />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -65,7 +65,7 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/linbei/wsgi.py"> <entry file="file://$PROJECT_DIR$/linbei/wsgi.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="346"> <state relative-caret-position="286">
<caret line="16" selection-start-line="16" selection-end-line="16" selection-end-column="45" /> <caret line="16" selection-start-line="16" selection-end-line="16" selection-end-column="45" />
<folding> <folding>
<element signature="e#222#231#0" expanded="true" /> <element signature="e#222#231#0" expanded="true" />
@ -94,7 +94,7 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/linbei/settings.py"> <entry file="file://$PROJECT_DIR$/linbei/settings.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300"> <state relative-caret-position="2838">
<caret line="132" selection-start-line="132" selection-end-line="132" /> <caret line="132" selection-start-line="132" selection-end-line="132" />
<folding> <folding>
<element signature="e#305#314#0" expanded="true" /> <element signature="e#305#314#0" expanded="true" />
@ -164,7 +164,6 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="Scope" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<expand> <expand>
@ -283,13 +282,14 @@
<select /> <select />
</subPane> </subPane>
</pane> </pane>
<pane id="Scope" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
<property name="DefaultHtmlFileTemplate" value="HTML File" /> <property name="DefaultHtmlFileTemplate" value="HTML File" />
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" /> <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" /> <property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../drought" /> <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_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" /> <property name="nodejs_npm_path_reset_for_default_project" value="true" />
</component> </component>
@ -366,7 +366,9 @@
<workItem from="1568879070987" duration="209000" /> <workItem from="1568879070987" duration="209000" />
<workItem from="1568879428159" duration="222000" /> <workItem from="1568879428159" duration="222000" />
<workItem from="1570518069954" duration="2656000" /> <workItem from="1570518069954" duration="2656000" />
<workItem from="1570582655843" duration="3413000" /> <workItem from="1570582655843" duration="5240000" />
<workItem from="1571210770034" duration="26000" />
<workItem from="1572434744443" duration="297000" />
</task> </task>
<task id="LOCAL-00001" summary="#creat"> <task id="LOCAL-00001" summary="#creat">
<created>1567674653918</created> <created>1567674653918</created>
@ -466,17 +468,24 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1570530689485</updated> <updated>1570530689485</updated>
</task> </task>
<option name="localTasksCounter" value="15" /> <task id="LOCAL-00015" summary="#index">
<created>1570593381732</created>
<option name="number" value="00015" />
<option name="presentableId" value="LOCAL-00015" />
<option name="project" value="LOCAL" />
<updated>1570593381732</updated>
</task>
<option name="localTasksCounter" value="16" />
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="30943000" /> <option name="totallyTimeSpent" value="33093000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.28700745" /> <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.29339722" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" /> <window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" /> <window_info anchor="bottom" id="Message" order="0" />
@ -589,6 +598,37 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/dashboard/templates/dashboard/common/base.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="968">
<caret line="44" column="40" selection-start-line="44" selection-start-column="40" selection-end-line="44" selection-end-column="40" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dashboard/templates/dashboard/index_1.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="616">
<caret line="28" column="45" selection-start-line="28" selection-start-column="45" selection-end-line="28" selection-end-column="45" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/js/dashboard.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="44">
<caret line="2" column="3" selection-start-line="2" selection-start-column="3" selection-end-line="2" selection-end-column="3" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/linbei/wsgi.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="286">
<caret line="16" selection-start-line="16" selection-end-line="16" selection-end-column="45" />
<folding>
<element signature="e#222#231#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/linbei/urls.py"> <entry file="file://$PROJECT_DIR$/linbei/urls.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="418"> <state relative-caret-position="418">
@ -602,22 +642,9 @@
<entry file="file://$PROJECT_DIR$/manage.py"> <entry file="file://$PROJECT_DIR$/manage.py">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/requirements.txt">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/linbei/wsgi.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="346">
<caret line="16" selection-start-line="16" selection-end-line="16" selection-end-column="45" />
<folding>
<element signature="e#222#231#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/linbei/settings.py"> <entry file="file://$PROJECT_DIR$/linbei/settings.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300"> <state relative-caret-position="2838">
<caret line="132" selection-start-line="132" selection-end-line="132" /> <caret line="132" selection-start-line="132" selection-end-line="132" />
<folding> <folding>
<element signature="e#305#314#0" expanded="true" /> <element signature="e#305#314#0" expanded="true" />
@ -625,41 +652,23 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/dashboard/templates/dashboard/common/base.html"> <entry file="file://$PROJECT_DIR$/requirements.txt">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor" />
<state relative-caret-position="354">
<caret line="44" column="40" lean-forward="true" selection-start-line="44" selection-start-column="40" selection-end-line="44" selection-end-column="40" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/js/dashboard.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="44">
<caret line="2" column="3" selection-start-line="2" selection-start-column="3" selection-end-line="2" selection-end-column="3" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dashboard/templates/dashboard/index_1.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420">
<caret line="28" column="45" selection-start-line="28" selection-start-column="45" selection-end-line="28" selection-end-column="45" />
</state>
</provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/js/index_1.js"> <entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/js/index_1.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="486"> <state relative-caret-position="332">
<caret line="55" column="25" lean-forward="true" selection-start-line="49" selection-start-column="4" selection-end-line="55" selection-end-column="25" /> <caret line="50" column="37" lean-forward="true" selection-start-line="50" selection-start-column="17" selection-end-line="50" selection-end-column="37" />
<folding> <folding>
<marker date="1570592600885" expanded="true" signature="1253:1279" ph="..." /> <marker date="1572434780140" expanded="true" signature="1253:1279" ph="..." />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/js/index_2.js"> <entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/js/index_2.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="530"> <state relative-caret-position="398">
<caret line="54" column="25" selection-start-line="54" selection-start-column="25" selection-end-line="54" selection-end-column="25" /> <caret line="49" column="37" selection-start-line="49" selection-start-column="37" selection-end-line="49" selection-end-column="37" />
</state> </state>
</provider> </provider>
</entry> </entry>

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

@ -48,7 +48,7 @@ $(function () {
map.addLayer(w35Layer) map.addLayer(w35Layer)
var points = L.tileLayer.wms('http://210.77.68.250:8080/geoserver/linbei/wms', { var points = L.tileLayer.wms('http://210.77.68.250:8080/geoserver/linbei/wms', {
layers: 'linbei:linbei_points', layers: 'linbei:BaseStation_m',
transparent: true, transparent: true,
format: 'image/png' format: 'image/png'
}); });

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

@ -47,7 +47,7 @@ $(function () {
}); });
map.addLayer(w35Layer) map.addLayer(w35Layer)
var points = L.tileLayer.wms('http://210.77.68.250:8080/geoserver/linbei/wms', { var points = L.tileLayer.wms('http://210.77.68.250:8080/geoserver/linbei/wms', {
layers: 'linbei:linbei_points', layers: 'linbei:BaseStation_m',
transparent: true, transparent: true,
format: 'image/png' format: 'image/png'
}); });