From fca38a73f7b138ceae4f7946cc8a8d95a09054db Mon Sep 17 00:00:00 2001 From: wlx Date: Fri, 24 May 2013 14:40:57 +0000 Subject: [PATCH 01/17] change style --- application/default/views/scripts/data/view.phtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/default/views/scripts/data/view.phtml b/application/default/views/scripts/data/view.phtml index 1e22c420..739512e2 100755 --- a/application/default/views/scripts/data/view.phtml +++ b/application/default/views/scripts/data/view.phtml @@ -273,7 +273,7 @@ foreach($this->keys as $cg) : endforeach; ?> doi) : ?> - +

From c546a1b7ea5e87ee97fbc73e267b0f9d271210c8 Mon Sep 17 00:00:00 2001 From: wlx Date: Fri, 24 May 2013 14:41:19 +0000 Subject: [PATCH 02/17] title change --- application/admin/views/scripts/data/doi-add.phtml | 2 +- application/admin/views/scripts/data/doi.phtml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/application/admin/views/scripts/data/doi-add.phtml b/application/admin/views/scripts/data/doi-add.phtml index fcee2f92..b1692e8f 100644 --- a/application/admin/views/scripts/data/doi-add.phtml +++ b/application/admin/views/scripts/data/doi-add.phtml @@ -1,6 +1,6 @@ headTitle($this->config->title->site); -$this->headTitle($this->config->title->author); +$this->headTitle('后台管理'); $this->headTitle()->setSeparator(' - '); //$this->headLink()->appendStylesheet('/css/admin.css'); $this->breadcrumb('首页'); diff --git a/application/admin/views/scripts/data/doi.phtml b/application/admin/views/scripts/data/doi.phtml index cd6e61df..e7433d50 100644 --- a/application/admin/views/scripts/data/doi.phtml +++ b/application/admin/views/scripts/data/doi.phtml @@ -1,6 +1,6 @@ headTitle($this->config->title->site); -$this->headTitle($this->config->title->author); +$this->headTitle('后台管理'); $this->headTitle()->setSeparator(' - '); $this->breadcrumb('首页'); $this->breadcrumb('数据管理'); From 8ab96d547ab8e817727c1b5bbc88fce81934096a Mon Sep 17 00:00:00 2001 From: wlx Date: Fri, 24 May 2013 16:24:31 +0000 Subject: [PATCH 03/17] change hiwater code --- .../default/controllers/HiwaterController.php | 450 +++--------------- .../default/views/scripts/hiwater/base.phtml | 21 +- .../views/scripts/hiwater/browse.phtml | 26 +- .../default/views/scripts/hiwater/index.phtml | 39 +- .../default/views/scripts/hiwater/navi.phtml | 20 +- .../default/views/scripts/hiwater/thumb.phtml | 15 +- 6 files changed, 87 insertions(+), 484 deletions(-) diff --git a/application/default/controllers/HiwaterController.php b/application/default/controllers/HiwaterController.php index 3020f6b1..536ef2f4 100644 --- a/application/default/controllers/HiwaterController.php +++ b/application/default/controllers/HiwaterController.php @@ -9,27 +9,27 @@ class HiwaterController extends DataController //$this->_helper->layout->setLayout('hiwater'); $this->debug = 1; $acName = $this->_request->getActionName(); - if(in_array($acName,array("dem","landuse","core","bdk","eb"))) + if(in_array($acName,array("aviation","radiometer","lidar","widas","nearvis","thermal"))) { $this->view->pageIn = "collapse1"; } - if(in_array($acName,array("forest","dyk","plg"))) + else if(in_array($acName,array("forest","dyk","plg"))) { $this->view->pageIn = "collapse2"; } - if(in_array($acName,array("arid","hzz","yk",'zy','zynoc','lzg','lzs'))) + else if(in_array($acName,array("arid","hzz","yk",'zy','zynoc','lzg','lzs'))) { $this->view->pageIn = "collapse3"; } - if(in_array($acName,array("meteo","autometeo","mobilemeteo","ec",'las','normalmeteo','regionalmeteo','doppler','hydro','airsounding'))) + else if(in_array($acName,array("meteo","autometeo","mobilemeteo","ec",'las','normalmeteo','regionalmeteo','doppler','hydro','airsounding'))) { $this->view->pageIn = "collapse4"; } - if(in_array($acName,array("radiometer","airebone","lidar","widas",'asd'))) + else if(in_array($acName,array("radiometer","airebone","lidar","widas",'asd'))) { $this->view->pageIn = "collapse5"; } - if(in_array($acName,array("satellite"))) + else if(in_array($acName,array("satellite"))) { $this->view->pageIn = "collapse6"; } @@ -91,6 +91,37 @@ class HiwaterController extends DataController $this->view->offset=$offset+1; } + function aviationAction() + { + $this->getmd(array('航空遥感','WiDAS')); + $this->_helper->viewRenderer('base'); + } + function radiometerAction() + { + $this->getmd(array('航空遥感','PLMR')); + $this->_helper->viewRenderer('base'); + } + function lidarAction() + { + $this->getmd(array('','Lidar')); + $this->_helper->viewRenderer('base'); + } + function widasAction() + { + $this->getmd(array('','WiDAS')); + $this->_helper->viewRenderer('base'); + } + function nearvisAction() + { + $this->getmd(array('航空遥感','CASI')); + $this->_helper->viewRenderer('base'); + } + function thermalAction() + { + $this->getmd(array('','热红外高光谱数据')); + $this->_helper->viewRenderer('base'); + } + function baseAction() { $page=(int)$this->_request->getParam('page'); @@ -153,19 +184,6 @@ class HiwaterController extends DataController $this->view->offset=$offset+1; } - function economicAction() - { - $page=(int)$this->_request->getParam('page'); - if (empty($page)) $page=1; - $offset=$this->limit*($page-1); - $state=$this->db->query("select count(*) from normalmetadata where uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='hiwater') and id in (select id from keyword where keytype='theme' and (keyword='人口' or keyword='社会经济'))"); - $row=$state->fetchAll(); - $sum=$row[0]['count']; - $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') and id in (select id from keyword where keytype='theme' and (keyword='人口' or keyword='社会经济')) order by timebegin,title limit ? offset ?"; - $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; - } function landsurfaceAction() { @@ -328,302 +346,29 @@ class HiwaterController extends DataController $page=(int)$this->_request->getParam('page'); if (empty($page)) $page=1; $offset=$this->limit*($page-1); - $state=$this->db->query("select count(m.*) from normalmetadata m left join datasource d on m.uuid=d.uuid left join source s on d.sourceid=s.id where s.code='hiwater' and m.id in (select id from keyword where keytype='".$type."' and keyword='".$keyword."')"); + if (!is_array($keyword)) + { + $keyword=array($keyword); + } + $key="("; + foreach($keyword as $k) + { + $key.="'".$k."',"; + } + $key=substr($key,0,-1); + $key.=")"; + $keyword=$key; + + $state=$this->db->query("select count(m.*) from normalmetadata m left join datasource d on m.uuid=d.uuid left join source s on d.sourceid=s.id where s.code='hiwater' and m.id in (select id from keyword where keytype='".$type."' and keyword in ".$keyword.")"); $row=$state->fetchAll(); $sum=$row[0]['count']; //@todo: add order with title - $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') and id in (select id from keyword where keytype='".$type."' and keyword='".$keyword."') order by timebegin,title limit ? offset ?"; + $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') and id in (select id from keyword where keytype='".$type."' and keyword in ".$keyword.") order by timebegin,title limit ? offset ?"; $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; } - - /* - * projectsAction() 数据汇交计划 - * - * - * - * - */ - function projectsAction() - { - - $ac = $this->_getParam('ac'); - $invite = $this->_getParam('invite'); - - $auth = Zend_Auth::getInstance(); - if($auth->hasIdentity()) - { - $user = $auth->getIdentity(); - $uid = $user->id; - $this->view->user_email = $user_email = $user->email; - } - - if(empty($ac) || $ac == "index") - { - $this->_helper->viewRenderer('project-index'); - - //Search Link - $this->view->searchLink = "/heihe/projects/ac/index/"; - - $q = $this->_getParam('q'); - - $wheresql = array(); - - if(!empty($q)) - { - if(!preg_match("/^[\x{4e00}-\x{9fa5}A-Za-z0-9_]+$/u",$q)) - { - $this->view->error = "输入的搜索条件有误,只允许输入汉字、数字、字母"; - return true; - } - $wheresql[] = " (title LIKE '%$q%' OR - code LIKE '%$q%' OR - name LIKE '%$q%')"; - $this->view->searchKeyword = $q; - } - - if(count($wheresql)>0) - { - $wheresql = join(" AND ",$wheresql); - }else{ - $wheresql = ""; - } - - if(!empty($wheresql)) - { - $wheresql = " WHERE ".$wheresql; - } - - $sql = "SELECT * FROM heiheproject $wheresql - ORDER BY id DESC"; - $sth = $this->db->query($sql); - $rows = $sth->fetchAll(); - - foreach ($rows as $k=>$v) - { - $rows[$k]['status'] = $this->replacestatus($v['status']); - } - - $paginator = Zend_Paginator::factory($rows); - $paginator->setCurrentPageNumber($this->_getParam('page')); - $paginator->setItemCountPerPage(15); - $paginator->setView($this->view); - Zend_View_Helper_PaginationControl::setDefaultViewPartial('pagination_param.phtml'); - $this->view->paginator=$paginator; - - }//ac == index - - if($ac == "submitting") - { - $this->_helper->viewRenderer('project-index'); - - $sql = "SELECT * FROM heiheproject WHERE status<4"; - $sth = $this->db->query($sql); - $rows = $sth->fetchAll(); - - foreach ($rows as $k=>$v) - { - $rows[$k]['status'] = $this->replacestatus($v['status']); - } - - $paginator = Zend_Paginator::factory($rows); - $paginator->setCurrentPageNumber($this->_getParam('page')); - $paginator->setItemCountPerPage(15); - $paginator->setView($this->view); - Zend_View_Helper_PaginationControl::setDefaultViewPartial('pagination_param.phtml'); - $this->view->paginator=$paginator; - }//ac == submitting 正在提交 - - if($ac == "unsubmit") - { - $this->_helper->viewRenderer('project-index'); - - $sql = "SELECT * FROM heiheproject WHERE attachid IS NULL OR attachid=0"; - $sth = $this->db->query($sql); - $rows = $sth->fetchAll(); - - foreach ($rows as $k=>$v) - { - $rows[$k]['status'] = $this->replacestatus($v['status']); - } - - $paginator = Zend_Paginator::factory($rows); - $paginator->setCurrentPageNumber($this->_getParam('page')); - $paginator->setItemCountPerPage(15); - $paginator->setView($this->view); - Zend_View_Helper_PaginationControl::setDefaultViewPartial('pagination_param.phtml'); - $this->view->paginator=$paginator; - }//ac == unsubmit 未提交 - - if($ac == "submit") - { - $this->_helper->viewRenderer('project-index'); - - $sql = "SELECT * FROM heiheproject WHERE status=4"; - $sth = $this->db->query($sql); - $rows = $sth->fetchAll(); - - foreach ($rows as $k=>$v) - { - $rows[$k]['status'] = $this->replacestatus($v['status']); - } - - $paginator = Zend_Paginator::factory($rows); - $paginator->setCurrentPageNumber($this->_getParam('page')); - $paginator->setItemCountPerPage(15); - $paginator->setView($this->view); - Zend_View_Helper_PaginationControl::setDefaultViewPartial('pagination_param.phtml'); - $this->view->paginator=$paginator; - }//ac == submit 已提交 - - if($ac == "upload") - { - $this->_helper->layout->setLayout('layout-iframe'); - $this->_helper->viewRenderer('project-upload'); - - $submit = $this->_getParam('submit'); - - $pid = $this->_getParam('pid'); - - if(empty($pid) || !is_numeric($pid)) - { - $this->view->error = "参数错误"; - return true; - } - - $this->view->pid = $pid; - - if(empty($uid)) - { - $this->view->error = "请先登录"; - return true; - } - - $sql = "SELECT * FROM heiheproject WHERE id=$pid"; - $sth = $this->db->query($sql); - $row = $sth->fetch(); - - if($row['email']!= $user_email) - { - $this->view->error = "您没有权限进行此操作"; - return true; - } - - if(!empty($submit) && empty($this->view->error)) - { - - $files=new files(); - $msg = $files -> upload($this->view->config->upload,$_FILES['Filedata'],'heihe'); - - if(empty($msg['error'])) - { - $msg['error']=""; - $filename = $msg['db_path']; - $filesize = $msg['file_size']; - $filedesc = $this->_request->getParam('filedesc'); - $filetype = $msg['file_type']; - $realname = $msg['realname']; - - if(!empty($row['attachid'])) - { - $sql = "SELECT * FROM attachments WHERE id={$row['attachid']}"; - $sth = $this->db->query($sql); - $attach = $sth->fetch(); - $this->db->exec("DELETE FROM attachments WHERE id={$row['attachid']} AND filetype='heihe'"); - @unlink($this->view->config->upload.$attach['filename']); - } - - $sql = " INSERT INTO attachments (filename,filetype,filedesc,userid,filesize,realname) values - ('$filename','heihe','$filedesc','$uid','$filesize','$realname') RETURNING id"; - $sth = $this->db->prepare($sql); - $sth->execute(); - $att = $sth->fetch(PDO::FETCH_ASSOC); - $msg['attid'] = $attid = $att['id']; - - $sql = "UPDATE heiheproject SET attachid=$attid WHERE id=$pid"; - $sth = $this->db->exec($sql); - - if($sth) - { - $this->view->message = "上传成功"; - }else{ - @unlink($filename); - $this->view->error = '附件上传失败:写入附件表出错'; - return true; - } - }else{ - @unlink($filename); - $this->view->error = "附件上传失败".$msg['error']; - return true; - } - } - - $sql = "SELECT * FROM heiheproject WHERE id=$pid"; - $sth = $this->db->query($sql); - $row = $sth->fetch(); - - $sql = "SELECT * FROM attachments WHERE id = {$row['attachid']}"; - $sth = $this->db->query($sql); - $this->view->att = $sth->fetch(); - - return true; - } - - if(!empty($invite)) - { - - $this->_helper->viewRenderer('project-invite'); - - if(!preg_match("/[A-Za-z0-9]/",$invite)) - { - $this->view->error = "参数错误!"; - return true; - } - - if(strlen($invite)!=12) - { - $this->view->error = "参数错误"; - return true; - } - - $pid = $this->_getParam('pid'); - - if(!is_numeric($pid)) - { - $this->view->error = "参数错误"; - return true; - } - - $sql = "SELECT * FROM $projectTable WHERE id=$pid"; - $sth = $this->db->query($sql); - $row = $sth->fetch(); - - if(empty($row['expert_name'])) - { - $this->view->error = "此项目尚未邀请跟踪专家"; - return true; - } - - $names = $this->getArray($row['expert_name']); - $emails = $this->getArray($row['expert_email']); - $validations = $this->getArray($row['expert_validation']); - $created = $this->getArray($row['expert_created']); - - if(!in_array($validations)) - { - $this->view->error = "您不在被邀请的专家名单内"; - return true; - } - - - - }//专家邀请链接 - - - }//projectsAction() - //从pgsql读取数组并拆分为php数组 function getArray($str){ if(strlen($str)>3) @@ -650,95 +395,6 @@ class HiwaterController extends DataController return "{".join(",",$array)."}"; } } - - function replacestatus($status) - { - if($status == 0) - { - return "计划未提交"; - } - if($status == 1) - { - return "计划未审核"; - } - if($status == 2) - { - return "跟踪专家审核"; - } - if($status == 3) - { - return "跟踪专家通过"; - } - if($status == 4) - { - return "数据委员会通过"; - } - } - - function genRandomString($len) - { - $chars = array( - "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", - "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", - "w", "x", "y", "z", "A", "B", "C", "D", "E", "F", "G", - "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", - "S", "T", "U", "V", "W", "X", "Y", "Z", "0", "1", "2", - "3", "4", "5", "6", "7", "8", "9" - ); - $charsLen = count($chars) - 1; - - shuffle($chars); // 将数组打乱 - - $output = ""; - for ($i=0; $i<$len; $i++) - { - $output .= $chars[mt_rand(0, $charsLen)]; - } - return $output; - } - - function chmodr($path, $filemode) { - if (!is_dir($path)) - return chmod($path, $filemode); - - $dh = opendir($path); - while (($file = readdir($dh)) !== false) { - if($file != '.' && $file != '..') { - $fullpath = $path.'/'.$file; - if(is_link($fullpath)) - return FALSE; - elseif(!is_dir($fullpath) && !chmod($fullpath, $filemode)) - return FALSE; - elseif(!$this->chmodr($fullpath, $filemode)) - return FALSE; - } - } - closedir($dh); - if(chmod($path, $filemode)) - return TRUE; - else - return FALSE; - } - - //成为作者后的后继处理工作 - private function author_first($uuid,$author) - { - $sql="insert into mdversion (xml,ts_created,uuid,changelog,userid) - select x.data,m.ts_created,?,?,? from metadata m left join xml x on m.id=x.id - left join mdversion v on m.uuid=v.uuid - where m.uuid=? and v.changelog is null"; - $sth=$this->db->prepare($sql); - try - { - $sth->execute(array($uuid,'初始版本 version 1.0',$author,$uuid)); - } catch(Exception $e){ - // do nothing here. - // 说明之前已经有对应数据 - } - $this->wdb=Zend_Db::factory($this->view->config->geonetwork); - $sql="update metadata set owner=? where uuid=?"; - $sth=$this->wdb->prepare($sql); - $sth->execute(array($author,$uuid)); - } + } \ No newline at end of file diff --git a/application/default/views/scripts/hiwater/base.phtml b/application/default/views/scripts/hiwater/base.phtml index 2b3c6991..c956349f 100644 --- a/application/default/views/scripts/hiwater/base.phtml +++ b/application/default/views/scripts/hiwater/base.phtml @@ -3,33 +3,26 @@ $this->headTitle($this->config->title->site); $this->headTitle($this->config->title->data); $this->headTitle()->setSeparator(' - '); $this->headLink()->appendStylesheet('/css/water.css'); -$this->breadcrumb('首页'); -$this->breadcrumb(''.$this->config->title->data.''); -$this->breadcrumb(''.$this->config->title->heihe.''); -$this->breadcrumb('基础数据'); -$this->breadcrumb()->setSeparator(' > '); +$this->nav[] = array('link'=>"/water",'title'=>'黑河生态水文遥感试验'); ?> +render('breadcrumbs.phtml'); ?>
partial('hiwater/navi.phtml'); ?>
-
breadcrumb() ?>
-
-

