diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp index d695e43..bda9cbc 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp @@ -157,8 +157,7 @@
-
+
@@ -305,7 +304,8 @@ $(document).ready(function(){ ctrl.dataset.onSort = sorter => { let t = $P.getGridTemplate(), trs = Apply.fromDataset.getTbody(ctrl.dataset, t.found, t.notFound, t.replacer); - $P.renderCrdnList(ctrl.dataset.totalSize, ctrl.dataset.length, trs); + if (sorter.by) + $P.renderCrdnList(ctrl.dataset.totalSize, ctrl.dataset.length, trs); document.querySelectorAll("div[data-doctx='${pageName}'] table[name='crdnTable'] th[data-sort]").forEach(th => { th.classList.remove( @@ -501,9 +501,10 @@ $(document).ready(function(){ } $P.renderCrdnList = (total, listLength, trs, option) => { + debug("renderCrdnList"); let noMore = (listLength >= total); let initScroll = (ctrl.query.pageNum < 2); - if (option != null && option.reloaded){ + if (option && option.reloaded){ initScroll = false; } diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08010-main.jsp index ae42195..aa23772 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08010-main.jsp @@ -122,7 +122,9 @@ $(document).ready(function(){ ctrl.dataset.onSort = sorter => { let t = $P.getGridTemplate(), trs = Apply.fromDataset.getTbody(ctrl.dataset, t.found, t.notFound, t.replacer); - $P.renderExmptnVhclList(ctrl.dataset.totalSize, ctrl.dataset.length, trs); + + if (sorter.by) + $P.renderExmptnVhclList(ctrl.dataset.totalSize, ctrl.dataset.length, trs); document.querySelectorAll("div[data-doctx='${pageName}'] table[name='exmptnVhclTable'] th[data-sort]").forEach(th => { th.classList.remove( diff --git a/src/sql/xit-fims-mariadb.sql b/src/sql/xit-fims-mariadb.sql index 7b6fa3d..4ce4206 100644 --- a/src/sql/xit-fims-mariadb.sql +++ b/src/sql/xit-fims-mariadb.sql @@ -722,6 +722,7 @@ CREATE OR REPLACE TABLE TB_CRDN_ADI ( CRDN_ID VARCHAR(20) NOT NULL COMMENT '단속 ID', CRDN_SE_CD VARCHAR(2) NULL COMMENT '단속 구분 코드', TEAM_ID VARCHAR(10) NULL COMMENT '조 ID', + EQP_CD VARCHAR(3) NULL COMMENT '장비 코드', DTL_CRDN_PLC VARCHAR(300) NULL COMMENT '상세 단속 장소', CRDN_SPAREA_CD VARCHAR(2) NULL COMMENT '단속 특별구역 코드', CRDN_BGNG_TM VARCHAR(6) NULL COMMENT '단속 시작 시각',