diff --git a/src/main/resources/static/img/logoNew.png b/src/main/resources/static/img/logoNew.png index 8dda7a05..d5137758 100644 Binary files a/src/main/resources/static/img/logoNew.png and b/src/main/resources/static/img/logoNew.png differ diff --git a/src/main/resources/static/img/logoNew1.png b/src/main/resources/static/img/logoNew1.png new file mode 100644 index 00000000..8dda7a05 Binary files /dev/null and b/src/main/resources/static/img/logoNew1.png differ diff --git a/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultViewModal.html b/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultViewModal.html index 3f2f2690..bdbe09a1 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultViewModal.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultViewModal.html @@ -212,7 +212,7 @@ 결재결과: - + 결재자: diff --git a/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/fireExtensionReportEditModal.html b/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/fireExtensionReportEditModal.html index 04af75d4..cd8a9092 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/fireExtensionReportEditModal.html +++ b/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/fireExtensionReportEditModal.html @@ -16,7 +16,7 @@ -
+
@@ -29,13 +29,12 @@
-
정보협력자
구성
-
+
■ 정보협력자 구성
+
-
-
+
@@ -49,8 +48,7 @@
-
-
+
@@ -64,8 +62,7 @@
-
-
+
@@ -83,13 +80,12 @@
-
정보협력자
구성
+
정보협력자 구성
-
-
+
@@ -104,7 +100,6 @@
-
@@ -119,7 +114,6 @@
-
@@ -136,10 +130,9 @@
-
소요예산
+
■ 소요예산
-
@@ -154,29 +147,28 @@
-
- +

- +
- +
- +
diff --git a/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/fireExtensionReportViewModal.html b/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/fireExtensionReportViewModal.html index 664598ad..d52c900d 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/fireExtensionReportViewModal.html +++ b/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/fireExtensionReportViewModal.html @@ -26,9 +26,8 @@

-
정보협력자 구성
-
-
+
■ 정보협력자 구성
+
@@ -37,7 +36,6 @@
-
@@ -46,16 +44,14 @@
-

-
소요예산
-
-
+
■ 소요예산
+
@@ -64,7 +60,6 @@
-
@@ -98,17 +93,21 @@
- + + + - - + +
+ 결재일 : + +
+
diff --git a/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/intelligenceAnalyzeViewModal.html b/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/intelligenceAnalyzeViewModal.html index 61b31ebb..f1416e4f 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/intelligenceAnalyzeViewModal.html +++ b/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/intelligenceAnalyzeViewModal.html @@ -8,65 +8,71 @@
- + - + - +

- - -
+ + +
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
첩보수집실적허위오보활용실적
특보중보통보조사무가치외사
활동
공작검거
-
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
첩보수집실적허위오보활용실적
특보중보통보조사무가치외사
활동
공작검거
+

@@ -111,67 +117,94 @@
- - -
-
-
-
-
+
+
+
+
- + ] - -
- -
- -
+ +
+ +
+ +
+
+

+
+ +
+
-

-
- -
- -
-
-
+
+
\ No newline at end of file diff --git a/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/operationPlanEditModal.html b/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/operationPlanEditModal.html index 50bc2036..42350633 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/operationPlanEditModal.html +++ b/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/operationPlanEditModal.html @@ -30,7 +30,7 @@

-
정보협력자 구성
+
■ 정보협력자 구성
diff --git a/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/operationPlanViewModal.html b/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/operationPlanViewModal.html index c0888723..17f6720d 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/operationPlanViewModal.html +++ b/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/operationPlanViewModal.html @@ -31,7 +31,7 @@

-
정보협력자 구성
+
■ 정보협력자 구성
diff --git a/src/main/resources/templates/igActivities/fpiMgt/monitoring/designationEditModal.html b/src/main/resources/templates/igActivities/fpiMgt/monitoring/designationEditModal.html index 1e07c27d..11a9292a 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/monitoring/designationEditModal.html +++ b/src/main/resources/templates/igActivities/fpiMgt/monitoring/designationEditModal.html @@ -71,7 +71,7 @@
- +
diff --git a/src/main/resources/templates/igActivities/fpiMgt/monitoring/designationViewModal.html b/src/main/resources/templates/igActivities/fpiMgt/monitoring/designationViewModal.html index e792d485..a65e098a 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/monitoring/designationViewModal.html +++ b/src/main/resources/templates/igActivities/fpiMgt/monitoring/designationViewModal.html @@ -37,7 +37,6 @@

모니터링 대상자
-
@@ -111,7 +110,7 @@ -