Index: ssts-web/src/main/webapp/dx-disinfectsystem/css/useRecord/index.css =================================================================== diff -u -r24798 -r24802 --- ssts-web/src/main/webapp/dx-disinfectsystem/css/useRecord/index.css (.../index.css) (revision 24798) +++ ssts-web/src/main/webapp/dx-disinfectsystem/css/useRecord/index.css (.../index.css) (revision 24802) @@ -31,7 +31,7 @@ border:0; } a.color_tbody{ - color:#367f21 !important; + color:#42b954 !important; text-decoration:none; cursor:pointer @@ -302,14 +302,14 @@ } .gridBtn{ width: 100%; - height: 70px; - line-height: 70px; + height: 50px; + line-height: 50px; display: inline-block; - background-color: #C6E3CA; + background-color: #f3f3f3; } .gridHead_r{ margin-right:10px; - margin-top: 25px; + margin-top: 12px; } .gridHead_r input{ padding: 2px 10px; @@ -331,5 +331,5 @@ height:200px; } .content_body{ - height:70px; + height:50px; } \ No newline at end of file Index: ssts-web/src/main/webapp/dx-disinfectsystem/plugins/SlickGrid/slick-default-theme.css =================================================================== diff -u -r24760 -r24802 --- ssts-web/src/main/webapp/dx-disinfectsystem/plugins/SlickGrid/slick-default-theme.css (.../slick-default-theme.css) (revision 24760) +++ ssts-web/src/main/webapp/dx-disinfectsystem/plugins/SlickGrid/slick-default-theme.css (.../slick-default-theme.css) (revision 24802) @@ -88,7 +88,7 @@ } .slick-cell.selected { - background-color: beige; + background-color: #d6f0da; } .slick-cell.active { @@ -101,7 +101,7 @@ } .slick-row.odd { - background: #fafafa; + background: #f7f7f7; } .slick-row.ui-state-active { @@ -129,4 +129,8 @@ @-webkit-keyframes slickgrid-invalid-hilite { from { box-shadow: 0 0 6px red; } to { box-shadow: none; } +} +.slick-column-name{ + /*color:#689d61;*/ + font-size: 14px; } \ No newline at end of file Index: ssts-web/src/main/webapp/dx-disinfectsystem/css/common/dingxiang-common.css =================================================================== diff -u -r24734 -r24802 --- ssts-web/src/main/webapp/dx-disinfectsystem/css/common/dingxiang-common.css (.../dingxiang-common.css) (revision 24734) +++ ssts-web/src/main/webapp/dx-disinfectsystem/css/common/dingxiang-common.css (.../dingxiang-common.css) (revision 24802) @@ -48,7 +48,7 @@ text-align: center; line-height: 26px; - height: 34px; + height: 30px; padding: 0 10px; margin: 0; /* margin-left: 10px; */ Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/slickGridRecord.js =================================================================== diff -u -r24798 -r24802 --- ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/slickGridRecord.js (.../slickGridRecord.js) (revision 24798) +++ ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/slickGridRecord.js (.../slickGridRecord.js) (revision 24802) @@ -30,7 +30,9 @@ $(window).trigger('resize').off('resize'); } function calculateGridNewDimensions(gridId, gridContainerId) { - var availableHeight = $(window).height() - $('#' + gridId).offset().top - DATAGRID_BOTTOM_PADDING-$('#pager').height()-window.parent.$(".head-index").height()-window.parent.$(".content-index").height()-$('.gridBtn').height()+90; + // var availableHeight = $(window).height() - $('#' + gridId).offset().top - DATAGRID_BOTTOM_PADDING-$('#pager').height()-window.parent.$(".head-index").height()-window.parent.$(".content-index").height()-$('.gridBtn').height()+10; + var availableHeight = $(window).height() - $('#' + gridId).offset().top - DATAGRID_BOTTOM_PADDING-$('.content_body').height()-window.parent.$(".head-index").height()-window.parent.$(".content-index").height()+40 + var availableWidth = $('#' + gridContainerId).width(); var newHeight = availableHeight; var newWidth = availableWidth;