Index: ssts-web/src/main/webapp/dx-disinfectsystem/css/index/index.css =================================================================== diff -u -r24844 -r24943 --- ssts-web/src/main/webapp/dx-disinfectsystem/css/index/index.css (.../index.css) (revision 24844) +++ ssts-web/src/main/webapp/dx-disinfectsystem/css/index/index.css (.../index.css) (revision 24943) @@ -1,9 +1,14 @@ body{ - background:url("../../img/bg.jpg"); - background-repeat: no-repeat; - background-position: top right; - background-color: #337b47; + background-image:url("../../img/newbg.png"); + background-repeat: no-repeat; + background-position: 90px left; font-size:15px; + background-size: cover; + -ms-background-size:cover; + -webkit-background-size:cover; + -ms-filter:"progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/dx-disinfectsystem/img/newbg.png',sizingMethod='scale')"; + filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/dx-disinfectsystem/img/newbg.png',sizingMethod='scale'); + overflow: hidden; } a:hover{text-decoration: none;} html { overflow-y: auto;} @@ -79,10 +84,12 @@ } /*首页头部start */ .head-index{ - height:87px; + height: 55px; + background:#1faf51; + padding:0px 29px; } .head-index .head-index-left{ - height:87px; + height: 55px; /* line-height: 87px; */ } .common-bg{ @@ -231,10 +238,11 @@ display: inline-block; } .content-index-nav-wrapper{ - background: #d6d6d6; + background: #1faf51; margin-right: 0; margin-left: 0; } +.nav-tabs{border:none;} .content-index-icon{ margin-top: 3px; float: right; @@ -254,32 +262,33 @@ padding-left: 8px; } .content-index .content-index-nav-title li.active{ - background: url(../../img/img7.gif) repeat-x !important; + background: url(../../img/btn-icon.png) repeat-x !important; } .content-index .content-index-nav-title li{ - height: 33px; + height: 39px; width: 103px; margin-left:4px; - background: url(../../img/img8.gif) repeat-x !important; + + /* background:url(../../img/btn-icon.png) repeat-x !important; */ + /* background: url(../../img/img8.gif) repeat-x !important; */ } .content-index .content-index-nav-title li a{ display:block; - width: 103px; - height:35px; + width: 103px; + line-height: 25px; text-align: center; - color:#000; + color:#fff; background-color:none!important; padding-right:0px !important; padding-left:0px !important; font-size: 15px; } -.content-index .content-index-nav-title li a:hover{ - color:#596e95 !important; -} +/* .content-index .content-index-nav-title li a:hover{ + color:#31b546 !important; +} */ .content-index .content-index-nav-title li.active a{ - color:#000; - font-weight: bold; + color:#28b353; background-color:none!important; border:none !important; } @@ -300,36 +309,53 @@ height:86px; } .content-index .content-index-tab-col-mb20 .content-index-tab-icon-text { - background: url(../../img/icon_text_l.png) no-repeat scroll 0 0 transparent; + width:86px; + padding:0px 1px; + height:28px; + line-height:28px; + background:#2cb04e; + position: relative; + z-index: 1000; + -ms-border-radius: 19px ; + -webkit-border-radius: 19px; + border-radius:19px; + behavior: url(/dx-disinfectsystem/pages/disinfectsystem/PIE.htc); + text-align: center; + color:#fff; + font-family: "宋体"; + font-size: 14px; + /* background: url(../../img/left.png) no-repeat; cursor: pointer; display: inline-block; - height: 20px; + height: 28px; margin-top: 3px; - padding-left: 10px; + padding-left: 11px; */ } .content-index .content-index-tab-col-mb20 .content-index-tab-icon-text span { - background: url(../../img/icon_text_r.png) no-repeat scroll right center transparent; - color: #FFFFFF; - display: inline-block; - height: 20px; - line-height: 20px; - padding: 0 10px 0 0; - font-family: "宋体"; - font-size: 14px; + /* background: url(../../img/right.png) no-repeat right center; + color: #FFFFFF; + display: inline-block; + height: 28px; + line-height: 28px; + padding: 0 0px 0 0px; + font-family: "宋体"; + font-size: 14px; */ } .content-index-nav-title .close-tab{ position: absolute; font-size: 1px; display: block; padding: 0px; - width: 11px; - height: 11px; - top: 3px; - right: 3px; + width: 18px; + height: 18px; + top: 5px; + right: 5px; opacity: 0.6; + filter: alpha(opacity=60); - background: url(../../img/tabs_close.gif) no-repeat; + /* background: url(../../img/tabs_close.gif) no-repeat; */ + background-position: 5px -46px; cursor:pointer; } @@ -338,7 +364,7 @@ display: none; position: absolute; background-color:#fff; - z-index: 2; + z-index: 2000; list-style: none; border:1px solid #ccc; } Index: ssts-web/src/main/webapp/dx-disinfectsystem/img/newbg.png =================================================================== diff -u Binary files differ Index: ssts-web/src/main/webapp/dx-disinfectsystem/img/right.png =================================================================== diff -u Binary files differ Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/slickGridRecord.js =================================================================== diff -u -r24938 -r24943 --- ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/slickGridRecord.js (.../slickGridRecord.js) (revision 24938) +++ ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/slickGridRecord.js (.../slickGridRecord.js) (revision 24943) @@ -893,6 +893,8 @@ data:{barcode:$(this).val()}, success:function(data){ var database =data.data + console.log("database",database); + console.log("id",database.barcode); if(data.success===true){ var databaseGood ={id:database.barcode}; $.each(database,function(k,v){ Index: ssts-web/src/main/webapp/dx-disinfectsystem/img/left.png =================================================================== diff -u Binary files differ Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/index.jsp =================================================================== diff -u -r24803 -r24943 --- ssts-web/src/main/webapp/dx-disinfectsystem/pages/index.jsp (.../index.jsp) (revision 24803) +++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/index.jsp (.../index.jsp) (revision 24943) @@ -31,8 +31,17 @@ - - + + + +
@@ -41,7 +50,7 @@ --> -