bob
/
westdc-zf1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

加入可视化的链接地址，修改了数据集的展示名称

This commit is contained in:
Li Jianxuan 2014-05-22 08:59:35 +00:00
parent c986d6c535
commit a8df49bff7
3 changed files with 83 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
application/default/views/scripts/data/index.phtml
View File

@ -8,81 +8,81 @@ $this->headTitle()->setSeparator(' - ');
.fieldlist ul li:hover{color:#FFF;background:#0088CC;border-radius: 6px 6px 6px 6px;}
.fieldlist ul li:hover a{color:#FFF; text-decoration:none;}
.news_list ul li{line-height:24px;}
</style>
<div class="row">
<div class="span12">
<h4><i class="icon-flag"></i>特色导航</h4>
</style>
<div class="row">
<div class="span12">
<h4><i class="icon-flag"></i>特色导航</h4>
<form method="get" action="/search" id="search" class="form-search">
<div class="input-append">
<input type="text" value="" id="q" name="q" class="span2 search-query" placeholder="全文搜索">
<button type="submit" class="btn"><i class="icon-search"></i>搜索</button>
</div>
<a class="btn" href="/search/advance"><i class="icon-search"></i>高级搜索</a>
<a class="btn" href="/search/advance"><i class="icon-search"></i>高级搜索</a>
<a class="btn" href="/data/browse"><i class="icon-reorder"></i>数据列表浏览</a>
<a class="btn" href="/data/onlinelist"><i class="icon-th"></i>在线数据清单</a>
<a class="btn" href="/data/offlinelist"><i class="icon-th"></i>离线数据清单</a>
<a class="btn" href="/data/offlinelist"><i class="icon-th"></i>离线数据清单</a>
</form>
<ul class="unstyled inline">
<ul class="unstyled inline">
<li><a class="btn" href="/data/thumb"><i class="icon-picture"></i>缩略图浏览</a></li>
<li><a class="btn" href="/data/timeline"><i class="icon-calendar"></i>时间轴浏览</a></li>
<li><a class="btn" href="/data/map"><i class="icon-globe"></i>空间浏览</a></li>
<li><a class="btn" href="/data/timemap"><i class="icon-film"></i>时空浏览</a></li>
<li><a class="btn" href="/data/organization"><i class="icon-filter"></i>单位浏览</a></li>
<li><a class="btn" href="/data/fund"><i class="icon-money"></i>项目浏览</a></li>
<li><a class="btn" href="/data/author"><i class="icon-user-md"></i>作者浏览</a></li>
<li><a class="btn" href="/knowledge"><i class="icon-exchange"></i>文献浏览</a></li>
<li><a class="btn" href="/data/doi"><i class="icon-paper-clip"></i>DOI浏览</a></li>
</ul>
</div>
<li><a class="btn" href="/data/organization"><i class="icon-filter"></i>单位浏览</a></li>
<li><a class="btn" href="/data/fund"><i class="icon-money"></i>项目浏览</a></li>
<li><a class="btn" href="/data/author"><i class="icon-user-md"></i>作者浏览</a></li>
<li><a class="btn" href="/knowledge"><i class="icon-exchange"></i>文献浏览</a></li>
<li><a class="btn" href="/data/doi"><i class="icon-paper-clip"></i>DOI浏览</a></li>
</ul>
</div>
<?php
$keytypezh=array('place'=>'地点关键词','theme'=>'主题关键词','discipline'=>'学科关键词','stratum'=>'地层关键词','temporal'=>'时间关键词');
$keytypezh=array('place'=>'地点关键词','theme'=>'主题关键词','discipline'=>'学科关键词','stratum'=>'地层关键词','temporal'=>'时间关键词');
$type='theme';
?>
<div class="span6">
<h4><a href="/data/tag/keytype/theme"><i class="icon-tags"></i><?php echo $keytypezh[$type]; ?></a></h4>
?>
<div class="span6">
<h4><a href="/data/tag/keytype/theme"><i class="icon-tags"></i><?php echo $keytypezh[$type]; ?></a></h4>
<ul class="unstyled inline">
<?php foreach($this->keywords[$type] as $cg) : ?>
<li><a href='/data/tag/<?php echo $cg['keyword']; ?>'><i class="icon-tag"></i><?php echo $cg['keyword']; ?></a><span class="note">(<?php echo $cg['count']; ?>)</span></li>
<?php endforeach; ?>
</ul>
</div>
</div>
<?php
$type='discipline';
?>
<div class="span6">
<h4><a href="/data/tag/keytype/discipline"><i class="icon-tags"></i><?php echo $keytypezh[$type]; ?></a></h4>
<div class="span6">
<h4><a href="/data/tag/keytype/discipline"><i class="icon-tags"></i><?php echo $keytypezh[$type]; ?></a></h4>
<ul class="unstyled inline">
<?php foreach($this->keywords[$type] as $cg) : ?>
<li><a href='/data/tag/<?php echo $cg['keyword']; ?>'><i class="icon-tag"></i><?php echo $cg['keyword']; ?></a><span class="note">(<?php echo $cg['count']; ?>)</span></li>
<?php endforeach; ?>
</ul>
</div>
</div>
<div class="row">
</div>
</div>
<div class="row">
<?php
$type='place';
?>
<div class="span6">
<h4><a href="/data/tag/keytype/place"><i class="icon-tags"></i><?php echo $keytypezh[$type]; ?></a></h4>
?>
<div class="span6">
<h4><a href="/data/tag/keytype/place"><i class="icon-tags"></i><?php echo $keytypezh[$type]; ?></a></h4>
<ul class="unstyled inline">
<?php foreach($this->keywords[$type] as $cg) : ?>
<li><a href='/data/tag/<?php echo $cg['keyword']; ?>'><i class="icon-tag"></i><?php echo $cg['keyword']; ?></a><span class="note">(<?php echo $cg['count']; ?>)</span></li>
<?php endforeach; ?>
</ul>
</div>
</div>
<?php
$type='temporal';
?>
<div class="span6">
<h4><a href="/data/tag/keytype/temporal"><i class="icon-tags"></i><?php echo $keytypezh[$type]; ?></a></h4>
<div class="span6">
<h4><a href="/data/tag/keytype/temporal"><i class="icon-tags"></i><?php echo $keytypezh[$type]; ?></a></h4>
<ul class="unstyled inline">
<?php foreach($this->keywords[$type] as $cg) : ?>
<li><a href='/data/tag/<?php echo $cg['keyword']; ?>'><i class="icon-tag"></i><?php echo $cg['keyword']; ?></a><span class="note">(<?php echo $cg['count']; ?>)</span></li>
<?php endforeach; ?>
</ul>
</div>
</div>
</div>
<div class="row">
<div class="span6">
@ -94,7 +94,7 @@ $this->headTitle()->setSeparator(' - ');
<li><a href='/data/category/code/<?php echo $cg['code']; ?>'><i class="icon-th-large"></i><?php (empty($cg['name_zh']))?print($cg['name']):print($cg['name_zh']); ?></a><span class="note">(<?php echo $cg['count']; ?>)</span></li>
<?php endforeach; ?>
</ul></fieldset>
</div>
</div>
<h4><img src="/images/Project24x24_24-bit.png" align="absmiddle" />&nbsp;数据服务</h4>
<div class="items">
<div class="item">
@ -102,6 +102,7 @@ $this->headTitle()->setSeparator(' - ');
<li>-&nbsp;&nbsp;&nbsp;<a href="/data/offlineapp">离线数据服务记录（最近20个）</a></li>
<li>-&nbsp;&nbsp;&nbsp;<a href="/data/request">如何从数据中心申请数据</a></li>
<li>-&nbsp;&nbsp;&nbsp;<a href="/data/submit">如何在数据中心发布数据</a></li>
<li>-&nbsp;&nbsp;&nbsp;<a href="/visual">数据可视化</a></li>
</ul>
</div>

82
application/default/views/scripts/visual/index.phtml
View File

@ -10,36 +10,52 @@ $this->breadcrumb('数据可视化');
$this->breadcrumb()->setSeparator(' > ');
?>
<div class="row">
<div class="span3">
<div class="span12">
<h3>选择数据集</h3>
<hr />
<a class="btn btn-default control-btn" href="javascript:void(0);" data-dataset="sc" data-subdataset="avg" data-seriename="逐月含沙量平均值">
逐月含沙量平均值
</a>
<a class="btn btn-default control-btn" href="javascript:void(0);" data-dataset="sc" data-subdataset="max" data-seriename="逐月含沙量最大值">
逐月含沙量最大值
</a>
<a class="btn btn-default control-btn" href="javascript:void(0);" data-dataset="sc" data-subdataset="min" data-seriename="逐月含沙量最小值">
逐月含沙量最小值
</a>
<a class="btn btn-default control-btn" href="javascript:void(0);" data-dataset="SoilMoisture" data-subdataset="20cm" data-seriename="土壤水分20CM">
土壤水分20CM
</a>
<a class="btn btn-default control-btn" href="javascript:void(0);" data-dataset="SoilMoisture" data-subdataset="30cm" data-seriename="土壤水分30CM">
土壤水分30CM
</a>
<a class="btn btn-default control-btn" href="javascript:void(0);" data-dataset="SoilMoisture" data-subdataset="40cm" data-seriename="土壤水分40CM">
土壤水分40CM
</a>
<a class="btn btn-default control-btn" href="javascript:void(0);" data-dataset="SoilMoisture" data-subdataset="50cm" data-seriename="土壤水分50CM">
土壤水分50CM
</a>
<div class="tabbable">
<ul class="nav nav-tabs">
<li class="active"><a href="#tab1" data-toggle="tab">青海三江源自然保护区2012年水资源监测含沙量数据集</a></li>
<li><a href="#tab2" data-toggle="tab">青海三江源区珍秦草地生态综合站2011年土壤水分监测数据</a></li>
</ul>
<div class="tab-content">
<div class="tab-pane active" id="tab1">
<a class="btn btn-default control-btn" href="javascript:void(0);" data-dataset="sc" data-subdataset="avg" data-seriename="2012逐月含沙量平均值">
平均值
</a>
<a class="btn btn-default control-btn" href="javascript:void(0);" data-dataset="sc" data-subdataset="max" data-seriename="2012逐月含沙量最大值">
最大值
</a>
<a class="btn btn-default control-btn" href="javascript:void(0);" data-dataset="sc" data-subdataset="min" data-seriename="2012逐月含沙量最小值">
最小值
</a>
</div>
<div class="tab-pane" id="tab2">
<a class="btn btn-default control-btn" href="javascript:void(0);" data-dataset="SoilMoisture" data-subdataset="20cm" data-seriename="珍秦草地生态综合站2011土壤水分20CM">
20CM
</a>
<a class="btn btn-default control-btn" href="javascript:void(0);" data-dataset="SoilMoisture" data-subdataset="30cm" data-seriename="珍秦草地生态综合站2011土壤水分30CM">
30CM
</a>
<a class="btn btn-default control-btn" href="javascript:void(0);" data-dataset="SoilMoisture" data-subdataset="40cm" data-seriename="珍秦草地生态综合站2011土壤水分40CM">
40CM
</a>
<a class="btn btn-default control-btn" href="javascript:void(0);" data-dataset="SoilMoisture" data-subdataset="50cm" data-seriename="珍秦草地生态综合站2011土壤水分50CM">
50CM
</a>
</div>
</div>
</div><!-- Tabbable -->
</div>
<!-- 页面内容 -->
<div class="span9">
<div class="span12">
<div id="datachart" style="width:100%;height:500px;"></div>
<div id="loading" style="display:none">Loading...</div>
<a class="btn btn-primary control-btn-cls" href="javascript:void(0);">
清除图像
</a>
</div>
<!-- //页面内容 -->
</div>
@ -94,19 +110,15 @@ $(function() {
});
});
$(".control-btn-cls").click(function(e) {
for(i in chart.series)
{
chart.series[i].remove();
}
});
});
function onDataReceived(data)
{
chart.addSeries({
name: 'Sediment Concentration',
data: data,
type : 'column'
});
alert(chart.series[0].name)
}
$( document ).ajaxSend(function() {
$('#loading').css('display','none');
});

2
application/module/Westdc/Visual/Reader/Sc.php
View File

@ -39,7 +39,7 @@ class Sc extends Record implements RecordInterface
}
public function getData()
{
{
$sql = "SELECT * FROM data_sands
ORDER BY
year ASC,