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

#添加三层和四层

This commit is contained in:
Bob 2020-03-19 17:05:19 +08:00
parent feb1b90d22
commit c605f6671d
4 changed files with 71 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
.idea/workspace.xml
View File

@ -2,9 +2,10 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="9cbc7ee8-e518-44ca-870c-9743cf0f1b98" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/dashboard/static/dashboard/img/jizhan.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/dashboard/static/dashboard/img/renyuan.png" afterDir="false" />
<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" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
@ -74,8 +75,8 @@
<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="565">
<caret line="569" column="35" selection-start-line="569" selection-start-column="35" selection-end-line="569" selection-end-column="35" />
<state relative-caret-position="5727">
<caret line="862" column="50" selection-start-line="862" selection-start-column="50" selection-end-line="862" selection-end-column="50" />
<folding>
<element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
</folding>
@ -95,7 +96,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="220">
<state relative-caret-position="198">
<caret line="10" selection-start-line="10" selection-end-line="10" />
<folding>
<element signature="e#0#29#0" expanded="true" />
@ -107,7 +108,7 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/dashboard/templates/dashboard/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="129">
<state relative-caret-position="1782">
<caret line="81" column="47" selection-start-line="81" selection-start-column="47" selection-end-line="81" selection-end-column="47" />
</state>
</provider>
@ -116,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="88">
<state relative-caret-position="66">
<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" />
@ -128,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="242">
<state relative-caret-position="88">
<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" />
@ -245,6 +246,7 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
@ -276,7 +278,7 @@
<item name="dashboard" type="462c0819:PsiDirectoryNode" />
<item name="static" type="462c0819:PsiDirectoryNode" />
<item name="dashboard" type="462c0819:PsiDirectoryNode" />
<item name="json" type="462c0819:PsiDirectoryNode" />
<item name="img" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="linbei" type="b2602c69:ProjectViewProjectNode" />
@ -292,7 +294,6 @@
<select />
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
@ -302,26 +303,26 @@
<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$" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/dashboard/static/dashboard/img" />
<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" />
<property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="D:\python\p3\linbei\dashboard\static\dashboard\json" />
<recent name="D:\python\p3\linbei\static" />
<recent name="D:\python\p3\linbei\dashboard\static\dashboard\js" />
<recent name="D:\python\p3\linbei\dashboard\static\dashboard\img" />
<recent name="D:\python\p3\linbei\dashboard\static\dashboard\css" />
</key>
<key name="MoveFile.RECENT_KEYS">
<recent name="D:\python\p3\linbei\dashboard\static\dashboard\img" />
<recent name="D:\python\p3\linbei\dashboard\static\dashboard\js" />
<recent name="D:\python\p3\linbei\dashboard\templates" />
<recent name="D:\python\p3\linbei\dashboard\templates\dashboard" />
<recent name="D:\python\p3\linbei\dashboard" />
<recent name="D:\python\p3\linbei" />
</key>
<key name="CopyFile.RECENT_KEYS">
<recent name="D:\python\p3\linbei\dashboard\static\dashboard\img" />
<recent name="D:\python\p3\linbei\dashboard\static\dashboard\json" />
<recent name="D:\python\p3\linbei\static" />
<recent name="D:\python\p3\linbei\dashboard\static\dashboard\js" />
<recent name="D:\python\p3\linbei\dashboard\static\dashboard\css" />
</key>
</component>
<component name="RunDashboard">
@ -456,7 +457,8 @@
<workItem from="1583692865129" duration="5810000" />
<workItem from="1584493719865" duration="4577000" />
<workItem from="1584514313911" duration="258000" />
<workItem from="1584518933909" duration="447000" />
<workItem from="1584518933909" duration="738000" />
<workItem from="1584602918716" duration="3823000" />
</task>
<task id="LOCAL-00001" summary="#creat">
<created>1567674653918</created>
@ -787,17 +789,24 @@
<option name="project" value="LOCAL" />
<updated>1584514347690</updated>
</task>
<option name="localTasksCounter" value="48" />
<task id="LOCAL-00048" summary="#添加三层和四层">
<created>1584519434075</created>
<option name="number" value="00048" />
<option name="presentableId" value="LOCAL-00048" />
<option name="project" value="LOCAL" />
<updated>1584519434075</updated>
</task>
<option name="localTasksCounter" value="49" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="294377000" />
<option name="totallyTimeSpent" value="298491000" />
</component>
<component name="ToolWindowManager">
<frame x="-1752" y="76" width="1936" height="1056" extended-state="0" />
<frame x="-8" y="-8" width="1936" height="1056" extended-state="7" />
<editor active="true" />
<layout>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.14589989" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.14749734" />
<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" />
@ -811,7 +820,7 @@
<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="Event Log" order="10" side_tool="true" />
<window_info active="true" anchor="bottom" id="Terminal" order="11" visible="true" weight="0.31533477" />
<window_info anchor="bottom" id="Terminal" order="11" weight="0.31533477" />
<window_info anchor="bottom" id="Python Console" order="12" />
<window_info anchor="bottom" id="Database Console" order="13" weight="0.32937366" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
@ -837,21 +846,6 @@
<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$" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/manage.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/static/js/bootstrap.min.js">
<provider selected="true" editor-type-id="text-editor">
<state>
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dashboard/apps.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/js/index_2.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264">
@ -1081,7 +1075,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/fabfile.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220">
<state relative-caret-position="198">
<caret line="10" selection-start-line="10" selection-end-line="10" />
<folding>
<element signature="e#0#29#0" expanded="true" />
@ -1089,9 +1083,16 @@
</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="1782">
<caret line="81" column="47" selection-start-line="81" selection-start-column="47" selection-end-line="81" selection-end-column="47" />
</state>
</provider>
</entry>
<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="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" />
@ -1101,7 +1102,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/dashboard/views.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="242">
<state relative-caret-position="88">
<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" />
@ -1116,17 +1117,19 @@
</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="129">
<caret line="81" column="47" selection-start-line="81" selection-start-column="47" selection-end-line="81" selection-end-column="47" />
</state>
</provider>
<entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/img/1574392786(1).png">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/img/jizhan.jpg">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/img/jizhan.png">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/js/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="565">
<caret line="569" column="35" selection-start-line="569" selection-start-column="35" selection-end-line="569" selection-end-column="35" />
<state relative-caret-position="5727">
<caret line="862" column="50" selection-start-line="862" selection-start-column="50" selection-end-line="862" selection-end-column="50" />
<folding>
<element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
</folding>

