From 2d4c668c88cbbb93b953dbfd72c6d2bfa1597689 Mon Sep 17 00:00:00 2001 From: wlx Date: Tue, 25 Jun 2013 00:49:31 +0000 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9hiwater=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../default/controllers/HiwaterController.php | 13 +++++++++++-- .../default/views/scripts/hiwater/navi.phtml | 2 +- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/application/default/controllers/HiwaterController.php b/application/default/controllers/HiwaterController.php index 55cb1263..3e53a9a1 100644 --- a/application/default/controllers/HiwaterController.php +++ b/application/default/controllers/HiwaterController.php @@ -190,16 +190,23 @@ class HiwaterController extends DataController { $this->getmd(array('','自动气象站')); $this->_helper->viewRenderer('base'); + $archive = new Archive($this->db); + $this->view->info = $archive->getOneArchive('HiWATER-通量观测矩阵','about'); } function ecAction() { $this->getmd(array('','涡动相关仪')); $this->_helper->viewRenderer('base'); + $archive = new Archive($this->db); + $this->view->info = $archive->getOneArchive('HiWATER-通量观测矩阵','about'); } function lasAction() { $this->getmd(array('','大孔径闪烁仪')); - $this->_helper->viewRenderer('base'); + $this->_helper->viewRenderer('base'); + $archive = new Archive($this->db); + $this->view->info = $archive->getOneArchive('HiWATER-通量观测矩阵','about'); + } function precAction() { @@ -288,7 +295,9 @@ class HiwaterController extends DataController function msoAction() { $this->getmd(array('自动气象站','涡动相关仪','大孔径闪烁仪','稳定同位素观测系统','热扩散液流计（TDP）','宇宙射线土壤水分')); - $this->_helper->viewRenderer('base'); + $this->_helper->viewRenderer('base'); + $archive = new Archive($this->db); + $this->view->info = $archive->getOneArchive('HiWATER-通量观测矩阵','about'); } function isotopeAction() diff --git a/application/default/views/scripts/hiwater/navi.phtml b/application/default/views/scripts/hiwater/navi.phtml index 88e2e45b..09f3fd82 100644 --- a/application/default/views/scripts/hiwater/navi.phtml +++ b/application/default/views/scripts/hiwater/navi.phtml @@ -105,7 +105,7 @@