From 741dd2b2bfa3d082d8106a9042839a51071ec670 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Tue, 8 Mar 2022 14:03:39 +0900 Subject: [PATCH 1/5] =?UTF-8?q?=EB=8C=80=EC=8B=9C=EB=B3=B4=EB=93=9C=20?= =?UTF-8?q?=EC=A7=80=EC=97=AD=EB=B3=84=20=ED=98=84=EC=9E=A5=EC=88=98?= =?UTF-8?q?=EC=A7=91=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20=ED=98=84=ED=99=A9=20?= =?UTF-8?q?=EC=A7=80=ED=91=9C=20=EC=B6=94=EA=B0=80.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mca/cmmn/web/AdminController.java | 23 +++--- .../com/mca/map/mapper/FieldDataMapper.java | 3 + .../com/mca/map/mapper/UseHistoryMapper.java | 4 +- .../com/mca/map/service/FieldDataService.java | 5 ++ .../mca/map/service/UseHistoryService.java | 4 +- src/main/java/com/mca/map/vo/ChartVO.java | 41 ++++++++++ .../com/mca/map/vo/UseHistoryChartVO.java | 22 ------ .../sqlmap/mappers/map/fieldData.xml | 27 ++++--- .../sqlmap/mappers/map/useHistory.xml | 8 +- .../sqlmap/sql-mapper-config.xml | 2 +- .../webapp/WEB-INF/jsp/admin/dashBoard.jsp | 74 +++++++++---------- src/main/webapp/js/admin/dashBoard.js | 31 +++++++- 12 files changed, 148 insertions(+), 96 deletions(-) create mode 100644 src/main/java/com/mca/map/vo/ChartVO.java delete mode 100644 src/main/java/com/mca/map/vo/UseHistoryChartVO.java diff --git a/src/main/java/com/mca/cmmn/web/AdminController.java b/src/main/java/com/mca/cmmn/web/AdminController.java index bb14877..8f2309e 100644 --- a/src/main/java/com/mca/cmmn/web/AdminController.java +++ b/src/main/java/com/mca/cmmn/web/AdminController.java @@ -102,12 +102,17 @@ public class AdminController { searchVO.setSearchStartDate(searchStartDate.minusMonths(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); model.addAttribute("monthLoginCount", logService.selectLoginCnt(searchVO)); - //일별 지도사용 추이 데이터 + //일별 지도사용 수 UseHistorySearchVO useHistorySearchVO = new UseHistorySearchVO(); useHistorySearchVO.setSearchEndDate(searchVO.getSearchEndDate()); useHistorySearchVO.setSearchStartDate(searchStartDate.minusDays(14).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); - List dataList = useHistoryService.selectDayMapUseData(useHistorySearchVO); - model.addAttribute("dayMapUseDataList", dataList); + List dayMapUseDataList = useHistoryService.selectDayMapUseData(useHistorySearchVO); + model.addAttribute("dayMapUseDataList", dayMapUseDataList); + + // 지역별 현장수집 데이터 수 + List areaDataList = fieldDataService.selectAreaDataList(); + model.addAttribute("areaDataList", areaDataList); + return "admin/dashBoard"; } catch (Exception e) { @@ -128,18 +133,14 @@ public class AdminController { @ResponseBody public JSONArray dayMapUseData(@ModelAttribute("UseRequestSearchVO") UseHistorySearchVO useHistorySearchVO, Model model) throws Exception { try { - List dataList = useHistoryService.selectDayMapUseData(useHistorySearchVO); + List dataList = useHistoryService.selectDayMapUseData(useHistorySearchVO); JSONArray returnAry = new JSONArray(); - for(UseHistoryChartVO chartVO: dataList){ + for(ChartVO chartVO: dataList){ JSONArray temp = new JSONArray(); - temp.put(chartVO.getDateStr()); - temp.put(chartVO.getUseCnt()); + temp.put(chartVO.getParam01()); + temp.put(chartVO.getValue01()); returnAry.put(temp); -// JSONObject temp = new JSONObject(); -// temp.put("date", chartVO.getDateStr()); -// temp.put("useCnt", chartVO.getUseCnt()); -// returnAry.put(temp); } System.out.println("결과 배열 수 : "+returnAry.length()); return returnAry; diff --git a/src/main/java/com/mca/map/mapper/FieldDataMapper.java b/src/main/java/com/mca/map/mapper/FieldDataMapper.java index 4c761ad..c3173ac 100644 --- a/src/main/java/com/mca/map/mapper/FieldDataMapper.java +++ b/src/main/java/com/mca/map/mapper/FieldDataMapper.java @@ -2,6 +2,7 @@ package com.mca.map.mapper; import java.util.List; +import com.mca.map.vo.ChartVO; import com.mca.map.vo.FieldDataSearchVO; import com.mca.map.vo.FieldDataVO; @@ -15,4 +16,6 @@ public interface FieldDataMapper { int selectFieldDataCnt(FieldDataSearchVO fieldDataSearchVO); FieldDataVO selectFieldData(String id); + + List selectAreaDataList(); } diff --git a/src/main/java/com/mca/map/mapper/UseHistoryMapper.java b/src/main/java/com/mca/map/mapper/UseHistoryMapper.java index ad154a4..f32896b 100644 --- a/src/main/java/com/mca/map/mapper/UseHistoryMapper.java +++ b/src/main/java/com/mca/map/mapper/UseHistoryMapper.java @@ -2,7 +2,7 @@ package com.mca.map.mapper; import java.util.List; -import com.mca.map.vo.UseHistoryChartVO; +import com.mca.map.vo.ChartVO; import com.mca.map.vo.UseHistorySearchVO; import egovframework.rte.psl.dataaccess.mapper.Mapper; @@ -14,5 +14,5 @@ public interface UseHistoryMapper { int selectUseHistoryCnt(UseHistorySearchVO useHistorySearchVO); - List selectDayMapUseData(UseHistorySearchVO useHistorySearchVO); + List selectDayMapUseData(UseHistorySearchVO useHistorySearchVO); } diff --git a/src/main/java/com/mca/map/service/FieldDataService.java b/src/main/java/com/mca/map/service/FieldDataService.java index 24c63c6..0840c7d 100644 --- a/src/main/java/com/mca/map/service/FieldDataService.java +++ b/src/main/java/com/mca/map/service/FieldDataService.java @@ -5,6 +5,7 @@ import java.util.List; import javax.annotation.Resource; +import com.mca.map.vo.ChartVO; import org.springframework.stereotype.Service; import com.mca.map.mapper.FieldDataMapper; @@ -31,4 +32,8 @@ public class FieldDataService { // TODO Auto-generated method stub return fieldDataMapper.selectFieldData(id); } + + public List selectAreaDataList() { + return fieldDataMapper.selectAreaDataList(); + } } diff --git a/src/main/java/com/mca/map/service/UseHistoryService.java b/src/main/java/com/mca/map/service/UseHistoryService.java index 55dd471..3c8a6d2 100644 --- a/src/main/java/com/mca/map/service/UseHistoryService.java +++ b/src/main/java/com/mca/map/service/UseHistoryService.java @@ -4,7 +4,7 @@ import java.util.List; import javax.annotation.Resource; -import com.mca.map.vo.UseHistoryChartVO; +import com.mca.map.vo.ChartVO; import org.springframework.stereotype.Service; import com.mca.map.mapper.UseHistoryMapper; import com.mca.map.vo.UseHistorySearchVO; @@ -26,7 +26,7 @@ public class UseHistoryService { return useHistoryMapper.selectUseHistoryList(useHistorySearchVO); } - public List selectDayMapUseData(UseHistorySearchVO useHistorySearchVO) { + public List selectDayMapUseData(UseHistorySearchVO useHistorySearchVO) { return useHistoryMapper.selectDayMapUseData(useHistorySearchVO); } } diff --git a/src/main/java/com/mca/map/vo/ChartVO.java b/src/main/java/com/mca/map/vo/ChartVO.java new file mode 100644 index 0000000..5be16b4 --- /dev/null +++ b/src/main/java/com/mca/map/vo/ChartVO.java @@ -0,0 +1,41 @@ +package com.mca.map.vo; + +public class ChartVO { + private String param01; + private String param02; + private Integer value01; + private Integer value02; + + + public String getParam01() { + return param01; + } + + public void setParam01(String param01) { + this.param01 = param01; + } + + public String getParam02() { + return param02; + } + + public void setParam02(String param02) { + this.param02 = param02; + } + + public Integer getValue01() { + return value01; + } + + public void setValue01(Integer value01) { + this.value01 = value01; + } + + public Integer getValue02() { + return value02; + } + + public void setValue02(Integer value02) { + this.value02 = value02; + } +} diff --git a/src/main/java/com/mca/map/vo/UseHistoryChartVO.java b/src/main/java/com/mca/map/vo/UseHistoryChartVO.java deleted file mode 100644 index 9879cfd..0000000 --- a/src/main/java/com/mca/map/vo/UseHistoryChartVO.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.mca.map.vo; - -public class UseHistoryChartVO { - private String dateStr; - private Integer useCnt; - - public String getDateStr() { - return dateStr; - } - - public void setDateStr(String dateStr) { - this.dateStr = dateStr; - } - - public Integer getUseCnt() { - return useCnt; - } - - public void setUseCnt(Integer useCnt) { - this.useCnt = useCnt; - } -} diff --git a/src/main/resources/egovframework/sqlmap/mappers/map/fieldData.xml b/src/main/resources/egovframework/sqlmap/mappers/map/fieldData.xml index 95096b2..ba97574 100644 --- a/src/main/resources/egovframework/sqlmap/mappers/map/fieldData.xml +++ b/src/main/resources/egovframework/sqlmap/mappers/map/fieldData.xml @@ -96,18 +96,25 @@ + + \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/mappers/map/useHistory.xml b/src/main/resources/egovframework/sqlmap/mappers/map/useHistory.xml index 11757e3..eff892c 100644 --- a/src/main/resources/egovframework/sqlmap/mappers/map/useHistory.xml +++ b/src/main/resources/egovframework/sqlmap/mappers/map/useHistory.xml @@ -50,12 +50,12 @@ - + select DATE_FORMAT(log_date ,'%m-%d') as param01, + count(*) as value01 from map_use_history where log_date >= CONCAT(#{searchStartDate}, ' 00:00:00') and log_date <= CONCAT(#{searchEndDate}, ' 23:59:59') - group by dateStr + group by param01 \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/sql-mapper-config.xml b/src/main/resources/egovframework/sqlmap/sql-mapper-config.xml index 73eb392..9a3c020 100644 --- a/src/main/resources/egovframework/sqlmap/sql-mapper-config.xml +++ b/src/main/resources/egovframework/sqlmap/sql-mapper-config.xml @@ -14,7 +14,7 @@ - + diff --git a/src/main/webapp/WEB-INF/jsp/admin/dashBoard.jsp b/src/main/webapp/WEB-INF/jsp/admin/dashBoard.jsp index 2990702..b68ac8f 100644 --- a/src/main/webapp/WEB-INF/jsp/admin/dashBoard.jsp +++ b/src/main/webapp/WEB-INF/jsp/admin/dashBoard.jsp @@ -8,10 +8,16 @@ + + +
@@ -52,28 +58,6 @@
- <%--
-
-
- -
-
-

-

-

0

-
-
-
-
-
-
- -
-
-

-

-

0

-
-
-
--%>
@@ -98,28 +82,36 @@
-
-
-

지도사용 이력 추이

-
+
+
+
+
+

지도사용 이력 추이

+
+
+
-
- <%--
-
-
-

-

- 그래프 +
+
+
+
+

지역별 현장수집 데이터 현황

+
+
+
+
+
+
+
+
+
+

-

+ 그래프 +
+
-
-
-
-

-

- 그래프 -
-
-
--%>
diff --git a/src/main/webapp/js/admin/dashBoard.js b/src/main/webapp/js/admin/dashBoard.js index c1d9cae..fce265e 100644 --- a/src/main/webapp/js/admin/dashBoard.js +++ b/src/main/webapp/js/admin/dashBoard.js @@ -1,16 +1,29 @@ $(function (){ google.charts.load('current', {packages: ['corechart', 'line']}); google.charts.setOnLoadCallback(drawMapUseFromDayChart); + + google.charts.load("current", {packages:["corechart"]}); + google.charts.setOnLoadCallback(drawAreaDonutChart); }) function drawMapUseFromDayChart() { var dataHeader = [['날짜', '사용량']]; var chartData = google.visualization.arrayToDataTable(dataHeader.concat(dayMapUseDataList)); + + var view = new google.visualization.DataView(chartData); + view.setColumns([0, 1, + { calc: "stringify", + sourceColumn: 1, + type: "string", + role: "annotation" }]); + var options = { - legend: { position: 'bottom' } + bar: {groupWidth: "95%"}, + legend: { position: "bottom" }, }; - var chart = new google.visualization.LineChart(document.getElementById('mapUseFromDayChart')); - chart.draw(chartData, options); + var chart = new google.visualization.ColumnChart(document.getElementById("mapUseFromDayChart")); + chart.draw(view, options); + /*$.ajax({ url: "/admin/dayMapUseData", type: "GET", @@ -34,4 +47,16 @@ function drawMapUseFromDayChart() { } });*/ +} + +function drawAreaDonutChart() { + var dataHeader = [['지역', '수집 건 수']]; + var data = google.visualization.arrayToDataTable(dataHeader.concat(areaDataList)); + + var options = { + pieHole: 0.4, + }; + + var chart = new google.visualization.PieChart(document.getElementById('areaDonutChart')); + chart.draw(data, options); } \ No newline at end of file From 25a8b4b38b64ea3d75287df650551128c9e2cae7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Tue, 8 Mar 2022 15:33:07 +0900 Subject: [PATCH 2/5] =?UTF-8?q?=EB=8C=80=EC=8B=9C=EB=B3=B4=EB=93=9C=20?= =?UTF-8?q?=EC=9E=84=EC=8B=9C=20=EA=B7=B8=EB=9E=98=ED=94=84=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20=EB=93=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webapp/WEB-INF/jsp/admin/dashBoard.jsp | 6 +-- src/main/webapp/js/admin/dashBoard.js | 49 ++++++++++++++++--- 2 files changed, 46 insertions(+), 9 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/admin/dashBoard.jsp b/src/main/webapp/WEB-INF/jsp/admin/dashBoard.jsp index b68ac8f..f0fdefb 100644 --- a/src/main/webapp/WEB-INF/jsp/admin/dashBoard.jsp +++ b/src/main/webapp/WEB-INF/jsp/admin/dashBoard.jsp @@ -48,7 +48,7 @@
- +
-

-

- 그래프 +

빈자리 메꿀 그래프

+
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 From 77bdfebc43ee64031c5651856ad893b6e430ca90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Tue, 8 Mar 2022 15:34:37 +0900 Subject: [PATCH 3/5] =?UTF-8?q?=E3=85=81=E3=84=B4=E3=85=87=E3=84=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/jsp/admin/dashBoard.jsp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/webapp/WEB-INF/jsp/admin/dashBoard.jsp b/src/main/webapp/WEB-INF/jsp/admin/dashBoard.jsp index f0fdefb..cc8850c 100644 --- a/src/main/webapp/WEB-INF/jsp/admin/dashBoard.jsp +++ b/src/main/webapp/WEB-INF/jsp/admin/dashBoard.jsp @@ -21,7 +21,10 @@
-
+
+
+

대시보드

+
From cbb655441e9a6e44cf4fdd45203b873bf2883919 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Thu, 10 Mar 2022 09:08:54 +0900 Subject: [PATCH 4/5] no message --- src/main/webapp/WEB-INF/jsp/admin/request.jsp | 2 +- src/main/webapp/js/admin/dashBoard.js | 25 +++++++++++-------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/admin/request.jsp b/src/main/webapp/WEB-INF/jsp/admin/request.jsp index 729978a..7bbd231 100644 --- a/src/main/webapp/WEB-INF/jsp/admin/request.jsp +++ b/src/main/webapp/WEB-INF/jsp/admin/request.jsp @@ -66,7 +66,7 @@ <%-- --%> - ${item.title} + ${item.title} diff --git a/src/main/webapp/js/admin/dashBoard.js b/src/main/webapp/js/admin/dashBoard.js index 43e5432..223e953 100644 --- a/src/main/webapp/js/admin/dashBoard.js +++ b/src/main/webapp/js/admin/dashBoard.js @@ -69,16 +69,16 @@ function drawTempChart() { data.addColumn('number', 'value02'); data.addRows([ - [1, 37.8, 80.8], - [2, 30.9, 69.5], - [3, 25.4, 57], + [1, 37.8, 55.8], + [2, 30.9, 42.5], + [3, 25.4, 37], [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], + [8, 12.3, 21.2], + [9, 16.9, 32.9], + [10, 12.8, 23.9], [11, 5.3, 7.9], [12, 6.6, 8.4], [13, 4.8, 6.3], @@ -86,11 +86,14 @@ function drawTempChart() { ]); var options = { - axes: { - x: { - 0: {side: 'top'} - } - } + // chart: { + // title: '빈자리 메꿀 그래프', + // }, + // axes: { + // x: { + // 0: {side: 'top'} + // } + // } }; var chart = new google.charts.Line(document.getElementById('tempLineChart')); From 967e1b456db5cf4ecf1af7616573d87fd2b76efc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Thu, 10 Mar 2022 10:55:45 +0900 Subject: [PATCH 5/5] =?UTF-8?q?=EB=B0=98=EC=9D=91=ED=98=95=20=EC=9E=91?= =?UTF-8?q?=EC=97=85=EC=A4=91.=20bootstrap.js=20->=20bootstrap.bundle.js?= =?UTF-8?q?=20=EA=B5=90=EC=B2=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webapp/WEB-INF/jsp/admin/userInfoView.jsp | 3 + src/main/webapp/WEB-INF/jsp/layout/header.jsp | 58 +- .../webapp/WEB-INF/jsp/layout/leftMenu.jsp | 4 +- .../WEB-INF/jsp/layout/template_login.jsp | 56 +- .../WEB-INF/jsp/layout/template_main.jsp | 38 +- .../css/bootstrap-grid.css | 5051 +++++++ .../css/bootstrap-grid.css.map | 1 + .../css/bootstrap-grid.min.css | 7 + .../css/bootstrap-grid.min.css.map | 1 + .../css/bootstrap-grid.rtl.css | 5050 +++++++ .../css/bootstrap-grid.rtl.css.map | 1 + .../css/bootstrap-grid.rtl.min.css | 7 + .../css/bootstrap-grid.rtl.min.css.map | 1 + .../css/bootstrap-reboot.css | 485 + .../css/bootstrap-reboot.css.map | 1 + .../css/bootstrap-reboot.min.css | 8 + .../css/bootstrap-reboot.min.css.map | 1 + .../css/bootstrap-reboot.rtl.css | 482 + .../css/bootstrap-reboot.rtl.css.map | 1 + .../css/bootstrap-reboot.rtl.min.css | 8 + .../css/bootstrap-reboot.rtl.min.css.map | 1 + .../css/bootstrap-utilities.css | 4866 +++++++ .../css/bootstrap-utilities.css.map | 1 + .../css/bootstrap-utilities.min.css | 7 + .../css/bootstrap-utilities.min.css.map | 1 + .../css/bootstrap-utilities.rtl.css | 4857 +++++++ .../css/bootstrap-utilities.rtl.css.map | 1 + .../css/bootstrap-utilities.rtl.min.css | 7 + .../css/bootstrap-utilities.rtl.min.css.map | 1 + .../css/bootstrap.css} | 50 +- .../css/bootstrap.css.map | 1 + .../css/bootstrap.min.css | 7 + .../css/bootstrap.min.css.map | 1 + .../css/bootstrap.rtl.css | 11242 ++++++++++++++++ .../css/bootstrap.rtl.css.map | 1 + .../css/bootstrap.rtl.min.css | 7 + .../css/bootstrap.rtl.min.css.map | 1 + src/main/webapp/css/style.css | 52 +- .../js/bootstrap.bundle.js | 6812 ++++++++++ .../js/bootstrap.bundle.js.map | 1 + .../js/bootstrap.bundle.min.js | 7 + .../js/bootstrap.bundle.min.js.map | 1 + .../bootstrap-5.1.3-dist/js/bootstrap.esm.js | 4999 +++++++ .../js/bootstrap.esm.js.map | 1 + .../js/bootstrap.esm.min.js | 7 + .../js/bootstrap.esm.min.js.map | 1 + .../js/bootstrap-5.1.3-dist/js/bootstrap.js | 5046 +++++++ .../bootstrap-5.1.3-dist/js/bootstrap.js.map | 1 + .../js/bootstrap.min.js} | 0 .../js/bootstrap.min.js.map | 1 + 50 files changed, 49125 insertions(+), 120 deletions(-) create mode 100644 src/main/webapp/css/bootstrap-5.1.3-dist/css/bootstrap-grid.css create mode 100644 src/main/webapp/css/bootstrap-5.1.3-dist/css/bootstrap-grid.css.map create mode 100644 src/main/webapp/css/bootstrap-5.1.3-dist/css/bootstrap-grid.min.css create mode 100644 src/main/webapp/css/bootstrap-5.1.3-dist/css/bootstrap-grid.min.css.map create mode 100644 src/main/webapp/css/bootstrap-5.1.3-dist/css/bootstrap-grid.rtl.css create mode 100644 src/main/webapp/css/bootstrap-5.1.3-dist/css/bootstrap-grid.rtl.css.map create mode 100644 src/main/webapp/css/bootstrap-5.1.3-dist/css/bootstrap-grid.rtl.min.css create mode 100644 src/main/webapp/css/bootstrap-5.1.3-dist/css/bootstrap-grid.rtl.min.css.map create mode 100644 src/main/webapp/css/bootstrap-5.1.3-dist/css/bootstrap-reboot.css create mode 100644 src/main/webapp/css/bootstrap-5.1.3-dist/css/bootstrap-reboot.css.map create mode 100644 src/main/webapp/css/bootstrap-5.1.3-dist/css/bootstrap-reboot.min.css create mode 100644 src/main/webapp/css/bootstrap-5.1.3-dist/css/bootstrap-reboot.min.css.map create mode 100644 src/main/webapp/css/bootstrap-5.1.3-dist/css/bootstrap-reboot.rtl.css create mode 100644 src/main/webapp/css/bootstrap-5.1.3-dist/css/bootstrap-reboot.rtl.css.map create mode 100644 src/main/webapp/css/bootstrap-5.1.3-dist/css/bootstrap-reboot.rtl.min.css create mode 100644 src/main/webapp/css/bootstrap-5.1.3-dist/css/bootstrap-reboot.rtl.min.css.map create mode 100644 src/main/webapp/css/bootstrap-5.1.3-dist/css/bootstrap-utilities.css create mode 100644 src/main/webapp/css/bootstrap-5.1.3-dist/css/bootstrap-utilities.css.map create mode 100644 src/main/webapp/css/bootstrap-5.1.3-dist/css/bootstrap-utilities.min.css create mode 100644 src/main/webapp/css/bootstrap-5.1.3-dist/css/bootstrap-utilities.min.css.map create mode 100644 src/main/webapp/css/bootstrap-5.1.3-dist/css/bootstrap-utilities.rtl.css create mode 100644 src/main/webapp/css/bootstrap-5.1.3-dist/css/bootstrap-utilities.rtl.css.map create mode 100644 src/main/webapp/css/bootstrap-5.1.3-dist/css/bootstrap-utilities.rtl.min.css create mode 100644 src/main/webapp/css/bootstrap-5.1.3-dist/css/bootstrap-utilities.rtl.min.css.map rename src/main/webapp/css/{bootstrap-5.1.3.css => bootstrap-5.1.3-dist/css/bootstrap.css} (99%) create mode 100644 src/main/webapp/css/bootstrap-5.1.3-dist/css/bootstrap.css.map create mode 100644 src/main/webapp/css/bootstrap-5.1.3-dist/css/bootstrap.min.css create mode 100644 src/main/webapp/css/bootstrap-5.1.3-dist/css/bootstrap.min.css.map create mode 100644 src/main/webapp/css/bootstrap-5.1.3-dist/css/bootstrap.rtl.css create mode 100644 src/main/webapp/css/bootstrap-5.1.3-dist/css/bootstrap.rtl.css.map create mode 100644 src/main/webapp/css/bootstrap-5.1.3-dist/css/bootstrap.rtl.min.css create mode 100644 src/main/webapp/css/bootstrap-5.1.3-dist/css/bootstrap.rtl.min.css.map create mode 100644 src/main/webapp/js/bootstrap-5.1.3-dist/js/bootstrap.bundle.js create mode 100644 src/main/webapp/js/bootstrap-5.1.3-dist/js/bootstrap.bundle.js.map create mode 100644 src/main/webapp/js/bootstrap-5.1.3-dist/js/bootstrap.bundle.min.js create mode 100644 src/main/webapp/js/bootstrap-5.1.3-dist/js/bootstrap.bundle.min.js.map create mode 100644 src/main/webapp/js/bootstrap-5.1.3-dist/js/bootstrap.esm.js create mode 100644 src/main/webapp/js/bootstrap-5.1.3-dist/js/bootstrap.esm.js.map create mode 100644 src/main/webapp/js/bootstrap-5.1.3-dist/js/bootstrap.esm.min.js create mode 100644 src/main/webapp/js/bootstrap-5.1.3-dist/js/bootstrap.esm.min.js.map create mode 100644 src/main/webapp/js/bootstrap-5.1.3-dist/js/bootstrap.js create mode 100644 src/main/webapp/js/bootstrap-5.1.3-dist/js/bootstrap.js.map rename src/main/webapp/js/{bootstrap-5.1.3.min.js => bootstrap-5.1.3-dist/js/bootstrap.min.js} (100%) create mode 100644 src/main/webapp/js/bootstrap-5.1.3-dist/js/bootstrap.min.js.map diff --git a/src/main/webapp/WEB-INF/jsp/admin/userInfoView.jsp b/src/main/webapp/WEB-INF/jsp/admin/userInfoView.jsp index aed74ee..f812530 100644 --- a/src/main/webapp/WEB-INF/jsp/admin/userInfoView.jsp +++ b/src/main/webapp/WEB-INF/jsp/admin/userInfoView.jsp @@ -69,6 +69,9 @@
+

+ +

diff --git a/src/main/webapp/WEB-INF/jsp/layout/header.jsp b/src/main/webapp/WEB-INF/jsp/layout/header.jsp index 821e4e7..8b40bfc 100644 --- a/src/main/webapp/WEB-INF/jsp/layout/header.jsp +++ b/src/main/webapp/WEB-INF/jsp/layout/header.jsp @@ -5,31 +5,51 @@ <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>

- +
-
-
- - 모바일센터 관리시스템 - - - 모바일센터 관리시스템 - -
- -
- - 로그아웃 - -
+
+
+ + 모바일센터 관리시스템 + + 모바일센터 관리시스템 + +
+ +
+ + 로그아웃 + +
+ + +
+
+
diff --git a/src/main/webapp/WEB-INF/jsp/layout/leftMenu.jsp b/src/main/webapp/WEB-INF/jsp/layout/leftMenu.jsp index f0fe7cb..3427186 100644 --- a/src/main/webapp/WEB-INF/jsp/layout/leftMenu.jsp +++ b/src/main/webapp/WEB-INF/jsp/layout/leftMenu.jsp @@ -9,7 +9,7 @@ -