diff --git a/application/default/controllers/HiwaterController.php b/application/default/controllers/HiwaterController.php index 81e8d3ad..e271ee6a 100644 --- a/application/default/controllers/HiwaterController.php +++ b/application/default/controllers/HiwaterController.php @@ -9,11 +9,11 @@ class HiwaterController extends DataController //$this->_helper->layout->setLayout('hiwater'); $this->debug = 1; $acName = $this->_request->getActionName(); - if(in_array($acName,array("aviation","radiometer","lidar","widas",'ccd',"nearvis","thermal"))) + if(in_array($acName,array("aviation","radiometer","lidar","ccdlidar","widas",'ccdwidas',"nearvis","thermal"))) { $this->view->pageIn = "collapse1"; } - else if(in_array($acName,array("airborne","vegstructure","vegparam","temperature","soilmoisture"))) + else if(in_array($acName,array("airborne","demdsm","reflectance","vegtypeair","vegparam","temperature","soilmoisture"))) { $this->view->pageIn = "collapse2"; } @@ -28,15 +28,15 @@ class HiwaterController extends DataController else if(in_array($acName,array("wsn","waternet","soilnet","bnunet",'bnulai'))) { $this->view->pageIn = "collapse5"; - } + } else if(in_array($acName,array("mso","autometeo","ec",'las',"cosmos","tdp","isotope"))) { $this->view->pageIn = "collapse6"; - } + } else if(in_array($acName,array("rsproduct","dem","precipitation",'sm',"snow","vegtype","vegcov",'phenology','npp'))) { $this->view->pageIn = "collapse7"; - } + } else if(in_array($acName,array("browse","thumb","fund","tag","timeline","timemap",'author','organization'))) { $this->view->pageIn = "collapse10"; @@ -45,7 +45,7 @@ class HiwaterController extends DataController { $this->view->pageIn = "collapse9"; } - $this->view->pageID = "hiwater-".$acName; + $this->view->pageID = "hiwater-".$acName; $this->_helper->layout->setLayout('heihe'); } @@ -119,23 +119,28 @@ class HiwaterController extends DataController $this->getmdlimited('激光雷达','航空遥感'); $this->_helper->viewRenderer('base'); } + function ccdlidarAction() + { + $this->getmdlimited('CCD','航空遥感',"激光雷达"); + $this->_helper->viewRenderer('base'); + } function widasAction() - { + { $this->getmdlimited('WIDAS','航空遥感'); $this->_helper->viewRenderer('base'); } - function ccdAction() - { - $this->getmdlimited('CCD','航空遥感'); + function ccdwidasAction() + { + $this->getmdlimited('CCD','航空遥感','WIDAS'); $this->_helper->viewRenderer('base'); - } + } function nearvisAction() - { + { $this->getmdlimited('CASI','航空遥感'); $this->_helper->viewRenderer('base'); } function thermalAction() - { + { $this->getmdlimited('热红外高光谱数据','航空遥感'); $this->_helper->viewRenderer('base'); } @@ -145,36 +150,46 @@ class HiwaterController extends DataController $this->getmd(array('航空遥感产品','种植结构图','植被类型图','植被结构参数','数字高程模型','数字表面模型','地表温度','地表土壤水文')); $this->_helper->viewRenderer('base'); } - function vegstructureAction() + + function demdsmAction() { - $this->getmd(array('','种植结构图')); + $this->getmd(array('DEM','DSM','DOM'),"数据产品"); + $this->_helper->viewRenderer('base'); + } + function reflectanceAction() + { + $this->getmd(array('地表反照率','地表反射率'),"数据产品"); + $this->_helper->viewRenderer('base'); + } + function vegtypeairAction() + { + $this->getmdlimited(array('植被类型',''),'数据产品'); $this->_helper->viewRenderer('base'); } - function vegparamAction() { - $this->getmd(array('','植被结构参数')); + $this->getmd(array("",'植被结构参数'),"数据产品"); $this->_helper->viewRenderer('base'); - } - function dsmAction() + } + function soilmoistureAction() { - $this->getmd(array('','数字表面模型')); + $this->getmd(array('','土壤水分'),"数据产品"); $this->_helper->viewRenderer('base'); } function temperatureAction() { - $this->getmd(array('','地表温度')); + $this->getmd(array('','地表温度'),"数据产品"); $this->_helper->viewRenderer('base'); } function hmonAction() { - $this->getmdlimited(array('西支','黄藏寺','黄草沟','峨堡','景阳岭','阿柔阳坡','阿柔阴坡','戈壁站','神沙窝沙漠站','花寨子荒漠站','张掖湿地站','阿柔超级站','大满超级站','四道桥超级站'),'水文气象'); - $md=$this->view->metadata; - $this->getmd(array('','河川径流观测')); + $this->getmdlimited(array('西支','黄藏寺','黄草沟','峨堡','景阳岭','阿柔阳坡','阿柔阴坡','戈壁站','神沙窝沙漠站','花寨子荒漠站','张掖湿地站','阿柔超级站','大满超级站','四道桥超级站'),'水文气象'); + $md=$this->view->metadata; + $this->getmd(array('','河川径流观测')); $this->view->metadata=array_merge($md,$this->view->metadata); $this->_helper->viewRenderer('base'); - } + } function superAction() { $this->getmdlimited(array('阿柔超级站','大满超级站','四道桥超级站'),'水文气象'); @@ -190,22 +205,22 @@ class HiwaterController extends DataController { $this->getmd(array('','自动气象站')); $this->_helper->viewRenderer('base'); - $archive = new Archive($this->db); - $this->view->info = $archive->getOneArchive('HiWATER-通量观测矩阵','about'); + $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'); + $archive = new Archive($this->db); + $this->view->info = $archive->getOneArchive('HiWATER-通量观测矩阵','about'); } function lasAction() { $this->getmd(array('','大孔径闪烁仪')); - $this->_helper->viewRenderer('base'); - $archive = new Archive($this->db); - $this->view->info = $archive->getOneArchive('HiWATER-通量观测矩阵','about'); + $this->_helper->viewRenderer('base'); + $archive = new Archive($this->db); + $this->view->info = $archive->getOneArchive('HiWATER-通量观测矩阵','about'); } function precAction() @@ -291,12 +306,12 @@ class HiwaterController extends DataController { $this->getmd('试验','theme'); } - + function msoAction() { $this->getmd(array('自动气象站','涡动相关仪','大孔径闪烁仪','稳定同位素观测系统','热扩散液流计（TDP）','宇宙射线土壤水分')); - $this->_helper->viewRenderer('base'); - $archive = new Archive($this->db); + $this->_helper->viewRenderer('base'); + $archive = new Archive($this->db); $this->view->info = $archive->getOneArchive('HiWATER-通量观测矩阵','about'); } @@ -305,18 +320,18 @@ class HiwaterController extends DataController $this->getmd(array('','稳定同位素观测系统')); $this->_helper->viewRenderer('base'); } - + function tdpAction() { $this->getmd(array('','热扩散液流计（TDP）')); $this->_helper->viewRenderer('base'); } - + function cosmosAction() { $this->getmd(array('','宇宙射线土壤水分')); $this->_helper->viewRenderer('base'); - } + } function rsproductAction() { @@ -337,35 +352,35 @@ class HiwaterController extends DataController } function smAction() { - $this->getmdlimited(array('土壤水分'),'数据产品'); + $this->getmdlimited(array('土壤水分',"卫星遥感"),'数据产品'); $this->_helper->viewRenderer('base'); } function snowAction() { - $this->getmdlimited(array('积雪'),'数据产品'); + $this->getmdlimited(array('积雪',"卫星遥感"),'数据产品'); $this->_helper->viewRenderer('base'); - } + } function vegtypeAction() { - $this->getmdlimited(array('植被类型','种植结构'),'数据产品'); + $this->getmdlimited(array('植被类型','卫星遥感'),'数据产品'); $this->_helper->viewRenderer('base'); - } + } function vegcovAction() { - $this->getmdlimited(array('植被覆盖度',''),'数据产品'); + $this->getmdlimited(array('植被覆盖度','卫星遥感'),'数据产品'); $this->_helper->viewRenderer('base'); - } + } function phenologyAction() { - $this->getmdlimited(array('物候期',''),'数据产品'); + $this->getmdlimited(array('物候期','卫星遥感'),'数据产品'); $this->_helper->viewRenderer('base'); - } + } function nppAction() { - $this->getmdlimited(array('NPP',''),'数据产品'); + $this->getmdlimited(array('NPP','卫星遥感'),'数据产品'); $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"; @@ -507,11 +522,11 @@ class HiwaterController extends DataController $this->view->metadata=$this->db->fetchAll($sql,array($this->limit,$offset)); $this->view->page=new Pagination($sum,$page,$this->limit); $this->view->offset=$offset+1; - } - - //获取多项条件并列关系的数据并必须满足limited条件 - //$keyword:字符串或字符串数组 - //$limited:限制字符串 + } + + //获取多项条件并列关系的数据并必须满足limited条件 + //$keyword:字符串或字符串数组 + //$limited:限制字符串 private function getmdlimited($keyword,$limited) { $page=(int)$this->_request->getParam('page'); @@ -608,8 +623,8 @@ class HiwaterController extends DataController $this->view->paginator=$paginator; } } - } - + } + function fundAction() { $id = (int)$this->_request->getParam('id'); @@ -642,8 +657,8 @@ class HiwaterController extends DataController $this->view->paginator=$paginator; $this->_helper->viewRenderer('fund-list'); } - } - + } + function organizationAction() { $page = $this->_request->getParam('page'); diff --git a/application/default/views/scripts/hiwater/navi.phtml b/application/default/views/scripts/hiwater/navi.phtml index 09f3fd82..9ff3114a 100644 --- a/application/default/views/scripts/hiwater/navi.phtml +++ b/application/default/views/scripts/hiwater/navi.phtml @@ -19,15 +19,15 @@ - - +
-
-
+
- -
- -
-
- -
-
-
+
-->
+
+ +
+
+ +
+
+
-
+