From 5421a8ff06e5e7d9d6263d87aa9d001e1f08b624 Mon Sep 17 00:00:00 2001 From: wlx Date: Wed, 18 Jun 2014 13:46:25 +0000 Subject: [PATCH 01/19] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E6=96=B0=E9=97=BB=E7=9A=84=E6=97=B6=E9=97=B4=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/default/views/scripts/index/index.phtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/default/views/scripts/index/index.phtml b/application/default/views/scripts/index/index.phtml index 3944e3e0..27720468 100755 --- a/application/default/views/scripts/index/index.phtml +++ b/application/default/views/scripts/index/index.phtml @@ -54,7 +54,7 @@ \ No newline at end of file From 838c4c295d866d7379fea2da49ed3a550ae783ab Mon Sep 17 00:00:00 2001 From: wlx Date: Fri, 20 Jun 2014 01:28:59 +0000 Subject: [PATCH 14/19] fix errors --- application/default/views/scripts/footer.phtml | 8 -------- application/default/views/scripts/index/index.phtml | 10 +++++++++- application/layouts/layout.phtml | 3 +-- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/application/default/views/scripts/footer.phtml b/application/default/views/scripts/footer.phtml index 43d1f406..51e800e2 100755 --- a/application/default/views/scripts/footer.phtml +++ b/application/default/views/scripts/footer.phtml @@ -7,14 +7,6 @@ - pageID)) {?> diff --git a/application/default/views/scripts/index/index.phtml b/application/default/views/scripts/index/index.phtml index 27720468..918d3c86 100755 --- a/application/default/views/scripts/index/index.phtml +++ b/application/default/views/scripts/index/index.phtml @@ -116,4 +116,12 @@ - \ No newline at end of file + + \ No newline at end of file diff --git a/application/layouts/layout.phtml b/application/layouts/layout.phtml index 271e7700..ec2b2833 100755 --- a/application/layouts/layout.phtml +++ b/application/layouts/layout.phtml @@ -29,12 +29,11 @@ headStyle() ?> - + render('header.phtml') ?> - layout()->content ?> render('footer.phtml') ?> From c49cc9217593c6e46f295c3080cfa205d722361d Mon Sep 17 00:00:00 2001 From: Li Heng Date: Fri, 20 Jun 2014 02:39:44 +0000 Subject: [PATCH 15/19] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=A6=96=E9=A1=B5=20?= =?UTF-8?q?=E6=9C=80=E8=BF=91=E6=9B=B4=E6=96=B0=E6=95=B0=E6=8D=AE=EF=BC=8C?= =?UTF-8?q?=E6=9C=80=E5=A4=9A=E6=B5=8F=E8=A7=88=E6=95=B0=E6=8D=AE=20?= =?UTF-8?q?=E5=B0=8F=E5=9B=BE=E6=A0=87=E4=B8=8E=E6=96=87=E5=AD=97=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/default/views/scripts/data/index.phtml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/application/default/views/scripts/data/index.phtml b/application/default/views/scripts/data/index.phtml index c7b774e7..471b1c8f 100755 --- a/application/default/views/scripts/data/index.phtml +++ b/application/default/views/scripts/data/index.phtml @@ -57,18 +57,18 @@
-

数据最近更新

+

数据最近更新

-

最多浏览数据集

+

最多浏览数据集

From fc2cb61d8e6b3cf5d6b427c91424f9a452675761 Mon Sep 17 00:00:00 2001 From: wlx Date: Fri, 20 Jun 2014 06:41:44 +0000 Subject: [PATCH 16/19] =?UTF-8?q?=E7=94=A8=E5=A4=A9=E5=9C=B0=E5=9B=BE?= =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/scripts/search/advance.phtml | 255 ++++++------------ 1 file changed, 84 insertions(+), 171 deletions(-) diff --git a/application/default/views/scripts/search/advance.phtml b/application/default/views/scripts/search/advance.phtml index af5cde54..d0833bb9 100644 --- a/application/default/views/scripts/search/advance.phtml +++ b/application/default/views/scripts/search/advance.phtml @@ -2,185 +2,116 @@ $this->headTitle($this->config->title->site); $this->headTitle($this->config->title->data); $this->headTitle('高级搜索'); -if (!empty($this->codename)) $this->headTitle($this->codename); $this->headTitle()->setSeparator(' - '); -$this->headLink()->appendStylesheet('/css/metadata.css'); $this->breadcrumb('首页'); $this->breadcrumb(''.$this->config->title->data.''); $this->breadcrumb('高级搜索'); $this->breadcrumb()->setSeparator(' > '); -$this->theme->AppendPlus($this,'google_map_v3'); -$this->theme->AppendPlus($this,'google_map_keydragzone'); +$this->theme->AppendPlus($this,'tianditu'); $this->theme->AppendPlus($this,'jquery_ui'); -$this->theme->AppendPlus($this,'colorbox'); ?>
partial('data/tools.phtml'); ?>
-metadata)) : - echo $this->page->getNavigation();?> -
- -metadata as $md) : ?> -
-
-

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