- 基础数据指为流域生态-水文研究提供各种自然、生态、水文、社会经济等本底信息的数据,同时还包括了主要的几次科学试验数据、模型数据集等。 -

-

- 基础数据主要包括了流域基础地理数据、流域各种专题数据、水文水资源数据、流域科学试验数据、航空遥感和卫星遥感数据、模型数据、社会经济数据等。 -

+ info) : ?> +
+ info['body'])) echo $this->info['body'];?>
+
metadata) : ?> page->getNavigation(); ?>
    metadata as $md) : ?> -
  1. +
diff --git a/application/default/views/scripts/hiwater/browse.phtml b/application/default/views/scripts/hiwater/browse.phtml index 20f2abf5..51528ee9 100644 --- a/application/default/views/scripts/hiwater/browse.phtml +++ b/application/default/views/scripts/hiwater/browse.phtml @@ -4,31 +4,23 @@ $this->headTitle('全部浏览'); $this->headTitle()->setSeparator(' - '); $this->headLink()->appendStylesheet('/css/water.css'); -$this->breadcrumb('首页'); -$this->breadcrumb(''.$this->config->title->data.''); -$this->breadcrumb('浏览'); -$this->breadcrumb()->setSeparator(' > '); +$this->nav[] = array('link'=>"/water",'title'=>'黑河生态水文遥感试验'); ?> +render('breadcrumbs.phtml'); ?>
partial('hiwater/navi.phtml'); ?>
-
- partial('data/tools.phtml'); ?> -
- page->getNavigation(); ?> - metadata as $md) : ?> + page->getNavigation(); ?>
-
-
-

