From 6ebe6ce99734e59565893304430b4a87d08feabf Mon Sep 17 00:00:00 2001 From: minuk926 Date: Tue, 7 Feb 2023 15:42:32 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=EB=B6=80=EA=B3=BC,=20=EB=8B=B5=EB=B3=80?= =?UTF-8?q?=20=ED=99=94=EB=A9=B4=EB=8B=A8=20=EA=B0=9C=EB=B0=9C=20=EC=A7=84?= =?UTF-8?q?=ED=96=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/cmm/cmmFimsCrackdownTotMgtPopup.jsp | 8 +- .../fims/biz/rt/rtCrackdownMgtMainForm.jsp | 92 +++++++++++-------- .../framework/css/cmmn/common-style.css | 7 +- 3 files changed, 60 insertions(+), 47 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownTotMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownTotMgtPopup.jsp index 1119f3aa..11c6a138 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownTotMgtPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownTotMgtPopup.jsp @@ -561,7 +561,7 @@ Date Author Description ,data: params ,success: (res) => { cmmImgDownload('#imgList', res.attchFiles, fnPopupBiz.pagePopup, true, '60px'); - window.opener.pageNav.reloadNav($('#prev'), $('#next'), $('span#totCnt')) + window.opener.ARR_NAV[window.opener.CUR_TAB_IDX].reloadNav($('#prev'), $('#next'), $('span#totCnt')) fnPopupBiz.resetDisplay(res.ctznDTO?.cvplRceptNo); $('#violtDtlsNm').text(res.ctznDTO?.violtDtlsNm); @@ -681,13 +681,13 @@ Date Author Description }); $('#prev').on('click', () => { - window.opener.pageNav.onClickNavBtn('prev', (gridInfo) => { + window.opener.ARR_NAV[window.opener.CUR_TAB_IDX].onClickNavBtn('prev', (gridInfo) => { fnPopupBiz.search(gridInfo.curRowData) }); }) $('#next').on('click', () => { - window.opener.pageNav.onClickNavBtn('next', (gridInfo) => { + window.opener.ARR_NAV[window.opener.CUR_TAB_IDX].onClickNavBtn('next', (gridInfo) => { fnPopupBiz.search(gridInfo.curRowData); }); }); @@ -860,7 +860,7 @@ Date Author Description fnPopupBiz.downloadImg(); fnPopupBiz.resetDisplay('${ctznDTO.cvplRceptNo}'); - window.opener.pageNav.reloadNav($('#prev'), $('#next'), $('span#totCnt')) + window.opener.ARR_NAV[window.opener.CUR_TAB_IDX].reloadNav($('#prev'), $('#next'), $('span#totCnt')) }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtCrackdownMgtMainForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtCrackdownMgtMainForm.jsp index 1bc00a8c..0147536d 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtCrackdownMgtMainForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtCrackdownMgtMainForm.jsp @@ -26,10 +26,8 @@ Date Author Description
-
- test -

상세검색

-
    +<%--

    상세검색

    --%> +<%--
      --%> +<%--
      --%> - 검색 - + 연계파일처리 -
    -
+<%--
--%> + +
-
+<%--
--%>
전체 ㅣ
@@ -88,7 +87,7 @@ Date Author Description 답변처리 -
+<%--
--%> @@ -151,7 +150,7 @@ Date Author Description ,sch_date_to: $('#sch_date_to').val() ,[$('#sch_opt').val()]: $('#sch_word').val() ,sysCode: $('input:radio[name=sysCode]:checked').val() - ,regltSeCode: $('input:radio[name=regltSeCode]:checked').val() + ,regltSeCode: CUR_TAB_IDX === 2 ? '09' : $('input:radio[name=regltSeCode]:checked').val() ,regltProcessSttusCode: CUR_TAB_IDX === 2 ? 'NON-INIT' : $('#regltProcessSttusCode').val() //,cnfmYn: $('input[name=regltYn]:checked').val() ,cnfmYn: $('#cnfmYn').val() @@ -219,25 +218,34 @@ Date Author Description $('#btnImpose').hide(); $('#btnAnswer').hide(); $('#regltProcessSttusCode').show(); - $('input:radio[name=regltSeCode]').prop('disabled', false); + $('#fldRegltSeCode').show(); break; case 1: $('#btnExtrRegist').hide(); $('#btnImpose').show(); $('#btnAnswer').hide(); $('#regltProcessSttusCode').show(); - $('input:radio[name=regltSeCode]').prop('disabled', false); + $('#fldRegltSeCode').show(); break; case 2: $('#btnExtrRegist').hide(); $('#btnImpose').hide(); $('#btnAnswer').show(); $('#regltProcessSttusCode').hide(); - $('input:radio[name=regltSeCode]').val('09').prop('checked', true); - $('input:radio[name=regltSeCode]').prop('disabled', true); + $('#fldRegltSeCode').hide(); break; } } + ,setDblClickEvent: function (idx) { + ARR_GRID[idx].on('dblclick', function (props) { + curClickColName = 'vhcleNo'; + const rowDatas = ARR_GRID[idx].store.data.rawData.map(d => { + return {regltSeCode: d.regltSeCode, regltId: d.regltId, regltProcessSttusCode: d.regltProcessSttusCode} + }) + ARR_NAV[idx] = new PageNavigation(ARR_GRID[idx], rowDatas, props.rowKey); + fnBiz.pagePopup('total', ARR_NAV[idx].gridInfo.curRowData); + }); + } }; const fnTab0Biz = { @@ -341,19 +349,19 @@ Date Author Description minWidth: 100, sortable: false, align: 'center', - renderer: { - type: CustomButtonRenderer, - options: { - formatter: (props)=>{ - return { - formatter: props.grid.getRow(props.rowKey).vhcleNo - ,element: "text" - } - } - ,eventFunction: fnBiz.onClickGrid - ,eventType: "click" - } - } + // renderer: { + // type: CustomButtonRenderer, + // options: { + // formatter: (props)=>{ + // return { + // formatter: props.grid.getRow(props.rowKey).vhcleNo + // ,element: "text" + // } + // } + // ,eventFunction: fnBiz.onClickGrid + // ,eventType: "dblclick" + // } + // } }, { header: '신고자', @@ -479,7 +487,7 @@ Date Author Description frozenCount: 5 } ,pageOptions: { - perPage: 1000 + perPage: 2 } }; @@ -508,11 +516,15 @@ Date Author Description else fnBiz.pagePopup('detail', ARR_NAV[idx].gridInfo.curRowData); }) } + fnBiz.setDblClickEvent(idx); } const initGrid = () => { - ARR_GRID[0] = TuiGrid.of(gridOptions, gridDatasource, (res) => gridResposeSet(res, 0)) - ARR_GRID[1] = TuiGrid.of({...gridOptions, el: 'grid_t1', rowHeaders: ['checkbox','rowNum']}, gridDatasource, (res) => gridResposeSet(res, 1)) - ARR_GRID[2] = TuiGrid.of({...gridOptions, el: 'grid_t2', rowHeaders: ['checkbox','rowNum']}, gridDatasource, (res) => gridResposeSet(res, 2)) + ARR_GRID[0] = TuiGrid.of(gridOptions, gridDatasource, (res) => gridResposeSet(res, 0)); + const options = $.extend(gridOptions, gridOptions.columns[1].renderer = null, true); + //const options = {...gridOptions} + //options.columns[1].renderer = null; + ARR_GRID[1] = TuiGrid.of({...options, el: 'grid_t1', rowHeaders: ['checkbox','rowNum']}, gridDatasource, (res) => gridResposeSet(res, 1)) + ARR_GRID[2] = TuiGrid.of({...options, el: 'grid_t2', rowHeaders: ['checkbox','rowNum']}, gridDatasource, (res) => gridResposeSet(res, 2)) }; /************************************************************************** diff --git a/src/main/webapp/resources/framework/css/cmmn/common-style.css b/src/main/webapp/resources/framework/css/cmmn/common-style.css index 68d75192..0fcf1757 100644 --- a/src/main/webapp/resources/framework/css/cmmn/common-style.css +++ b/src/main/webapp/resources/framework/css/cmmn/common-style.css @@ -1385,12 +1385,12 @@ fieldset { display: block; margin-inline-start: 2px; margin-inline-end: 2px; - padding-block-start: 0.35em; + /*padding-block-start: 0.01em;*/ padding-inline-start: 0.75em; padding-inline-end: 0.75em; - padding-block-end: 0.625em; + padding-block-end: 0.5em; min-inline-size: min-content; - border-width: 2px; + border-width: 1px; border-style: groove; border-color: rgb(192, 192, 192); border-image: initial; @@ -1401,6 +1401,7 @@ legend { padding: 3px 6px; position: inherit; font-size: 12px; + font-weight: bold; letter-spacing: -0.6px; } /*단속현황관리- 메인폼 (시스템구분,단속구분) 디자인 추가*/