- 400?$this->escape(mb_substr($md['description'],0,400,'UTF-8').'...'):$this->escape($md['description']);?> -
- -page->getNavigation();?> - -
-
-
- -
+
+
+ +
-
-
搜索说明
  • 关键词：您可以使用一个关键词，比如“沙漠”，也可以使用多个关键词，中间用空格分开。
    • -
  • 空间范围：这是以度为单位的十进制数字。比如，东经125度30分，可以输入为125.5。您也可以通过下面的在线地图工具直接在图上拉框选择一个范围，空间坐标会自动转换到文本框中。
    • -
  • 时间范围：指数据的时间范围，从开始时间到结束时间。开始时间与结束时间可以为空，若仅填写开始时间，则含义为选择大于开始时间的数据。若仅填写结束时间，则含义为选择小于结束时间的数据。时间格式为YYYY-MM-DD。
    • -
  • 还不清楚？您可以到论坛提问。
    • -
-
- - - - \ No newline at end of file + \ No newline at end of file From e8bdd36d0ce39207e037cb46d2e62f99afb0b2bc Mon Sep 17 00:00:00 2001 From: wlx Date: Fri, 20 Jun 2014 09:37:04 +0000 Subject: [PATCH 17/19] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E5=92=8C=E7=BC=A9=E6=94=BE=E7=BA=A7=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/default/views/scripts/search/advance.phtml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/application/default/views/scripts/search/advance.phtml b/application/default/views/scripts/search/advance.phtml index d0833bb9..4157a038 100644 --- a/application/default/views/scripts/search/advance.phtml +++ b/application/default/views/scripts/search/advance.phtml @@ -41,12 +41,11 @@ $(function() { }); var bounds = null; var rect = null; -var map,zoom=10,rectTool; -var rectangle; +var map,zoom=6,rectTool; var input = {east:'#east',west:'#west',north:'#north',south:'#south'}; //加载地图 -var myLatlng = new TLngLat(105.819946,35.656456); +var myLatlng = new TLngLat(97,38); map = new TMap("map_canvas"); map.centerAndZoom(myLatlng,zoom); map.enableHandleMouseScroll(); From 2e4cb25293e0c78c55dbe26fbfaf8d41700f246e Mon Sep 17 00:00:00 2001 From: wlx Date: Fri, 20 Jun 2014 11:35:13 +0000 Subject: [PATCH 18/19] =?UTF-8?q?#618,=20=E7=94=A8=E5=A4=A9=E5=9C=B0?= =?UTF-8?q?=E5=9B=BE=E5=AE=9E=E7=8E=B0=E7=A9=BA=E9=97=B4=E6=B5=8F=E8=A7=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../default/views/scripts/data/map.phtml | 136 ++++++------------ application/models/data/Metadata.php | 4 +- 2 files changed, 47 insertions(+), 93 deletions(-) diff --git a/application/default/views/scripts/data/map.phtml b/application/default/views/scripts/data/map.phtml index 8460daf8..95d930ae 100755 --- a/application/default/views/scripts/data/map.phtml +++ b/application/default/views/scripts/data/map.phtml @@ -3,23 +3,19 @@ $this->headTitle($this->config->title->site); $this->headTitle($this->config->title->data); $this->headTitle("空间浏览"); $this->headTitle()->setSeparator(' - '); -$this->theme->AppendPlus($this,'jquery_ui'); -//$this->theme->AppendPlus($this,'google_map_v3'); -$this->theme->AppendPlus($this,'colorbox'); -$this->headLink()->appendStylesheet('/js/theme/default/style.css'); +$this->theme->AppendPlus($this,'tianditu'); $this->nav[] = array('link'=>"/data/map",'title'=>'空间导航'); ?>
- render('breadcrumbs.phtml'); ?> partial('data/tools.phtml'); ?>
- - + +

将地图中范围调整至要搜索数据的范围，然后点击“搜索数据”按钮查看当前范围的所有数据

@@ -43,103 +39,59 @@ $this->nav[] = array('link'=>"/data/map",'title'=>'空间导航');