escape($md['title']);?> - - -

-
',mb_strlen($md['description'])>400?$this->escape(mb_substr($md['description'],0,400,'UTF-8').'...'):$this->escape($md['description']));?>
+
+
    + metadata as $md) : ?> +
  1. + +
-
page->getNavigation(); ?>
diff --git a/application/default/views/scripts/hiwater/index.phtml b/application/default/views/scripts/hiwater/index.phtml index f165f8c8..5b1df0cf 100644 --- a/application/default/views/scripts/hiwater/index.phtml +++ b/application/default/views/scripts/hiwater/index.phtml @@ -3,13 +3,9 @@ $this->headTitle($this->config->title->site); $this->headTitle($this->config->title->data); $this->headTitle()->setSeparator(' - '); $this->headLink()->appendStylesheet('/css/water.css'); -$this->breadcrumb('首页'); -$this->breadcrumb(''.$this->config->title->data.''); -$this->headScript()->appendFile('/js/jquery-1.7.min.js'); -$this->breadcrumb($this->config->title->heihe); -$this->breadcrumb()->setSeparator(' > '); +$this->nav[] = array('link'=>"/water",'title'=>'黑河生态水文遥感试验'); ?> - +render('breadcrumbs.phtml'); ?>
partial('hiwater/navi.phtml'); ?> @@ -21,36 +17,5 @@ $this->breadcrumb()->setSeparator(' > '); info['body'])) echo $this->info['body'];?>
-
-

