
@@ -1896,14 +1897,53 @@
var temp = window.showModalDialog(url, obj, "dialogWidth=760px;dialogHeight=500px");
}
- function isIE() {
+ function isIE(value) {
+ var vals = value || '';
if(!!window.ActiveXObject || "ActiveXObject" in window){
- return true;
+ if(vals !== ''){
+ var DEFAULT_VERSION = 8.0;
+ var ua = navigator.userAgent.toLowerCase();
+ var safariVersion = ua.match(/msie ([\d.]+)/) || '';
+ if(safariVersion == ''){
+ return false;
+ }
+ if(safariVersion[1] <= DEFAULT_VERSION ){
+ return true;
+ }else {
+ return false;
+ }
+ }
+
+ return true;
}else{
- return false;
+ return false;
}
}
+ function getRatio(){
+ var ratio=0;
+ var ratio=0;
+ var screen=window.screen;
+ var ua=navigator.userAgent.toLowerCase();
+
+ if(window.devicePixelRatio !== undefined){
+ ratio=window.devicePixelRatio;
+ }else if(~ua.indexOf('msie')){
+ if(screen.deviceXDPI && screen.logicalXDPI)
+ {
+ ratio=screen.deviceXDPI/screen.logicalXDPI;
+ }
+ }else if(window.outerWidth !== undefined && window.innerWidth !== undefined){
+ ratio=window.outerWidth/window.innerWidth;
+ }
+
+ if(ratio){
+ ratio=Math.round(ratio*100);
+ }
+
+ return ratio;
+ }
+
function ChangeRatio(type){
var ratio=0;
var screen=window.screen;
@@ -1943,75 +1983,100 @@
return parseInt(value);
}
-
var screenWidth = ChangeRatio('width');
- var screenHeight = ChangeRatio('height');
-
+ var screenHeight = ChangeRatio('height')-40;
if(screenWidth < 1030){
$('.wait_item,.his_item').css({'height':'1130px'});
$('.wait_item .scroll,.his_item .scroll').css({'height':'970px'});
$('.wait_item .sum,.his_item .page').css('bottom','0px');
$('.mbody_02').css('width','1920px');
+ if(isIE()){
+ $('.wait_item,.his_item').css({'height':'1100px','top':'175px'});
+ $('.wait_item .scroll,.his_item .scroll').css({'height':'940px'});
+ $('.mbody_02').css({'zoom':0.507*(105/getRatio()),'height':'1350px'});
+ if(isIE(8)){
+ $('.wait_item,.his_item').css({'height':'1100px','top':'175px'});
+ $('.wait_item .scroll,.his_item .scroll').css({'height':'940px'});
+ }
+ }
}else if(screenWidth>1270 && screenWidth<1300){
if(screenHeight<730){
$('.wait_item,.his_item').css({'height':'860px'});
$('.wait_item .scroll,.his_item .scroll').css({'height':'700px'});
$('.wait_item .sum,.his_item .page').css('bottom','0px');
$('.mbody_02').css('width','2030px');
if(isIE()){
- $('.wait_item,.his_item').css({'height':'890px'});
- $('.wait_item .scroll,.his_item .scroll').css({'height':'730px'});
+ $('.mbody_02').css({'zoom':0.6*(105/getRatio()),'height':'1080px'});
}
}else if(screenHeight>790 && screenHeight<810){
$('.wait_item,.his_item').css({'height':'900px'});
$('.wait_item .scroll,.his_item .scroll').css({'height':'740px'});
$('.wait_item .sum,.his_item .page').css('bottom','10px');
$('.mbody_02').css('width','1920px');
if(isIE()){
- $('.mbody_02').css({'height':'1140px'});
- $('.wait_item,.his_item').css({'height':'940px','top':'138px'});
- $('.wait_item .scroll,.his_item .scroll').css({'height':'780px'});
- $('.wait_item .sum,.his_item .page').css('bottom','0px');
+ $('.wait_item,.his_item').css({'height':'930px','top':'130px'});
+ $('.wait_item .scroll,.his_item .scroll').css({'height':'770px'});
+ $('.mbody_02').css({'zoom':0.634*(105/getRatio()),'height':'1110px'});
+ if(isIE(8)){
+ $('.wait_item,.his_item').css({'height':'930px','top':'135px'});
+ $('.wait_item .scroll,.his_item .scroll').css({'height':'770px'});
+ }
}
}else {
$('.wait_item,.his_item').css({'height':'1270px'});
$('.wait_item .scroll,.his_item .scroll').css({'height':'1100px'});
$('.wait_item .sum,.his_item .page').css('bottom','10px');
$('.mbody_02').css('width','1920px');
+ if(isIE()){
+ $('.wait_item,.his_item').css({'height':'1240px','top':'195px'});
+ $('.wait_item .scroll,.his_item .scroll').css({'height':'1080px'});
+ $('.mbody_02').css({'zoom':0.634*(105/getRatio()),'height':'1500px'});
+ if(isIE(8)){
+ $('.wait_item,.his_item').css({'height':'1240px','top':'195px'});
+ $('.wait_item .scroll,.his_item .scroll').css({'height':'1080px'});
+ }
+ }
}
}else if(screenWidth>1350 && screenWidth<1370){
- $('.wait_item,.his_item').css({'height':'870px'});
+ $('.wait_item,.his_item').css({'height':'870px','top': '130px'});
$('.wait_item .scroll,.his_item .scroll').css({'height':'710px'});
$('.wait_item .sum,.his_item .page').css('bottom','0px');
- $('.mbody_02').css('width','2025px');
+ $('.mbody_02').css({'width':'2025px'});
if(isIE()){
- $('.wait_item,.his_item').css({'height':'890px'});
+ $('.wait_item,.his_item').css({'height':'900px','top': '128px'});
+ $('.wait_item .scroll,.his_item .scroll').css({'height':'740px'});
+ $('.mbody_02').css('zoom',0.641*(105/getRatio()));
}
}else if(screenWidth>1390 && screenWidth<1450){
$('.wait_item,.his_item').css({'height':'890px'});
$('.wait_item .scroll,.his_item .scroll').css({'height':'730px'});
$('.wait_item .sum,.his_item .page').css('bottom','0px');
- $('.mbody_02').css('width','1920px');
+ $('.mbody_02').css({'width':'1920px'});
if(isIE()){
- $('.mbody_02').css({'height':'1140px'});
- $('.wait_item,.his_item').css({'height':'920px','top':'138px'});
+ $('.wait_item,.his_item').css({'height':'940px','top':'135px'});
$('.wait_item .scroll,.his_item .scroll').css({'height':'780px'});
- $('.wait_item .sum,.his_item .page').css('bottom','-20px');
+ $('.mbody_02').css({'zoom':0.715*(105/getRatio()),'height':'1140px'});
+ if(isIE(8)){
+ $('.wait_item,.his_item').css({'height':'940px','top':'140px'});
+ $('.wait_item .scroll,.his_item .scroll').css({'height':'780px'});
+ }
}
}else if(screenWidth>1590 && screenWidth<1610){
- $('.wait_item,.his_item').css({'height':'870px'});
- $('.wait_item .scroll,.his_item .scroll').css({'height':'710px'});
+ $('.wait_item,.his_item').css({'height':'890px','top':'130px'});
+ $('.wait_item .scroll,.his_item .scroll').css({'height':'730px'});
$('.wait_item .sum,.his_item .page').css('bottom','0px');
$('.mbody_02').css('width','2010px');
if(isIE()){
- $('.wait_item,.his_item').css({'height':'890px'});
- $('.wait_item .scroll,.his_item .scroll').css({'height':'730px'});
+ $('.mbody_02').css('zoom',0.76*(105/getRatio()));
}
}else if(screenWidth>1910 && screenWidth<1930){
- $('.wait_item,.his_item').css({'height':'890px'});
+ $('.wait_item,.his_item').css({'height':'890px','top':'130px'});
$('.wait_item .scroll,.his_item .scroll').css({'height':'730px'});
$('.wait_item .sum,.his_item .page').css('bottom','0px');
$('.mbody_02').css('width','2000px');
+ if(isIE()){
+ $('.mbody_02').css('zoom',0.915*(105/getRatio()));
+ }
}
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
===================================================================
diff -u -r27823 -r27854
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 27823)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 27854)
@@ -51,11 +51,27 @@
-
+
-
-
<%
String orgUnitCoding = AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig();
String orgUnitName = AcegiHelper.getLoginUser().getCurrentOrgUnitName();
@@ -235,7 +242,6 @@
//layer.alert('layer皮肤-myskin');
-document.write('');
$(document).ready(function() {
if (notInWhiteList(sstsConfig, 'tousseSplitRecycle')) {
$("#customIntoBasketDiv").hide();
@@ -338,14 +344,6 @@
*{
font-size: 23px;
}
- .bgImg {
- width: 100%;
- height: 100%;
- position: absolute;
- left: 0;
- top: 0;
- z-index: -1;
- }
#scanContainerBarcodeTipUl {
height: 99%;
}
@@ -364,12 +362,10 @@
.mbody .btn-h,.mbody .btn-h:hover {
margin: 0px !important;
}
-
-
-