diff --git a/modules/bmw/src/main/resources/mapper/person/InOutMapper.xml b/modules/bmw/src/main/resources/mapper/person/InOutMapper.xml index 21e871f..238a9cc 100644 --- a/modules/bmw/src/main/resources/mapper/person/InOutMapper.xml +++ b/modules/bmw/src/main/resources/mapper/person/InOutMapper.xml @@ -181,6 +181,7 @@ ORDER BY ein_time DESC ) a group by idNumber + ORDER BY einTime DESC limit #{offset}, #{limit} diff --git a/modules/bmw/src/main/resources/static/js/work/team/JobPointSetting/JobPointList.js b/modules/bmw/src/main/resources/static/js/work/team/JobPointSetting/JobPointList.js index 3ba776d..f248a70 100644 --- a/modules/bmw/src/main/resources/static/js/work/team/JobPointSetting/JobPointList.js +++ b/modules/bmw/src/main/resources/static/js/work/team/JobPointSetting/JobPointList.js @@ -80,18 +80,18 @@ function init() { "dom": "<'dt-toolbar'r>t<'dt-toolbar-footer'<'col-sm-4 col-xs-4 hidden-xs'i><'col-xs-8 col-sm-8' p v>>", "columns": [ { - width: '40px', + width: "3%", data: function (row, type, set, meta) { let c = meta.settings._iDisplayStart + meta.row + 1; return c; } }, - {"data": "teamName", "defaultContent": ""}, - {"data": "subName", "defaultContent": ""}, - {"data": "proName", "defaultContent": ""}, + {"data": "teamName", "defaultContent": "","width":"10%" }, + {"data": "subName", "defaultContent": "","width":"10%"}, + {"data": "proName", "defaultContent": "","width":"15%"}, { "data": "workPointNumber", - "defaultContent": "", + "defaultContent": "","width":"5%", "render": function (data, type, row) { let teamId = row['teamId']; let workPointNumber = row['workPointNumber']; @@ -102,7 +102,7 @@ function init() { }, { "data": "workPointExamNumber", - "defaultContent": "", + "defaultContent": "","width":"5%", "render": function (data, type, row) { let teamId = row['teamId']; let workPointExamNumber = row['workPointExamNumber']; @@ -113,7 +113,7 @@ function init() { }, { "data": "workPointView", - "defaultContent": "", + "defaultContent": "","width":"10%", "render": function (data, type, row) { let teamId = row['id']; let html = ""; diff --git a/modules/bmw/src/main/resources/static/pages/work/team/JobPointSetting/JobPointList.html b/modules/bmw/src/main/resources/static/pages/work/team/JobPointSetting/JobPointList.html index aa853d5..0dfd902 100644 --- a/modules/bmw/src/main/resources/static/pages/work/team/JobPointSetting/JobPointList.html +++ b/modules/bmw/src/main/resources/static/pages/work/team/JobPointSetting/JobPointList.html @@ -14,6 +14,21 @@ height: 30px; display: inline-block; } + /* dataTables列内容居中 */ + .table > tbody > tr > td { + text-align: center; + vertical-align: middle; + } + + /* dataTables表头居中 */ + .table > thead:first-child > tr:first-child > th { + text-align: center; + vertical-align: middle; + } + + .table-bordered > thead > tr > td, .table-bordered > thead > tr > th { + text-align: center; + }