已整理数据展示

-
    - meatdata as $md) : ?> -
  • - - Data Thumbnail - -
  • - -
- -
- \ No newline at end of file diff --git a/application/default/views/scripts/hiwater/navi.phtml b/application/default/views/scripts/hiwater/navi.phtml index 5584457b..55a3590d 100644 --- a/application/default/views/scripts/hiwater/navi.phtml +++ b/application/default/views/scripts/hiwater/navi.phtml @@ -22,18 +22,19 @@
@@ -52,6 +53,7 @@ + @@ -62,14 +64,14 @@
From 792da561722cd30e7b8730a087aeedf8458eaf91 Mon Sep 17 00:00:00 2001 From: wlx Date: Sat, 25 May 2013 02:19:17 +0000 Subject: [PATCH 04/17] hiwatr implementation --- .../default/controllers/HiwaterController.php | 191 +++++++++++------- .../default/views/scripts/hiwater/base.phtml | 1 - .../default/views/scripts/hiwater/core.phtml | 33 --- .../default/views/scripts/hiwater/dem.phtml | 34 ---- .../views/scripts/hiwater/economic.phtml | 35 ---- .../views/scripts/hiwater/geobase.phtml | 32 --- .../default/views/scripts/hiwater/hydro.phtml | 39 ---- .../views/scripts/hiwater/irragation.phtml | 39 ---- .../views/scripts/hiwater/landsurface.phtml | 33 --- .../views/scripts/hiwater/landuse.phtml | 33 --- .../default/views/scripts/hiwater/meteo.phtml | 35 ---- .../default/views/scripts/hiwater/model.phtml | 35 ---- .../views/scripts/hiwater/navi.bak.phtml | 145 ------------- .../default/views/scripts/hiwater/navi.phtml | 107 +++++----- .../default/views/scripts/hiwater/obs.phtml | 45 ----- .../default/views/scripts/hiwater/rs.phtml | 32 --- .../default/views/scripts/hiwater/soil.phtml | 35 ---- .../default/views/scripts/hiwater/water.phtml | 39 ---- 18 files changed, 167 insertions(+), 776 deletions(-) delete mode 100644 application/default/views/scripts/hiwater/core.phtml delete mode 100644 application/default/views/scripts/hiwater/dem.phtml delete mode 100644 application/default/views/scripts/hiwater/economic.phtml delete mode 100644 application/default/views/scripts/hiwater/geobase.phtml delete mode 100644 application/default/views/scripts/hiwater/hydro.phtml delete mode 100644 application/default/views/scripts/hiwater/irragation.phtml delete mode 100644 application/default/views/scripts/hiwater/landsurface.phtml delete mode 100644 application/default/views/scripts/hiwater/landuse.phtml delete mode 100644 application/default/views/scripts/hiwater/meteo.phtml delete mode 100644 application/default/views/scripts/hiwater/model.phtml delete mode 100644 application/default/views/scripts/hiwater/navi.bak.phtml delete mode 100644 application/default/views/scripts/hiwater/obs.phtml delete mode 100644 application/default/views/scripts/hiwater/rs.phtml delete mode 100644 application/default/views/scripts/hiwater/soil.phtml delete mode 100644 application/default/views/scripts/hiwater/water.phtml diff --git a/application/default/controllers/HiwaterController.php b/application/default/controllers/HiwaterController.php index 536ef2f4..2d27245c 100644 --- a/application/default/controllers/HiwaterController.php +++ b/application/default/controllers/HiwaterController.php @@ -13,23 +13,23 @@ class HiwaterController extends DataController { $this->view->pageIn = "collapse1"; } - else if(in_array($acName,array("forest","dyk","plg"))) + else if(in_array($acName,array("airborne","vegstructure","vegtype","vegparam","dem","dsm","temperature","soilmoisture"))) { $this->view->pageIn = "collapse2"; } - else if(in_array($acName,array("arid","hzz","yk",'zy','zynoc','lzg','lzs'))) + else if(in_array($acName,array("hmon","autometeo","ec",'las','prec'))) { $this->view->pageIn = "collapse3"; } - else if(in_array($acName,array("meteo","autometeo","mobilemeteo","ec",'las','normalmeteo','regionalmeteo','doppler','hydro','airsounding'))) + else if(in_array($acName,array("cgs","calibration","ground",'sync'))) { $this->view->pageIn = "collapse4"; } - else if(in_array($acName,array("radiometer","airebone","lidar","widas",'asd'))) + else if(in_array($acName,array("wsn","waternet","soilnet","bnunet",'bnulai'))) { $this->view->pageIn = "collapse5"; } - else if(in_array($acName,array("satellite"))) + else if(in_array($acName,array("other"))) { $this->view->pageIn = "collapse6"; } @@ -93,12 +93,12 @@ class HiwaterController extends DataController function aviationAction() { - $this->getmd(array('航空遥感','WiDAS')); + $this->getmd(array('航空遥感','WiDAS','PLMR','Lidar','CASI','热红外高光谱数据')); $this->_helper->viewRenderer('base'); } function radiometerAction() { - $this->getmd(array('航空遥感','PLMR')); + $this->getmd(array('','PLMR')); $this->_helper->viewRenderer('base'); } function lidarAction() @@ -113,7 +113,7 @@ class HiwaterController extends DataController } function nearvisAction() { - $this->getmd(array('航空遥感','CASI')); + $this->getmd(array('','CASI')); $this->_helper->viewRenderer('base'); } function thermalAction() @@ -122,91 +122,130 @@ class HiwaterController extends DataController $this->_helper->viewRenderer('base'); } - function baseAction() + function airborneAction() { - $page=(int)$this->_request->getParam('page'); - if (empty($page)) $page=1; - $offset=$this->limit*($page-1); - $state=$this->db->query("select count(*) from normalmetadata where uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='hiwater') and id in (select id from keyword where keytype='theme' and (keyword='冰川' or keyword='沙漠' or keyword='地貌' or keyword='植被' or keyword='草场' or keyword='沙漠化' or keyword='基础地理' or keyword='遥感影像' or keyword='水文地质' or keyword='社会经济' or keyword='人口' or keyword='SWAT' or keyword='NPP' or keyword='WRF' or keyword='辐射' or keyword='NEP'))"); - $row=$state->fetchAll(); - $sum=$row[0]['count']; - $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') and id in (select id from keyword where keytype='theme' and (keyword='冰川' or keyword='沙漠' or keyword='地貌' or keyword='植被' or keyword='草场' or keyword='沙漠化' or keyword='基础地理' or keyword='遥感影像' or keyword='水文地质' or keyword='社会经济' or keyword='人口' or keyword='SWAT' or keyword='NPP' or keyword='WRF' or keyword='辐射' or keyword='NEP')) order by timebegin,title limit ? offset ?"; - $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; + $this->getmd(array('航空遥感产品','种植结构图','植被类型图','植被结构参数','数字高程模型','数字表面模型','地表温度','地表土壤水文')); + $this->_helper->viewRenderer('base'); } - - function geobaseAction() + function vegstructureAction() { - $this->getmd('基础地理'); + $this->getmd(array('','种植结构图')); + $this->_helper->viewRenderer('base'); } - - function coreAction() + function vegtypeAction() { - $page=(int)$this->_request->getParam('page'); - if (empty($page)) $page=1; - $offset=$this->limit*($page-1); - $state=$this->db->query("select count(*) from normalmetadata where uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='hiwater') and id in (select id from keyword where keytype='theme' and (keyword='DEM' or keyword='土地利用' or keyword='土壤' or keyword='气象' or keyword='水文观测' or keyword='灌溉' or keyword='试验'))"); - $row=$state->fetchAll(); - $sum=$row[0]['count']; - $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') and id in (select id from keyword where keytype='theme' and (keyword='DEM' or keyword='土地利用' or keyword='土壤' or keyword='气象' or keyword='水文观测' or keyword='灌溉' or keyword='试验')) order by timebegin,title limit ? offset ?"; - $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; + $this->getmd(array('','植被类型图')); + $this->_helper->viewRenderer('base'); + } + function vegparamAction() + { + $this->getmd(array('','植被结构参数')); + $this->_helper->viewRenderer('base'); } - function demAction() { - $this->getmd('DEM'); + $this->getmd(array('','数字高程模型')); + $this->_helper->viewRenderer('base'); + } + function dsmAction() + { + $this->getmd(array('','数字表面模型')); + $this->_helper->viewRenderer('base'); + } + function temperatureAction() + { + $this->getmd(array('','地表温度')); + $this->_helper->viewRenderer('base'); + } + function soilmoistureAction() + { + $this->getmd(array('','地表土壤水文')); + $this->_helper->viewRenderer('base'); + } + + function hmonAction() + { + $this->getmd(array('自动气象站','涡动相关仪','大孔径闪烁仪','河川径流观测')); + $this->_helper->viewRenderer('base'); + } + function autometeoAction() + { + $this->getmd(array('','自动气象站')); + $this->_helper->viewRenderer('base'); + } + function ecAction() + { + $this->getmd(array('','涡动相关仪')); + $this->_helper->viewRenderer('base'); + } + function lasAction() + { + $this->getmd(array('','大孔径闪烁仪')); + $this->_helper->viewRenderer('base'); + } + function precAction() + { + $this->getmd(array('','河川径流观测')); + $this->_helper->viewRenderer('base'); + } + + function cgsAction() + { + $this->getmd(array('定标观测','地基遥感观测','地面同步观测')); + $this->_helper->viewRenderer('base'); + } + function calibrationAction() + { + $this->getmd(array('','定标观测')); + $this->_helper->viewRenderer('base'); + } + function groundAction() + { + $this->getmd(array('','地基遥感观测')); + $this->_helper->viewRenderer('base'); + } + function syncAction() + { + $this->getmd(array('','地面同步观测')); + $this->_helper->viewRenderer('base'); } - function rsAction() + function wsnAction() { - $this->getmd('遥感影像'); + $this->getmd(array('WATERNET','SoilNET','BNUNET','BNULAI')); + $this->_helper->viewRenderer('base'); + } + function waternetAction() + { + $this->getmd(array('','WATERNET')); + $this->_helper->viewRenderer('base'); + } + function soilnetAction() + { + $this->getmd(array('','SoilNET')); + $this->_helper->viewRenderer('base'); + } + function bnunetAction() + { + $this->getmd(array('','BNUNET')); + $this->_helper->viewRenderer('base'); + } + function bnulaiAction() + { + $this->getmd(array('','BNULAI')); + $this->_helper->viewRenderer('base'); } - function waterAction() + function satelliteAction() { - $this->getmd('水文地质'); - } - - function modelAction() - { - $page=(int)$this->_request->getParam('page'); - if (empty($page)) $page=1; - $offset=$this->limit*($page-1); - $state=$this->db->query("select count(*) from normalmetadata where uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='hiwater') and id in (select id from keyword where keytype='theme' and (keyword='WRF' or keyword='NPP' or keyword='SWAT' or keyword='NEP' or keyword='辐射'))"); - $row=$state->fetchAll(); - $sum=$row[0]['count']; - $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') and id in (select id from keyword where keytype='theme' and (keyword='WRF' or keyword='NPP' or keyword='SWAT' or keyword='NEP' or keyword='辐射')) order by timebegin,title limit ? offset ?"; - $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; - } - - - function landsurfaceAction() - { - $page=(int)$this->_request->getParam('page'); - if (empty($page)) $page=1; - $offset=$this->limit*($page-1); - $state=$this->db->query("select count(*) from normalmetadata where uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='hiwater') and id in (select id from keyword where keytype='theme' and (keyword='冰川' or keyword='沙漠' or keyword='地貌' or keyword='植被' or keyword='草场' or keyword='沙漠化'))"); - $row=$state->fetchAll(); - $sum=$row[0]['count']; - $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') and id in (select id from keyword where keytype='theme' and (keyword='冰川' or keyword='沙漠' or keyword='地貌' or keyword='植被' or keyword='草场' or keyword='沙漠化')) order by timebegin,title limit ? offset ?"; - $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; - } - - function landuseAction() - { - $this->getmd('土地利用','theme'); + $this->getmd(array('','卫星遥感')); + $this->_helper->viewRenderer('base'); } function soilAction() { - $this->getmd('土壤','theme'); + $this->getmd(array('','卫星遥感')); + $this->_helper->viewRenderer('base'); } function meteoAction() @@ -272,7 +311,7 @@ class HiwaterController extends DataController //$form->submit->setLabel('快速搜索'); $key=$this->_request->getParam('q'); if (!empty($key)) { - $search=new Search($key); + $search=new SimpleSearch($key); $where=$search->sql_expr(array("title","description")); $page=@(int)$this->_request->getParam('page'); if (empty($page)) $page=1; diff --git a/application/default/views/scripts/hiwater/base.phtml b/application/default/views/scripts/hiwater/base.phtml index c956349f..58cc53e7 100644 --- a/application/default/views/scripts/hiwater/base.phtml +++ b/application/default/views/scripts/hiwater/base.phtml @@ -16,7 +16,6 @@ $this->nav[] = array('link'=>"/water",'title'=>'黑河生态水文遥感试验') info['body'])) echo $this->info['body'];?>
-
metadata) : ?> page->getNavigation(); ?>
diff --git a/application/default/views/scripts/hiwater/core.phtml b/application/default/views/scripts/hiwater/core.phtml deleted file mode 100644 index 9cc88eff..00000000 --- a/application/default/views/scripts/hiwater/core.phtml +++ /dev/null @@ -1,33 +0,0 @@ -headTitle($this->config->title->site); -$this->headTitle($this->config->title->data); -$this->headTitle()->setSeparator(' - '); -$this->headLink()->appendStylesheet('/css/water.css'); -$this->breadcrumb('首页'); -$this->breadcrumb(''.$this->config->title->data.''); -$this->breadcrumb(''.$this->config->title->heihe.''); -$this->breadcrumb('核心数据'); -$this->breadcrumb()->setSeparator(' > '); -?> -
-
- partial('hiwater/navi.phtml'); ?> -
-
-
breadcrumb() ?>
-
-

