DESKTOP-PC6TBNS\강환석씨

Merge branch 'developing' of http://khuhub.khu.ac.kr/2017104029/2018_2_project into developing

...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
109 }, 109 },
110 yAxis: { 110 yAxis: {
111 title: { 111 title: {
112 - text: "Value", 112 + text: "사망확률(%)",
113 style: { 113 style: {
114 color: "white" 114 color: "white"
115 } 115 }
...@@ -251,7 +251,7 @@ plotOptions: { ...@@ -251,7 +251,7 @@ plotOptions: {
251 }, 251 },
252 yAxis: { 252 yAxis: {
253 title: { 253 title: {
254 - text: "Value", 254 + text: "기온(°C)",
255 style: { 255 style: {
256 color: "white" 256 color: "white"
257 } 257 }
...@@ -272,7 +272,7 @@ plotOptions: { ...@@ -272,7 +272,7 @@ plotOptions: {
272 }, 272 },
273 tooltip: { 273 tooltip: {
274 headerFormat: "<b>{series.name}</b><br/>", 274 headerFormat: "<b>{series.name}</b><br/>",
275 - pointFormat: "{point.x:%Y년%m월%d일 %H시%M분}<br/>의 기온 : {point.y:.2f}" 275 + pointFormat: "{point.x:%Y년%m월%d일 %H시%M분}<br/>의 기온 : {point.y:.2f}°C"
276 }, 276 },
277 legend: { 277 legend: {
278 //enabled: false 278 //enabled: false
...@@ -379,7 +379,7 @@ plotOptions: { ...@@ -379,7 +379,7 @@ plotOptions: {
379 }, 379 },
380 yAxis: { 380 yAxis: {
381 title: { 381 title: {
382 - text: "Value", 382 + text: "풍속(m/s)",
383 style: { 383 style: {
384 color: "white" 384 color: "white"
385 } 385 }
...@@ -506,7 +506,7 @@ plotOptions: { ...@@ -506,7 +506,7 @@ plotOptions: {
506 }, 506 },
507 yAxis: { 507 yAxis: {
508 title: { 508 title: {
509 - text: "Value", 509 + text: "강수량(mm)",
510 style: { 510 style: {
511 color: "white" 511 color: "white"
512 } 512 }
...@@ -602,21 +602,25 @@ plotOptions: { ...@@ -602,21 +602,25 @@ plotOptions: {
602 602
603 chart1.series[0].addPoint({ 603 chart1.series[0].addPoint({
604 x: date, 604 x: date,
605 - y: info.death 605 + y: info.death,
606 + color:"#FFE08C"
606 }); 607 });
607 chart2.series[0].addPoint({ 608 chart2.series[0].addPoint({
608 x: date, 609 x: date,
609 - y: info.temperature*1 610 + y: info.temperature*1,
611 + color:"#FFE08C"
610 }); 612 });
611 613
612 chart3.series[0].addPoint({ 614 chart3.series[0].addPoint({
613 x: date, 615 x: date,
614 - y: info.wind*1 616 + y: info.wind*1,
617 + color:"#FFE08C"
615 }); 618 });
616 619
617 chart4.series[0].addPoint({ 620 chart4.series[0].addPoint({
618 x: date, 621 x: date,
619 - y: info.rain*1 622 + y: info.rain*1,
623 + color:"#FFE08C"
620 }); 624 });
621 625
622 }); 626 });
...@@ -626,4 +630,4 @@ plotOptions: { ...@@ -626,4 +630,4 @@ plotOptions: {
626 630
627 </body> 631 </body>
628 632
629 -</html> -->
...\ No newline at end of file ...\ No newline at end of file
633 +</html>
...\ No newline at end of file ...\ No newline at end of file
......