From aebc288596f9a22a39a7c62c1ffe66aa38e5605c Mon Sep 17 00:00:00 2001 From: kimjhjjang Date: Mon, 7 Nov 2022 14:04:09 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B3=B5=EC=A7=80=EC=82=AC=ED=95=AD=20FAQ=20?= =?UTF-8?q?=EB=85=B8=EC=B6=9C=20=EC=A0=95=EB=B3=B4=20=EC=88=98=EC=A0=95=20?= =?UTF-8?q?(Y=20:=20=EC=82=AC=EC=9A=A9=20N=20:=20=EC=82=AC=EC=9A=A9?= =?UTF-8?q?=EC=95=88=ED=95=A8)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/NavBar.vue | 20 +++++----------- .../src/modules/homeMgt/components/FaqPop.vue | 4 ++-- .../homeMgt/components/FaqUpdatePop.vue | 4 ++-- .../modules/homeMgt/components/NoticePop.vue | 8 +++---- .../homeMgt/components/NoticeUpdatePop.vue | 8 +++---- frontend/src/modules/homeMgt/views/faq.vue | 12 ++++++++-- frontend/src/modules/homeMgt/views/notice.vue | 23 ++++++++++++++++--- .../ez/api/homeMgt/HomeMgtController.java | 8 +++---- 8 files changed, 52 insertions(+), 35 deletions(-) diff --git a/frontend/src/components/NavBar.vue b/frontend/src/components/NavBar.vue index ff5c070..34f0e24 100644 --- a/frontend/src/components/NavBar.vue +++ b/frontend/src/components/NavBar.vue @@ -6,7 +6,6 @@ {{ child.menuNm }} -
-
  • - 홈페이지 관리 -
    -
      -
    • - 공지사항 -
      • -
    • - 자주하는 질문 -
      • -
    -
    -
    • @@ -165,6 +151,12 @@ export default { classNm += ' is-current'; } break; + case 1011: + classNm = 'moniter'; + if (nowUrl.indexOf('homeMgt') > -1) { + classNm += ' is-current'; + } + break; default: classNm = 'customer'; classNm += ' is-current'; diff --git a/frontend/src/modules/homeMgt/components/FaqPop.vue b/frontend/src/modules/homeMgt/components/FaqPop.vue index e2094e0..e25a2fc 100644 --- a/frontend/src/modules/homeMgt/components/FaqPop.vue +++ b/frontend/src/modules/homeMgt/components/FaqPop.vue @@ -32,8 +32,8 @@
    diff --git a/frontend/src/modules/homeMgt/components/FaqUpdatePop.vue b/frontend/src/modules/homeMgt/components/FaqUpdatePop.vue index 0521827..ae227eb 100644 --- a/frontend/src/modules/homeMgt/components/FaqUpdatePop.vue +++ b/frontend/src/modules/homeMgt/components/FaqUpdatePop.vue @@ -32,8 +32,8 @@
    diff --git a/frontend/src/modules/homeMgt/components/NoticePop.vue b/frontend/src/modules/homeMgt/components/NoticePop.vue index ff209c7..63fd89b 100644 --- a/frontend/src/modules/homeMgt/components/NoticePop.vue +++ b/frontend/src/modules/homeMgt/components/NoticePop.vue @@ -34,8 +34,8 @@
    @@ -43,8 +43,8 @@
    diff --git a/frontend/src/modules/homeMgt/components/NoticeUpdatePop.vue b/frontend/src/modules/homeMgt/components/NoticeUpdatePop.vue index 87d49fb..9053077 100644 --- a/frontend/src/modules/homeMgt/components/NoticeUpdatePop.vue +++ b/frontend/src/modules/homeMgt/components/NoticeUpdatePop.vue @@ -34,8 +34,8 @@
    @@ -43,8 +43,8 @@
    diff --git a/frontend/src/modules/homeMgt/views/faq.vue b/frontend/src/modules/homeMgt/views/faq.vue index 1c98cce..ad7ce14 100644 --- a/frontend/src/modules/homeMgt/views/faq.vue +++ b/frontend/src/modules/homeMgt/views/faq.vue @@ -126,7 +126,6 @@ export default { columns: [ { name: 'no', header: 'No', align: 'center', width: '5%' }, - { name: 'faqNo', header: '게시물', align: 'center', width: '5%' }, { name: 'ctgCdNm', header: '분류코드명', align: 'center', width: '10%' }, { name: 'title', @@ -140,7 +139,16 @@ export default { }, }, }, - { name: 'useYn', header: '사용여부', align: 'center', width: '5%' }, + { + name: 'useYn', + header: '사용여부', + align: 'center', + width: '5%', + formatter: (props) => { + let result = props.useYn === 'Y' ? '사용' : '사용 안함'; + return result; + }, + }, { name: 'regId', header: '등록자', align: 'center', width: '10%' }, { name: 'regDt', header: '등록일자', align: 'center', width: '10%' }, ], diff --git a/frontend/src/modules/homeMgt/views/notice.vue b/frontend/src/modules/homeMgt/views/notice.vue index 77d8299..7ef85e1 100644 --- a/frontend/src/modules/homeMgt/views/notice.vue +++ b/frontend/src/modules/homeMgt/views/notice.vue @@ -138,9 +138,26 @@ export default { }, }, }, - { name: 'emgYn', header: '긴급여부(Y/N)', align: 'center', width: '10%' }, - { name: 'fileYn', header: '파일유무', align: 'center', width: '5%' }, - { name: 'useYn', header: '사용여부', align: 'center', width: '5%' }, + { + name: 'emgYn', + header: '긴급여부(Y/N)', + align: 'center', + width: '10%', + formatter: (props) => { + let result = props.emgYn === 'Y' ? '긴급' : ''; + return result; + }, + }, + { + name: 'useYn', + header: '사용여부', + align: 'center', + width: '5%', + formatter: (props) => { + let result = props.useYn === 'Y' ? '사용' : '사용 안함'; + return result; + }, + }, { name: 'regr', header: '등록자', align: 'center', width: '10%' }, { name: 'regDt', header: '등록일자', align: 'center', width: '10%' }, ], diff --git a/src/main/java/kr/co/uplus/ez/api/homeMgt/HomeMgtController.java b/src/main/java/kr/co/uplus/ez/api/homeMgt/HomeMgtController.java index e865b58..325be67 100644 --- a/src/main/java/kr/co/uplus/ez/api/homeMgt/HomeMgtController.java +++ b/src/main/java/kr/co/uplus/ez/api/homeMgt/HomeMgtController.java @@ -204,7 +204,7 @@ public class HomeMgtController { * @param faqListReqDto * @return FaqListResDto */ - @ApiOperation(value = "/faqList", notes = "자주묻는 질문 조회") + @ApiOperation(value = "/faqList", notes = "FAQ 조회") @ApiResponses({ @ApiResponse(code = HttpServletResponse.SC_OK, message = "SUCESS") }) @RequestMapping(value = "/faqList", method = { RequestMethod.POST }) @ResponseBody @@ -225,7 +225,7 @@ public class HomeMgtController { * @param insertFaqReqDto * @return InsertFaqResDto */ - @ApiOperation(value = "/insertFaq", notes = "자주묻는 질문 등록") + @ApiOperation(value = "/insertFaq", notes = "FAQ 등록") @ApiResponses({ @ApiResponse(code = HttpServletResponse.SC_OK, message = "SUCESS") }) @RequestMapping(value = "/insertFaq", method = { RequestMethod.POST }) @ResponseBody @@ -247,7 +247,7 @@ public class HomeMgtController { * @param updateFaqReqDto * @return UpdateFaqResDto */ - @ApiOperation(value = "/updateFaq", notes = "자주묻는 질문 등록") + @ApiOperation(value = "/updateFaq", notes = "FAQ 수정") @ApiResponses({ @ApiResponse(code = HttpServletResponse.SC_OK, message = "SUCESS") }) @RequestMapping(value = "/updateFaq", method = { RequestMethod.POST }) @ResponseBody @@ -267,7 +267,7 @@ public class HomeMgtController { * @param deleteFaqReqDto * @return DeleteFaqResDto */ - @ApiOperation(value = "/deleteFaq", notes = "공지사항 삭제") + @ApiOperation(value = "/deleteFaq", notes = "FAQ 삭제") @ApiResponses({ @ApiResponse(code = HttpServletResponse.SC_OK, message = "SUCESS") }) @RequestMapping(value = "/deleteFaq", method = { RequestMethod.POST }) @ResponseBody