流域核心数据指流域生态-水文模型、陆面过程模型、社会经济模型以及其他各类模型所需要的关键性的驱动和参数数据集以及验证、发展和改进模型所需的关键观测数据。

-
-
- metadata) : ?> - page->getNavigation(); ?> -
-
    - metadata as $md) : ?> -
  1. - -
-
- -
-
\ No newline at end of file diff --git a/application/default/views/scripts/hiwater/dem.phtml b/application/default/views/scripts/hiwater/dem.phtml deleted file mode 100644 index febebef4..00000000 --- a/application/default/views/scripts/hiwater/dem.phtml +++ /dev/null @@ -1,34 +0,0 @@ -headTitle($this->config->title->site); -$this->headTitle($this->config->title->data); -$this->headTitle()->setSeparator(' - '); -$this->headLink()->appendStylesheet('/css/water.css'); -$this->breadcrumb('首页'); -$this->breadcrumb(''.$this->config->title->data.''); -$this->breadcrumb(''.$this->config->title->heihe.''); -$this->breadcrumb('DEM数据'); -$this->breadcrumb()->setSeparator(' > '); -?> -
-
- partial('hiwater/navi.phtml'); ?> -
-
-
breadcrumb() ?>
-
-

DEM是数字高程模型的英文简称(Digital Elevation Model),DEM是地貌形态信息的离散表示,这些信息包含流域网格单元的坡度、坡向以及单元格之间的关系等,是开展流域研究的重要原始资料。

