merge sanjiangyuan-sub r4693 to r4733 into sjy-meteorology
This commit is contained in:
wlx
commit
c099c3a62c
|
|
@ -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>
|
||||
|
|
@ -1,145 +1,162 @@
|
|||
<?php
|
||||
namespace Users;
|
||||
|
||||
use Zend_Acl;
|
||||
use Zend_Acl_Role;
|
||||
use Zend_Acl_Resource;
|
||||
|
||||
|
||||
class AclManager extends \Zend_Controller_Plugin_Abstract
|
||||
{
|
||||
// default user role if not logged or (or invalid role found)
|
||||
private $_defaultRole = 'guest';
|
||||
// the action to dispatch if a user doesn't have sufficient privileges
|
||||
private $_authController = array(
|
||||
'module'=>'',
|
||||
'controller' => 'account',
|
||||
'action' => 'login'
|
||||
);
|
||||
|
||||
private $_adminRole;
|
||||
|
||||
public function __construct(\Zend_Auth $auth)
|
||||
{
|
||||
$config = \Zend_Registry::get('config');
|
||||
$this->_adminRole = $config->auth->identifier;
|
||||
|
||||
$this->db=\Zend_Registry::get('db');
|
||||
$this->auth = $auth;
|
||||
$this->acl = new Zend_Acl();
|
||||
// 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');
|
||||
|
||||
// add the resources we want to have control over
|
||||
$this->acl->add(new Zend_Acl_Resource('account'));
|
||||
$this->acl->add(new Zend_Acl_Resource('data'));
|
||||
$this->acl->add(new Zend_Acl_Resource('water'));
|
||||
$this->acl->add(new Zend_Acl_Resource('admin'));
|
||||
$this->acl->add(new Zend_Acl_Resource('upload'));
|
||||
$this->acl->add(new Zend_Acl_Resource('author'));
|
||||
$this->acl->add(new Zend_Acl_Resource('heihe'));
|
||||
// allow access to everything for all users by default
|
||||
// except for the account management and administration areas
|
||||
$this->acl->allow();
|
||||
$this->acl->deny(null, 'account');
|
||||
$this->acl->deny(null, 'admin');
|
||||
$this->acl->deny(null, 'author');
|
||||
// add an exception so guests can log in or register
|
||||
// in order to gain privilege
|
||||
$this->acl->allow('guest', 'account', array('login',
|
||||
'logout',
|
||||
'captcha',
|
||||
'fetchpwd',
|
||||
'register',
|
||||
'registercomplete',
|
||||
'wcdlogin'));
|
||||
$this->acl->deny('guest','data',array('download','order'));
|
||||
$this->acl->deny('guest','water',array('download','order'));
|
||||
$this->acl->deny('guest','heihe',array('submit'));
|
||||
// allow members access to the account management area
|
||||
$this->acl->allow('guest','author',array('index'));
|
||||
$this->acl->allow('member', 'account');
|
||||
$this->acl->allow('member', 'author');
|
||||
|
||||
// allows administrators access to the admin area
|
||||
$this->acl->allow($this->_adminRole, 'admin');
|
||||
}
|
||||
/**
|
||||
* preDispatch
|
||||
*
|
||||
* Before an action is dispatched, check if the current user
|
||||
* has sufficient privileges. If not, dispatch the default
|
||||
* action instead
|
||||
*
|
||||
* @param Zend_Controller_Request_Abstract $request
|
||||
*/
|
||||
public function preDispatch(\Zend_Controller_Request_Abstract $request)
|
||||
{
|
||||
|
||||
$phpSessId = $request->getParam('PHPSESSID');
|
||||
|
||||
if (!empty($phpSessId) && session_id() != $phpSessId) {
|
||||
session_destroy();
|
||||
session_id($phpSessId);
|
||||
session_start();
|
||||
}
|
||||
// check if a user is logged in and has a valid role,
|
||||
// otherwise, assign them the default role (guest)
|
||||
|
||||
if(!$this->auth->hasIdentity())
|
||||
{
|
||||
$mb = new \member();
|
||||
$mb->db=$this->db;
|
||||
if($mb->checkcookie())
|
||||
{
|
||||
$auth = Zend_Auth::getInstance();
|
||||
$authAdapter = new Zend_Auth_Adapter_DbTable($this->db);
|
||||
$authAdapter->setTableName('users')
|
||||
->setIdentityColumn('username')
|
||||
->setCredentialColumn('password');
|
||||
$authAdapter->setIdentity($mb->user)->setCredential($mb->srpwd);
|
||||
$result = $auth->authenticate($authAdapter);
|
||||
if ($result->isValid()) {
|
||||
$data = $authAdapter->getResultRowObject(null,'password');
|
||||
//头像
|
||||
include_once("Avatar.php");
|
||||
$avatar = new Avatar();
|
||||
$data->avatar = $avatar->Get($data->email,40);
|
||||
|
||||
//组ID
|
||||
include_once("Users.php");
|
||||
$usr = new Users($this->db);
|
||||
$data->gid = $usr->getGroup($data->id);
|
||||
|
||||
$auth->getStorage()->write($data);
|
||||
$this->db->query("update users set ts_last_login=now() where username=?",array($mb->user));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ($this->auth->hasIdentity())
|
||||
$role = $this->auth->getIdentity()->usertype;
|
||||
else
|
||||
$role = $this->_defaultRole;
|
||||
if (!$this->acl->hasRole($role))
|
||||
$role = $this->_defaultRole;
|
||||
// the ACL resource is the requested controller name
|
||||
$resource = $request->controller;
|
||||
if ($request->module<>"default") $resource=$request->module;
|
||||
// the ACL privilege is the requested action name
|
||||
$privilege = $request->action;
|
||||
if ($request->module<>"default") $privilege = $request->controller;
|
||||
// if we haven't explicitly added the resource, check
|
||||
// the default global permissions
|
||||
if (!$this->acl->has($resource))
|
||||
$resource = null;
|
||||
// access denied - reroute the request to the default action handler
|
||||
if (!$this->acl->isAllowed($role, $resource, $privilege)) {
|
||||
$request->setModuleName($this->_authController['module']);
|
||||
$request->setControllerName($this->_authController['controller']);
|
||||
$request->setActionName($this->_authController['action']);
|
||||
}
|
||||
}
|
||||
}
|
||||
<?php
|
||||
namespace Users;
|
||||
|
||||
use Zend_Acl;
|
||||
use Zend_Acl_Role;
|
||||
use Zend_Acl_Resource;
|
||||
|
||||
|
||||
class AclManager extends \Zend_Controller_Plugin_Abstract
|
||||
{
|
||||
// default user role if not logged or (or invalid role found)
|
||||
private $_defaultRole = 'guest';
|
||||
// the action to dispatch if a user doesn't have sufficient privileges
|
||||
private $_authController = array(
|
||||
'module'=>'',
|
||||
'controller' => 'account',
|
||||
'action' => 'login'
|
||||
);
|
||||
|
||||
private $_adminRole;
|
||||
|
||||
private $roles = array(
|
||||
'系统管理员' => 'administrator',
|
||||
'青海省气象科学研究所' => 'meteorologic',
|
||||
'青海省环境监测中心站' => 'qhemc',
|
||||
'青海省水土保持局' => 'watersoil',
|
||||
'青海省林业调查规划院' => 'forestry',
|
||||
'青海省水文水资源局' => 'hydrology',
|
||||
'青海省草原总站' => 'grassland',
|
||||
'青海省生态环境遥感监测中心' => 'qherc'
|
||||
);
|
||||
|
||||
public function __construct(\Zend_Auth $auth)
|
||||
{
|
||||
$config = \Zend_Registry::get('config');
|
||||
$this->_adminRole = $config->auth->identifier;
|
||||
|
||||
$this->db=\Zend_Registry::get('db');
|
||||
$this->auth = $auth;
|
||||
$this->acl = new Zend_Acl();
|
||||
// add the different user roles
|
||||
$this->acl->addRole(new Zend_Acl_Role($this->_defaultRole));
|
||||
$this->acl->addRole(new Zend_Acl_Role('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'));
|
||||
$this->acl->add(new Zend_Acl_Resource('data'));
|
||||
$this->acl->add(new Zend_Acl_Resource('water'));
|
||||
$this->acl->add(new Zend_Acl_Resource('admin'));
|
||||
$this->acl->add(new Zend_Acl_Resource('upload'));
|
||||
$this->acl->add(new Zend_Acl_Resource('author'));
|
||||
$this->acl->add(new Zend_Acl_Resource('heihe'));
|
||||
// allow access to everything for all users by default
|
||||
// except for the account management and administration areas
|
||||
$this->acl->allow();
|
||||
$this->acl->deny(null, 'account');
|
||||
$this->acl->deny(null, 'admin');
|
||||
$this->acl->deny(null, 'author');
|
||||
// add an exception so guests can log in or register
|
||||
// in order to gain privilege
|
||||
$this->acl->allow('guest', 'account', array('login',
|
||||
'logout',
|
||||
'captcha',
|
||||
'fetchpwd',
|
||||
'register',
|
||||
'registercomplete',
|
||||
'wcdlogin'));
|
||||
$this->acl->deny('guest','data',array('download','order'));
|
||||
$this->acl->deny('guest','water',array('download','order'));
|
||||
$this->acl->deny('guest','heihe',array('submit'));
|
||||
// allow members access to the account management area
|
||||
$this->acl->allow('guest','author',array('index'));
|
||||
$this->acl->allow('member', 'account');
|
||||
$this->acl->allow('member', 'author');
|
||||
|
||||
// allows administrators access to the admin area
|
||||
$this->acl->allow($this->_adminRole, 'admin');
|
||||
}
|
||||
/**
|
||||
* preDispatch
|
||||
*
|
||||
* Before an action is dispatched, check if the current user
|
||||
* has sufficient privileges. If not, dispatch the default
|
||||
* action instead
|
||||
*
|
||||
* @param Zend_Controller_Request_Abstract $request
|
||||
*/
|
||||
public function preDispatch(\Zend_Controller_Request_Abstract $request)
|
||||
{
|
||||
|
||||
$phpSessId = $request->getParam('PHPSESSID');
|
||||
|
||||
if (!empty($phpSessId) && session_id() != $phpSessId) {
|
||||
session_destroy();
|
||||
session_id($phpSessId);
|
||||
session_start();
|
||||
}
|
||||
// check if a user is logged in and has a valid role,
|
||||
// otherwise, assign them the default role (guest)
|
||||
|
||||
if(!$this->auth->hasIdentity())
|
||||
{
|
||||
$mb = new \member();
|
||||
$mb->db=$this->db;
|
||||
if($mb->checkcookie())
|
||||
{
|
||||
$auth = Zend_Auth::getInstance();
|
||||
$authAdapter = new Zend_Auth_Adapter_DbTable($this->db);
|
||||
$authAdapter->setTableName('users')
|
||||
->setIdentityColumn('username')
|
||||
->setCredentialColumn('password');
|
||||
$authAdapter->setIdentity($mb->user)->setCredential($mb->srpwd);
|
||||
$result = $auth->authenticate($authAdapter);
|
||||
if ($result->isValid()) {
|
||||
$data = $authAdapter->getResultRowObject(null,'password');
|
||||
//头像
|
||||
include_once("Avatar.php");
|
||||
$avatar = new Avatar();
|
||||
$data->avatar = $avatar->Get($data->email,40);
|
||||
|
||||
//组ID
|
||||
include_once("Users.php");
|
||||
$usr = new Users($this->db);
|
||||
$data->gid = $usr->getGroup($data->id);
|
||||
|
||||
$auth->getStorage()->write($data);
|
||||
$this->db->query("update users set ts_last_login=now() where username=?",array($mb->user));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ($this->auth->hasIdentity())
|
||||
$role = $this->auth->getIdentity()->usertype;
|
||||
else
|
||||
$role = $this->_defaultRole;
|
||||
if (!$this->acl->hasRole($role))
|
||||
$role = $this->_defaultRole;
|
||||
// the ACL resource is the requested controller name
|
||||
$resource = $request->controller;
|
||||
if ($request->module<>"default") $resource=$request->module;
|
||||
// the ACL privilege is the requested action name
|
||||
$privilege = $request->action;
|
||||
if ($request->module<>"default") $privilege = $request->controller;
|
||||
// if we haven't explicitly added the resource, check
|
||||
// the default global permissions
|
||||
if (!$this->acl->has($resource))
|
||||
$resource = null;
|
||||
// access denied - reroute the request to the default action handler
|
||||
if (!$this->acl->isAllowed($role, $resource, $privilege)) {
|
||||
$request->setModuleName($this->_authController['module']);
|
||||
$request->setControllerName($this->_authController['controller']);
|
||||
$request->setActionName($this->_authController['action']);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue