From 30a86f97fe42404717665b1f36a3125e9db2f33d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Sat, 28 Jan 2023 13:07:09 +0900 Subject: [PATCH] =?UTF-8?q?=EC=84=A0=ED=83=9D=20=EB=A9=94=EB=89=B4=20?= =?UTF-8?q?=EC=9C=A0=EC=A7=80=20=EB=8F=99=EC=9E=91=20=EC=88=98=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/menuMgt/service/MenuMgtService.java | 2 + .../resources/mybatisMapper/menuMgtMapper.xml | 3 +- src/main/resources/static/js/common.js | 7 +- .../templates/adminPage/menuMgt/menuMgt.html | 13 +- .../activityCase/activityCaseBoard.html | 1 + .../ciWork/ciWorkBoard.html | 1 + .../counterIntelligence/ciaEduList.html | 1 + .../counterIntelligence/ciaForeignerList.html | 1 + .../ciaManageCompanyList.html | 1 + .../ciaSaftyDemandList.html | 1 + .../templates/equip/cellPhoneList.html | 1 + .../resources/templates/equip/equipList.html | 1 + .../templates/equip/equipStatus.html | 1 + .../templates/equip/pvreUseList.html | 1 + .../resources/templates/equip/qirUseList.html | 1 + .../resources/templates/faRpt/faRptBoard.html | 1 + .../templates/faStatistics/asfCov/asfCov.html | 1 + .../crackdownStatus/crackdownStatus.html | 1 + .../fishingBoat/fishingBoatMgt.html | 1 + .../internationalCrimeArrest.html | 1 + .../processResult/processResult.html | 1 + .../templates/faStatistics/sailor/sailor.html | 1 + .../templates/fipTarget/ipShipList.html | 3 +- .../templates/fipTarget/partInfoList.html | 1 + .../templates/fipTarget/partWorkList.html | 1 + .../templates/fipTarget/vulnerableList.html | 1 + .../templates/fragments/leftMenu.html | 6 +- .../igActivities/fpiMgt/affair/affairMgt.html | 1 + .../fpiMgt/affair/affairStatistics.html | 1 + .../fpiMgt/affairPlan/planMgt.html | 1 + .../fpiMgt/affairResult/resultMgt.html | 1 + .../intelligenceNetwork/analyzeList.html | 1 + .../fireExtensionReportList.html | 1 + .../operationPlanList.html | 1 + .../fpiMgt/monitoring/designationList.html | 1 + src/main/resources/templates/ivsgt/ivsgt.html | 1 + .../ivsgt/majorStatus/majorStatusPage.html | 265 +++++++++--------- .../templates/police/career/careerMgt.html | 1 + .../police/education/educationMgt.html | 1 + .../personnelStatus/personnelStatus.html | 1 + .../templates/police/police/policeList.html | 1 + .../resources/templates/sri/sriBoard.html | 1 + .../templates/translator/translator.html | 2 + .../translator/translatorStatisticsLang.html | 1 + 44 files changed, 187 insertions(+), 150 deletions(-) diff --git a/src/main/java/com/dbnt/faisp/main/menuMgt/service/MenuMgtService.java b/src/main/java/com/dbnt/faisp/main/menuMgt/service/MenuMgtService.java index e6570f5c..7acf197b 100644 --- a/src/main/java/com/dbnt/faisp/main/menuMgt/service/MenuMgtService.java +++ b/src/main/java/com/dbnt/faisp/main/menuMgt/service/MenuMgtService.java @@ -138,6 +138,7 @@ public class MenuMgtService { secondMenu.setOrderStr(orderStr.substring(1,2)); thirdMenu.setOrderStr(orderStr.substring(2,3)); thirdMenu.setMenuUrl(accessMenu.getMenuUrl()); + thirdMenu.setMenuKey(accessMenu.getMenuKey()); break; } } @@ -159,6 +160,7 @@ public class MenuMgtService { firstMenu.setOrderStr(orderStr.substring(0,1)); secondMenu.setOrderStr(orderStr.substring(1,2)); secondMenu.setMenuUrl(accessMenu.getMenuUrl()); + secondMenu.setMenuKey(accessMenu.getMenuKey()); break; } } diff --git a/src/main/resources/mybatisMapper/menuMgtMapper.xml b/src/main/resources/mybatisMapper/menuMgtMapper.xml index 866de17e..b5247dab 100644 --- a/src/main/resources/mybatisMapper/menuMgtMapper.xml +++ b/src/main/resources/mybatisMapper/menuMgtMapper.xml @@ -51,7 +51,8 @@ + menuKey 대분류 중분류 소분류 @@ -99,6 +100,7 @@ + @@ -109,14 +111,11 @@ - - - + + + - - - - + diff --git a/src/main/resources/templates/counterIntelligence/activityCase/activityCaseBoard.html b/src/main/resources/templates/counterIntelligence/activityCase/activityCaseBoard.html index e3aa2ba5..e3a51cbe 100644 --- a/src/main/resources/templates/counterIntelligence/activityCase/activityCaseBoard.html +++ b/src/main/resources/templates/counterIntelligence/activityCase/activityCaseBoard.html @@ -8,6 +8,7 @@
+
diff --git a/src/main/resources/templates/counterIntelligence/ciWork/ciWorkBoard.html b/src/main/resources/templates/counterIntelligence/ciWork/ciWorkBoard.html index 2a920082..60d23673 100644 --- a/src/main/resources/templates/counterIntelligence/ciWork/ciWorkBoard.html +++ b/src/main/resources/templates/counterIntelligence/ciWork/ciWorkBoard.html @@ -7,6 +7,7 @@
+
diff --git a/src/main/resources/templates/counterIntelligence/ciaEduList.html b/src/main/resources/templates/counterIntelligence/ciaEduList.html index 1db539a2..fc428690 100644 --- a/src/main/resources/templates/counterIntelligence/ciaEduList.html +++ b/src/main/resources/templates/counterIntelligence/ciaEduList.html @@ -7,6 +7,7 @@
+
diff --git a/src/main/resources/templates/counterIntelligence/ciaForeignerList.html b/src/main/resources/templates/counterIntelligence/ciaForeignerList.html index 2dcaa368..bccdfaab 100644 --- a/src/main/resources/templates/counterIntelligence/ciaForeignerList.html +++ b/src/main/resources/templates/counterIntelligence/ciaForeignerList.html @@ -7,6 +7,7 @@
+
diff --git a/src/main/resources/templates/counterIntelligence/ciaManageCompanyList.html b/src/main/resources/templates/counterIntelligence/ciaManageCompanyList.html index d3a720b7..71b8585c 100644 --- a/src/main/resources/templates/counterIntelligence/ciaManageCompanyList.html +++ b/src/main/resources/templates/counterIntelligence/ciaManageCompanyList.html @@ -7,6 +7,7 @@
+
diff --git a/src/main/resources/templates/counterIntelligence/ciaSaftyDemandList.html b/src/main/resources/templates/counterIntelligence/ciaSaftyDemandList.html index ca19f853..8894525b 100644 --- a/src/main/resources/templates/counterIntelligence/ciaSaftyDemandList.html +++ b/src/main/resources/templates/counterIntelligence/ciaSaftyDemandList.html @@ -7,6 +7,7 @@
+
diff --git a/src/main/resources/templates/equip/cellPhoneList.html b/src/main/resources/templates/equip/cellPhoneList.html index a4d61e2e..e851b6f9 100644 --- a/src/main/resources/templates/equip/cellPhoneList.html +++ b/src/main/resources/templates/equip/cellPhoneList.html @@ -7,6 +7,7 @@
+

