This commit is contained in:
Bob 2019-11-14 10:24:16 +08:00
parent ff6c854ea2
commit 17472098c0
2 changed files with 17 additions and 80 deletions

View File

@ -2,77 +2,7 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="9cbc7ee8-e518-44ca-870c-9743cf0f1b98" name="Default Changelist" comment=""> <list default="true" id="9cbc7ee8-e518-44ca-870c-9743cf0f1b98" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/.idea/dataSources.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/dashboard/static/dashboard/css/htmleaf-demo.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/dashboard/static/dashboard/css/style.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/dashboard/static/dashboard/json/BaseStation_P_C.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/dashboard/templates/dashboard/results_by_keywords.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/import_points.py" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/bootstrap.dropdown.cascade/css/bootstrap-cascader-1241e02452.min.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/bootstrap.dropdown.cascade/css/bootstrap-cascader-1241e02452.min.css.map" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/bootstrap.dropdown.cascade/css/bootstrap-cascader.eot" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/bootstrap.dropdown.cascade/css/bootstrap-cascader.min.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/bootstrap.dropdown.cascade/css/bootstrap-cascader.min.css.map" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/bootstrap.dropdown.cascade/css/bootstrap-cascader.svg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/bootstrap.dropdown.cascade/css/bootstrap-cascader.ttf" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/bootstrap.dropdown.cascade/css/bootstrap-cascader.woff" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/bootstrap.dropdown.cascade/js/bootstrap-cascader-dcbf0e3207.min.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/bootstrap.dropdown.cascade/js/bootstrap-cascader-dcbf0e3207.min.js.map" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/bootstrap.dropdown.cascade/js/bootstrap-cascader.min.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/bootstrap.dropdown.cascade/js/bootstrap-cascader.min.js.map" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/js/bootstrap-drawer-1.0.6/.gitignore" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/js/bootstrap-drawer-1.0.6/bower.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/js/bootstrap-drawer-1.0.6/changelog.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/js/bootstrap-drawer-1.0.6/customize.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/js/bootstrap-drawer-1.0.6/dist/css/bootstrap-drawer.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/js/bootstrap-drawer-1.0.6/dist/css/bootstrap-drawer.min.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/js/bootstrap-drawer-1.0.6/dist/js/drawer.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/js/bootstrap-drawer-1.0.6/dist/js/drawer.min.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/js/bootstrap-drawer-1.0.6/docs/_footer.htm" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/js/bootstrap-drawer-1.0.6/docs/_header.htm" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/js/bootstrap-drawer-1.0.6/docs/customize.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/js/bootstrap-drawer-1.0.6/docs/html/customize.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/js/bootstrap-drawer-1.0.6/docs/html/index.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/js/bootstrap-drawer-1.0.6/docs/html/javascript.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/js/bootstrap-drawer-1.0.6/docs/html/less.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/js/bootstrap-drawer-1.0.6/docs/index.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/js/bootstrap-drawer-1.0.6/docs/javascript.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/js/bootstrap-drawer-1.0.6/docs/less.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/js/bootstrap-drawer-1.0.6/example/bootstrap-drawer.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/js/bootstrap-drawer-1.0.6/example/bootstrap.drawer.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/js/bootstrap-drawer-1.0.6/example/bootstrap.min.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/js/bootstrap-drawer-1.0.6/example/bootstrap.min.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/js/bootstrap-drawer-1.0.6/example/docs.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/js/bootstrap-drawer-1.0.6/example/drawer-docs.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/js/bootstrap-drawer-1.0.6/example/drawer.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/js/bootstrap-drawer-1.0.6/example/github.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/js/bootstrap-drawer-1.0.6/example/highlight.pack.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/js/bootstrap-drawer-1.0.6/example/index.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/js/bootstrap-drawer-1.0.6/gulpfile.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/js/bootstrap-drawer-1.0.6/index.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/js/bootstrap-drawer-1.0.6/javascript.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/js/bootstrap-drawer-1.0.6/js/drawer.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/js/bootstrap-drawer-1.0.6/less.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/js/bootstrap-drawer-1.0.6/less/bootstrap-drawer.less" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/js/bootstrap-drawer-1.0.6/less/drawer-docs.less" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/js/bootstrap-drawer-1.0.6/less/drawer-variables.less" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/js/bootstrap-drawer-1.0.6/less/drawer.less" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/js/bootstrap-drawer-1.0.6/less/mixins/drawer-framework.less" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/js/bootstrap-drawer-1.0.6/less/mixins/fold.less" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/js/bootstrap-drawer-1.0.6/package.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/js/bootstrap-drawer-1.0.6/readme.md" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/dashboard/models.py" beforeDir="false" afterPath="$PROJECT_DIR$/dashboard/models.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/dashboard/static/dashboard/css/dashboard.css" beforeDir="false" afterPath="$PROJECT_DIR$/dashboard/static/dashboard/css/dashboard.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/dashboard/static/dashboard/js/dashboard.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/dashboard/static/dashboard/js/index_1.js" beforeDir="false" afterPath="$PROJECT_DIR$/dashboard/static/dashboard/js/index_1.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/dashboard/static/dashboard/js/leaflet.ChineseTmsProviders.js" beforeDir="false" afterPath="$PROJECT_DIR$/dashboard/static/dashboard/js/leaflet.ChineseTmsProviders.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/dashboard/static/dashboard/js/map-height.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/dashboard/templates/dashboard/common/base.html" beforeDir="false" afterPath="$PROJECT_DIR$/dashboard/templates/dashboard/common/base.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/dashboard/templates/dashboard/index_1.html" beforeDir="false" afterPath="$PROJECT_DIR$/dashboard/templates/dashboard/index_1.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> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
@ -139,8 +69,8 @@
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="true">
<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="132"> <state relative-caret-position="733">
<caret line="60" column="158" selection-start-line="60" selection-start-column="158" selection-end-line="60" selection-end-column="158" /> <caret line="139" lean-forward="true" selection-start-line="139" selection-end-line="139" />
<folding> <folding>
<element signature="n#style#0;n#button#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#button#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#button#1;n#!!top" expanded="true" /> <element signature="n#style#0;n#button#1;n#!!top" expanded="true" />
@ -400,7 +330,7 @@
<property name="WebServerToolWindowFactoryState" value="false" /> <property name="WebServerToolWindowFactoryState" value="false" />
<property name="database.console.LAST_STATE" value="true" /> <property name="database.console.LAST_STATE" value="true" />
<property name="editor.config.ad.shown" value="true" /> <property name="editor.config.ad.shown" value="true" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/dashboard/static/dashboard/css" /> <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_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" /> <property name="nodejs_npm_path_reset_for_default_project" value="true" />
</component> </component>
@ -513,7 +443,7 @@
<workItem from="1573175099019" duration="1897000" /> <workItem from="1573175099019" duration="1897000" />
<workItem from="1573433843998" duration="1289000" /> <workItem from="1573433843998" duration="1289000" />
<workItem from="1573520211053" duration="848000" /> <workItem from="1573520211053" duration="848000" />
<workItem from="1573607045845" duration="21767000" /> <workItem from="1573607045845" duration="22410000" />
</task> </task>
<task id="LOCAL-00001" summary="#creat"> <task id="LOCAL-00001" summary="#creat">
<created>1567674653918</created> <created>1567674653918</created>
@ -648,17 +578,24 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1573121658538</updated> <updated>1573121658538</updated>
</task> </task>
<option name="localTasksCounter" value="20" /> <task id="LOCAL-00020" summary="#index">
<created>1573638900089</created>
<option name="number" value="00020" />
<option name="presentableId" value="LOCAL-00020" />
<option name="project" value="LOCAL" />
<updated>1573638900089</updated>
</task>
<option name="localTasksCounter" value="21" />
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="64204000" /> <option name="totallyTimeSpent" value="64847000" />
</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 content_ui="combo" id="Project" order="0" visible="true" weight="0.31576145" /> <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.31576145" />
<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="Database Console" weight="0.32937366" /> <window_info anchor="bottom" id="Database Console" weight="0.32937366" />
@ -956,8 +893,8 @@
</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="132"> <state relative-caret-position="733">
<caret line="60" column="158" selection-start-line="60" selection-start-column="158" selection-end-line="60" selection-end-column="158" /> <caret line="139" lean-forward="true" selection-start-line="139" selection-end-line="139" />
<folding> <folding>
<element signature="n#style#0;n#button#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#button#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#button#1;n#!!top" expanded="true" /> <element signature="n#style#0;n#button#1;n#!!top" expanded="true" />

View File

@ -58,7 +58,7 @@ $(function () {
//创建一个图片要素 //创建一个图片要素
var labels = [] var labels = []
labels.push( labels.push(
'<button id="m" style="z-index: 9999;margin-top: 20px;">厂</button><button id="d" style="z-index: 9999;margin-top: 20px;margin-right: 20px">煤场</button>'); '<button id="m" style="z-index: 9999;margin-top: 20px;">厂</button><button id="d" style="z-index: 9999;margin-top: 20px;margin-right: 20px">厂区</button>');
this._container.innerHTML = labels.join('<br>'); this._container.innerHTML = labels.join('<br>');
return this._container; return this._container;
}, },