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

#图层替换

This commit is contained in:
Bob 2020-06-08 11:35:48 +08:00
parent 04790fc5ed
commit 469c03105a
2 changed files with 93 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

162
.idea/workspace.xml
View File

@ -4,10 +4,6 @@
<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/urls.py" beforeDir="false" afterPath="$PROJECT_DIR$/dashboard/urls.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/dashboard/views.py" beforeDir="false" afterPath="$PROJECT_DIR$/dashboard/views.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/linbei/settings.py" beforeDir="false" afterPath="$PROJECT_DIR$/linbei/settings.py" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
@ -77,15 +73,14 @@
<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="466">
<caret line="1701" column="13" lean-forward="true" selection-start-line="1701" selection-start-column="13" selection-end-line="1701" selection-end-column="13" />
<state relative-caret-position="443">
<caret line="73" column="27" selection-start-line="73" selection-start-column="27" selection-end-line="73" selection-end-column="27" />
<folding>
<element signature="e#464#688#0" />
<element signature="e#752#795#0" />
<element signature="e#803#844#0" />
<element signature="e#885#924#0" />
<element signature="e#1170#1193#0" />
<element signature="e#1653#1960#0" />
<element signature="e#2031#2338#0" />
<element signature="e#2405#2565#0" />
<element signature="e#2605#3069#0" />
@ -209,7 +204,7 @@
<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="1870">
<state relative-caret-position="1804">
<caret line="85" selection-start-line="85" selection-end-line="95" />
<folding>
<element signature="e#305#314#0" expanded="true" />
@ -239,7 +234,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="176">
<state relative-caret-position="154">
<caret line="8" column="39" selection-start-line="8" selection-start-column="39" selection-end-line="8" selection-end-column="39" />
<folding>
<element signature="e#0#19#0" expanded="true" />
@ -251,7 +246,7 @@
<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="250">
<state relative-caret-position="682">
<caret line="40" column="14" selection-start-line="40" selection-start-column="14" selection-end-line="40" selection-end-column="14" />
<folding>
<element signature="e#0#11#0" expanded="true" />
@ -648,14 +643,8 @@
<workItem from="1591252817898" duration="6847000" />
<workItem from="1591268601699" duration="1623000" />
<workItem from="1591289116263" duration="1056000" />
<workItem from="1591318999695" duration="572000" />
</task>
<task id="LOCAL-00012" summary="#index">
<created>1570519321771</created>
<option name="number" value="00012" />
<option name="presentableId" value="LOCAL-00012" />
<option name="project" value="LOCAL" />
<updated>1570519321771</updated>
<workItem from="1591318999695" duration="1227000" />
<workItem from="1591587017803" duration="232000" />
</task>
<task id="LOCAL-00013" summary="#index">
<created>1570519731363</created>
@ -993,17 +982,24 @@
<option name="project" value="LOCAL" />
<updated>1589854722709</updated>
</task>
<option name="localTasksCounter" value="61" />
<task id="LOCAL-00061" summary="#人员点击">
<created>1591319629502</created>
<option name="number" value="00061" />
<option name="presentableId" value="LOCAL-00061" />
<option name="project" value="LOCAL" />
<updated>1591319629502</updated>
</task>
<option name="localTasksCounter" value="62" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="374377000" />
<option name="totallyTimeSpent" value="375264000" />
</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.27902022" />
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.28168264" />
<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" />
@ -1041,7 +1037,8 @@
<MESSAGE value="#更换一层数据" />
<MESSAGE value="#更换室内数据" />
<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$" />
@ -1243,75 +1240,16 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/import_points.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="550">
<caret line="31" column="28" selection-start-line="31" selection-start-column="28" selection-end-line="31" selection-end-column="28" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/linbei/settings.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1870">
<caret line="85" selection-start-line="85" selection-end-line="95" />
<folding>
<element signature="e#305#314#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://D:/2020/linbei/decode.py">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret selection-end-line="21" selection-end-column="26" />
</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="3630">
<caret line="165" column="103" selection-start-line="165" selection-start-column="92" selection-end-line="165" selection-end-column="103" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dashboard/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="8" column="39" selection-start-line="8" selection-start-column="39" selection-end-line="8" selection-end-column="39" />
<folding>
<element signature="e#0#19#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">
<caret line="27" selection-start-line="27" selection-end-line="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dashboard/views.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="40" column="14" selection-start-line="40" selection-start-column="14" selection-end-line="40" selection-end-column="14" />
<folding>
<element signature="e#0#11#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="466">
<caret line="1701" column="13" lean-forward="true" selection-start-line="1701" selection-start-column="13" selection-end-line="1701" selection-end-column="13" />
<state relative-caret-position="443">
<caret line="73" column="27" selection-start-line="73" selection-start-column="27" selection-end-line="73" selection-end-column="27" />
<folding>
<element signature="e#464#688#0" />
<element signature="e#752#795#0" />
<element signature="e#803#844#0" />
<element signature="e#885#924#0" />
<element signature="e#1170#1193#0" />
<element signature="e#1653#1960#0" />
<element signature="e#2031#2338#0" />
<element signature="e#2405#2565#0" />
<element signature="e#2605#3069#0" />
@ -1422,5 +1360,63 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/import_points.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="550">
<caret line="31" column="28" selection-start-line="31" selection-start-column="28" selection-end-line="31" selection-end-column="28" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/linbei/settings.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1804">
<caret line="85" selection-start-line="85" selection-end-line="95" />
<folding>
<element signature="e#305#314#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://D:/2020/linbei/decode.py">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret selection-end-line="21" selection-end-column="26" />
</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="3630">
<caret line="165" column="103" selection-start-line="165" selection-start-column="92" selection-end-line="165" selection-end-column="103" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dashboard/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154">
<caret line="8" column="39" selection-start-line="8" selection-start-column="39" selection-end-line="8" selection-end-column="39" />
<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="682">
<caret line="40" column="14" selection-start-line="40" selection-start-column="14" selection-end-line="40" selection-end-column="14" />
<folding>
<element signature="e#0#11#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">
<caret line="27" selection-start-line="27" selection-end-line="27" />
</state>
</provider>
</entry>
</component>
</project>

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

@ -52,13 +52,26 @@ $(function () {
// console.log('WebSocket open');//成功连接上Websocket
// };
//============================================================================================================================
// var w3132Layer = new ol.layer.Tile({
// source: new ol.source.TileWMS({
// url: 'http://210.77.68.250:8080/geoserver/linbei/gwc/service/wms',
// params: {
// 'VERSION': '1.1.1',
// tiled: true,
// "LAYERS": 'linbei:3132_wgs84',
//
// }
// }),
// maxZoom: 20
// });
// map.addLayer(w3132Layer);
var w3132Layer = new ol.layer.Tile({
source: new ol.source.TileWMS({
url: 'http://210.77.68.250:8080/geoserver/linbei/gwc/service/wms',
params: {
'VERSION': '1.1.1',
tiled: true,
"LAYERS": 'linbei:3132_wgs84',
"LAYERS": 'linbei:矩形区域(3)',
}
}),