-

数据包括黑河全流域范围各种不同分辨率的数字高程模型(DEM)(栅格大小为30m、90m、1000m和30sec)。

-
-
- metadata) : ?> - page->getNavigation(); ?> -
-
    - metadata as $md) : ?> -
  1. - -
-
- -
-
diff --git a/application/default/views/scripts/hiwater/economic.phtml b/application/default/views/scripts/hiwater/economic.phtml deleted file mode 100644 index e8dc5c08..00000000 --- a/application/default/views/scripts/hiwater/economic.phtml +++ /dev/null @@ -1,35 +0,0 @@ -headTitle($this->config->title->site); -$this->headTitle($this->config->title->data); -$this->headTitle()->setSeparator(' - '); -$this->headLink()->appendStylesheet('/css/water.css'); -$this->breadcrumb('首页'); -$this->breadcrumb(''.$this->config->title->data.''); -$this->breadcrumb(''.$this->config->title->heihe.''); -$this->breadcrumb('社会经济数据'); -$this->breadcrumb()->setSeparator(' > '); -?> -
-
- partial('hiwater/navi.phtml'); ?> -
-
-
breadcrumb() ?>
-
-

- 各类社会经济数据。 -

-
-
- metadata) : ?> - page->getNavigation(); ?> -
-
    - metadata as $md) : ?> -
  1. - -
