From 2c78aadeedd8feff850815cb2b514b87fa755041 Mon Sep 17 00:00:00 2001
From: Li Jianxuan <la5c@qq.com>
Date: Fri, 13 Jun 2014 06:14:27 +0000
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9highstock=E6=8F=92=E4=BB=B6?=
 =?UTF-8?q?=EF=BC=8C=E5=85=B3=E9=97=AD=E6=97=B6=E5=8C=BA=E7=9F=AB=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../default/views/scripts/visual/view.phtml   | 25 +++++++++++++------
 application/module/Westdc/Visual/Record.php   |  2 +-
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/application/default/views/scripts/visual/view.phtml b/application/default/views/scripts/visual/view.phtml
index d8f205c5..52cec9bf 100644
--- a/application/default/views/scripts/visual/view.phtml
+++ b/application/default/views/scripts/visual/view.phtml
@@ -13,13 +13,20 @@ $this->breadcrumb()->setSeparator(' > ');
     <div class="span12">
         <h3><?= $this->info['title'] ?> <small>数据可视化查看</small></h3>
         <h4><small>请在需要查看的可视化要素上点击以描绘图表，再次点击可取消显示，绘制图像前可自主选择图像类型</small></h4>
-        <div class="btn-group linetypes" data-toggle="buttons-radio">
-        	<button type="button" class="btn active" value="line">折线图</button>
-        	<button type="button" class="btn" value="column">柱状图</button>
-        </div>
-        <a class="btn btn-primary control-btn-cls" href="javascript:void(0);">
-            清除图像
-        </a>
+        
+        <div class="row-fluid">
+        	<div class="span6">
+                <div class="btn-group linetypes" data-toggle="buttons-radio">
+                    <button type="button" class="btn active" value="line">折线图</button>
+                    <button type="button" class="btn" value="column">柱状图</button>
+                </div>
+            </div>
+            <div class="span6 text-right">
+                <a class="btn btn-primary control-btn-cls" href="javascript:void(0);">
+                    清除图像
+                </a>
+            </div>
+    	</div>
         <hr />
         
         <?php $vars = (new \Westdc\Visual\VariableEncoder)->normaldecode($this->data['vars']);?>
@@ -41,6 +48,7 @@ $this->breadcrumb()->setSeparator(' > ');
 <script>
 _this = {};
 _this.linetype = 'line';
+_this.utctimezone = false;
 $(function() {
 	
 	$('.linetypes button').click(function(e) {
@@ -52,6 +60,9 @@ $(function() {
 			months : [ '一月', '二月', '三月', '四月', '五月', '六月',  '七月', '八月', '九月', '十月', '十一月', '十二月'],
 			//months : ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'],
 			weekdays: ['星期一', '星期二', '星期三', '星期四', '星期五', '星期六', '星期日']
+		},
+		global: {
+			useUTC: _this.utctimezone
 		}
 	});
 	
diff --git a/application/module/Westdc/Visual/Record.php b/application/module/Westdc/Visual/Record.php
index 4b1144df..dc222013 100644
--- a/application/module/Westdc/Visual/Record.php
+++ b/application/module/Westdc/Visual/Record.php
@@ -101,6 +101,6 @@ class Record
 		if(empty($time))
 			return (time()+8*3600)*1000;
 		else
-			return ($time+8*3600)*1000;
+			return ($time)*1000;
 	}
 }
\ No newline at end of file