-

+
diff --git a/src/main/webapp/js/admin/dashBoard.js b/src/main/webapp/js/admin/dashBoard.js
index fce265e..43e5432 100644
--- a/src/main/webapp/js/admin/dashBoard.js
+++ b/src/main/webapp/js/admin/dashBoard.js
@@ -1,9 +1,10 @@
$(function (){
- google.charts.load('current', {packages: ['corechart', 'line']});
+ google.charts.load('current', {packages: ['bar']});
google.charts.setOnLoadCallback(drawMapUseFromDayChart);
-
- google.charts.load("current", {packages:["corechart"]});
+ google.charts.load('current', {packages: ['corechart']});
google.charts.setOnLoadCallback(drawAreaDonutChart);
+ google.charts.load('current', {packages:['line']});
+ google.charts.setOnLoadCallback(drawTempChart);
})
function drawMapUseFromDayChart() {
@@ -18,11 +19,11 @@ function drawMapUseFromDayChart() {
role: "annotation" }]);
var options = {
- bar: {groupWidth: "95%"},
+ bar: {groupWidth: "80%"},
legend: { position: "bottom" },
};
- var chart = new google.visualization.ColumnChart(document.getElementById("mapUseFromDayChart"));
- chart.draw(view, options);
+ var chart = new google.charts.Bar(document.getElementById("mapUseFromDayChart"));
+ chart.draw(view, google.charts.Bar.convertOptions(options));
/*$.ajax({
url: "/admin/dayMapUseData",
@@ -59,4 +60,40 @@ function drawAreaDonutChart() {
var chart = new google.visualization.PieChart(document.getElementById('areaDonutChart'));
chart.draw(data, options);
+}
+
+function drawTempChart() {
+ var data = new google.visualization.DataTable();
+ data.addColumn('number', 'param01');
+ data.addColumn('number', 'value01');
+ data.addColumn('number', 'value02');
+
+ data.addRows([
+ [1, 37.8, 80.8],
+ [2, 30.9, 69.5],
+ [3, 25.4, 57],
+ [4, 11.7, 18.8],
+ [5, 11.9, 17.6],
+ [6, 8.8, 13.6],
+ [7, 7.6, 12.3],
+ [8, 12.3, 29.2],
+ [9, 16.9, 42.9],
+ [10, 12.8, 30.9],
+ [11, 5.3, 7.9],
+ [12, 6.6, 8.4],
+ [13, 4.8, 6.3],
+ [14, 4.2, 6.2]
+ ]);
+
+ var options = {
+ axes: {
+ x: {
+ 0: {side: 'top'}
+ }
+ }
+ };
+
+ var chart = new google.charts.Line(document.getElementById('tempLineChart'));
+
+ chart.draw(data, google.charts.Line.convertOptions(options));
}
\ No newline at end of file