-
- -
-
\ No newline at end of file diff --git a/application/default/views/scripts/hiwater/geobase.phtml b/application/default/views/scripts/hiwater/geobase.phtml deleted file mode 100644 index da310775..00000000 --- a/application/default/views/scripts/hiwater/geobase.phtml +++ /dev/null @@ -1,32 +0,0 @@ -headTitle($this->config->title->site); -$this->headTitle($this->config->title->data); -$this->headTitle()->setSeparator(' - '); -$this->headLink()->appendStylesheet('/css/water.css'); -$this->breadcrumb('首页'); -$this->breadcrumb(''.$this->config->title->data.''); -$this->breadcrumb(''.$this->config->title->heihe.''); -$this->breadcrumb('基础地理数据'); -$this->breadcrumb()->setSeparator(' > '); -?> -
-
- partial('hiwater/navi.phtml'); ?> -
-
-
breadcrumb() ?>
-
-
-
- metadata) : ?> - page->getNavigation(); ?> -
-
    - metadata as $md) : ?> -
  1. - -
-
- -
-
\ No newline at end of file diff --git a/application/default/views/scripts/hiwater/hydro.phtml b/application/default/views/scripts/hiwater/hydro.phtml deleted file mode 100644 index 633fe311..00000000 --- a/application/default/views/scripts/hiwater/hydro.phtml +++ /dev/null @@ -1,39 +0,0 @@ -headTitle($this->config->title->site); -$this->headTitle($this->config->title->data); -$this->headTitle()->setSeparator(' - '); -$this->headLink()->appendStylesheet('/css/water.css'); -$this->breadcrumb('首页'); -$this->breadcrumb(''.$this->config->title->data.''); -$this->breadcrumb(''.$this->config->title->heihe.''); -$this->breadcrumb('水文观测数据'); -$this->breadcrumb()->setSeparator(' > '); -?> -
-
- partial('hiwater/navi.phtml'); ?> -
-
-
breadcrumb() ?>
-
-

- 黑河流域的基本水文观测站点共计30个,其中包括了水文站18个,雨量站12个。 - 按照水文站点实际控制黑河流域的状况,我们收集了黑河流域范围10个核心水文站的水文数据, - 其中主要包括了位于黑河上游东、西支的祁连站、扎马什克站,黑河干流的莺落峡站、高崖站、正义峡站, - 位于黑河第二大支流-梨园河的肃南站、梨园堡站(控制主要灌区),其他支流上的李桥站、冰沟站等, - 以及黑河下游的额济纳旗站。 -

-
-
- metadata) : ?> - page->getNavigation(); ?> -
-
    - metadata as $md) : ?> -
  1. - -
-
- -
-
\ No newline at end of file diff --git a/application/default/views/scripts/hiwater/irragation.phtml b/application/default/views/scripts/hiwater/irragation.phtml deleted file mode 100644 index c4d7faf5..00000000 --- a/application/default/views/scripts/hiwater/irragation.phtml +++ /dev/null @@ -1,39 +0,0 @@ -headTitle($this->config->title->site); -$this->headTitle($this->config->title->data); -$this->headTitle()->setSeparator(' - '); -$this->headLink()->appendStylesheet('/css/water.css'); -$this->breadcrumb('首页'); -$this->breadcrumb(''.$this->config->title->data.''); -$this->breadcrumb(''.$this->config->title->heihe.''); -$this->breadcrumb('水文观测数据'); -$this->breadcrumb()->setSeparator(' > '); -?> - -
-
- partial('hiwater/navi.phtml'); ?> -
-
-
breadcrumb() ?>
-
-

