From 7ff08bee516f97d06639b94a2fc461a0efbef5d6 Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Wed, 28 Feb 2024 13:45:26 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B3=B4=EC=95=88=EB=AA=A8=EB=93=9C=20?= =?UTF-8?q?=EC=B2=98=EB=A6=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/jsp/fims/crdn/crdn02010-main.jsp | 16 ++++++++-------- .../WEB-INF/jsp/fims/sprt/sprt01010-main.jsp | 8 ++++---- .../WEB-INF/jsp/fims/sprt/sprt01014-info.jsp | 6 +----- .../WEB-INF/jsp/fims/sprt/sprt01015-info.jsp | 10 +++------- src/main/webapp/WEB-INF/jsp/include/top.jsp | 15 +++++---------- .../css/fims/framework/common/common.css | 15 +++++++++++++++ src/main/webapp/resources/js/base/base-fims.js | 8 +++++++- 7 files changed, 43 insertions(+), 35 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02010-main.jsp index d934eb67..c0d71b66 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02010-main.jsp @@ -330,8 +330,6 @@ style="width:120px">성명 주민번호 - 주민번호 @@ -348,14 +346,16 @@ {CRDN_STTS_CD} {FFNLG_CRDN_AMT} {RTPYR_NM} - {RTPYR_NO} - ************ + + {RTPYR_NO} + ************ + @@ -577,7 +577,7 @@ $(document).ready(function(){ $P.searchDetailInspectionDataList = (dataKey) => { $P.sameVehicleSubControl.query = {}; $P.sameVehicleSubControl.query.inspectionDataType = "sameVehicleSub"; - $P.sameVehicleSubControl.query.crdnIDs = dataKey; + $P.sameVehicleSubControl.query.crdnIds = dataKey; $P.sameVehicleSubControl.query.taskSeCd = $P.sameVehicleMainControl.query.taskSeCd; $P.sameVehicleSubControl.load(0); } @@ -718,8 +718,8 @@ $(document).ready(function(){ $P.sameVehicleMainControl.download(); } else { - var cellDefs = getCellDefs($("#sameVehicleInspectionSub_Table_0--${pageName} thead th").not(".dummy-th").not(":hidden"), - $($("#sameVehicleInspectionSubRow--${pageName}")[0].content).find("td").not(".dummy-td").not(".privacy-mask")); + var cellDefs = getCellDefs($("#sameVehicleInspectionSub_Table_0--${pageName} thead th").not(".dummy-th"), + $($("#sameVehicleInspectionSubRow--${pageName}")[0].content).find("td").not(".dummy-td")); $P.sameVehicleSubControl.query.cellDefs = cellDefs; $P.sameVehicleSubControl.download(); diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01010-main.jsp index 045fb1a9..4cf79fb2 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01010-main.jsp @@ -248,8 +248,8 @@ $(document).ready(function() { return; } - cellDefs = getCellDefs($("#upTheadTr--${pageName} th").not(".dummy-th").not(":eq(0)").not(":hidden"), - $($("#row--${pageName}")[0].content).find("td").not(".dummy-td").not(":eq(0)").not(".privacy-mask")); + cellDefs = getCellDefs($("#upTheadTr--${pageName} th").not(".dummy-th").not(":eq(0)"), + $($("#row--${pageName}")[0].content).find("td").not(".dummy-td").not(":eq(0)")); $P.integrationSearchControl.query.gridType = "up"; } else { @@ -258,8 +258,8 @@ $(document).ready(function() { return; } - cellDefs = getCellDefs($("#downTheadTr--${pageName} th").not(".dummy-th").not(":eq(0)").not(":hidden"), - $($("#row--${pageName}")[0].content).find("td").not(".dummy-td").not(":eq(0)").not(".privacy-mask")); + cellDefs = getCellDefs($("#downTheadTr--${pageName} th").not(".dummy-th").not(":eq(0)"), + $($("#row--${pageName}")[0].content).find("td").not(".dummy-td").not(":eq(0)")); $P.integrationSearchControl.query.gridType = "down"; } diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01014-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01014-info.jsp index e83719a1..445e6435 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01014-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01014-info.jsp @@ -61,11 +61,7 @@ onclick="searchFromGridTitle('RTPYR_NM', this.innerText, 'match', 'perfect');" >납부자명 - 납부자번호 - - 납부자번호 diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01015-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01015-info.jsp index 92492d32..429c7a43 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01015-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01015-info.jsp @@ -61,13 +61,9 @@ onclick="{onclick}" ondblclick="{ondblclick}" >{RTPYR_NM} - {RTPYR_NO} - - ************ + >{RTPYR_NO}************ - 정보를 찾지 못했습니다. + 정보를 찾지 못했습니다. \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/include/top.jsp b/src/main/webapp/WEB-INF/jsp/include/top.jsp index f1e5d70c..f195cf27 100644 --- a/src/main/webapp/WEB-INF/jsp/include/top.jsp +++ b/src/main/webapp/WEB-INF/jsp/include/top.jsp @@ -327,7 +327,7 @@ function showHelp(){ * 보안모드 토글 처리 */ function fn_securityModeToggle(flag, elementId){ - + var executionArea; if(elementId){ executionArea = $("#"+elementId); @@ -350,21 +350,16 @@ function fn_securityModeToggle(flag, elementId){ $("input.privacy-mask").removeAttr("hidden"); //그리드 - $("th.privacy").attr("hidden","hidden"); - $("td.privacy").attr("hidden","hidden"); - $("th.privacy-mask").removeAttr("hidden"); - $("td.privacy-mask").removeAttr("hidden"); + $("body").addClass("root-privacy-on"); } else { //개인정보 표시 //입력상자 $("input.privacy").removeAttr("hidden"); $("input.privacy-mask").attr("hidden","hidden"); - - $("th.privacy").removeAttr("hidden"); - $("td.privacy").removeAttr("hidden"); - $("th.privacy-mask").attr("hidden","hidden"); - $("td.privacy-mask").attr("hidden","hidden"); + + //그리드 + $("body").removeClass("root-privacy-on"); } diff --git a/src/main/webapp/resources/css/fims/framework/common/common.css b/src/main/webapp/resources/css/fims/framework/common/common.css index 0dcc0ee0..77a7ef47 100644 --- a/src/main/webapp/resources/css/fims/framework/common/common.css +++ b/src/main/webapp/resources/css/fims/framework/common/common.css @@ -1,3 +1,18 @@ +body:not(.root-privacy-on) td.privacy-cell span:nth-child(1){ + display:block; +} + +body:not(.root-privacy-on) td.privacy-cell span:nth-child(2){ + display:none; +} + +body.root-privacy-on td.privacy-cell span:nth-child(1){ + display:none; +} +body.root-privacy-on td.privacy-cell span:nth-child(2){ + display:block; +} + caption { display: none; diff --git a/src/main/webapp/resources/js/base/base-fims.js b/src/main/webapp/resources/js/base/base-fims.js index a7e466ca..dd2bf21e 100644 --- a/src/main/webapp/resources/js/base/base-fims.js +++ b/src/main/webapp/resources/js/base/base-fims.js @@ -291,7 +291,13 @@ function getCellDefs($th, $td){ var width = $th.eq(i).outerWidth(); width = Math.ceil(width/10) + 2; - var field = $td.eq(i).text(); + + var field; + if($td.eq(i).hasClass("privacy-cell")){ + field = $td.eq(i).find("span:eq(0)").text(); + } else { + field = $td.eq(i).text(); + } field = field.replace("{", ""); field = field.replace("}", "");