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

#creat

This commit is contained in:
Bob 2019-09-06 14:54:40 +08:00
parent 326f5ae5a6
commit 4fb45ea1d9
2 changed files with 151 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

242
.idea/workspace.xml
View File

@ -3,6 +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" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
@ -11,7 +12,7 @@
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="FileEditorManager">
<leaf>
<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">
@ -37,7 +38,7 @@
<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="88">
<state relative-caret-position="484">
<caret line="22" selection-start-line="22" selection-end-line="22" />
</state>
</provider>
@ -46,17 +47,20 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/js/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="352">
<caret line="16" column="17" selection-start-line="16" selection-start-column="17" selection-end-line="16" selection-end-column="17" />
<state relative-caret-position="442">
<caret line="48" selection-start-line="48" selection-end-line="48" />
<folding>
<marker date="1567752147950" expanded="true" signature="1211:1240" ph="..." />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/fabfile.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="132">
<caret line="6" column="55" selection-start-line="6" selection-start-column="55" selection-end-line="6" selection-end-column="55" />
<state relative-caret-position="220">
<caret line="10" selection-start-line="10" selection-end-line="10" />
<folding>
<element signature="e#0#29#0" expanded="true" />
</folding>
@ -64,11 +68,23 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<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="352">
<caret line="19" selection-start-line="19" selection-end-line="19" />
<state relative-caret-position="396">
<caret line="18" column="25" selection-start-line="18" selection-start-column="25" selection-end-line="18" selection-end-column="25" />
<folding>
<element signature="e#222#231#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<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">
<caret line="4" column="4" selection-start-line="4" selection-start-column="4" selection-end-line="4" selection-end-column="4" />
</state>
</provider>
</entry>
@ -76,8 +92,11 @@
<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="-680">
<caret line="70" column="23" selection-start-line="70" selection-start-column="23" selection-end-line="70" selection-end-column="23" />
<state relative-caret-position="464">
<caret line="131" column="3" selection-start-line="131" selection-start-column="3" selection-end-line="131" selection-end-column="3" />
<folding>
<element signature="e#305#314#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
@ -85,8 +104,8 @@
<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="398">
<caret line="20" selection-start-line="20" selection-end-line="21" />
<state relative-caret-position="396">
<caret line="19" column="14" selection-start-line="19" selection-start-column="14" selection-end-line="19" selection-end-column="14" />
<folding>
<element signature="e#630#662#0" expanded="true" />
</folding>
@ -97,7 +116,7 @@
<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="88">
<state relative-caret-position="66">
<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" />
@ -130,13 +149,13 @@
<option value="$PROJECT_DIR$/graphic/urls.py" />
<option value="$PROJECT_DIR$/graphic/views.py" />
<option value="$PROJECT_DIR$/graphic/templates/graphic/index.html" />
<option value="$PROJECT_DIR$/linbei/settings.py" />
<option value="$PROJECT_DIR$/linbei/urls.py" />
<option value="$PROJECT_DIR$/dashboard/templates/dashboard/common/base.html" />
<option value="$PROJECT_DIR$/dashboard/templates/dashboard/index.html" />
<option value="$PROJECT_DIR$/dashboard/static/dashboard/js/index.js" />
<option value="$PROJECT_DIR$/fabfile.py" />
<option value="$PROJECT_DIR$/linbei/settings.py" />
<option value="$PROJECT_DIR$/linbei/wsgi.py" />
<option value="$PROJECT_DIR$/dashboard/static/dashboard/js/index.js" />
</list>
</option>
</component>
@ -152,7 +171,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
@ -169,13 +187,14 @@
<select />
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="DefaultHtmlFileTemplate" value="HTML File" />
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../qilianshan" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
</component>
@ -238,7 +257,9 @@
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1567669372596</updated>
<workItem from="1567669377954" duration="6752000" />
<workItem from="1567669377954" duration="6960000" />
<workItem from="1567648886635" duration="264000" />
<workItem from="1567650026768" duration="4782000" />
</task>
<task id="LOCAL-00001" summary="#creat">
<created>1567674653918</created>
@ -261,25 +282,26 @@
<option name="project" value="LOCAL" />
<updated>1567675840647</updated>
</task>
<option name="localTasksCounter" value="4" />
<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>
<option name="localTasksCounter" value="5" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="6752000" />
<option name="totallyTimeSpent" value="12006000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
<editor active="true" />
<layout>
<window_info id="Favorites" side_tool="true" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24973376" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2550586" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info anchor="bottom" id="Docker" show_stripe_button="false" />
<window_info anchor="bottom" id="Database Changes" />
<window_info anchor="bottom" id="Version Control" />
<window_info anchor="bottom" id="Python Console" />
<window_info anchor="bottom" id="Terminal" visible="true" weight="0.32937366" />
<window_info anchor="bottom" id="Event Log" 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="Find" order="1" />
<window_info anchor="bottom" id="Run" order="2" />
@ -287,11 +309,17 @@
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="right" id="SciView" />
<window_info anchor="right" id="Database" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" order="8" />
<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="Terminal" order="11" visible="true" weight="0.32937366" />
<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="Ant Build" order="1" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="right" id="SciView" order="3" />
<window_info anchor="right" id="Database" order="4" />
</layout>
</component>
<component name="TypeScriptGeneratedFilesManager">
@ -331,74 +359,10 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/graphic/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154">
<caret line="7" column="20" selection-start-line="7" selection-start-column="20" selection-end-line="7" selection-end-column="20" />
<folding>
<element signature="e#0#28#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/graphic/views.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="396">
<caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
<folding>
<element signature="e#0#15#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/graphic/static/graphic/js/leaflet.ChineseTmsProviders.js">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/graphic/templates/graphic/index.html">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="34" lean-forward="true" selection-start-column="34" selection-end-column="34" />
<folding>
<element signature="e#714#745#0#HTML" expanded="true" />
<element signature="e#772#829#0#HTML" expanded="true" />
<element signature="e#1027#1074#0#HTML" expanded="true" />
<element signature="e#1085#1091#0#HTML" expanded="true" />
<element signature="e#1091#1097#0#HTML" expanded="true" />
<element signature="e#1097#1103#0#HTML" expanded="true" />
<element signature="e#1103#1109#0#HTML" expanded="true" />
<element signature="e#1109#1115#0#HTML" expanded="true" />
<element signature="e#1115#1121#0#HTML" expanded="true" />
<element signature="e#1316#1363#0#HTML" expanded="true" />
<element signature="e#1373#1379#0#HTML" expanded="true" />
<element signature="e#1379#1385#0#HTML" expanded="true" />
<element signature="e#1385#1391#0#HTML" expanded="true" />
<element signature="e#1391#1397#0#HTML" expanded="true" />
<element signature="e#1397#1403#0#HTML" expanded="true" />
<element signature="e#1403#1409#0#HTML" 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="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$/linbei/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="398">
<caret line="20" selection-start-line="20" selection-end-line="21" />
<folding>
<element signature="e#630#662#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/graphic/urls.py" />
<entry file="file://$PROJECT_DIR$/graphic/views.py" />
<entry file="file://$PROJECT_DIR$/graphic/static/graphic/js/leaflet.ChineseTmsProviders.js" />
<entry file="file://$PROJECT_DIR$/graphic/templates/graphic/index.html" />
<entry file="file://$PROJECT_DIR$/dashboard/views.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="88">
@ -406,13 +370,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="88">
<caret line="22" selection-start-line="22" selection-end-line="22" />
</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="264">
@ -424,34 +381,77 @@
</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="484">
<caret line="22" selection-start-line="22" selection-end-line="22" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/linbei/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="396">
<caret line="19" column="14" selection-start-line="19" selection-start-column="14" selection-end-line="19" selection-end-column="14" />
<folding>
<element signature="e#630#662#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">
<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/static/dashboard/js/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="352">
<caret line="16" column="17" selection-start-line="16" selection-start-column="17" selection-end-line="16" selection-end-column="17" />
<state relative-caret-position="442">
<caret line="48" selection-start-line="48" selection-end-line="48" />
<folding>
<marker date="1567752147950" expanded="true" signature="1211:1240" ph="..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/linbei/settings.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-680">
<caret line="70" column="23" selection-start-line="70" selection-start-column="23" selection-end-line="70" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/fabfile.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="132">
<caret line="6" column="55" selection-start-line="6" selection-start-column="55" selection-end-line="6" selection-end-column="55" />
<state relative-caret-position="464">
<caret line="131" column="3" selection-start-line="131" selection-start-column="3" selection-end-line="131" selection-end-column="3" />
<folding>
<element signature="e#0#29#0" expanded="true" />
<element signature="e#305#314#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/linbei/wsgi.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="352">
<caret line="19" selection-start-line="19" selection-end-line="19" />
<state relative-caret-position="396">
<caret line="18" column="25" selection-start-line="18" selection-start-column="25" selection-end-line="18" selection-end-column="25" />
<folding>
<element signature="e#222#231#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<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">
<caret line="4" column="4" selection-start-line="4" selection-start-column="4" selection-end-line="4" selection-end-column="4" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/fabfile.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220">
<caret line="10" selection-start-line="10" selection-end-line="10" />
<folding>
<element signature="e#0#29#0" expanded="true" />
</folding>
</state>
</provider>
</entry>

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