업무용 휴대전화 현황

diff --git a/src/main/resources/templates/equip/equipList.html b/src/main/resources/templates/equip/equipList.html index 9e035f7e..6c169f24 100644 --- a/src/main/resources/templates/equip/equipList.html +++ b/src/main/resources/templates/equip/equipList.html @@ -7,6 +7,7 @@
+

diff --git a/src/main/resources/templates/equip/equipStatus.html b/src/main/resources/templates/equip/equipStatus.html index 0ec4f697..c2a3fd00 100644 --- a/src/main/resources/templates/equip/equipStatus.html +++ b/src/main/resources/templates/equip/equipStatus.html @@ -7,6 +7,7 @@
+
diff --git a/src/main/resources/templates/equip/pvreUseList.html b/src/main/resources/templates/equip/pvreUseList.html index 23818e57..4c8b2646 100644 --- a/src/main/resources/templates/equip/pvreUseList.html +++ b/src/main/resources/templates/equip/pvreUseList.html @@ -7,6 +7,7 @@
+
diff --git a/src/main/resources/templates/equip/qirUseList.html b/src/main/resources/templates/equip/qirUseList.html index 19737fff..b1c7de17 100644 --- a/src/main/resources/templates/equip/qirUseList.html +++ b/src/main/resources/templates/equip/qirUseList.html @@ -7,6 +7,7 @@
+
diff --git a/src/main/resources/templates/faRpt/faRptBoard.html b/src/main/resources/templates/faRpt/faRptBoard.html index 39d17caf..3a9fa9d7 100644 --- a/src/main/resources/templates/faRpt/faRptBoard.html +++ b/src/main/resources/templates/faRpt/faRptBoard.html @@ -8,6 +8,7 @@
+
diff --git a/src/main/resources/templates/faStatistics/asfCov/asfCov.html b/src/main/resources/templates/faStatistics/asfCov/asfCov.html index 7572ab92..09e4baf1 100644 --- a/src/main/resources/templates/faStatistics/asfCov/asfCov.html +++ b/src/main/resources/templates/faStatistics/asfCov/asfCov.html @@ -8,6 +8,7 @@
+
diff --git a/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatus.html b/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatus.html index 784dd8ac..f3d4e7a1 100644 --- a/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatus.html +++ b/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatus.html @@ -11,6 +11,7 @@
+
diff --git a/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatMgt.html b/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatMgt.html index d39cd553..375e0116 100644 --- a/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatMgt.html +++ b/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatMgt.html @@ -18,6 +18,7 @@
+
diff --git a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrest.html b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrest.html index 40f688f0..6f13ec28 100644 --- a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrest.html +++ b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrest.html @@ -13,6 +13,7 @@
+
diff --git a/src/main/resources/templates/faStatistics/processResult/processResult.html b/src/main/resources/templates/faStatistics/processResult/processResult.html index d76887e0..b1912620 100644 --- a/src/main/resources/templates/faStatistics/processResult/processResult.html +++ b/src/main/resources/templates/faStatistics/processResult/processResult.html @@ -10,6 +10,7 @@
+
diff --git a/src/main/resources/templates/faStatistics/sailor/sailor.html b/src/main/resources/templates/faStatistics/sailor/sailor.html index 18a0c06f..0d22023d 100644 --- a/src/main/resources/templates/faStatistics/sailor/sailor.html +++ b/src/main/resources/templates/faStatistics/sailor/sailor.html @@ -10,6 +10,7 @@
+
diff --git a/src/main/resources/templates/fipTarget/ipShipList.html b/src/main/resources/templates/fipTarget/ipShipList.html index 305caa7b..4b25cfde 100644 --- a/src/main/resources/templates/fipTarget/ipShipList.html +++ b/src/main/resources/templates/fipTarget/ipShipList.html @@ -7,6 +7,7 @@
+
@@ -106,7 +107,7 @@
-
+
diff --git a/src/main/resources/templates/fipTarget/partInfoList.html b/src/main/resources/templates/fipTarget/partInfoList.html index 6aa2bdca..5de76368 100644 --- a/src/main/resources/templates/fipTarget/partInfoList.html +++ b/src/main/resources/templates/fipTarget/partInfoList.html @@ -7,6 +7,7 @@
+
diff --git a/src/main/resources/templates/fipTarget/partWorkList.html b/src/main/resources/templates/fipTarget/partWorkList.html index 738907f0..d9ab0787 100644 --- a/src/main/resources/templates/fipTarget/partWorkList.html +++ b/src/main/resources/templates/fipTarget/partWorkList.html @@ -7,6 +7,7 @@
+
diff --git a/src/main/resources/templates/fipTarget/vulnerableList.html b/src/main/resources/templates/fipTarget/vulnerableList.html index 631075af..67dcf355 100644 --- a/src/main/resources/templates/fipTarget/vulnerableList.html +++ b/src/main/resources/templates/fipTarget/vulnerableList.html @@ -7,6 +7,7 @@
+
diff --git a/src/main/resources/templates/fragments/leftMenu.html b/src/main/resources/templates/fragments/leftMenu.html index 123eca29..8ee0625a 100644 --- a/src/main/resources/templates/fragments/leftMenu.html +++ b/src/main/resources/templates/fragments/leftMenu.html @@ -29,7 +29,7 @@ -
@@ -39,12 +39,12 @@
  • -
