From ccbb0ee2efec4a06196efbd10d521df6e2f1c311 Mon Sep 17 00:00:00 2001
From: Li Jianxuan <la5c@qq.com>
Date: Mon, 25 Jun 2012 09:19:23 +0000
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=E7=9B=91=E6=B5=8B=E6=95=B0=E6=8D=AE=E7=9A=84=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=EF=BC=8C=E5=9C=A8=E7=BB=98=E5=9B=BE=E6=97=B6?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E7=B1=BB=E5=9E=8B=E3=80=81=E7=BC=A9?=
 =?UTF-8?q?=E6=94=BE=E7=BA=A7=E5=88=AB=E4=B8=A4=E4=B8=AA=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../default/controllers/VisualController.php  | 28 +++++++++++++++++--
 .../default/views/scripts/visual/index.phtml  | 13 ++++++---
 2 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/application/default/controllers/VisualController.php b/application/default/controllers/VisualController.php
index 278c38eb..57ec3bbe 100644
--- a/application/default/controllers/VisualController.php
+++ b/application/default/controllers/VisualController.php
@@ -518,7 +518,8 @@ class VisualController extends Zend_Controller_Action
 		$datas = array();
 		$label = "";
 		$title = "";
-		
+		$range = 0;
+		$type = "line";
 		
 		if($base == "meteorology")
 		{
@@ -527,6 +528,7 @@ class VisualController extends Zend_Controller_Action
 				
 				$title = "日平均温度";
 				$label = "℃";
+				$type = "line";
 				
 				$datas = $this->getMeteorologyDataByStationId($ac,$label);
 				
@@ -537,6 +539,7 @@ class VisualController extends Zend_Controller_Action
 
 				$title = "日平均风速";
 				$label = "m/s";
+				$type = "line";
 				
 				$datas = $this->getMeteorologyDataByStationId($ac,$label);
 				
@@ -547,6 +550,7 @@ class VisualController extends Zend_Controller_Action
 				
 				$title = "日合计降水量";
 				$label = "mm";
+				$type = "line";
 				
 				$datas = $this->getMeteorologyDataByStationId($ac,$label);
 				
@@ -557,6 +561,7 @@ class VisualController extends Zend_Controller_Action
 				
 				$title = "日照小时数";
 				$label = "h";
+				$type = "line";
 				
 				$datas = $this->getMeteorologyDataByStationId($ac,$label);
 				
@@ -571,6 +576,7 @@ class VisualController extends Zend_Controller_Action
 			{
 				$title = "日降水量";
 				$label = "mm";
+				$type = "line";
 				
 				$datas = $this->getHydrologyDataByStationId($ac,$label);
 				
@@ -580,6 +586,7 @@ class VisualController extends Zend_Controller_Action
 			{
 				$title = "月均降水";
 				$label = "mm";
+				$type = "line";
 				
 				$datas = $this->getHydrologyDataByStationId($ac,$label);
 			}//月均降水
@@ -588,6 +595,7 @@ class VisualController extends Zend_Controller_Action
 			{
 				$title = "年均降水";
 				$label = "mm";
+				$type = "line";
 				
 				$datas = $this->getHydrologyDataByStationId($ac,$label);
 			}//年均降水
@@ -596,6 +604,7 @@ class VisualController extends Zend_Controller_Action
 			{
 				$title = "日均流量";
 				$label = "mm";
+				$type = "line";
 				
 				$datas = $this->getHydrologyDataByStationId($ac,$label);
 			}
@@ -604,6 +613,7 @@ class VisualController extends Zend_Controller_Action
 			{
 				$title = "月均流量";
 				$label = "mm";
+				$type = "line";
 				
 				$datas = $this->getHydrologyDataByStationId($ac,$label);
 			}
@@ -612,6 +622,7 @@ class VisualController extends Zend_Controller_Action
 			{
 				$title = "年均流量";
 				$label = "mm";
+				$type = "line";
 				
 				$datas = $this->getHydrologyDataByStationId($ac,$label);
 			}			
@@ -626,6 +637,8 @@ class VisualController extends Zend_Controller_Action
 			{
 				$title = "总悬浮颗粒物";
 				$label="";
+				$type = "column";
+				$range = 6;
 				$datas = $this->getAmbientDataByStationId($ac,$label);
 			}
 			
@@ -633,6 +646,8 @@ class VisualController extends Zend_Controller_Action
 			{
 				$title = "可吸入颗粒物";
 				$label="";
+				$type = "column";
+				$range = 6;
 				$datas = $this->getAmbientDataByStationId($ac,$label);
 			}
 			
@@ -640,6 +655,8 @@ class VisualController extends Zend_Controller_Action
 			{
 				$title = "二氧化硫";
 				$label="";
+				$type = "column";
+				$range = 6;
 				$datas = $this->getAmbientDataByStationId($ac,$label);
 			}
 			
@@ -647,15 +664,22 @@ class VisualController extends Zend_Controller_Action
 			{
 				$title = "二氧化氮";
 				$label="";
+				$type = "column";
+				$range = 6;
 				$datas = $this->getAmbientDataByStationId($ac,$label);
 			}
 		}//环境监测数据
 		
-		
+		if(empty($range))
+		{
+			$range = 0;
+		}
 		
 		$data = array(
 				"label"=>$label,
 				"title"=>$title,
+				"type"=>$type,
+				"range"=>$range,
 				"datas"=>$datas
 			);
 			
diff --git a/application/default/views/scripts/visual/index.phtml b/application/default/views/scripts/visual/index.phtml
index ded298c0..ef7a2322 100644
--- a/application/default/views/scripts/visual/index.phtml
+++ b/application/default/views/scripts/visual/index.phtml
@@ -63,16 +63,21 @@ $this->breadcrumb()->setSeparator(' > ');
 </div>
 <!-- //页面内容 -->
 <script>
-function drawchart(data,title) {
+function drawchart(type,range,data,title) {
 	// Create the chart
 		window.chart = new Highcharts.StockChart({
 			'chart' : {
-				'renderTo' : 'datachart'
+				'renderTo' : 'datachart',
+				'type': type
 			},
 			
 			'rangeSelector' :{
 				'enabled' : true,
-				'selected' : 0
+				'selected' : range
+			},
+			
+			'credits':{
+				'enabled': false
 			},
 			
 			'exporting': {
@@ -121,7 +126,7 @@ $(".fetchSeries").click(function () {
 		{$('.fetchSeries').removeClass('btn-green');Alert('未请求到数据');return false;}
 		if(typeof(series.error)!='undefined') 
 		{$('.fetchSeries').removeClass('btn-green');Alert(series.error);return false;}
-		drawchart(series.datas,series.title);
+		drawchart(series.type,series.range,series.datas,series.title);
 	 }
 	
 	$.ajax({