From 99cee3a95029d745904ce9b0583f8325a32c63e0 Mon Sep 17 00:00:00 2001 From: wyu <kknd09321@nate.com> Date: 화, 28 12월 2021 11:05:40 +0900 Subject: [PATCH] 대시보드 - 위험 관리 문구 변경 필요 '빈번한 담당자 변경' -> '빈번한 담당부서 변경' --- src/main/webapp/custom_components/widget/risk-issue-widget/risk-issue-widget.html | 6 +++--- src/main/java/kr/wisestone/owl/service/impl/WidgetServiceImpl.java | 4 ++-- src/main/webapp/i18n/ko/global.json | 2 ++ src/main/webapp/WEB-INF/i18n/code_ko_KR.properties | 1 + src/main/webapp/assets/styles/main.css | 8 +------- 5 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/main/java/kr/wisestone/owl/service/impl/WidgetServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/WidgetServiceImpl.java index a17c3b5..2ae3432 100644 --- a/src/main/java/kr/wisestone/owl/service/impl/WidgetServiceImpl.java +++ b/src/main/java/kr/wisestone/owl/service/impl/WidgetServiceImpl.java @@ -1157,7 +1157,7 @@ if (changeAssigneeType != null) { if (changeAssigneeType.equals("1")) { - riskType = this.messageAccessor.message("common.reversalAssigneeUpdate"); // 鍮덈쾲�븳 �떞�떦�옄 蹂�寃� + riskType = this.messageAccessor.message("common.reversalAssigneeTeamUpdate"); // 鍮덈쾲�븳 �떞�떦遺��꽌 蹂�寃� } } @@ -1169,7 +1169,7 @@ if (changeAssigneeType != null && changeIssueStatusType != null) { if (changeAssigneeType.equals("1") && changeIssueStatusType.equals("1")) { - riskType = this.messageAccessor.message("common.reversalAssigneeUpdate") + '\n' + this.messageAccessor.message("common.reversalStatusUpdate"); // 鍮덈쾲�븳 �떞�떦�옄 蹂�寃�, 踰덈났�릺�뒗 �긽�깭 蹂�寃� + riskType = this.messageAccessor.message("common.reversalAssigneeTeamUpdate") + '\n' + this.messageAccessor.message("common.reversalStatusUpdate"); // 鍮덈쾲�븳 �떞�떦遺��꽌 蹂�寃�, 踰덈났�릺�뒗 �긽�깭 蹂�寃� } } diff --git a/src/main/webapp/WEB-INF/i18n/code_ko_KR.properties b/src/main/webapp/WEB-INF/i18n/code_ko_KR.properties index ee17883..4fd3b7b 100644 --- a/src/main/webapp/WEB-INF/i18n/code_ko_KR.properties +++ b/src/main/webapp/WEB-INF/i18n/code_ko_KR.properties @@ -34,6 +34,7 @@ common.assigned=\uB2F4\uB2F9 common.progressPercent=\uC9C4\uD589\uB960 common.reversalAssigneeUpdate=\uBE48\uBC88\uD55C \uB2F4\uB2F9\uC790 \uBCC0\uACBD +common.reversalAssigneeTeamUpdate=\uBE48\uBC88\uD55C \uB2F4\uB2F9\uBD80\uC11C \uBCC0\uACBD common.reversalStatusUpdate=\uBC88\uBCF5\uB418\uB294 \uC0C1\uD0DC \uBCC0\uACBD common.typeErrorDownloadWidget=\uB2E4\uC6B4\uB85C\uB4DC \uC704\uC82F \uC720\uD615 \uC624\uB958 common.inProgressProjectStatus=\uC9C4\uD589 \uC911\uC778 \uD504\uB85C\uC81D\uD2B8 \uD604\uD669 diff --git a/src/main/webapp/assets/styles/main.css b/src/main/webapp/assets/styles/main.css index 0d295ee..baf6003 100644 --- a/src/main/webapp/assets/styles/main.css +++ b/src/main/webapp/assets/styles/main.css @@ -5223,14 +5223,8 @@ height: 150px } }*/ -body.modal-open { - overflow: hidden; - position:fixed; - width: 100%; -} - .modal-open { - overflow: auto; + overflow: hidden; } .modal { diff --git a/src/main/webapp/custom_components/widget/risk-issue-widget/risk-issue-widget.html b/src/main/webapp/custom_components/widget/risk-issue-widget/risk-issue-widget.html index b8d0296..3794feb 100644 --- a/src/main/webapp/custom_components/widget/risk-issue-widget/risk-issue-widget.html +++ b/src/main/webapp/custom_components/widget/risk-issue-widget/risk-issue-widget.html @@ -4,7 +4,7 @@ <div class="bar-labels"> <div class="bar-label-left"> <h5 translate="dashboard.managementRisk">�쐞�뿕 愿�由�</h5> - <small translate="dashboard.updateIssueAndStatusUpdate">鍮덈쾲�븳 �떞�떦�옄 蹂�寃�, �옦�� �긽�깭 蹂�寃� �벑 �씠�뒋 泥섎━�뿉 �쐞�뿕 �슂�냼媛� �엳�떎怨� 蹂댁뿬吏��뒗 �씠�뒋 紐⑸줉</small> + <small translate="dashboard.updateIssueDepartmentAndStatusUpdate">鍮덈쾲�븳 �떞�떦遺��꽌 蹂�寃�, �옦�� �긽�깭 蹂�寃� �벑 �씠�뒋 泥섎━�뿉 �쐞�뿕 �슂�냼媛� �엳�떎怨� 蹂댁뿬吏��뒗 �씠�뒋 紐⑸줉</small> </div> <div class="bar-label-right"> <form class="form-inline justify-content-sm-end" method="post" action="/widget/downloadExcel" name="riskIssueWidgetForm"> @@ -36,8 +36,8 @@ </div> <div class="col-sm-6"> <div class="el-tablo centered"> - <div class="label" translate="dashboard.reversalAssigneeUpdate"> - 鍮덈쾲�븳 �떞�떦�옄 蹂�寃� + <div class="label" translate="dashboard.reversalAssigneeTeamUpdate"> + 鍮덈쾲�븳 �떞�떦遺��꽌 蹂�寃� </div> <div class="value text-danger mt-10"> <i class="os-icon os-icon-user-male-circle" ></i> diff --git a/src/main/webapp/i18n/ko/global.json b/src/main/webapp/i18n/ko/global.json index 8bb5130..e2a74f8 100644 --- a/src/main/webapp/i18n/ko/global.json +++ b/src/main/webapp/i18n/ko/global.json @@ -26,8 +26,10 @@ "issueName": "�씠�뒋�씠由�", "managementRisk": "�쐞�뿕 愿�由�", "updateIssueAndStatusUpdate": "鍮덈쾲�븳 �떞�떦�옄 蹂�寃�, �옦�� �긽�깭 蹂�寃� �벑 �씠�뒋 泥섎━�뿉 �쐞�뿕 �슂�냼媛� �엳�떎怨� 蹂댁뿬吏��뒗 �씠�뒋 紐⑸줉", + "updateIssueDepartmentAndStatusUpdate": "鍮덈쾲�븳 �떞�떦遺��꽌 蹂�寃�, �옦�� �긽�깭 蹂�寃� �벑 �씠�뒋 泥섎━�뿉 �쐞�뿕 �슂�냼媛� �엳�떎怨� 蹂댁뿬吏��뒗 �씠�뒋 紐⑸줉", "reversalStatusUpdate": "踰덈났�릺�뒗 �긽�깭 蹂�寃�", "reversalAssigneeUpdate": "鍮덈쾲�븳 �떞�떦�옄 蹂�寃�", + "reversalAssigneeTeamUpdate": "鍮덈쾲�븳 �떞�떦遺��꽌 蹂�寃�", "division": "援щ텇", "registeredByMeIssue": "�궡媛� �벑濡앺븳 �씠�뒋 �쁽�솴", "registeredTodayIssue": "�삤�뒛 �벑濡앺븳 �씠�뒋", -- Gitblit v1.8.0