diff --git a/src/main/java/com/dbnt/faisp/main/equip/EquipController.java b/src/main/java/com/dbnt/faisp/main/equip/EquipController.java index 92d4bdc1..1d7005a4 100644 --- a/src/main/java/com/dbnt/faisp/main/equip/EquipController.java +++ b/src/main/java/com/dbnt/faisp/main/equip/EquipController.java @@ -127,7 +127,9 @@ public class EquipController { @GetMapping("/historyView") public ModelAndView historyView(Equip equip) { ModelAndView mav = new ModelAndView("equip/equipHistory"); - mav.addObject("equList", equipService.selectHistoryList(equip)); + List equipHistoryList = equipService.selectHistoryList(equip); + mav.addObject("historyList", equipHistoryList.subList(1, equipHistoryList.size())); + mav.addObject("lastVersion", equipService.selectHistoryDetail(equipHistoryList.get(0))); return mav; } diff --git a/src/main/resources/static/js/equip/equip.js b/src/main/resources/static/js/equip/equip.js index 0d9e738f..e4460e35 100644 --- a/src/main/resources/static/js/equip/equip.js +++ b/src/main/resources/static/js/equip/equip.js @@ -298,4 +298,9 @@ $(document).on('click', '.modalCloseBtn', function (){ location.reload(); }) - +$(document).on('click', '.equipTr', function (event){ + if(event.target.className !== "equInfoCheckBox"){ + const chkBox = $(this).find(".equInfoCheckBox")[0]; + chkBox.checked = !chkBox.checked; + } +}) diff --git a/src/main/resources/templates/equip/equipHistory.html b/src/main/resources/templates/equip/equipHistory.html index 1f90ed14..f31f86c4 100644 --- a/src/main/resources/templates/equip/equipHistory.html +++ b/src/main/resources/templates/equip/equipHistory.html @@ -10,7 +10,7 @@
-
+
@@ -20,67 +20,132 @@ - - - - - + + + + + + + + + + + +
- - -
+ + +
수정 이력이 없습니다.
-
-
+
+
+
+
수정이력
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
최신데이터
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ 첨부이미지 +
+
+ +
diff --git a/src/main/resources/templates/equip/equipList.html b/src/main/resources/templates/equip/equipList.html index 582d594c..9e035f7e 100644 --- a/src/main/resources/templates/equip/equipList.html +++ b/src/main/resources/templates/equip/equipList.html @@ -57,7 +57,7 @@ - + @@ -127,7 +127,7 @@