From d9bf09221f7d2e3eecfd0eb878c3a9de9d292808 Mon Sep 17 00:00:00 2001 From: thkim Date: Tue, 10 Jun 2025 16:58:22 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=EB=B0=9C=EC=A3=BC=EA=B8=B0=EA=B4=80=20?= =?UTF-8?q?>=20'=EA=B4=80=EB=A6=AC=20=EC=8B=9C=EC=B6=94=EC=A0=95=EB=B3=B4?= =?UTF-8?q?=20=ED=98=84=ED=99=A9'=EC=97=90=EC=84=9C=20=ED=85=8C=EC=9D=B4?= =?UTF-8?q?=EB=B8=94=20=EB=84=93=EC=9D=B4=20=ED=86=B5=EC=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- list.txt | 10 +- .../impl/DrillingInquiryServiceImpl.java | 4 +- .../views/drilling/common/includeTopMenu.jsp | 40 ++-- .../views/drilling/home/drilling_index.jsp | 69 +++++-- src/main/webapp/com/css/common.v2.0.css | 107 ++++++----- src/main/webapp/com/css/common.v2.0.css.map | 2 +- src/main/webapp/com/css/sass/common.v2.0.scss | 173 +++++++++++++++--- .../img/drilling/maps/dokdo_active_alone.svg | 80 ++++++++ .../drilling/maps/uleungdo_active_alone.svg | 83 +++++++++ 9 files changed, 457 insertions(+), 111 deletions(-) create mode 100644 src/main/webapp/com/img/drilling/maps/dokdo_active_alone.svg create mode 100644 src/main/webapp/com/img/drilling/maps/uleungdo_active_alone.svg diff --git a/list.txt b/list.txt index 0fa9149f..22ca2219 100644 --- a/list.txt +++ b/list.txt @@ -1,9 +1,15 @@ -src\main\resources\egovframework\egovProps\globals.properties +#src\main\resources\egovframework\egovProps\globals.properties #src\main\java\geoinfo\regi\manageList\ManageExcelUploadProc01Controller.java #src\main\webapp\WEB-INF\views\web\input\excel_step00.jsp #src\main\webapp\WEB-INF\views\web\input\excel_step31.jsp #src\main\webapp\com\css\common.v2.0.css #src\main\webapp\com\css\common.v2.0.css.map -src\main\webapp\WEB-INF\views\web\manage\list_reg.jsp +#src\main\webapp\WEB-INF\views\web\manage\list_reg.jsp src\main\webapp\js\map\main\map.js +src\main\webapp\WEB-INF\views\drilling\common\includeTopMenu.jsp +src\main\webapp\WEB-INF\views\drilling\home\drilling_index.jsp +src\main\webapp\com\css\common.v2.0.css +src\main\webapp\com\css\common.v2.0.css.map +src\main\webapp\com\img\drilling\maps\dokdo_active_alone.svg +src\main\webapp\com\img\drilling\maps\uleungdo_active_alone.svg \ No newline at end of file diff --git a/src/main/java/geoinfo/drilling/inquiry/service/impl/DrillingInquiryServiceImpl.java b/src/main/java/geoinfo/drilling/inquiry/service/impl/DrillingInquiryServiceImpl.java index 07235a26..7619e76b 100644 --- a/src/main/java/geoinfo/drilling/inquiry/service/impl/DrillingInquiryServiceImpl.java +++ b/src/main/java/geoinfo/drilling/inquiry/service/impl/DrillingInquiryServiceImpl.java @@ -139,10 +139,10 @@ public class DrillingInquiryServiceImpl implements DrillingInquiryService { projectStateCodeName = "검수 중"; break; case 4: - projectStateCodeName = "수정 요청"; + projectStateCodeName = "수정 요청_"; break; case 5: - projectStateCodeName = "검수 완료"; + projectStateCodeName = "수정 요청"; break; case 6: projectStateCodeName = "등록 완료"; diff --git a/src/main/webapp/WEB-INF/views/drilling/common/includeTopMenu.jsp b/src/main/webapp/WEB-INF/views/drilling/common/includeTopMenu.jsp index 9329ef99..d6fe2316 100644 --- a/src/main/webapp/WEB-INF/views/drilling/common/includeTopMenu.jsp +++ b/src/main/webapp/WEB-INF/views/drilling/common/includeTopMenu.jsp @@ -26,14 +26,16 @@
-
- -
-
    -
  • -
-
-