Showing
1 changed file
with
4 additions
and
17 deletions
| ... | @@ -38,20 +38,7 @@ | ... | @@ -38,20 +38,7 @@ |
| 38 | ></div> | 38 | ></div> |
| 39 | </div> | 39 | </div> |
| 40 | </div> | 40 | </div> |
| 41 | -<<<<<<< HEAD | ||
| 42 | 41 | ||
| 43 | - <script src="/socket.io/socket.io.js"></script> | ||
| 44 | - <script> | ||
| 45 | - var socket = io.connect('/'); | ||
| 46 | - socket.emit("connection"); | ||
| 47 | - socket.on("weatherInfo_minutely_send_to_cliend",(info)=>{ //서버에서 client에게 메세지 전송 | ||
| 48 | - console.log(info); | ||
| 49 | - }); | ||
| 50 | - </script> | ||
| 51 | - | ||
| 52 | -======= | ||
| 53 | - | ||
| 54 | ->>>>>>> 0f5edf6316e2444f5fd2a050fed5e771e5141733 | ||
| 55 | <!-- 첫번째 그래프 --> | 42 | <!-- 첫번째 그래프 --> |
| 56 | <script type="text/javascript"> | 43 | <script type="text/javascript"> |
| 57 | Highcharts.chart("container1", { | 44 | Highcharts.chart("container1", { |
| ... | @@ -134,7 +121,7 @@ | ... | @@ -134,7 +121,7 @@ |
| 134 | } | 121 | } |
| 135 | 122 | ||
| 136 | <%probArr.forEach((probArr)=>{%> | 123 | <%probArr.forEach((probArr)=>{%> |
| 137 | - temp; | 124 | + var temp; |
| 138 | temp= <%=probArr%>; | 125 | temp= <%=probArr%>; |
| 139 | 126 | ||
| 140 | for(j;j<10;j++) | 127 | for(j;j<10;j++) |
| ... | @@ -236,7 +223,7 @@ | ... | @@ -236,7 +223,7 @@ |
| 236 | } | 223 | } |
| 237 | 224 | ||
| 238 | <%ptArr.forEach((ptArr)=>{%> | 225 | <%ptArr.forEach((ptArr)=>{%> |
| 239 | - temp; | 226 | + var temp; |
| 240 | temp= <%=ptArr%>; | 227 | temp= <%=ptArr%>; |
| 241 | 228 | ||
| 242 | for(j;j<10;j++) | 229 | for(j;j<10;j++) |
| ... | @@ -338,7 +325,7 @@ | ... | @@ -338,7 +325,7 @@ |
| 338 | } | 325 | } |
| 339 | 326 | ||
| 340 | <%wsArr.forEach((wsArr)=>{%> | 327 | <%wsArr.forEach((wsArr)=>{%> |
| 341 | - temp; | 328 | + var temp; |
| 342 | temp= <%=wsArr%>; | 329 | temp= <%=wsArr%>; |
| 343 | 330 | ||
| 344 | for(j;j<10;j++) | 331 | for(j;j<10;j++) |
| ... | @@ -440,7 +427,7 @@ | ... | @@ -440,7 +427,7 @@ |
| 440 | } | 427 | } |
| 441 | 428 | ||
| 442 | <%rainArr.forEach((rainArr)=>{%> | 429 | <%rainArr.forEach((rainArr)=>{%> |
| 443 | - temp; | 430 | + var temp; |
| 444 | temp= <%=rainArr%>; | 431 | temp= <%=rainArr%>; |
| 445 | 432 | ||
| 446 | for(j;j<10;j++) | 433 | for(j;j<10;j++) | ... | ... |
-
Please register or login to post a comment