From 0dafec751385cbd8a4cba095ee482ad59ccccf05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Tue, 15 Mar 2022 12:12:41 +0900 Subject: [PATCH 1/5] =?UTF-8?q?=ED=9A=8C=EC=9B=90=EA=B4=80=EB=A6=AC=20?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=EB=B0=98=EC=9D=91=ED=98=95=20?= =?UTF-8?q?=EC=9E=91=EC=97=85.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webapp/WEB-INF/jsp/admin/dashBoard.jsp | 6 +- .../webapp/WEB-INF/jsp/admin/userInfo.jsp | 77 ++++++++++++++++--- .../webapp/WEB-INF/jsp/map/requestView.jsp | 20 ++--- src/main/webapp/css/style.css | 9 +-- src/main/webapp/js/admin/userinfo.js | 2 +- 5 files changed, 80 insertions(+), 34 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/admin/dashBoard.jsp b/src/main/webapp/WEB-INF/jsp/admin/dashBoard.jsp index cc8850c..327e0af 100644 --- a/src/main/webapp/WEB-INF/jsp/admin/dashBoard.jsp +++ b/src/main/webapp/WEB-INF/jsp/admin/dashBoard.jsp @@ -86,7 +86,7 @@
-
+

지도사용 이력 추이

@@ -94,7 +94,7 @@
-
+
@@ -104,7 +104,7 @@
-
+
diff --git a/src/main/webapp/WEB-INF/jsp/admin/userInfo.jsp b/src/main/webapp/WEB-INF/jsp/admin/userInfo.jsp index 2fc971c..c66b7ed 100644 --- a/src/main/webapp/WEB-INF/jsp/admin/userInfo.jsp +++ b/src/main/webapp/WEB-INF/jsp/admin/userInfo.jsp @@ -15,8 +15,8 @@

회원관리

