From d5becee1065e912605d2424d6aa0ebefa9a60aff Mon Sep 17 00:00:00 2001
From: wlx <wangliangxu@lzb.ac.cn>
Date: Sat, 31 Jan 2015 16:19:59 +0000
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E8=A1=A8=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E9=BB=98=E8=AE=A4=E5=80=BC=EF=BC=8C=E5=B9=B6=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=96=87=E5=AD=97=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/views/scripts/data/visual-add.phtml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/admin/views/scripts/data/visual-add.phtml b/application/admin/views/scripts/data/visual-add.phtml
index 489d4744..d7a20cd9 100644
--- a/application/admin/views/scripts/data/visual-add.phtml
+++ b/application/admin/views/scripts/data/visual-add.phtml
@@ -60,12 +60,12 @@
                 <label class="control-label">绘图插件</label>
                 <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":"" ?>>
+                        <input type="radio" name="chartjs" id="optionsRadios1" value="highcharts" <?= (isset($this->info['chartjs']) && $this->info['chartjs']=='highcharts') ? "checked":"" ?>>
                         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"':"" ?>>
+                            <?= (isset($this->info['chartjs']) && $this->info['chartjs'] == 'highstock') || empty($this->info['chartjs']) ? 'checked="checked"':"" ?>>
                         Highstock（适合时间序列数据可视化）
                     </label>
                 </div>
@@ -124,7 +124,7 @@
                 <label class="control-label">X轴取值</label>
                 <div class="controls">
                     <input type="text" name="xaxis" placeholder="时间字段读取SQL" class="input-block-level" value="<?= isset($this->info['xaxis']) ? $this->info['xaxis']:'' ?>" />
-                    <p class="help-block">例如: utctime, times , (year||'-'||month||'-1')::timestamp without time zone ,不需要在最外层加括号或者双引号</p>
+                    <p class="help-block">例如: utctime, times , (year||'-'||month||'-1')::timestamp without time zone ,不需要在最外层加括号或者双引号。如果是制作分类图，则X轴必须是category，请在数据读取SQL中用将所需字段命名为category。</p>
                 </div>
             </div>