BIN
dashboard/static/dashboard/img/jizhan.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.4 KiB

BIN
dashboard/static/dashboard/img/renyuan.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.9 KiB

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

@ -68,13 +68,7 @@ $(function () {
})
});
// var iconStyle = new ol.style.Style({
// image: new ol.style.Icon({
// opacity: 0.75,
// src: "static/dashboard/img/1574392786(1).png",
//
// }),
// });
var road = new ol.layer.Vector({
@ -154,13 +148,20 @@ $(function () {
// map.addLayer(pipe);
var iconStyle_jizhan = new ol.style.Style({
image: new ol.style.Icon({
// opacity: 0.75,
src: "static/dashboard/img/jizhan.png",
}),
});
var GeoJsonLayer = new ol.layer.Vector({
source: new ol.source.Vector({
projection: projection,
url: 'static/dashboard/json/BaseStation_C_ALL.json',
format: new ol.format.GeoJSON()
}),
style: style,
style: iconStyle_jizhan,
maxZoom: 20
});
@ -836,9 +837,16 @@ $(function () {
//点图层
var markVectorSource = new ol.source.Vector();
var markVectorLayer = new ol.layer.Vector({
source: markVectorSource
source: markVectorSource,
});
var iconStyle_renyuan = new ol.style.Style({
image: new ol.style.Icon({
// opacity: 0.75,
src: "static/dashboard/img/renyuan.png",
}),
});
function addMarker(marker) {
markVectorSource.clear();
@ -852,6 +860,7 @@ $(function () {
}
map.addLayer(markVectorLayer);
markVectorLayer.setZIndex(5)
markVectorLayer.setStyle(iconStyle_renyuan)
}