- +
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html b/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html index 7923d9d6..1580699e 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html @@ -7,6 +7,7 @@
+
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affair/affairStatistics.html b/src/main/resources/templates/igActivities/fpiMgt/affair/affairStatistics.html index a28d913a..60a10c20 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affair/affairStatistics.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affair/affairStatistics.html @@ -10,6 +10,7 @@
+
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planMgt.html b/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planMgt.html index e37049f9..aa0263d0 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planMgt.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planMgt.html @@ -7,6 +7,7 @@
+
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultMgt.html b/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultMgt.html index bc4916b2..ad0d9bb5 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultMgt.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultMgt.html @@ -7,6 +7,7 @@
+
diff --git a/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/analyzeList.html b/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/analyzeList.html index aa7ce149..e22e79d7 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/analyzeList.html +++ b/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/analyzeList.html @@ -7,6 +7,7 @@
+
diff --git a/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/fireExtensionReportList.html b/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/fireExtensionReportList.html index c8a00e13..007b665e 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/fireExtensionReportList.html +++ b/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/fireExtensionReportList.html @@ -7,6 +7,7 @@
+
diff --git a/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/operationPlanList.html b/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/operationPlanList.html index da110534..772cab64 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/operationPlanList.html +++ b/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/operationPlanList.html @@ -7,6 +7,7 @@
+
diff --git a/src/main/resources/templates/igActivities/fpiMgt/monitoring/designationList.html b/src/main/resources/templates/igActivities/fpiMgt/monitoring/designationList.html index 03e5ba6a..40cd5488 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/monitoring/designationList.html +++ b/src/main/resources/templates/igActivities/fpiMgt/monitoring/designationList.html @@ -7,6 +7,7 @@
+
diff --git a/src/main/resources/templates/ivsgt/ivsgt.html b/src/main/resources/templates/ivsgt/ivsgt.html index c018166a..288a2053 100644 --- a/src/main/resources/templates/ivsgt/ivsgt.html +++ b/src/main/resources/templates/ivsgt/ivsgt.html @@ -11,6 +11,7 @@
+
diff --git a/src/main/resources/templates/ivsgt/majorStatus/majorStatusPage.html b/src/main/resources/templates/ivsgt/majorStatus/majorStatusPage.html index b0260759..26b33a36 100644 --- a/src/main/resources/templates/ivsgt/majorStatus/majorStatusPage.html +++ b/src/main/resources/templates/ivsgt/majorStatus/majorStatusPage.html @@ -4,147 +4,148 @@ xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout/layout}"> - +
-
-
-
-
주요사건처리현황
-
- - -
-
-
-
- -
-
- -
-
-
-
- -
-
- -
-
- -
-
-
- - -
-
-
- -
-
-
-
-
-
-
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - -
순번작성일시종류제목내용첨부파일
-
-
-
-
-
- -
-
- - -
-
-
-
-
+
+ +
+
+
주요사건처리현황
+
+ + +
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+ +
+
+
+ +
+
+
+ +
+
-
-
- - -
-
-
+ +
\ No newline at end of file diff --git a/src/main/resources/templates/police/career/careerMgt.html b/src/main/resources/templates/police/career/careerMgt.html index 27af0cf6..7d59e57a 100644 --- a/src/main/resources/templates/police/career/careerMgt.html +++ b/src/main/resources/templates/police/career/careerMgt.html @@ -7,6 +7,7 @@
+
diff --git a/src/main/resources/templates/police/education/educationMgt.html b/src/main/resources/templates/police/education/educationMgt.html index 7aa266ec..60ecd20b 100644 --- a/src/main/resources/templates/police/education/educationMgt.html +++ b/src/main/resources/templates/police/education/educationMgt.html @@ -7,6 +7,7 @@
+
diff --git a/src/main/resources/templates/police/personnelStatus/personnelStatus.html b/src/main/resources/templates/police/personnelStatus/personnelStatus.html index 186e0615..c6ea8cdc 100644 --- a/src/main/resources/templates/police/personnelStatus/personnelStatus.html +++ b/src/main/resources/templates/police/personnelStatus/personnelStatus.html @@ -7,6 +7,7 @@
+
diff --git a/src/main/resources/templates/police/police/policeList.html b/src/main/resources/templates/police/police/policeList.html index f2a5a168..b86b45f1 100644 --- a/src/main/resources/templates/police/police/policeList.html +++ b/src/main/resources/templates/police/police/policeList.html @@ -7,6 +7,7 @@
+
diff --git a/src/main/resources/templates/sri/sriBoard.html b/src/main/resources/templates/sri/sriBoard.html index 06eb0949..1f7b07fc 100644 --- a/src/main/resources/templates/sri/sriBoard.html +++ b/src/main/resources/templates/sri/sriBoard.html @@ -8,6 +8,7 @@
+
diff --git a/src/main/resources/templates/translator/translator.html b/src/main/resources/templates/translator/translator.html index c64ad579..4e2a84e4 100644 --- a/src/main/resources/templates/translator/translator.html +++ b/src/main/resources/templates/translator/translator.html @@ -1,3 +1,4 @@ +
+
diff --git a/src/main/resources/templates/translator/translatorStatisticsLang.html b/src/main/resources/templates/translator/translatorStatisticsLang.html index d355751b..1d725288 100644 --- a/src/main/resources/templates/translator/translatorStatisticsLang.html +++ b/src/main/resources/templates/translator/translatorStatisticsLang.html @@ -7,6 +7,7 @@
+