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

#index

This commit is contained in:
Bob 2019-11-06 16:11:02 +08:00
parent 793830ad4d
commit 414d1d49cc
3 changed files with 27 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
.idea/workspace.xml
View File

@ -14,40 +14,13 @@
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<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>
</file>
<file pinned="false" current-in-tab="false">
<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>
</file>
<file pinned="false" current-in-tab="false">
<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>
</file>
<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="332"> <state relative-caret-position="310">
<caret line="50" column="37" lean-forward="true" selection-start-line="50" selection-start-column="17" selection-end-line="50" selection-end-column="37" /> <caret line="50" column="39" selection-start-line="50" selection-start-column="17" selection-end-line="50" selection-end-column="39" />
<folding> <folding>
<marker date="1572434780140" expanded="true" signature="1253:1279" ph="..." /> <marker date="1573027690345" expanded="true" signature="1253:1279" ph="..." />
</folding> </folding>
</state> </state>
</provider> </provider>
@ -56,58 +29,12 @@
<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="398"> <state relative-caret-position="288">
<caret line="49" column="37" selection-start-line="49" selection-start-column="37" selection-end-line="49" selection-end-column="37" /> <caret line="49" column="39" selection-start-line="49" selection-start-column="39" selection-end-line="49" selection-end-column="39" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false">
<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>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/linbei/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="418">
<caret line="20" column="10" selection-start-line="20" selection-start-column="10" selection-end-line="20" selection-end-column="10" />
<folding>
<element signature="e#630#662#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/manage.py">
<provider selected="true" editor-type-id="text-editor" />
</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="2838">
<caret line="132" selection-start-line="132" selection-end-line="132" />
<folding>
<element signature="e#305#314#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/requirements.txt">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
</leaf> </leaf>
</component> </component>
<component name="FileTemplateManagerImpl"> <component name="FileTemplateManagerImpl">
@ -368,7 +295,8 @@
<workItem from="1570518069954" duration="2656000" /> <workItem from="1570518069954" duration="2656000" />
<workItem from="1570582655843" duration="5240000" /> <workItem from="1570582655843" duration="5240000" />
<workItem from="1571210770034" duration="26000" /> <workItem from="1571210770034" duration="26000" />
<workItem from="1572434744443" duration="297000" /> <workItem from="1572434744443" duration="608000" />
<workItem from="1573027123156" duration="716000" />
</task> </task>
<task id="LOCAL-00001" summary="#creat"> <task id="LOCAL-00001" summary="#creat">
<created>1567674653918</created> <created>1567674653918</created>
@ -475,17 +403,24 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1570593381732</updated> <updated>1570593381732</updated>
</task> </task>
<option name="localTasksCounter" value="16" /> <task id="LOCAL-00016" summary="#index">
<created>1572435056993</created>
<option name="number" value="00016" />
<option name="presentableId" value="LOCAL-00016" />
<option name="project" value="LOCAL" />
<updated>1572435056993</updated>
</task>
<option name="localTasksCounter" value="17" />
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="33093000" /> <option name="totallyTimeSpent" value="34120000" />
</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.29339722" /> <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.29659212" />
<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" />
@ -499,7 +434,7 @@
<window_info anchor="bottom" id="Version Control" order="8" weight="0.32937366" /> <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="Database Changes" order="9" />
<window_info anchor="bottom" id="Event Log" order="10" side_tool="true" /> <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
<window_info anchor="bottom" id="Terminal" order="11" visible="true" weight="0.32937366" /> <window_info anchor="bottom" id="Terminal" order="11" visible="true" weight="0.30561554" />
<window_info anchor="bottom" id="Python Console" order="12" /> <window_info anchor="bottom" id="Python Console" order="12" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
@ -621,7 +556,7 @@
</entry> </entry>
<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="286"> <state relative-caret-position="352">
<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" />
@ -657,18 +592,18 @@
</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="332"> <state relative-caret-position="310">
<caret line="50" column="37" lean-forward="true" selection-start-line="50" selection-start-column="17" selection-end-line="50" selection-end-column="37" /> <caret line="50" column="39" selection-start-line="50" selection-start-column="17" selection-end-line="50" selection-end-column="39" />
<folding> <folding>
<marker date="1572434780140" expanded="true" signature="1253:1279" ph="..." /> <marker date="1573027690345" 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="398"> <state relative-caret-position="288">
<caret line="49" column="37" selection-start-line="49" selection-start-column="37" selection-end-line="49" selection-end-column="37" /> <caret line="49" column="39" selection-start-line="49" selection-start-column="39" selection-end-line="49" selection-end-column="39" />
</state> </state>
</provider> </provider>
</entry> </entry>

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

@ -48,9 +48,9 @@ $(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:BaseStation_m', layers: 'linbei:BaseStation_P_C',
transparent: true, transparent: true,
format: 'image/png' format: 'image/png',
}); });
map.addLayer(points) map.addLayer(points)
points.bringToFront() points.bringToFront()

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:BaseStation_m', layers: 'linbei:BaseStation_P_C',
transparent: true, transparent: true,
format: 'image/png' format: 'image/png'
}); });