From ad6a880544ef4ecfe26dff6237aeb80df211c4f6 Mon Sep 17 00:00:00 2001
From: wlx <wangliangxu@lzb.ac.cn>
Date: Thu, 22 Jan 2015 01:19:30 +0000
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E4=BF=AE=E6=94=B9=E6=96=87?=
 =?UTF-8?q?=E5=AD=97=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/controllers/DataController.php        |  1 +
 .../admin/views/scripts/data/visual-add.phtml   | 17 +++++++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/application/admin/controllers/DataController.php b/application/admin/controllers/DataController.php
index f03f1c41..87131096 100755
--- a/application/admin/controllers/DataController.php
+++ b/application/admin/controllers/DataController.php
@@ -3989,6 +3989,7 @@ class Admin_DataController extends Zend_Controller_Action
 				if(!empty($data))
 				{
 					$this->view->info = $data;
+					//$this->_helper->viewRenderer('visual-edit');
 				}
 				
 				return true;
diff --git a/application/admin/views/scripts/data/visual-add.phtml b/application/admin/views/scripts/data/visual-add.phtml
index 395a914d..489d4744 100644
--- a/application/admin/views/scripts/data/visual-add.phtml
+++ b/application/admin/views/scripts/data/visual-add.phtml
@@ -5,7 +5,6 @@
 	$this->breadcrumb('<a href="/">首页</a>');
 	$this->breadcrumb('<a href="/admin">后台首页</a>');
 	$this->breadcrumb('<a href="/admin/data">数据管理</a>');
-	$this->breadcrumb('同步GEONETWORK元数据</a>');
 	$this->breadcrumb()->setSeparator(' > ');
 ?>
 <div class="row-fluid">
@@ -62,12 +61,12 @@
                 <div class="controls">
                     <label class="radio inline">
                         <input type="radio" name="chartjs" id="optionsRadios1" value="highcharts" <?= (isset($this->info['chartjs']) && $this->info['chartjs']=='highcharts') || empty($this->info['chartjs']) ? "checked":"" ?>>
-                        Highcharts
+                        Highcharts（适合分类数据展示和三维展示）
                     </label>
                     <label class="radio inline">
                         <input type="radio" name="chartjs" id="optionsRadios2" value="highstock"
                             <?= isset($this->info['chartjs']) && $this->info['chartjs'] == 'highstock' ? 'checked="checked"':"" ?>>
-                        Highstock(可控制x轴)
+                        Highstock（适合时间序列数据可视化）
                     </label>
                 </div>
             </div>
@@ -84,6 +83,16 @@
                             <?= isset($this->info['charttype']) && $this->info['charttype'] == 'column' ? 'checked="checked"':"" ?>>
                         柱状图
                     </label>
+                    <label class="radio inline">
+                        <input type="radio" name="charttype" id="optionsRadios3" value="spline"
+                            <?= isset($this->info['charttype']) && $this->info['charttype'] == 'spline' ? 'checked="checked"':"" ?>>
+                        样条线图
+                    </label>
+                    <label class="radio inline">
+                        <input type="radio" name="charttype" id="optionsRadios4" value="area"
+                            <?= isset($this->info['charttype']) && $this->info['charttype'] == 'area' ? 'checked="checked"':"" ?>>
+                        面积图
+                    </label>
                 </div>
             </div>
 
@@ -130,7 +139,7 @@
                         <div class="controls">
                             <input type="text" placeholder="字段名" class="" name="var[<?= $index ?>][name]" value="<?= $value['name'] ?>">
                             <input type="text" placeholder="显示名" class="" name="var[<?= $index ?>][title]" value="<?= $value['title'] ?>">
-                            <input type="text" placeholder="字段sql" class="" name="var[<?= $index ?>][sql]" value="<?= $value['sql'] ?>">
+                            <input type="text" placeholder="字段sql" class="" name="var[<?= $index ?>][sql]" value="<?= (isset($value['sql']))?$value['sql']:'' ?>">
                             <input type="text" placeholder="查询条件" name="var[<?= $index ?>][condition]" value="<?= isset($value['condition']) && is_string($value['condition']) ? $value['condition']:"" ?><?= isset($value['condition']) && is_array($value['condition']) ? join(";",$value['condition']):"" ?>">
                         </div>
                     </div>