From 6913c45c750fed7aaaa2d57bb90108055344b640 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Mon, 7 Mar 2022 17:03:38 +0900 Subject: [PATCH] =?UTF-8?q?=ED=98=84=EC=9E=A5=EC=88=98=EC=A7=91=20?= =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EC=83=81=EC=84=B8=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=EB=AA=A8=EB=8B=AC=20=EB=B3=80=ED=99=98.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mca/cmmn/web/AdminController.java | 2 +- .../webapp/WEB-INF/jsp/admin/dashBoard.jsp | 8 +- .../webapp/WEB-INF/jsp/admin/fieldData.jsp | 41 ++- .../webapp/WEB-INF/jsp/admin/fieldView.jsp | 195 +++++++------- src/main/webapp/css/style.css | 1 - src/main/webapp/js/admin/fieldData.js | 243 +++++++++++++++++- src/main/webapp/js/admin/fieldView.js | 211 --------------- 7 files changed, 369 insertions(+), 332 deletions(-) delete mode 100644 src/main/webapp/js/admin/fieldView.js diff --git a/src/main/java/com/mca/cmmn/web/AdminController.java b/src/main/java/com/mca/cmmn/web/AdminController.java index 6ab132e..bb14877 100644 --- a/src/main/java/com/mca/cmmn/web/AdminController.java +++ b/src/main/java/com/mca/cmmn/web/AdminController.java @@ -480,7 +480,7 @@ public class AdminController { model.addAttribute("fieldDataVO", fieldDataVO); model.addAttribute("userVO", userVO); - return "admin/fieldView"; + return "admin/html/fieldView"; } catch (Exception e) { // TODO: handle exception e.printStackTrace(); diff --git a/src/main/webapp/WEB-INF/jsp/admin/dashBoard.jsp b/src/main/webapp/WEB-INF/jsp/admin/dashBoard.jsp index 7aa4340..2990702 100644 --- a/src/main/webapp/WEB-INF/jsp/admin/dashBoard.jsp +++ b/src/main/webapp/WEB-INF/jsp/admin/dashBoard.jsp @@ -52,7 +52,7 @@ -
+ <%--
@@ -73,7 +73,7 @@

0

-
+
--%>
@@ -104,7 +104,7 @@
-
+ <%--

-

@@ -119,7 +119,7 @@ 그래프
-
+
--%>
diff --git a/src/main/webapp/WEB-INF/jsp/admin/fieldData.jsp b/src/main/webapp/WEB-INF/jsp/admin/fieldData.jsp index 1e10d0a..c26396e 100644 --- a/src/main/webapp/WEB-INF/jsp/admin/fieldData.jsp +++ b/src/main/webapp/WEB-INF/jsp/admin/fieldData.jsp @@ -4,9 +4,13 @@ <%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui" %> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> +" rel="stylesheet"> +" rel="stylesheet"> + + + + - -