diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 91a59dd..a4c3d89 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,7 +4,6 @@
-
@@ -17,7 +16,7 @@
-
+
@@ -29,12 +28,8 @@
-
-
-
-
-
-
+
+
@@ -56,14 +51,8 @@
-
+
-
-
-
-
-
-
@@ -71,8 +60,8 @@
-
-
+
+
@@ -80,7 +69,7 @@
-
+
@@ -91,8 +80,8 @@
-
-
+
+
@@ -101,16 +90,17 @@
- 班公湖
任意
api.ownthink
知识
china
交易量
- backg
brush
geo:
brush:
+ backg
+ 班公湖
+ http
@@ -143,7 +133,6 @@
-
@@ -155,6 +144,7 @@
+
@@ -188,18 +178,19 @@
1576569407340
-
+
+
-
+
-
+
@@ -212,7 +203,7 @@
-
+
@@ -260,6 +251,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -274,18 +291,19 @@
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -294,47 +312,10 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/js/map.js b/js/map.js
index 5512c48..30edaa2 100644
--- a/js/map.js
+++ b/js/map.js
@@ -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,36 +665,43 @@ myChart.setOption(option);
myChart.on('brushselected', renderBrushed);
// myChart.on('focusnodeadjacency', renderFocusNodeJacency);
myChart.on('click', function (params) {
-$('.fixed-left').css({left: 0}).addClass('collpased');
-// $('.screen-btn').css({left: '360px'});
-if (!$('.fixed-left').hasClass('active')) {
- $('.screen-btn').css({left: '360px'});
-}
-$('.collpase-icon').addClass('icon-shouqi').removeClass('icon-zhankai');
- const {seriesId, seriesIndex, seriesName, dataIndex, data, value } = params;
- myChart.dispatchAction({
- type: 'focusNodeAdjacency',
- seriesId,
- seriesIndex,
- seriesName,
- // 使用 dataIndex 来定位节点。
- dataIndex,
- });
- const count = params.data[params.data.length - 1];
- this.setOption({
- yAxis: {
- data: data
- },
- xAxis: {
- axisLabel: {show: !!count}
- },
- title: {
- id: 'statistic',
- text: count ? '平均: ' + (1000 / count).toFixed(4) : ''
- },
- series: {
- id: 'bar',
- data: name
+ 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')) {
+ $('.screen-btn').css({left: '360px'});
}
-});
+ $('.collpase-icon').addClass('icon-shouqi').removeClass('icon-zhankai');
+ const {seriesId, seriesIndex, seriesName, dataIndex, data, value } = params;
+ myChart.dispatchAction({
+ type: 'focusNodeAdjacency',
+ seriesId,
+ seriesIndex,
+ seriesName,
+ // 使用 dataIndex 来定位节点。
+ dataIndex,
+ });
+ const count = (params.data && params.data[params.data.length - 1]) || 0;
+ this.setOption({
+ yAxis: {
+ data: data
+ },
+ xAxis: {
+ axisLabel: {show: !!count}
+ },
+ title: {
+ id: 'statistic',
+ text: count ? '平均: ' + (1000 / count).toFixed(4) : ''
+ },
+ series: {
+ id: 'bar',
+ data: name
+ }
+ });
});
\ No newline at end of file
diff --git a/map.html b/map.html
index f7607da..93469cc 100755
--- a/map.html
+++ b/map.html
@@ -126,9 +126,6 @@
-
-
-
-
+
+