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

This commit is contained in:
caicai8 2019-12-19 17:58:23 +08:00
parent e2f6b2585f 0d59de77f8
commit 1bdbf1a0d8
3 changed files with 119 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

129
.idea/workspace.xml
View File

@ -4,7 +4,6 @@
<list default="true" id="0b71a6a1-d7aa-4903-a1f1-4488fea56112" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/js/map.js" beforeDir="false" afterPath="$PROJECT_DIR$/js/map.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/test.html" beforeDir="false" afterPath="$PROJECT_DIR$/test.html" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
@ -17,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" />
@ -29,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="179">
<caret line="929" column="32" selection-start-line="929" selection-start-column="32" selection-end-line="929" selection-end-column="39" />
<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>
@ -56,14 +51,8 @@
<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>
@ -71,8 +60,8 @@
<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="2261">
<caret line="119" column="43" selection-start-line="119" selection-start-column="38" selection-end-line="119" selection-end-column="43" />
<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>
@ -80,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>
@ -91,8 +80,8 @@
<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="234">
<caret line="458" column="32" selection-start-line="458" selection-start-column="32" selection-end-line="458" selection-end-column="32" />
<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>
@ -101,16 +90,17 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>班公湖</find>
<find>任意</find>
<find>api.ownthink</find>
<find>知识</find>
<find>china</find>
<find>交易量</find>
<find>backg</find>
<find>brush</find>
<find>geo:</find>
<find>brush:</find>
<find>backg</find>
<find>班公湖</find>
<find>http</find>
</findStrings>
</component>
<component name="Git.Settings">
@ -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,18 +178,19 @@
<updated>1576569407340</updated>
<workItem from="1576569409159" duration="1687000" />
<workItem from="1576671812636" duration="1016000" />
<workItem from="1576723846646" duration="4765000" />
<workItem from="1576723846646" duration="6468000" />
<workItem from="1576743516593" duration="368000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="7468000" />
<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 active="true" 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" />
@ -212,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 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" />
@ -260,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">
@ -274,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>
@ -294,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$/map.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2261">
<caret line="119" column="43" selection-start-line="119" selection-start-column="38" selection-end-line="119" selection-end-column="43" />
</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="179">
<caret line="929" column="32" selection-start-line="929" selection-start-column="32" selection-end-line="929" selection-end-column="39" />
<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$/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$/js/map.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="234">
<caret line="458" column="32" selection-start-line="458" selection-start-column="32" selection-end-line="458" selection-end-column="32" />
<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>

21
js/map.js
View File

@ -188,7 +188,10 @@ var geoCoordMap = {
"菏泽":[115.480656,35.23375],
"合肥":[117.27,31.86],
"武汉":[114.31,30.52],
"大庆":[125.03,46.58]
"大庆":[125.03,46.58],
"班公湖": [78.744718,33.670094],
"洞朗": [88.951476,27.298102],
"桑多河谷":[92.21,26.97]
};
var data = [
@ -381,7 +384,10 @@ var data = [
{name: "菏泽", value: 194},
{name: "合肥", value: 229},
{name: "武汉", value: 273},
{name: "大庆", value: 279}
{name: "大庆", value: 279},
{name: "班公湖", value: 300},
{name: "洞朗", value: 210},
{name: "桑多河谷", value: 200}
];
var convertData = function (data) {
@ -468,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: {
@ -659,6 +665,13 @@ myChart.setOption(option);
myChart.on('brushselected', renderBrushed);
// myChart.on('focusnodeadjacency', renderFocusNodeJacency);
myChart.on('click', function (params) {
console.log('init方法===》》》', window.initial);
var name = params.name;
console.log(name);
// window.loadData && window.loadData(name);
console.log(window.myChartGraph)
// window.myChartGraph && window.myChartGraph.restore && window.myChartGraph.restore();
window.initial && window.initial(name);
$('.fixed-left').css({left: 0}).addClass('collpased');
// $('.screen-btn').css({left: '360px'});
if (!$('.fixed-left').hasClass('active')) {
@ -674,7 +687,7 @@ $('.collpase-icon').addClass('icon-shouqi').removeClass('icon-zhankai');
// 使用 dataIndex 来定位节点。
dataIndex,
});
const count = params.data[params.data.length - 1];
const count = (params.data && params.data[params.data.length - 1]) || 0;
this.setOption({
yAxis: {
data: data

22
map.html
View File

@ -126,9 +126,6 @@
<script type="text/javascript" src="./js/jQuery-1.8.3.min.js"></script>
<script type="text/javascript" src="./js/jquery.easy_slides.js"></script>
<script type="text/javascript" src="./js/demo.js"></script>
<script src="./js/map.js"></script>
<script>
$(document).ready(function () {
var graphContainer = document.getElementById('mainGraph');
@ -373,6 +370,15 @@
alert("nothing")
return 0
}
graphList = {"keyword":{
"nodes":[],
"links":[]
}}
currentGraph = {
nodes: {},
links: {},
};
category = 1;
fillInfo(result, name)
nodeMap = {};
graph = graphList.keyword
@ -402,11 +408,15 @@
}
redrawGraph();
loadVideo('西藏');
loadVideo(name);
// myChartGraph.resize();
}
init("西藏")
window.loadData = loadData;
window.initial = init;
window.myChartGraph = myChartGraph;
myChartGraph.on('click', function(params) {
if (params.dataType === "node") {
const node = nodeMap[params.data.name];
@ -468,6 +478,7 @@
</script>
<script type="text/javascript">
// window.init = init;
$(document).ready(function () {
$('.slider_one_big_picture').EasySlides({
'autoplay': true,
@ -565,7 +576,6 @@
// })
});
</script>
<script>
$(function(){
$(".show_detail").hover(function(){
@ -593,5 +603,7 @@
$(".voicePanel").removeClass("active");
}
</script>
<script src="./js/map.js"></script>
</body>
</html>