-
-
+
+
-
-
+
+
- -
+
-
- +
+
- -
+
@@ -65,8 +63,8 @@ - - + + @@ -94,6 +92,61 @@
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
아이디
이름
소속
전화번호
이메일
가입일
${userSearchVO.auth eq '99'?'상태':'권한'} + + 관리자 + 사용자 + + + + + +
요청한 목록이 없습니다.
+
diff --git a/src/main/webapp/WEB-INF/jsp/map/requestView.jsp b/src/main/webapp/WEB-INF/jsp/map/requestView.jsp index fc6c689..a86e16c 100644 --- a/src/main/webapp/WEB-INF/jsp/map/requestView.jsp +++ b/src/main/webapp/WEB-INF/jsp/map/requestView.jsp @@ -134,10 +134,8 @@ - - - - + + @@ -160,15 +158,17 @@ 레이어 -<%--
--%> +
- + diff --git a/src/main/webapp/css/style.css b/src/main/webapp/css/style.css index 4aa9951..988d45a 100644 --- a/src/main/webapp/css/style.css +++ b/src/main/webapp/css/style.css @@ -19,10 +19,6 @@ a { padding-top: 10px; } -.text-center { - text-align: center; -} - .point-cursor { cursor: pointer; } @@ -232,10 +228,7 @@ a { .setting_content2 { width: 100%; - margin-top: 10px; justify-content: space-between; - line-height: 3; - } .setting_sub_title { @@ -682,7 +675,7 @@ a { .layer-label { width: 140px; display: inline-block; - line-height: 50px; + line-height: 30px; margin-left: 20px; } diff --git a/src/main/webapp/js/admin/userinfo.js b/src/main/webapp/js/admin/userinfo.js index a91be0c..3de7d09 100644 --- a/src/main/webapp/js/admin/userinfo.js +++ b/src/main/webapp/js/admin/userinfo.js @@ -4,7 +4,7 @@ $(function () { }) $(document).on('click', '.userInfoModalBtn', function () { - const userid = $(this.parentNode).find(".useridTd")[0].innerText; + const userid = $(this.parentNode).attr("data-userid"); $.ajax({ url: '/admin/userInfo/' + userid, type: 'GET', From 201a4153b7d5c706216893d2916dd3fadf15a3e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Tue, 15 Mar 2022 13:25:00 +0900 Subject: [PATCH 2/5] =?UTF-8?q?=EB=8C=80=EC=8B=9C=EB=B3=B4=EB=93=9C=20?= =?UTF-8?q?=ED=99=94=EB=A9=B4=ED=81=AC=EA=B8=B0=20=EB=B3=80=EA=B2=BD=20?= =?UTF-8?q?=EC=8B=9C=20=EC=B0=A8=ED=8A=B8=20=EB=A6=AC=EB=A1=9C=EB=93=9C=20?= =?UTF-8?q?=EC=9D=B4=EB=B2=A4=ED=8A=B8=20=EC=B6=94=EA=B0=80.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/js/admin/dashBoard.js | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/src/main/webapp/js/admin/dashBoard.js b/src/main/webapp/js/admin/dashBoard.js index 223e953..c07c7ca 100644 --- a/src/main/webapp/js/admin/dashBoard.js +++ b/src/main/webapp/js/admin/dashBoard.js @@ -1,11 +1,29 @@ +const smSize = 575; +let beforeSize; +window.onresize = function (){ + const nowWidth = this.innerWidth; + if(beforeSize>smSize&&nowWidthsmSize){ + loadChart(nowWidth) + }else if(beforeSize+100nowWidth+100){ + loadChart(nowWidth) + } +} $(function (){ + loadChart(window.innerWidth) +}) +function loadChart(nowWidth){ + beforeSize = nowWidth; google.charts.load('current', {packages: ['bar']}); google.charts.setOnLoadCallback(drawMapUseFromDayChart); google.charts.load('current', {packages: ['corechart']}); google.charts.setOnLoadCallback(drawAreaDonutChart); google.charts.load('current', {packages:['line']}); google.charts.setOnLoadCallback(drawTempChart); -}) +} function drawMapUseFromDayChart() { var dataHeader = [['날짜', '사용량']]; From b5368216b4ca4cf5fb0b0c138cd5deb951f594d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Tue, 15 Mar 2022 14:38:38 +0900 Subject: [PATCH 3/5] =?UTF-8?q?=ED=98=84=EC=9E=A5=EC=88=98=EC=A7=91?= =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=84=B0=20=ED=8E=98=EC=9D=B4=EC=A7=80=20?= =?UTF-8?q?=EB=B0=98=EC=9D=91=ED=98=95=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webapp/WEB-INF/jsp/admin/fieldData.jsp | 169 ++++++++++++------ .../webapp/WEB-INF/jsp/admin/fieldView.jsp | 164 ++++++++--------- .../webapp/WEB-INF/jsp/admin/userInfo.jsp | 8 +- 3 files changed, 186 insertions(+), 155 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/admin/fieldData.jsp b/src/main/webapp/WEB-INF/jsp/admin/fieldData.jsp index 573c114..6b7845d 100644 --- a/src/main/webapp/WEB-INF/jsp/admin/fieldData.jsp +++ b/src/main/webapp/WEB-INF/jsp/admin/fieldData.jsp @@ -19,39 +19,35 @@

현장수집 데이터

-
-
+
+
-
-
+
+
-
+
-
- +
+
- - - - - - - - - - - - - - - - <%----%> - - - - - - - - - - +
+
Data ID지역소속담당자수집날짜상태
- - 수집 - 검증실패 - 검증 - 반영실패 - 반영 - -
+ - + + + + + + - - -
요청한 목록이 없습니다.Data ID지역소속담당자수집날짜상태
+ + + + + + <%----%> + + + + + + + + 수집 + 검증실패 + 검증 + 반영실패 + 반영 + + + + + + + + 요청한 목록이 없습니다. + + + + +
+ +
+ + + + + <%-- + + + + + + --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
지역소속
Data ID
지역
소속
담당자
수집날짜
상태 + + 수집 + 검증실패 + 검증 + 반영실패 + 반영 + +
요청한 목록이 없습니다.
+
diff --git a/src/main/webapp/WEB-INF/jsp/admin/fieldView.jsp b/src/main/webapp/WEB-INF/jsp/admin/fieldView.jsp index 3491dd0..318c5e1 100644 --- a/src/main/webapp/WEB-INF/jsp/admin/fieldView.jsp +++ b/src/main/webapp/WEB-INF/jsp/admin/fieldView.jsp @@ -8,84 +8,85 @@ field_data = JSON.parse('${fieldDataVO.field_data}');
-
-
-
-
- -
+
+
+
+
-