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

#添加三层和四层

This commit is contained in:
Bob 2020-03-18 14:52:27 +08:00
parent 89b8e33d7e
commit d8c25f3cda
2 changed files with 40 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
.idea/workspace.xml
View File

@ -73,11 +73,8 @@
<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="351">
<state relative-caret-position="12122">
<caret line="551" selection-start-line="551" selection-end-line="551" />
<folding>
<element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
@ -94,7 +91,7 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/fabfile.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<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" />
@ -106,8 +103,8 @@
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/dashboard/templates/dashboard/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="491">
<caret line="34" column="9" lean-forward="true" selection-start-line="34" selection-start-column="9" selection-end-line="34" selection-end-column="9" />
<state relative-caret-position="462">
<caret line="84" column="45" selection-start-line="84" selection-start-column="45" selection-end-line="84" selection-end-column="45" />
<folding>
<element signature="n#style#0;n#div#0;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#!!top" expanded="true" />
@ -120,7 +117,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="66">
<state relative-caret-position="88">
<caret line="4" column="23" selection-start-line="4" selection-start-column="23" selection-end-line="4" selection-end-column="23" />
<folding>
<element signature="e#0#19#0" expanded="true" />
@ -132,7 +129,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="88">
<state relative-caret-position="242">
<caret line="11" column="43" selection-start-line="11" selection-start-column="43" selection-end-line="11" selection-end-column="43" />
<folding>
<element signature="e#0#30#0" expanded="true" />
@ -238,10 +235,10 @@
<auto-save>true</auto-save>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="-1688" />
<option name="y" value="16" />
<option name="width" value="1696" />
<option name="height" value="1026" />
<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">
@ -306,7 +303,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/json" />
<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_npm_path_reset_for_default_project" value="true" />
<property name="nodejs_package_manager_path" value="npm" />
@ -458,7 +455,8 @@
<workItem from="1581678313800" duration="1748000" />
<workItem from="1582103020023" duration="1580000" />
<workItem from="1583692865129" duration="5810000" />
<workItem from="1584493719865" duration="3949000" />
<workItem from="1584493719865" duration="4577000" />
<workItem from="1584514313911" duration="22000" />
</task>
<task id="LOCAL-00001" summary="#creat">
<created>1567674653918</created>
@ -775,17 +773,24 @@
<option name="project" value="LOCAL" />
<updated>1584497593712</updated>
</task>
<option name="localTasksCounter" value="46" />
<task id="LOCAL-00046" summary="#添加三层和四层">
<created>1584497703015</created>
<option name="number" value="00046" />
<option name="presentableId" value="LOCAL-00046" />
<option name="project" value="LOCAL" />
<updated>1584497703015</updated>
</task>
<option name="localTasksCounter" value="47" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="293044000" />
<option name="totallyTimeSpent" value="293694000" />
</component>
<component name="ToolWindowManager">
<frame x="-1688" y="16" width="1696" height="1026" extended-state="6" />
<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.34310135" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.30298188" />
<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" />
@ -1060,6 +1065,13 @@
<entry file="file://$PROJECT_DIR$/static/ol3-layerswitcher-master/examples/layerswitcher.html" />
<entry file="file://$PROJECT_DIR$/static/ol3-layerswitcher-master/examples/layerswitcher.js" />
<entry file="file://$PROJECT_DIR$/static/ol3-layerswitcher-master/src/ol3-layerswitcher.js" />
<entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/js/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="12122">
<caret line="551" selection-start-line="551" selection-end-line="551" />
</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="1232">
@ -1069,7 +1081,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/fabfile.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<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" />
@ -1079,7 +1091,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/dashboard/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="66">
<state relative-caret-position="88">
<caret line="4" column="23" selection-start-line="4" selection-start-column="23" selection-end-line="4" selection-end-column="23" />
<folding>
<element signature="e#0#19#0" expanded="true" />
@ -1089,7 +1101,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/dashboard/views.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="88">
<state relative-caret-position="242">
<caret line="11" column="43" selection-start-line="11" selection-start-column="43" selection-end-line="11" selection-end-column="43" />
<folding>
<element signature="e#0#30#0" expanded="true" />
@ -1104,20 +1116,10 @@
</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="351">
<caret line="551" selection-start-line="551" selection-end-line="551" />
<folding>
<element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
</folding>
</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="491">
<caret line="34" column="9" lean-forward="true" selection-start-line="34" selection-start-column="9" selection-end-line="34" selection-end-column="9" />
<state relative-caret-position="462">
<caret line="84" column="45" selection-start-line="84" selection-start-column="45" selection-end-line="84" selection-end-column="45" />
<folding>
<element signature="n#style#0;n#div#0;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#!!top" expanded="true" />

8
dashboard/templates/dashboard/index.html
View File

@ -79,10 +79,10 @@
<div id="map" style="width:100%;height:100%;">
<div class="layer-select">
<select id="selectLayer" name="selectLayer">
<option value="1" selected="selected">一层</option>
<option value="2">二层</option>
<option value="3">三层</option>
<option value="4">四层</option>
<option value="1" selected="selected">主机房一层</option>
<option value="2">主机房二层</option>
<option value="3">主机房三层</option>
<option value="4">主机房四层</option>
</select>
</div>
<div id="popup" class="ol-popup">