@ -9,24 +9,40 @@ $(function () {
// var h = w.height();
// var s = parseInt((h - 228) / 75);
// console.log("s:" + s);
var satelliteMap = L.tileLayer.chinaProvider('TianDiTu.Satellite.Map', {maxZoom: 18, minZoom: 5});
var satelliteAnnotion = L.tileLayer.chinaProvider('TianDiTu.Satellite.Annotion', {maxZoom: 18, minZoom: 5});
var countyLayer = L.nonTiledLayer.wms('http://210.77.68.250:8080/geoserver/linbei/wms', {
layers: 'linbei:3132_wgs84',
transparent: true,
format: 'image/png',
});
var map = L.map('map', {
center: [34.3632, 107.2377],
center: [34.91028, 107.55375],
zoomSnap: 0.1,
zoomDelta: 0.2,
zoom: 9,
layers: [satelliteMap, satelliteAnnotion, countyLayer,]
zoom: 16
});
map.addLayer(countyLayer)
L.tileLayer.chinaProvider('TianDiTu.Satellite.Map', {
maxZoom: 18,
minZoom: 5,
zoomIn: 0.1,
zoomOut: 0.1
}).addTo(map);
L.tileLayer.chinaProvider('TianDiTu.Satellite.Annotion', {
maxZoom: 18,
minZoom: 5,
zoomIn: 0.1,
zoomOut: 0.1
}).addTo(map);
var w3132Layer = L.tileLayer.wms('http://210.77.68.250:8080/geoserver/linbei/wms', {
layers: 'linbei:3132_wgs84',
transparent: true,
format: 'image/png',
});
map.addLayer(w3132Layer);
// var w35Layer = L.tileLayer.wms('http://210.77.68.250:8080/geoserver/linbei/wms', {
// layers: 'linbei:0035_wgs84',
// transparent: true,
// format: 'image/png',
//
// });
// map.addLayer(w35Layer)
});