- 黑河流域中游的水资源模拟主要是针对地表径流、地下水以及地表水与地下水相互转换等内容来开展, - 而对绿洲灌溉系统的水资源利用工作相对较少,这主要是因为没有绿洲灌溉系统的详细信息。如果能够获得渠系灌溉和机井灌溉的用水量信息, - 就可以更为完整地模拟整个黑河流域中游的水资源利用特征,为优化水资源利用提供参考依据。 - 这些数据为中游地区水文水资源模型建模工作提供了数据支撑,也为政府部门特别是水务部门的灌溉管理提供了重要的数据支持,为电子水务提供了可能性。 -

-
-
- metadata) : ?> - page->getNavigation(); ?> -
-
    - metadata as $md) : ?> -
  1. - -
-
- -
-
\ No newline at end of file diff --git a/application/default/views/scripts/hiwater/landsurface.phtml b/application/default/views/scripts/hiwater/landsurface.phtml deleted file mode 100644 index fdcf3633..00000000 --- a/application/default/views/scripts/hiwater/landsurface.phtml +++ /dev/null @@ -1,33 +0,0 @@ -headTitle($this->config->title->site); -$this->headTitle($this->config->title->data); -$this->headTitle()->setSeparator(' - '); -$this->headLink()->appendStylesheet('/css/water.css'); -$this->breadcrumb('首页'); -$this->breadcrumb(''.$this->config->title->data.''); -$this->breadcrumb(''.$this->config->title->heihe.''); -$this->breadcrumb('陆地表层数据'); -$this->breadcrumb()->setSeparator(' > '); -?> -
-
- partial('hiwater/navi.phtml'); ?> -
-
-
breadcrumb() ?>
-
-

陆地表层数据包括冰川、沙漠、草场、植被、地貌等数据。

-
-
- metadata) : ?> - page->getNavigation(); ?> -
-
    - metadata as $md) : ?> -
  1. - -
-
- -
-
\ No newline at end of file diff --git a/application/default/views/scripts/hiwater/landuse.phtml b/application/default/views/scripts/hiwater/landuse.phtml deleted file mode 100644 index 48c1c7e1..00000000 --- a/application/default/views/scripts/hiwater/landuse.phtml +++ /dev/null @@ -1,33 +0,0 @@ -headTitle($this->config->title->site); -$this->headTitle($this->config->title->data); -$this->headTitle()->setSeparator(' - '); -$this->headLink()->appendStylesheet('/css/water.css'); -$this->breadcrumb('首页'); -$this->breadcrumb(''.$this->config->title->data.''); -$this->breadcrumb(''.$this->config->title->heihe.''); -$this->breadcrumb('土地利用数据'); -$this->breadcrumb()->setSeparator(' > '); -?> -
-
- partial('hiwater/navi.phtml'); ?> -
-
-
breadcrumb() ?>
-
-

1:10万土地利用数据是在中国科学院“八五”重大应用项目《全国资源环境遥感宏观调查与动态研究》组织了中国科学院所属19个研究所的遥感科技队伍,以卫星遥感为手段,在三年内基于Landsat MSS,TM和ETM遥感数据建立了中国1:10万土地利用影像和矢量数据库。

-
-
- metadata) : ?> - page->getNavigation(); ?> -
-
    - metadata as $md) : ?> -
  1. - -
-
- -
-
diff --git a/application/default/views/scripts/hiwater/meteo.phtml b/application/default/views/scripts/hiwater/meteo.phtml deleted file mode 100644 index ae9f03b0..00000000 --- a/application/default/views/scripts/hiwater/meteo.phtml +++ /dev/null @@ -1,35 +0,0 @@ -headTitle($this->config->title->site); -$this->headTitle($this->config->title->data); -$this->headTitle()->setSeparator(' - '); -$this->headLink()->appendStylesheet('/css/water.css'); -$this->breadcrumb('首页'); -$this->breadcrumb(''.$this->config->title->data.''); -$this->breadcrumb(''.$this->config->title->heihe.''); -$this->breadcrumb('气象观测数据'); -$this->breadcrumb()->setSeparator(' > '); -?> -
-
- partial('hiwater/navi.phtml'); ?> -
-
-
breadcrumb() ?>
-
-

- 黑河流域及其周边地区的气象常规观测站点共21个。观测要素包括日平均气压、最高气压、最低气压、平均气温、最高气温、最低气温、平均相对湿度、最小相对湿度、平均风速、最大风速及风向、极大风速及风向、日照时数、降水量。 -

-
-
- metadata) : ?> - page->getNavigation(); ?> -
-
    - metadata as $md) : ?> -
  1. - -
-
- -
-
\ No newline at end of file diff --git a/application/default/views/scripts/hiwater/model.phtml b/application/default/views/scripts/hiwater/model.phtml deleted file mode 100644 index a77110d8..00000000 --- a/application/default/views/scripts/hiwater/model.phtml +++ /dev/null @@ -1,35 +0,0 @@ -headTitle($this->config->title->site); -$this->headTitle($this->config->title->data); -$this->headTitle()->setSeparator(' - '); -$this->headLink()->appendStylesheet('/css/water.css'); -$this->breadcrumb('首页'); -$this->breadcrumb(''.$this->config->title->data.''); -$this->breadcrumb(''.$this->config->title->heihe.''); -$this->breadcrumb('模型数据'); -$this->breadcrumb()->setSeparator(' > '); -?> -
-
- partial('hiwater/navi.phtml'); ?> -
-
-
breadcrumb() ?>
-
-

- 包括大气驱动数据、辐射数据、SWAT模型数据等。 -

-
-
- metadata) : ?> - page->getNavigation(); ?> -
-
    - metadata as $md) : ?> -
  1. - -
-
- -
-
\ No newline at end of file diff --git a/application/default/views/scripts/hiwater/navi.bak.phtml b/application/default/views/scripts/hiwater/navi.bak.phtml deleted file mode 100644 index fb9ae2cb..00000000 --- a/application/default/views/scripts/hiwater/navi.bak.phtml +++ /dev/null @@ -1,145 +0,0 @@ - - - \ No newline at end of file diff --git a/application/default/views/scripts/hiwater/navi.phtml b/application/default/views/scripts/hiwater/navi.phtml index 55a3590d..78acca3d 100644 --- a/application/default/views/scripts/hiwater/navi.phtml +++ b/application/default/views/scripts/hiwater/navi.phtml @@ -21,7 +21,7 @@
-