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

merge sanjiangyuan-sub r4693 to r4733 into sjy-emc

This commit is contained in:
wlx 2014-06-13 08:25:21 +00:00
parent bfe1464b19 70778573d2
commit 1a1e4bbfaf
3 changed files with 237 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
application/default/views/scripts/about/contact.phtml
View File

@ -15,19 +15,19 @@ $this->breadcrumb()->setSeparator(' > ');
<div class="span9">
<div id="content">
<h2>联系我们</h2>
<div id="offline">
<p>
<br />
青海省环境监测中心站<br />
西宁市城东区共和中路56号<br />
邮编：810000<br />
电话: +86-0971-8141830<br />
<br />
<div id="offline" class="span4">
<br />
青海省水文水资源局<br />
西宁市昆仑路20-2号<br />
邮编：810001<br />
电话: +86-0971-6161320<br />
<br />
</div>
<div id="online">
<p class="title">在线联系</p>
<p class="note">请填写以下表单，系统会自动发送到我们的邮箱</p>
<div id="online" class="span5">
<p class="note">填写以下信息在线联系我们。</p>
<?php echo $this->form; ?>
<?php if (!empty($this->messages)) : ?>

75
application/default/views/scripts/visual/view.phtml
View File

@ -13,10 +13,20 @@ $this->breadcrumb()->setSeparator(' > ');
<div class="span12">
<h3><?= $this->info['title'] ?> <small>数据可视化查看</small></h3>
<h4><small>请在需要查看的可视化要素上点击以描绘图表，再次点击可取消显示，绘制图像前可自主选择图像类型</small></h4>
<div class="btn-group linetypes" data-toggle="buttons-radio">
<button type="button" class="btn active" value="line">折线图</button>
<button type="button" class="btn" value="column">柱状图</button>
</div>
<div class="row-fluid">
<div class="span6">
<div class="btn-group linetypes" data-toggle="buttons-radio">
<button type="button" class="btn active" value="line">折线图</button>
<button type="button" class="btn" value="column">柱状图</button>
</div>
</div>
<div class="span6 text-right">
<a class="btn btn-primary control-btn-cls" href="javascript:void(0);">
清除图像
</a>
</div>
</div>
<hr />
<?php $vars = (new \Westdc\Visual\VariableEncoder)->normaldecode($this->data['vars']);?>
@ -27,25 +37,35 @@ $this->breadcrumb()->setSeparator(' > ');
<?php } ?>
</div>
</div>
<div class="row-fluid">
<!-- 页面内容 -->
<div class="span12">
<div id="datachart" style="width:100%;height:500px;"></div>
<a class="btn btn-primary control-btn-cls" href="javascript:void(0);">
清除图像
</a>
</div>
<!-- //页面内容 -->
</div>
<script>
_this = {};
_this.linetype = 'line';
_this.utctimezone = false;
$(function() {
$('.linetypes button').click(function(e) {
_this.linetype = $(this).val();
});
Highcharts.setOptions({
lang: {
months : [ '一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月'],
//months : ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'],
weekdays: ['星期一', '星期二', '星期三', '星期四', '星期五', '星期六', '星期日']
},
global: {
useUTC: _this.utctimezone
}
});
$('#datachart').highcharts('StockChart', {
rangeSelector : {
@ -57,9 +77,33 @@ $(function() {
enabled : false
},
xAxis : {
allowDecimals : true
}
xAxis: {
type: 'datetime',
dateTimeLabelFormats: {
second: '%Y-%m-%d<br/>%H:%M:%S',
minute: '%Y-%m-%d<br/>%H:%M',
hour: '%Y-%m-%d<br/>%H:%M',
day: '%Y<br/>%m-%d',
week: '%Y<br/>%m-%d',
month: '%Y-%m',
year: '%Y'
},
},
tooltip : {
formatter: function() {
var s = '<b>'+ Highcharts.dateFormat('%Y-%m-%d %A %H:%M:%S', this.x) +'</b>';
$.each(this.points, function(i, point) {
s += '<br /><span style="color: '+point.series.color+';">' + point.series.name + ': ' + point.y +'</span>';
});
return s;
}
},
});
@ -71,12 +115,14 @@ $(function() {
dataset = $(this).data('dataset');
subdataset = $(this).data('subdataset');
seriename = $(this).data('seriename');
_btn = this;
for(i in chart.series)
{
if(chart.series[i].name == seriename)
{
chart.series[i].remove();
$(_btn).removeClass('active');
return;
}
}
@ -96,6 +142,12 @@ $(function() {
forced: false,
}
});
$(_btn).removeAttr('disabled');
$(_btn).addClass('active');
},
beforeSend: function(){
$(_btn).attr('disabled','disabled');
},
'timeout': 30000,
'global' : true
@ -120,4 +172,5 @@ $( document ).ajaxSend(function() {
$( document ).ajaxSend(function() {
$('#loading').css('display','none');
});
</script>

19
application/module/Users/AclManager.php
View File

@ -19,6 +19,17 @@ class AclManager extends \Zend_Controller_Plugin_Abstract
private $_adminRole;
private $roles = array(
'系统管理员' => 'administrator',
'青海省气象科学研究所' => 'meteorologic',
'青海省环境监测中心站' => 'qhemc',
'青海省水土保持局' => 'watersoil',
'青海省林业调查规划院' => 'forestry',
'青海省水文水资源局' => 'hydrology',
'青海省草原总站' => 'grassland',
'青海省生态环境遥感监测中心' => 'qherc'
);
public function __construct(\Zend_Auth $auth)
{
$config = \Zend_Registry::get('config');
@ -30,7 +41,13 @@ class AclManager extends \Zend_Controller_Plugin_Abstract
// add the different user roles
$this->acl->addRole(new Zend_Acl_Role($this->_defaultRole));
$this->acl->addRole(new Zend_Acl_Role('member'));
$this->acl->addRole(new Zend_Acl_Role($this->_adminRole), 'member');
foreach($this->roles as $k=>$v)
{
$this->acl->addRole(new Zend_Acl_Role($v), 'member');
}
//$this->acl->addRole(new Zend_Acl_Role($this->_adminRole), 'member');
// add the resources we want to have control over
$this->acl->add(new Zend_Acl_Resource('account'));