Index: ssts-web/src/main/webapp/dx-disinfectsystem/css/recyclingApplication/recyclingApplication.css =================================================================== diff -u -r24683 -r24924 --- ssts-web/src/main/webapp/dx-disinfectsystem/css/recyclingApplication/recyclingApplication.css (.../recyclingApplication.css) (revision 24683) +++ ssts-web/src/main/webapp/dx-disinfectsystem/css/recyclingApplication/recyclingApplication.css (.../recyclingApplication.css) (revision 24924) @@ -1,5 +1,5 @@ -#page{ - margin-left: 10px; +body{ + background-color:#F5F5F5; } .content-header{ @@ -18,29 +18,37 @@ } /*标题--title*/ .modal-header{ - background-color: #693; + background-color: #23b051; color: white; border-top-left-radius: 6px; border-top-right-radius: 6px; } /*主要按钮栏*/ .content-toolbar-container{ - border-bottom:1px solid #dadada; + /* border-bottom:1px solid #dadada; */ /*margin-bottom: 10px;*/ /*padding-right: 30px;*/ padding-bottom: 4px; padding-top: 4px; - border-bottom:1px solid dimgray; + margin-left:20px; + margin-top:7px; + /* border-bottom:1px solid dimgray; */ } .content-search{ + margin:10px; + background-color:white; padding-top: 5px; padding-bottom: 2px; - border-bottom:1px solid dimgray; - /*margin-bottom: 10px;*/ + border-radius: 10px } +.content-search-title{ + border-bottom:1px solid #F5F5F5; + color:#57cc5d; + font-size:12px; +} #toolbar_table{ margin-left: 10px; } @@ -49,11 +57,11 @@ padding:0; padding-right: 4px; /*background-color: none;*/ - background-color: #73B043; + background-color: #57cc5d; } .panel-default > .panel-heading{ - border-color:#73B043; - background-color:#73B043; + border-color:#57cc5d; + background-color:#57cc5d; } /*.panel-default{ margin-top: 10px; @@ -75,6 +83,7 @@ /*border-color: #2BA245;*/ border-color: #73B043; } + .field{ padding: 0px; margin-right: 0px; @@ -87,6 +96,7 @@ #table td{ padding:0; } + .s21-col-xs-2{ padding-right: 0px; padding-left: 30px; @@ -124,16 +134,20 @@ } .content-table{ - position: absolute; - /* bottom: 50px; */ - left: 0; - right: 0; +/* position: absolute; + */ /* bottom: 50px; */ + /* left: 0; + right: 0; */ /* top: 148px; */ + padding:15px; + border-radius: 10px } .content-modal-tousse-modal-footer{ - margin-top:15px; - margin-bottom:15px; + margin-top:6px; + margin-bottom:6px; +/* width:350px; + margin:0 auto; */ } .table_div{ @@ -150,6 +164,7 @@ .search-more-body-label{ text-align:left; } + .fixed-table-pagination{ position: fixed; bottom: 120px; @@ -169,13 +184,9 @@ .fixed-table-toolbar{ background-color:#C6E3CA; } -.content-search{ - background-color:#C6E3CA; -} -.content-toolbar-container{ - background-color:#C6E3CA; -} + + /* .select2-search__field{ height:auto; } @@ -193,9 +204,6 @@ margin-bottom: 8px !important; } -.content-modal-tousse-modal-footer{ - margin-top: 0 !important; -} /*解决外来器械‘添加’按钮添加二字显示不出*/ .foreignTousse-add{ @@ -219,9 +227,151 @@ font-size:10px; } */ +.table-container{ + height:600px; + /* width:1920px; */ +} +.table-container{ + height:600px; + /* width:1920px; */ +} +.table-container1{ + height:710px; + /* width:1920px; */ +} +/* 器械包申请单类型 背景颜色 */ +.green{ + background-color: #7ae271; +} +.blue{ + background-color:#7ae271; +} +.gray{ + background-color:#7ae271; +} +/* slick.grid分页模块 begin */ + + .s-page li{ + list-style: none; + float: left; + } + .page-footer-left{ + margin-left:20px; + margin-top:20px; + display: inline-block; + } + + .page-footer-right{ + margin-right:20px; + margin-top:12px; + height: 30px; + display: inline-block; + float: right; + } + + .page-next a,.page-number a,.page-pre a,.page-more a{ + margin-top: 2px; + margin-left:4px; + margin-right:4px; + padding: 6px 12px; + position: relative; + float: left; + margin-left: -1px; + line-height: 1.42857143; + color: balck; + text-decoration: none; + background-color: #F5F5F5; + border-radius: 5px + + } + +.page-footer{ + /* height: 50px; */ + /* background-color: white; */ + position: fixed; + /* bottom: 160px; */ + left: 0; + right: 0; +} + +.activation{ + background-color: #57cc5d !important; + color:white !important; +} + +/* slick.grid分页模块 结束 */ + + +.tousse_table{ + border:1px gray solid; + height:300px; + width:800px; + margin-left:60px; +} + +.alone{ + display:block; + margin-top:-40px; +} + +.global-search{ + width:15%; + display:inline-block; +} +.reallyHidden { display: none !important;} + +.cont{ + background-color:white; + height:660px; + margin: 10px; + border-radius:15px; +} + +.search-btns{ + width:250px; + margin:10px auto; + +} + +.search-inputs{ + height:40px; +} + +.content-search-label{ + line-height:25px; + +} +.page-footer{ + padding-left:20px; +} + +/* 父子表字段隐藏 */ +.reallyHidden { display: none !important;} + +.application_details_show{ + display:block; + position:absolute; + z-index:1000; +} + +.application_details_hide{ + display:none; +} + +.application_details_table,.application_details_table th,.application_details_table tr{ + text-align:center; + opacity:1; + background-color:#7ae271; + border:1px solid black; +} + +.foreign_application_table{ + height:250px; + border: 1px gray solid; +}