From 71b9701160bd9e8884f7c74900c979db86953412 Mon Sep 17 00:00:00 2001 From: Hyung Geun Date: Mon, 11 Apr 2022 10:51:45 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B2=AC=EB=AC=B8=20submenu=20=EC=A0=84?= =?UTF-8?q?=EC=8B=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../message/message-common_ko.properties | 54 +-- .../sqlmapper/mappers/board/board.xml | 38 +- .../resources/sqlmapper/mappers/cmmn/menu.xml | 18 +- .../resources/sqlmapper/mappers/fa/equip.xml | 6 - .../sqlmapper/mappers/report/report.xml | 444 +++++++++--------- .../webapp/WEB-INF/jsp/common/submenu.jsp | 13 +- src/main/webapp/WEB-INF/jsp/equip/status.jsp | 112 ++--- .../webapp/WEB-INF/jsp/report/presentList.jsp | 3 +- .../webapp/WEB-INF/jsp/stats/statsList.jsp | 3 +- 9 files changed, 322 insertions(+), 369 deletions(-) diff --git a/src/main/resources/message/message-common_ko.properties b/src/main/resources/message/message-common_ko.properties index 25054b3..381ebb3 100644 --- a/src/main/resources/message/message-common_ko.properties +++ b/src/main/resources/message/message-common_ko.properties @@ -579,32 +579,32 @@ fa.edu.place1=\uc18c\uc18d ########---equip--######### equip.name=\uad6c\ubd84 equip.total=\uacc4 -equip.PS00=\uBCF8\uCCAD -equip.PS01=\ubd80\uc0b0 -equip.PS02=\uc778\ucc9c -equip.PS03=\uc18d\ucd08 -equip.PS04=\ub3d9\ud574 -equip.PS05=\ud0dc\uc548 -equip.PS06=\uad70\uc0b0 -equip.PS07=\ubaa9\ud3ec -equip.PS08=\uc644\ub3c4 -equip.PS09=\uc5ec\uc218 -equip.PS10=\ud3ec\ud56d -equip.PS11=\uc6b8\uc0b0 -equip.PS12=\ud1b5\uc601 -equip.PS13=\uc81c\uc8fc -equip.PS14=\ud3c9\ud0dd -equip.PS15=\ucc3d\uc6d0 -equip.PS16=\ubcf4\ub839 -equip.PS17=\uc11c\uadc0\ud3ec -equip.PS18=\ubd80\uc548 -equip.PS19=\uc6b8\uc9c4 -equip.PS50=\uc11c\ud5745\ub3c4 -equip.PS90=\uC911\uBD80\uC9C0\uBC29\uCCAD -equip.PS91=\uc81c\uc8fc\ubcf8\ubd80 -equip.PS92=\uc11c\ud574\ubcf8\ubd80 -equip.PS93=\ub0a8\ud574\ubcf8\ubd80 -equip.PS94=\ub3d9\ud574\ubcf8\ubd80 +equip.ps00=\uBCF8\uCCAD +equip.ps01=\ubd80\uc0b0 +equip.ps02=\uc778\ucc9c +equip.ps03=\uc18d\ucd08 +equip.ps04=\ub3d9\ud574 +equip.ps05=\ud0dc\uc548 +equip.ps06=\uad70\uc0b0 +equip.ps07=\ubaa9\ud3ec +equip.ps08=\uc644\ub3c4 +equip.ps09=\uc5ec\uc218 +equip.ps10=\ud3ec\ud56d +equip.ps11=\uc6b8\uc0b0 +equip.ps12=\ud1b5\uc601 +equip.ps13=\uc81c\uc8fc +equip.ps14=\ud3c9\ud0dd +equip.ps15=\ucc3d\uc6d0 +equip.ps16=\ubcf4\ub839 +equip.ps17=\uc11c\uadc0\ud3ec +equip.ps18=\ubd80\uc548 +equip.ps19=\uc6b8\uc9c4 +equip.ps50=\uc11c\ud5745\ub3c4 +equip.ps90=\uC911\uBD80\uC9C0\uBC29\uCCAD +equip.ps91=\uc81c\uc8fc\ubcf8\ubd80 +equip.ps92=\uc11c\ud574\ubcf8\ubd80 +equip.ps93=\ub0a8\ud574\ubcf8\ubd80 +equip.ps94=\ub3d9\ud574\ubcf8\ubd80 equip.stateWaiting.year=\ub144\ub3c4 equip.stateWaiting.division=\uad6c\ubd84 @@ -728,7 +728,7 @@ target.divmng.gubun=\uadfc\ubb34\ud615\ud0dc target.divmng.staffNum=\uadfc\ubb34\uc778\uc6d0 target.divmng.tel=\uc804\ud654\ubc88\ud638 target.divmng.condition=\ud604\ud669 -target.divmng.equipStat=\uc7a5\ube44\ud604\ud669 +target.divmng.equipstat=\uc7a5\ube44\ud604\ud669 target.divmng.fileImg=\uc0ac\uc9c4 target.divmng.file=\ucca8\ubd80\ud30c\uc77c diff --git a/src/main/resources/sqlmapper/mappers/board/board.xml b/src/main/resources/sqlmapper/mappers/board/board.xml index 038027f..b1d87be 100644 --- a/src/main/resources/sqlmapper/mappers/board/board.xml +++ b/src/main/resources/sqlmapper/mappers/board/board.xml @@ -48,22 +48,18 @@ @@ -135,19 +129,16 @@ - - #{step} - ]]> - - - diff --git a/src/main/resources/sqlmapper/mappers/cmmn/menu.xml b/src/main/resources/sqlmapper/mappers/cmmn/menu.xml index 79f0792..767be21 100644 --- a/src/main/resources/sqlmapper/mappers/cmmn/menu.xml +++ b/src/main/resources/sqlmapper/mappers/cmmn/menu.xml @@ -19,7 +19,6 @@ diff --git a/src/main/resources/sqlmapper/mappers/fa/equip.xml b/src/main/resources/sqlmapper/mappers/fa/equip.xml index f3e9983..c9d0067 100644 --- a/src/main/resources/sqlmapper/mappers/fa/equip.xml +++ b/src/main/resources/sqlmapper/mappers/fa/equip.xml @@ -53,16 +53,13 @@ diff --git a/src/main/resources/sqlmapper/mappers/report/report.xml b/src/main/resources/sqlmapper/mappers/report/report.xml index 11e64ff..25cb388 100644 --- a/src/main/resources/sqlmapper/mappers/report/report.xml +++ b/src/main/resources/sqlmapper/mappers/report/report.xml @@ -75,7 +75,6 @@ - - - + - + - + - + - + - + - + - + - - + + - - + + - + - - + + - -
  • - + +
@@ -19,13 +20,13 @@
  • - - - - ${current} href="//list.do?id=${id}">${sub.NAME} + + + + ${current} href="//list.do?id=${id}">${sub.name} - ${current} href="/">${sub.NAME} + ${current} href="/">${sub.name} ${isEnd} diff --git a/src/main/webapp/WEB-INF/jsp/equip/status.jsp b/src/main/webapp/WEB-INF/jsp/equip/status.jsp index 8f78b3e..211b9d2 100644 --- a/src/main/webapp/WEB-INF/jsp/equip/status.jsp +++ b/src/main/webapp/WEB-INF/jsp/equip/status.jsp @@ -3,7 +3,7 @@ <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> diff --git a/src/main/webapp/WEB-INF/jsp/stats/statsList.jsp b/src/main/webapp/WEB-INF/jsp/stats/statsList.jsp index 260a36c..51e0a99 100644 --- a/src/main/webapp/WEB-INF/jsp/stats/statsList.jsp +++ b/src/main/webapp/WEB-INF/jsp/stats/statsList.jsp @@ -8,7 +8,7 @@ <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>