Skip to content

Commit

Permalink
例子更新
Browse files Browse the repository at this point in the history
  • Loading branch information
@kener
kener committed Mar 26, 2014
1 parent 802edbe commit 0157e5a
Show file tree
Hide file tree
Showing 10 changed files with 401 additions and 95 deletions.
9 changes: 8 additions & 1 deletion doc/asset/css/echartsHome.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,10 @@ body {
}
.main {
height: 400px;
/*width: 800px;*/
/*
height : 400px !important;
width : 800px !important;
*/
overflow: hidden;
padding : 10px;
margin-bottom: 10px;
Expand All @@ -158,12 +161,14 @@ ul.nav-list {
float: left;
cursor : pointer;
opacity: .3;
filter:alpha(opacity=30);
}
i.icon-chevron-right{
float: right;
margin-top: 2px;
margin-right: -6px;
opacity: .25;
filter:alpha(opacity=25);
}
.page-header {
padding-top:35px;
Expand Down Expand Up @@ -277,7 +282,9 @@ table.full {width:100%;}
#icon-resize {
float:right;
opacity:.3;
filter:alpha(opacity=30);
}
a#icon-resize:hover {
opacity:.6;
filter:alpha(opacity=60);
}
Binary file modified doc/asset/img/example/k1.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/asset/img/example/map11.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/asset/img/example/map12.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/asset/img/example/mix10.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/asset/img/example/mix8.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/asset/img/example/mix9.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
64 changes: 44 additions & 20 deletions doc/example.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
.affix i {
margin-top:4px;
opacity:.5;
filter:alpha(opacity=50);
}
ul {
margin:5px;
Expand Down Expand Up @@ -270,7 +271,7 @@ <h3>K线图<a name="k"> </a></h3>
</li><!--/li-->
</ul>
</div>
</div>
</div>
</div>
<div>
<h3>饼图<a name="pie"> </a></h3>
Expand Down Expand Up @@ -332,7 +333,7 @@ <h3>雷达图<a name="radar"> </a></h3>
</li><!--/li-->
</ul>
</div>
</div>
</div>
</div>
<div>
<h3>和弦图<a name="chord"> </a></h3>
Expand All @@ -353,7 +354,7 @@ <h3>和弦图<a name="chord"> </a></h3>
</li><!--/li-->
</ul>
</div>
</div>
</div>
</div>
<div>
<h3>力导向布局图<a name="force"> </a></h3>
Expand All @@ -374,7 +375,7 @@ <h3>力导向布局图<a name="force"> </a></h3>
</li><!--/li-->
</ul>
</div>
</div>
</div>
</div>
<div>
<h3>地图<a name="map"> </a></h3>
Expand All @@ -389,6 +390,10 @@ <h3>地图<a name="map"> </a></h3>
<a href="example/map2.html"><img src="asset/img/example/cache.png">
<span><strong>标准地图</strong><br/>中国地图，地域选择器</span></a>
</li><!--/li-->
<li data-thumb="asset/img/example/cache.png">
<a href="example/map3.html"><img src="asset/img/example/cache.png">
<span><strong>标准地图</strong><br/>事件响应，切换，全国34个省市自治区</span></a>
</li><!--/li-->
<li data-thumb="asset/img/example/cache.png">
<a href="example/map4.html"><img src="asset/img/example/cache.png">
<span><strong>标准地图</strong><br/>世界地图，值域漫游</span></a>
Expand All @@ -398,8 +403,8 @@ <h3>地图<a name="map"> </a></h3>
<span><strong>标准地图</strong><br/>世界地图，地域选择器</span></a>
</li><!--/li-->
<li data-thumb="asset/img/example/cache.png">
<a href="example/map3.html"><img src="asset/img/example/cache.png">
<span><strong>标准地图</strong><br/>事件响应，切换，全国34个省市自治区</span></a>
<a href="example/map8.html"><img src="asset/img/example/cache.png">
<span><strong>子区域模式</strong><br/>子区域模式使用，值域漫游</span></a>
</li><!--/li-->
<li data-thumb="asset/img/example/cache.png">
<a href="example/map6.html"><img src="asset/img/example/cache.png">
Expand All @@ -410,28 +415,32 @@ <h3>地图<a name="map"> </a></h3>
<span><strong>地图扩展</strong><br/>标准geoJson格式扩展地图类型-美国</span></a>
</li><!--/li-->
<li data-thumb="asset/img/example/cache.png">
<a href="example/map8.html"><img src="asset/img/example/cache.png">
<span><strong>子区域模式</strong><br/>子区域模式使用，值域漫游</span></a>
<a href="example/mix5.html"><img src="asset/img/example/cache.png">
<span><strong>多地图</strong><br/>数据驱动，省市级下钻</span></a>
</li><!--/li-->
<li data-thumb="asset/img/example/cache.png">
<a href="example/map9.html"><img src="asset/img/example/cache.png">
<span><strong>地图标注</strong><br/>（markPoint）<br/>值域漫游</span></a>
<a href="example/map10.html"><img src="asset/img/example/cache.png">
<span><strong>地图标线</strong><br/>markLine<br/>多系列</span></a>
</li><!--/li-->
<li data-thumb="asset/img/example/cache.png">
<a href="example/map10.html"><img src="asset/img/example/cache.png">
<span><strong>地图标线</strong><br/>（markLine）<br/>多系列</span></a>
<a href="example/map11.html"><img src="asset/img/example/cache.png">
<span><strong>地图标线</strong><br/>markLine<br/>炫光特效，模拟百度迁徙，多系列</span></a>
</li><!--/li-->
<li data-thumb="asset/img/example/cache.png">
<a href="example/mix5.html"><img src="asset/img/example/cache.png">
<span><strong>多地图</strong><br/>数据驱动，省市级下钻</span></a>
<a href="example/map12.html"><img src="asset/img/example/cache.png">
<span><strong>地图标线</strong><br/>markLine<br/>炫光特效，中国铁路干线，多系列</span></a>
</li><!--/li-->
<li data-thumb="asset/img/example/cache.png">
<a href="example/map9.html"><img src="asset/img/example/cache.png">
<span><strong>地图标注</strong><br/>markPoint<br/>值域漫游</span></a>
</li><!--/li-->
<li data-thumb="asset/img/example/cache.png">
<a href="example/map.html"><img src="asset/img/example/cache.png">
<span><strong>地图</strong><br/>多级控制，个性化填充、标签文本、线条样式等</span></a>
</li><!--/li-->
</ul>
</div>
</div>
</div>
</div>
<div>
<h3>混搭<a name="mix"> </a></h3>
Expand All @@ -442,6 +451,10 @@ <h3>混搭<a name="mix"> </a></h3>
<a href="example/mix1.html"><img src="asset/img/example/cache.png">
<span><strong>折柱混搭</strong><br/>双数值轴</span></a>
</li><!--/li-->
<li data-thumb="asset/img/example/cache.png">
<a href="example/mix6.html"><img src="asset/img/example/cache.png">
<span><strong>折柱混搭</strong><br/>数据驱动，模拟范围图</span></a>
</li><!--/li-->
<li data-thumb="asset/img/example/cache.png">
<a href="example/mix2.html"><img src="asset/img/example/cache.png">
<span><strong>柱状饼混搭</strong><br/>数据驱动，饼图中心定义</span></a>
Expand All @@ -454,10 +467,22 @@ <h3>混搭<a name="mix"> </a></h3>
<a href="example/mix7.html"><img src="asset/img/example/cache.png">
<span><strong>散饼图</strong><br/>用饼图代替气泡图中的散点，多系列</span></a>
</li><!--/li-->
<li data-thumb="asset/img/example/cache.png">
<a href="example/mix10.html"><img src="asset/img/example/cache.png">
<span><strong>折线K线混搭</strong><br/>双数值轴，多系列</span></a>
</li><!--/li-->
<li data-thumb="asset/img/example/cache.png">
<a href="example/mix3.html"><img src="asset/img/example/cache.png">
<span><strong>地图与饼图混搭</strong><br/>地图作为地域选择器</span></a>
</li><!--/li-->
<li data-thumb="asset/img/example/cache.png">
<a href="example/mix9.html"><img src="asset/img/example/cache.png">
<span><strong>多图联动</strong><br/>简单connect，图例，工具箱共享，多系列</span></a>
</li><!--/li-->
<li data-thumb="asset/img/example/cache.png">
<a href="example/mix8.html"><img src="asset/img/example/cache.png">
<span><strong>多图联动</strong><br/>直角系多图联动，多系列</span></a>
</li><!--/li-->
<li data-thumb="asset/img/example/cache.png">
<a href="example/lasagna.html"><img src="asset/img/example/cache.png">
<span><strong>千层饼</strong><br/>多层嵌套环形图</span></a>
Expand All @@ -468,7 +493,7 @@ <h3>混搭<a name="mix"> </a></h3>
</li><!--/li-->
</ul>
</div>
</div>
</div>
</div>
<div>
<h3>组件<a name="component"> </a></h3>
Expand All @@ -485,7 +510,7 @@ <h3>组件<a name="component"> </a></h3>
</li><!--/li-->
<li data-thumb="asset/img/example/cache.png">
<a href="example/dataZoom.html"><img src="asset/img/example/cache.png">
<span><strong>数据区域缩放</strong><br/>个性化布局，数据阴影、背景、拖拽手柄样式等</span></a>
<span><strong>数据区域控件</strong><br/>个性化布局，数据阴影、背景、拖拽手柄样式等</span></a>
</li><!--/li-->
<li data-thumb="asset/img/example/cache.png">
<a href="example/tooltip.html"><img src="asset/img/example/cache.png">
Expand All @@ -501,7 +526,7 @@ <h3>组件<a name="component"> </a></h3>
</li><!--/li-->
</ul>
</div>
</div>
</div>
</div>
<div>
<h3>其他<a name="other"> </a></h3>
Expand Down Expand Up @@ -538,7 +563,7 @@ <h3>其他<a name="other"> </a></h3>
</li><!--/li-->
</ul>
</div>
</div>
</div>
</div>
<div>
<h3>主题<a name="theme"> </a></h3>
Expand All @@ -553,7 +578,6 @@ <h3>专题<a name="topic"></a></h3>
<li><a href="example/topic/aqi-china/index.html" target="_blank">中国主要城市空气质量实况 </a> by <a href="http://weibo.com/wfsr" target="_blank">大佛</a>（百度） · <a href="http://weibo.com/kenerlinfeng" target="_blank">林峰</a>（百度）</li>
<li><a href="example/topic/10-me-china/index.html" target="_blank">中国经济十年时空漫游（2002-2011）</a> by 于博（新华社） · 吴楚茵（南方都市报） · <a href="http://weibo.com/kenerlinfeng" target="_blank">林峰</a>（百度）</li>
<li><a href="example/topic/24-population-china/index.html" target="_blank">中国人口流动大潮（1987-2011）</a> by 孟立昕（腾讯）· 王飞宇（证券时报） · 颜冬（视觉中国） · <a href="http://weibo.com/kenerlinfeng" target="_blank">林峰</a>（百度）</li>

</ul>
</div>
</div>
Expand Down
74 changes: 0 additions & 74 deletions doc/example/k1.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,83 +139,9 @@
splitNumber: 9,
boundaryGap: [0.01, 0.01],
splitArea : {show : true}
},
{
type : 'value',
scale:true,
splitNumber: 9,
boundaryGap: [0.05, 0.05],
axisLabel: {
formatter: function(v) {
return Math.round(v/10000) + ' 万'
}
},
splitArea : {show : true}
}
],
series : [
{
name:'成交金额(万)',
type:'line',
yAxisIndex: 1,
symbol: 'none',
data:[
13560434, 8026738.5, 11691637, 12491697, 12485603,
11620504, 12555496, 15253370, 12709611, 10458354,
10933507, 9896523, 10365702, 10633095, 9722230,
12662783, 8757982, 7764234, 10591719, 8826293,
11591827, 11153111, 14304651, 11672120, 12536480,
12608589, 8843860, 7391994.5, 10063709, 7768895.5,
6921859, 10157810, 8148617.5, 7551207, 11397426,
10478607, 8595132, 8541862, 9181132, 8570842,
10759351, 7335819, 6699753.5, 7759666.5, 6880135.5,
7366616.5, 7313504, 7109021.5, 6213270, 5619688,
5816217.5, 6695584.5, 5998655.5, 6188812.5, 9538301,
8224500, 8221751.5, 7897721, 8448324, 6525151,
5987761, 7831570, 8162560.5, 7904092, 8139084.5,
9116529, 8128014, 7919148, 7566047, 6665826.5,
10225527, 11124881, 12884353, 11302521, 11529046,
11105205, 9202153, 9992016, 12035250, 11431155,
10354677, 10070399, 9164861, 9237718, 7114268,
7526158.5, 8105835, 7971452.5
],
markPoint : {
symbol: 'emptyPin',
itemStyle : {
normal : {
color:'#1e90ff',
label : {
show:true,
position:'top',
formatter: function(a,b,v) {
return Math.round(v/10000) + ' 万'
}
}
}
},
data : [
{type : 'max', name: '最大值', symbolSize:5},
{type : 'min', name: '最小值', symbolSize:5}
]
},
markLine : {
symbol : 'none',
itemStyle : {
normal : {
color:'#1e90ff',
label : {
show:true,
formatter: function(a,b,v) {
return Math.round(v/10000) + ' 万'
}
}
}
},
data : [
{type : 'average', name: '平均值'}
]
}
},
{
name:'上证指数',
type:'k',
Expand Down
Loading

0 comments on commit 0157e5a

Please sign in to comment.