From da346a6b32e555415122db5e46d1d5f6417b7c62 Mon Sep 17 00:00:00 2001 From: wlx Date: Wed, 6 Jul 2016 10:56:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B0=B4=E6=96=87=E6=B0=94?= =?UTF-8?q?=E8=B1=A12015=E5=B9=B4=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../default/controllers/HiwaterController.php | 25 ++++++++++++++++++- .../default/views/scripts/hiwater/navi.phtml | 11 ++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/application/default/controllers/HiwaterController.php b/application/default/controllers/HiwaterController.php index 87ee5693..78ad73a4 100644 --- a/application/default/controllers/HiwaterController.php +++ b/application/default/controllers/HiwaterController.php @@ -17,7 +17,7 @@ class HiwaterController extends DataController { $this->view->pageIn = "collapse2"; } - else if(in_array($acName,array("hmon",'hmon2012','hmon2013','hmon2014','hmon2012up','hmon2012middle','hmon2012down','hmon2013up','hmon2013middle','hmon2013down','hmon2014up','hmon2014middle','hmon2014down','super','normal','prec'))) + else if(in_array($acName,array("hmon",'hmon2012','hmon2013','hmon2014','hmon2015','hmon2012up','hmon2012middle','hmon2012down','hmon2013up','hmon2013middle','hmon2013down','hmon2014up','hmon2014middle','hmon2014down','hmon2015up','hmon2015middle','hmon2015down','super','normal','prec'))) { $this->view->pageIn = "collapse3"; } @@ -452,6 +452,29 @@ class HiwaterController extends DataController $this->_helper->viewRenderer('base'); } + function hmon2015Action() + { + $this->getmdrestricted(array('2015','水文气象观测网')); + $archive = new Archive($this->db); + $this->view->info = $archive->getOneArchive('HiWATER：流域水文气象观测网','about'); + $this->_helper->viewRenderer('base'); + } + function hmon2015upAction() + { + $this->getmdrestricted(array('2015','上游寒区水文试验区','水文气象观测网')); + $this->_helper->viewRenderer('base'); + } + function hmon2015middleAction() + { + $this->getmdrestricted(array('2015','中游人工绿洲试验区','水文气象观测网')); + $this->_helper->viewRenderer('base'); + } + function hmon2015downAction() + { + $this->getmdrestricted(array('2015','下游天然绿洲试验区','水文气象观测网')); + $this->_helper->viewRenderer('base'); + } + function listAction() { $sql="select uuid,title from normalmetadata where uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='hiwater') order by timebegin,title"; diff --git a/application/default/views/scripts/hiwater/navi.phtml b/application/default/views/scripts/hiwater/navi.phtml index c123bba9..790de7c8 100644 --- a/application/default/views/scripts/hiwater/navi.phtml +++ b/application/default/views/scripts/hiwater/navi.phtml @@ -77,6 +77,17 @@
  • 下游
    • +
  • +
    + + 2015 +
    + +