p85126437
/
geo_info_platform
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of http://git.trustie.net/qiubing/geo_info_platform 

merge code
This commit is contained in:
tangjiang 2019-12-19 16:46:54 +08:00
parent 5c87853852 82c3899e5c
commit 0d59de77f8
2 changed files with 56 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

128
.idea/workspace.xml
View File

@ -16,7 +16,7 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/test.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="327">
<state relative-caret-position="10032">
<caret line="528" column="49" selection-start-line="528" selection-start-column="42" selection-end-line="528" selection-end-column="49" />
<folding>
<element signature="n#style#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
@ -28,12 +28,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/echarts_map_test 1.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="193">
<caret line="168" column="32" lean-forward="true" selection-start-line="166" selection-start-column="12" selection-end-line="168" selection-end-column="32" />
<folding>
<element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#!!top" expanded="true" />
</folding>
<state relative-caret-position="3192">
<caret line="168" column="32" selection-start-line="166" selection-start-column="12" selection-end-line="168" selection-end-column="32" />
</state>
</provider>
</entry>
@ -55,23 +51,17 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/demo_1.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="388">
<state relative-caret-position="31502">
<caret line="1658" column="38" lean-forward="true" selection-start-line="1658" selection-start-column="38" selection-end-line="1658" selection-end-column="38" />
<folding>
<element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/map.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-505">
<caret line="367" column="86" lean-forward="true" selection-start-line="367" selection-start-column="35" selection-end-line="367" selection-end-column="86" />
<state relative-caret-position="10792">
<caret line="568" column="7" lean-forward="true" selection-start-line="568" selection-start-column="7" selection-end-line="568" selection-end-column="7" />
</state>
</provider>
</entry>
@ -79,7 +69,7 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/js/demo.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-569">
<state>
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
@ -87,11 +77,11 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/js/map.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="7372">
<caret line="388" column="24" selection-start-line="388" selection-start-column="24" selection-end-line="388" selection-end-column="24" />
<state relative-caret-position="191">
<caret line="476" column="36" selection-start-line="476" selection-start-column="36" selection-end-line="476" selection-end-column="36" />
</state>
</provider>
</entry>
@ -143,7 +133,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
@ -155,6 +144,7 @@
<select />
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
@ -188,17 +178,19 @@
<updated>1576569407340</updated>
<workItem from="1576569409159" duration="1687000" />
<workItem from="1576671812636" duration="1016000" />
<workItem from="1576723846646" duration="5964000" />
<workItem from="1576723846646" duration="6468000" />
<workItem from="1576743516593" duration="368000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="8667000" />
<option name="totallyTimeSpent" value="9539000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="1440" height="820" extended-state="0" />
<editor active="true" />
<layout>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.15379113" />
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.15593705" />
<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" />
@ -211,7 +203,7 @@
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Database Changes" order="8" />
<window_info anchor="bottom" id="Version Control" order="9" />
<window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.25686812" />
<window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.26785713" />
<window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
<window_info anchor="bottom" id="Messages" order="12" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
@ -259,6 +251,32 @@
<entry file="file://$PROJECT_DIR$/image/3.jpg">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/china.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$/test.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="10032">
<caret line="528" column="49" selection-start-line="528" selection-start-column="42" selection-end-line="528" selection-end-column="49" />
<folding>
<element signature="n#style#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/echarts_map_test 1.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3192">
<caret line="168" column="32" selection-start-line="166" selection-start-column="12" selection-end-line="168" selection-end-column="32" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/demo.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2527">
@ -273,18 +291,19 @@
</entry>
<entry file="file://$PROJECT_DIR$/demo_1.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="388">
<state relative-caret-position="31502">
<caret line="1658" column="38" lean-forward="true" selection-start-line="1658" selection-start-column="38" selection-end-line="1658" selection-end-column="38" />
<folding>
<element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/china.js">
<entry file="file://$PROJECT_DIR$/map.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="10792">
<caret line="568" column="7" lean-forward="true" selection-start-line="568" selection-start-column="7" selection-end-line="568" selection-end-column="7" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/demo.js">
<provider selected="true" editor-type-id="text-editor">
<state>
<folding>
@ -293,47 +312,10 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/demo.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-569">
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/test.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="327">
<caret line="528" column="49" selection-start-line="528" selection-start-column="42" selection-end-line="528" selection-end-column="49" />
<folding>
<element signature="n#style#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/echarts_map_test 1.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="193">
<caret line="168" column="32" lean-forward="true" selection-start-line="166" selection-start-column="12" selection-end-line="168" selection-end-column="32" />
<folding>
<element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/map.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="7372">
<caret line="388" column="24" selection-start-line="388" selection-start-column="24" selection-end-line="388" selection-end-column="24" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/map.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-505">
<caret line="367" column="86" lean-forward="true" selection-start-line="367" selection-start-column="35" selection-end-line="367" selection-end-column="86" />
<state relative-caret-position="191">
<caret line="476" column="36" selection-start-line="476" selection-start-column="36" selection-end-line="476" selection-end-column="36" />
</state>
</provider>
</entry>

2
js/map.js
View File

@ -474,7 +474,7 @@ option = {
map: 'china',
left: '140',
right: '10%',
center: [99.98561551896913, 30.205000490896193],
center: [99.98561551896913, 33.205000490896193],
zoom: 0.6,
label: {
emphasis: {