Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r28022 -r28038
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 28022)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 28038)
@@ -3827,10 +3827,20 @@
}
var endCase = openModalWindowForExt(WWWROOT+"/disinfectsystem/recyclingApplication/selectEndCause.jsp", '','请选择终止原因', "760", "400");
-
- if(endCase == undefined){
- return;
- }else {
+ var htmlHeight = $('html').height();
+ var htmlWidth = $('html').width();
+ var body_height = parseInt(htmlHeight/getZoom(1920,1080));
+ var body_width = parseInt(htmlWidth/getZoom(1920,1080));
+ var left = parseInt((body_width-$('#extWindow').width())/2);
+ var top = parseInt((body_height-$('#extWindow').height())/2);
+
+ $('.ext-el-mask').css({'width':'100%','height':'100%'});
+ $('#extWindow').css({'left':left+'px','top':top+'px'});
+ $('.x-shadow').css({'left':left+'px','top':top+'px'});
+
+ if(endCase == undefined){
+ return;
+ }else {
var loop = setInterval(function() {
if(endCase.hidden) {
clearInterval(loop);
@@ -4000,6 +4010,7 @@
var actualWidth = window.screen.availWidth;
var actualHeight = window.screen.availHeight;
var offsetTop = 100;
+ var offsetLeft = '';
var heightExtra = 10;
if(resolution == '1980'){
width = 1380;
@@ -4008,69 +4019,66 @@
var zoomRatio = calculateZoomRatio(designedWidth,designedHeight,actualWidth,actualHeight);
var size = calculateSizeAfterZoom(designedTousseWidth,designedTousseHeight,zoomRatio);
- var isLessIE11 = navigator.userAgent.indexOf('compatible') > -1 && navigator.userAgent.indexOf('MSIE') > -1;
-
- if(!isLessIE11){
- document.body.style.zoom = 1;
- documentGetElementsByClassName('mbody')[0].style.zoom = zoomRatio;
- }
-
- width = size.width;
- height = size.height;
-
- offsetTop = offsetTop*zoomRatio;
+ if(isIE()){
+ width = size.width;
+ height = size.height;
+ offsetTop = offsetTop*zoomRatio+'px';
+ }else {
+ width = designedTousseWidth;
+ height = designedTousseHeight;
+ offsetTop = offsetTop*zoomRatio+'px';
+ offsetLeft = ((parseInt(size.width/zoomRatio))/2)+'px';
+ }
layerIndex=layer.open({
type : 2,
title : ['添加器械包',true],
content : 'addTousse.jsp?resolution='+resolution+'&width='+width+'&height='+height+'&tousseName='+tousseName,
area : [ width + 'px' , height +heightExtra+ 'px'],
border : [5, 0.3, '#fff', true],
closeBtn : [2 , true],
- offset : [offsetTop+'px','']
+ offset : [offsetTop,offsetLeft]
});
}
//输入备注
function openInputRemark(){
if(!sstsConfig.modifyRemarkInRecycling){
return;
}
- var width = 780;
- var height = 100;
- var designedTousseWidth = 1080;
- var designedTousseHeight = 100;
+ var width = 980;
+ var height = 370;
var designedWidth = 1920;
var designedHeight = 1080;
var actualWidth = window.screen.availWidth;
var actualHeight = window.screen.availHeight;
var offsetTop = 400;
-
- if(resolution == '1980'){
- width = 1380;
- height = 100;
- }
+ var offsetLeft = '';
+ var htmlHeight = $('html').height();
+ var htmlWidth = $('html').width();
+ var body_height = parseInt(htmlHeight/getZoom(1920,1080));
+ var body_width = parseInt(htmlWidth/getZoom(1920,1080));
+
var zoomRatio = calculateZoomRatio(designedWidth,designedHeight,actualWidth,actualHeight);
- var size = calculateSizeAfterZoom(designedTousseWidth,designedTousseHeight,zoomRatio);
+ var size = calculateSizeAfterZoom(width,height,zoomRatio);
- var isLessIE11 = navigator.userAgent.indexOf('compatible') > -1 && navigator.userAgent.indexOf('MSIE') > -1;
+ if(isIE()){
+ width = size.width;
+ height = size.height;
+ offsetTop = offsetTop*zoomRatio+'px';
+ }else {
+ offsetTop = ((body_height-height)/2)+'px';
+ offsetLeft = ((body_width-width)/2)+'px';
+ }
- if(!isLessIE11){
- document.body.style.zoom = 1;
- documentGetElementsByClassName('mbody')[0].style.zoom = zoomRatio;
- }
-
- var width = 980;
- var height = 330;
var heightExtra = 10;
- offsetTop = offsetTop*zoomRatio;
layerIndex=layer.open({
type : 2,
title : ['输入备注',true],
- content : 'inputRemark.jsp?resolution='+resolution+'&width='+width+'&height='+height+'&remark=' + encodeURIComponent($('#remarkText').text()),
+ content : 'inputRemark.jsp?resolution='+resolution+'&remark=' + encodeURIComponent($('#remarkText').text()),
area : [ width + 'px' , height +heightExtra+ 'px'],
border : [5, 0.3, '#fff', true],
closeBtn : [2 , true],
- offset : [offsetTop+'px','']
+ offset : [offsetTop,offsetLeft]
});
}
/**
@@ -4095,6 +4103,7 @@
var actualWidth = window.screen.availWidth;
var actualHeight = window.screen.availHeight;
var offsetTop = 100;
+ var offsetLeft = '';
var heightExtra = 10;
if(resolution == '1980'){
width = 1380;
@@ -4103,25 +4112,25 @@
var zoomRatio = calculateZoomRatio(designedWidth,designedHeight,actualWidth,actualHeight);
var size = calculateSizeAfterZoom(designedTousseWidth,designedTousseHeight,zoomRatio);
- var isLessIE11 = navigator.userAgent.indexOf('compatible') > -1 && navigator.userAgent.indexOf('MSIE') > -1;
-
- if(!isLessIE11){
- document.body.style.zoom = 1;
- documentGetElementsByClassName('mbody')[0].style.zoom = zoomRatio;
- }
+ if(isIE()){
+ width = size.width;
+ height = size.height;
+ offsetTop = offsetTop*zoomRatio+'px';
+ }else {
+ width = designedTousseWidth;
+ height = designedTousseHeight;
+ offsetTop = offsetTop*zoomRatio+'px';
+ offsetLeft = ((parseInt(size.width/zoomRatio))/2)+'px';
+ }
- width = size.width;
- height = size.height;
-
- offsetTop = offsetTop*zoomRatio;
qmLayerIndex=layer.open({
type : 2,
title : ['添加质量监测记录',true],
content : 'addQualityMonitoring.jsp?resolution='+resolution+'&width='+width+'&height='+height,
area : [ width + 'px' , height +heightExtra+ 'px'],
border : [5, 0.3, '#fff', true],
closeBtn : [2 , true],
- offset : [offsetTop+'px','']
+ offset : [offsetTop,offsetLeft]
});
}
function customIntoBasketFun(data){
@@ -4239,6 +4248,7 @@
var actualWidth = window.screen.availWidth;
var actualHeight = window.screen.availHeight;
var offsetTop = 100;
+ var offsetLeft = '';
var heightExtra = 10;
if(resolution == '1980'){
width = 1100;
@@ -4247,25 +4257,25 @@
var zoomRatio = calculateZoomRatio(designedWidth,designedHeight,actualWidth,actualHeight);
var size = calculateSizeAfterZoom(designedTousseWidth,designedTousseHeight,zoomRatio);
- var isLessIE11 = navigator.userAgent.indexOf('compatible') > -1 && navigator.userAgent.indexOf('MSIE') > -1;
+ if(isIE()){
+ width = size.width;
+ height = size.height;
+ offsetTop = offsetTop*zoomRatio+'px';
+ }else {
+ width = designedTousseWidth;
+ height = designedTousseHeight;
+ offsetTop = offsetTop*zoomRatio+'px';
+ offsetLeft = ((parseInt(size.width/zoomRatio))/2)+'px';
+ }
- if(!isLessIE11){
- document.body.style.zoom = 1;
- documentGetElementsByClassName('mbody')[0].style.zoom = zoomRatio;
- }
-
- width = size.width;
- height = size.height;
-
- offsetTop = offsetTop*zoomRatio;
layerIndex=layer.open({
type : 2,
title : ['选择沟通人',true],
content : 'selectUser.jsp?p=p&searchLoginUserDepart=false&resolution='+resolution+'&width='+width+'&height='+height,
area : [ width + 'px' , height +heightExtra+ 'px'],
border : [5, 0.3, '#fff', true],
closeBtn : [2 , true],
- offset : [offsetTop+'px','']
+ offset : [offsetTop,offsetLeft]
});
}
function selectUser(userName,userFullName){
@@ -4342,6 +4352,7 @@
var actualWidth = window.screen.availWidth;
var actualHeight = window.screen.availHeight;
var offsetTop = 100;
+ var offsetLeft = '';
var heightExtra = 10;
if(resolution == '1980'){
width = 1100;
@@ -4350,25 +4361,25 @@
var zoomRatio = calculateZoomRatio(designedWidth,designedHeight,actualWidth,actualHeight);
var size = calculateSizeAfterZoom(designedTousseWidth,designedTousseHeight,zoomRatio);
- var isLessIE11 = navigator.userAgent.indexOf('compatible') > -1 && navigator.userAgent.indexOf('MSIE') > -1;
+ if(isIE()){
+ width = size.width;
+ height = size.height;
+ offsetTop = offsetTop*zoomRatio+'px';
+ }else {
+ width = designedTousseWidth;
+ height = designedTousseHeight;
+ offsetTop = offsetTop*zoomRatio+'px';
+ offsetLeft = ((parseInt(size.width/zoomRatio))/2)+'px';
+ }
- if(!isLessIE11){
- document.body.style.zoom = 1;
- documentGetElementsByClassName('mbody')[0].style.zoom = zoomRatio;
- }
-
- width = size.width;
- height = size.height;
-
- offsetTop = offsetTop*zoomRatio;
layerIndex=layer.open({
type : 2,
title : ['选择科室',true],
content : 'addDepart.jsp?resolution='+resolution+'&width='+width+'&height='+height+"&showDisableOrgUnit=false",
area : [ width + 'px' , height +heightExtra+ 'px'],
border : [5, 0.3, '#fff', true],
closeBtn : [2 , true],
- offset : [offsetTop+'px','']
+ offset : [offsetTop,offsetLeft]
});
}
/**
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/selectUser.jsp
===================================================================
diff -u -r22653 -r28038
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/selectUser.jsp (.../selectUser.jsp) (revision 22653)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/selectUser.jsp (.../selectUser.jsp) (revision 28038)
@@ -11,7 +11,7 @@
-
+
-
+
拼音/五笔 首字母 |
@@ -154,6 +154,11 @@
htmlResultCode += "";
document.getElementById('tousseListDiv').innerHTML = htmlResultCode;
};
-
+
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addTousse.jsp
===================================================================
diff -u -r27506 -r28038
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addTousse.jsp (.../addTousse.jsp) (revision 27506)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addTousse.jsp (.../addTousse.jsp) (revision 28038)
@@ -248,7 +248,7 @@
}
-
+
-
+
拼音/五笔 首字母 |
@@ -343,5 +343,11 @@
+
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addDepart.jsp
===================================================================
diff -u -r27772 -r28038
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addDepart.jsp (.../addDepart.jsp) (revision 27772)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addDepart.jsp (.../addDepart.jsp) (revision 28038)
@@ -28,7 +28,7 @@
showDisableOrgUnit = false;
}
-
+
-
+
拼音/五笔 首字母 |
@@ -232,6 +232,9 @@
htmlResultCode += "";
document.getElementById('tousseListDiv').innerHTML = htmlResultCode;
};
-
+ window.onload = function(){
+ var zoom = getZoom(1920,1080);
+ $('.add-bao').css('zoom',zoom-0.05)
+ }
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addQualityMonitoring.jsp
===================================================================
diff -u -r27759 -r28038
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addQualityMonitoring.jsp (.../addQualityMonitoring.jsp) (revision 27759)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addQualityMonitoring.jsp (.../addQualityMonitoring.jsp) (revision 28038)
@@ -90,4 +90,10 @@
+