diff --git a/src/main/resources/mybatisMapper/EquipMapper.xml b/src/main/resources/mybatisMapper/EquipMapper.xml index 50881d1f..02080c29 100644 --- a/src/main/resources/mybatisMapper/EquipMapper.xml +++ b/src/main/resources/mybatisMapper/EquipMapper.xml @@ -17,6 +17,7 @@ cnt_pyeongtaek+ cnt_taean+ cnt_boryeong+ + cnt_seotd+ cnt_west+ cnt_mokpo+ cnt_buan+ @@ -29,6 +30,7 @@ cnt_changwon+ cnt_tongyong+ cnt_sacheon+ + cnt_jungtd+ cnt_east+ cnt_sokcho+ cnt_donghe+ @@ -43,6 +45,7 @@ sum(cnt_pyeongtaek) as cnt_pyeongtaek, sum(cnt_taean) as cnt_taean, sum(cnt_boryeong) as cnt_boryeong, + sum(cnt_seotd) as cnt_seotd, sum(cnt_west) as cnt_west, sum(cnt_mokpo) as cnt_mokpo, sum(cnt_buan) as cnt_buan, @@ -55,6 +58,7 @@ sum(cnt_changwon) as cnt_changwon, sum(cnt_tongyong) as cnt_tongyong, sum(cnt_sacheon) as cnt_sacheon, + sum(cnt_jungtd) as cnt_jungtd, sum(cnt_east) as cnt_east, sum(cnt_sokcho) as cnt_sokcho, sum(cnt_donghe) as cnt_donghe, @@ -171,7 +175,15 @@ case when b.mgt_organ = 'OG026' then b.item_qty else 0 - end as cnt_seoguipo + end as cnt_seoguipo, + case + when b.mgt_organ = 'OG027' then b.item_qty + else 0 + end as cnt_seotd, + case + when b.mgt_organ = 'OG028' then b.item_qty + else 0 + end as cnt_jungtd from (select category_cd, item_cd, item_value diff --git a/src/main/resources/static/css/common.css b/src/main/resources/static/css/common.css index 1b428011..4f83a0bc 100644 --- a/src/main/resources/static/css/common.css +++ b/src/main/resources/static/css/common.css @@ -84,6 +84,9 @@ .pl-15{ padding-left: 15%; } +.pl-23{ + padding-left: 23%; +} .display-none{ display:none } \ No newline at end of file diff --git a/src/main/resources/static/js/equip/equip.js b/src/main/resources/static/js/equip/equip.js index 6795c905..36c30aff 100644 --- a/src/main/resources/static/js/equip/equip.js +++ b/src/main/resources/static/js/equip/equip.js @@ -1,5 +1,4 @@ - $(document).ready(function(){ $(".table_id").each(function(){ var rows = $(".table_id:contains('"+$(this).text()+"')"); @@ -12,8 +11,6 @@ $(document).ready(function(){ }); - - $(document).on('click', '#addEquip', function (){ $.ajax({ url: '/equip/equipEditModal', @@ -120,7 +117,7 @@ function showUpdateModal(equKey){ type: 'GET', dataType:"html", success: function(html){ - $("#configEqu").empty().append(html) + $("#equipEditModalContent").empty().append(html) $("#equipModifyModal").modal('show'); $(".mStoredYear").datepicker({ minViewMode: 'years', @@ -136,6 +133,7 @@ function showUpdateModal(equKey){ $(document).on('click', '#addImgBtn', function (){ $("#imgUpload").remove(); + $("#addImgBtn").hide(); $("#imgUpdate").show(); }) @@ -144,6 +142,7 @@ function deleteImg(equKey,versionNo){ $('#equipModifyForm').append('', ''); $("#imgUpload").remove(); + $("#deleteImgBtn").hide(); $("#imgUpdate").show(); } diff --git a/src/main/resources/templates/equip/cellPhoneEditModal.html b/src/main/resources/templates/equip/cellPhoneEditModal.html index d9f1bc62..729d936f 100644 --- a/src/main/resources/templates/equip/cellPhoneEditModal.html +++ b/src/main/resources/templates/equip/cellPhoneEditModal.html @@ -85,22 +85,16 @@ \ No newline at end of file diff --git a/src/main/resources/templates/equip/cellPhoneList.html b/src/main/resources/templates/equip/cellPhoneList.html index 753330fc..d827c42e 100644 --- a/src/main/resources/templates/equip/cellPhoneList.html +++ b/src/main/resources/templates/equip/cellPhoneList.html @@ -26,16 +26,19 @@
-
- -
- +
- - +
+
+ +
+
+ +
+
@@ -101,7 +104,7 @@
- +
@@ -129,16 +132,16 @@
- +
diff --git a/src/main/resources/templates/equip/equipModifyModal.html b/src/main/resources/templates/equip/equipModifyModal.html index c31ef417..986fc4de 100644 --- a/src/main/resources/templates/equip/equipModifyModal.html +++ b/src/main/resources/templates/equip/equipModifyModal.html @@ -72,27 +72,31 @@ -
+
- - -
+
+
+ + +
\ No newline at end of file diff --git a/src/main/resources/templates/equip/equipStatus.html b/src/main/resources/templates/equip/equipStatus.html index a1bc652d..a0f53ab1 100644 --- a/src/main/resources/templates/equip/equipStatus.html +++ b/src/main/resources/templates/equip/equipStatus.html @@ -23,7 +23,7 @@
-
+
@@ -39,14 +39,13 @@ - - - - + + + @@ -56,6 +55,7 @@ + @@ -68,6 +68,7 @@ + @@ -80,7 +81,6 @@ - @@ -90,6 +90,7 @@ + @@ -102,6 +103,7 @@ + diff --git a/src/main/resources/templates/equip/pvreUseList.html b/src/main/resources/templates/equip/pvreUseList.html index dbbb9151..921aa48e 100644 --- a/src/main/resources/templates/equip/pvreUseList.html +++ b/src/main/resources/templates/equip/pvreUseList.html @@ -14,7 +14,7 @@
- +
@@ -24,6 +24,11 @@
+
+ +
+
+
@@ -60,8 +65,7 @@
- - +
diff --git a/src/main/resources/templates/equip/qirUseList.html b/src/main/resources/templates/equip/qirUseList.html index 9145fc74..9f6af868 100644 --- a/src/main/resources/templates/equip/qirUseList.html +++ b/src/main/resources/templates/equip/qirUseList.html @@ -24,6 +24,11 @@
+
+ +
+
+
@@ -60,8 +65,7 @@
- - +
@@ -126,7 +130,7 @@
- +
diff --git a/src/main/resources/templates/equip/useEditModal.html b/src/main/resources/templates/equip/useEditModal.html index ce7a03d6..3d37b623 100644 --- a/src/main/resources/templates/equip/useEditModal.html +++ b/src/main/resources/templates/equip/useEditModal.html @@ -11,14 +11,14 @@
-
연번 분류 세부분류 총계 본청중부서해남해중부서해남해 동해 제주
평택서 태안서 보령서서특단 목포서 부안서창원서 통영서 사천서중특단 속초서 동해서