This commit is contained in:
Bob 2019-11-07 16:14:02 +08:00
parent 414d1d49cc
commit c460d8ec13
3 changed files with 43 additions and 21 deletions

View File

@ -12,15 +12,29 @@
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" /> <option name="LAST_RESOLUTION" value="IGNORE" />
</component> </component>
<component name="DatabaseView">
<option name="SHOW_INTERMEDIATE" value="true" />
<option name="GROUP_DATA_SOURCES" value="true" />
<option name="GROUP_SCHEMA" value="true" />
<option name="GROUP_CONTENTS" value="false" />
<option name="SORT_POSITIONED" value="false" />
<option name="SHOW_EMPTY_GROUPS" value="false" />
<option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
<option name="HIDDEN_KINDS">
<set />
</option>
<expand />
<select />
</component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<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="310"> <state relative-caret-position="404">
<caret line="50" column="39" selection-start-line="50" selection-start-column="17" selection-end-line="50" selection-end-column="39" /> <caret line="50" column="41" selection-start-line="50" selection-start-column="17" selection-end-line="50" selection-end-column="41" />
<folding> <folding>
<marker date="1573027690345" expanded="true" signature="1253:1279" ph="..." /> <marker date="1573114364345" expanded="true" signature="1253:1279" ph="..." />
</folding> </folding>
</state> </state>
</provider> </provider>
@ -29,8 +43,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_2.js"> <entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/js/index_2.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="288"> <state relative-caret-position="486">
<caret line="49" column="39" selection-start-line="49" selection-start-column="39" selection-end-line="49" selection-end-column="39" /> <caret line="49" column="41" selection-start-line="49" selection-start-column="41" selection-end-line="49" selection-end-column="41" />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -80,8 +94,7 @@
</option> </option>
</component> </component>
<component name="ProjectFrameBounds" extendedState="6"> <component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="-8" /> <option name="x" value="-5" />
<option name="y" value="-8" />
<option name="width" value="1936" /> <option name="width" value="1936" />
<option name="height" value="1056" /> <option name="height" value="1056" />
</component> </component>
@ -91,6 +104,7 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="Scope" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<expand> <expand>
@ -209,7 +223,6 @@
<select /> <select />
</subPane> </subPane>
</pane> </pane>
<pane id="Scope" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
@ -296,7 +309,9 @@
<workItem from="1570582655843" duration="5240000" /> <workItem from="1570582655843" duration="5240000" />
<workItem from="1571210770034" duration="26000" /> <workItem from="1571210770034" duration="26000" />
<workItem from="1572434744443" duration="608000" /> <workItem from="1572434744443" duration="608000" />
<workItem from="1573027123156" duration="716000" /> <workItem from="1573027123156" duration="1336000" />
<workItem from="1573088776148" duration="1065000" />
<workItem from="1573114037078" duration="390000" />
</task> </task>
<task id="LOCAL-00001" summary="#creat"> <task id="LOCAL-00001" summary="#creat">
<created>1567674653918</created> <created>1567674653918</created>
@ -410,17 +425,24 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1572435056993</updated> <updated>1572435056993</updated>
</task> </task>
<option name="localTasksCounter" value="17" /> <task id="LOCAL-00017" summary="#index">
<created>1573027862539</created>
<option name="number" value="00017" />
<option name="presentableId" value="LOCAL-00017" />
<option name="project" value="LOCAL" />
<updated>1573027862539</updated>
</task>
<option name="localTasksCounter" value="18" />
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="34120000" /> <option name="totallyTimeSpent" value="36195000" />
</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 active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.29659212" /> <window_info 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="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="Message" order="0" /> <window_info anchor="bottom" id="Message" order="0" />
@ -434,13 +456,13 @@
<window_info anchor="bottom" id="Version Control" order="8" weight="0.32937366" /> <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="Database Changes" order="9" />
<window_info anchor="bottom" id="Event Log" order="10" side_tool="true" /> <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
<window_info anchor="bottom" id="Terminal" order="11" visible="true" weight="0.30561554" /> <window_info active="true" anchor="bottom" id="Terminal" order="11" visible="true" weight="0.18034557" />
<window_info anchor="bottom" id="Python Console" order="12" /> <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="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" 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" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="right" id="SciView" order="3" /> <window_info anchor="right" id="SciView" order="3" />
<window_info anchor="right" id="Database" order="4" /> <window_info anchor="right" id="Database" order="4" visible="true" weight="0.22523962" />
</layout> </layout>
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
@ -592,18 +614,18 @@
</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="310"> <state relative-caret-position="404">
<caret line="50" column="39" selection-start-line="50" selection-start-column="17" selection-end-line="50" selection-end-column="39" /> <caret line="50" column="41" selection-start-line="50" selection-start-column="17" selection-end-line="50" selection-end-column="41" />
<folding> <folding>
<marker date="1573027690345" expanded="true" signature="1253:1279" ph="..." /> <marker date="1573114364345" expanded="true" signature="1253:1279" ph="..." />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/js/index_2.js"> <entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/js/index_2.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="288"> <state relative-caret-position="486">
<caret line="49" column="39" selection-start-line="49" selection-start-column="39" selection-end-line="49" selection-end-column="39" /> <caret line="49" column="41" selection-start-line="49" selection-start-column="41" selection-end-line="49" selection-end-column="41" />
</state> </state>
</provider> </provider>
</entry> </entry>

View File

@ -48,7 +48,7 @@ $(function () {
map.addLayer(w35Layer) map.addLayer(w35Layer)
var points = L.tileLayer.wms('http://210.77.68.250:8080/geoserver/linbei/wms', { var points = L.tileLayer.wms('http://210.77.68.250:8080/geoserver/linbei/wms', {
layers: 'linbei:BaseStation_P_C', layers: 'linbei:BaseStation_C_ALL',
transparent: true, transparent: true,
format: 'image/png', format: 'image/png',
}); });

View File

@ -47,7 +47,7 @@ $(function () {
}); });
map.addLayer(w35Layer) map.addLayer(w35Layer)
var points = L.tileLayer.wms('http://210.77.68.250:8080/geoserver/linbei/wms', { var points = L.tileLayer.wms('http://210.77.68.250:8080/geoserver/linbei/wms', {
layers: 'linbei:BaseStation_P_C', layers: 'linbei:BaseStation_C_ALL',
transparent: true, transparent: true,
format: 'image/png' format: 'image/png'
}); });