|
|
@@ -1691,6 +1691,10 @@ export default {
|
|
|
marginTop: '22px',
|
|
|
left: '28px'
|
|
|
};
|
|
|
+ if(this.chromeMatch && (this.chromeMatch == 'Chrome/139.0.0.0')) {//11病区,手推车电脑
|
|
|
+ this.removeConditionalPrintCSS()
|
|
|
+ console.log('removeConditionalPrintCSS')
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
// 例如:1366x768
|
|
|
@@ -1713,7 +1717,7 @@ export default {
|
|
|
if(this.marginTop > 38) {
|
|
|
if(this.marginTop < 58) {
|
|
|
containerStyle = {
|
|
|
- marginTop: (this.marginTop + 15) + 'px',//5楼左2 /8楼左1 /十楼左2
|
|
|
+ marginTop: (this.marginTop + 15) + 'px',//5楼左2 /8楼左1 /十楼左2 /11楼左2 /12楼左2 /15楼左2 /
|
|
|
left: '28px'
|
|
|
};
|
|
|
}else {
|
|
|
@@ -1722,6 +1726,11 @@ export default {
|
|
|
marginTop: (this.marginTop + 5) + 'px',
|
|
|
left: '28px'
|
|
|
};
|
|
|
+ }else {
|
|
|
+ containerStyle = {
|
|
|
+ marginTop: (14 - 12) + 'px',//13楼左2
|
|
|
+ left: '28px'
|
|
|
+ };
|
|
|
}
|
|
|
}
|
|
|
console.log("this.marginTop > 38",containerStyle.marginTop)
|
|
|
@@ -1738,7 +1747,7 @@ export default {
|
|
|
left: '28px'
|
|
|
};
|
|
|
}
|
|
|
- }else { //6楼左1 /3楼左2 /5楼左1 /9楼左一 /8楼左2
|
|
|
+ }else { //6楼左1 /3楼左2 /5楼左1 /9楼左一 /8楼左2 /15楼左1
|
|
|
this.applyConditionalPrintAdjustment(37)
|
|
|
containerStyle = {
|
|
|
marginTop: (this.marginTop + 10 + 14) + 'px',
|
|
|
@@ -1821,6 +1830,12 @@ export default {
|
|
|
marginTop: (this.marginTop + 14) + 'px',
|
|
|
left: '28px'
|
|
|
};
|
|
|
+ }else if((this.marginTop == 48) && (window.devicePixelRatio == 1) && (window.innerHeight == 799)) {//11楼左1
|
|
|
+ this.applyConditionalPrintAdjustment(26)
|
|
|
+ containerStyle = {
|
|
|
+ marginTop: (this.marginTop + 14 + 2) + 'px',
|
|
|
+ left: '28px'
|
|
|
+ };
|
|
|
}else {
|
|
|
containerStyle = {
|
|
|
marginTop: this.marginTop + 'px',
|
|
|
@@ -1836,7 +1851,7 @@ export default {
|
|
|
if((window.innerHeight == 712) || (window.innerHeight == 757)) {//九楼左2 (打印偏右半格)有俩个,怀疑是不同版本的谷歌
|
|
|
this.removeConditionalPrintCSS()
|
|
|
}
|
|
|
- if(window.innerHeight == 789) {//6楼左2 /3楼左3 /3楼左5 /10楼左1
|
|
|
+ if(window.innerHeight == 789) {//6楼左2 /3楼左3 /3楼左5 /10楼左1 /12楼左1
|
|
|
if(this.chromeMatch && (this.chromeMatch == 'Chrome/139.0.0.0')) {
|
|
|
this.removeConditionalPrintCSS() //6楼左2
|
|
|
}
|
|
|
@@ -1862,25 +1877,47 @@ export default {
|
|
|
};
|
|
|
console.log("window.innerHeight2222222222",window.innerHeight);
|
|
|
}else {
|
|
|
- pulseStyle = {
|
|
|
- titleMarginTop: '0px',
|
|
|
- firstRowMarginTop: '32px',
|
|
|
- normalRowMarginTop: '55px',
|
|
|
- lastRowMarginTop: '56px'
|
|
|
- };
|
|
|
- temperatureStyle = {
|
|
|
- titleMarginTop: '0px',
|
|
|
- firstRowMarginTop: '32px',
|
|
|
- normalRowMarginTop: '55px',
|
|
|
- lastRowMarginTop: '56px'
|
|
|
- };
|
|
|
- legendStyle = {
|
|
|
- marginTop: '476px'
|
|
|
- };
|
|
|
- containerStyle = {
|
|
|
- marginTop: this.marginTop + 'px',
|
|
|
- left: '28px'
|
|
|
- };
|
|
|
+ if((this.marginTop == 58) && (window.devicePixelRatio == 1) && (window.innerHeight == 785) && (this.chromeMatch && (this.chromeMatch == 'Chrome/95.0.4638.69'))) {//13楼左1
|
|
|
+ pulseStyle = {
|
|
|
+ titleMarginTop: '0px',
|
|
|
+ firstRowMarginTop: '32px',
|
|
|
+ normalRowMarginTop: '55px',
|
|
|
+ lastRowMarginTop: '56px'
|
|
|
+ };
|
|
|
+ temperatureStyle = {
|
|
|
+ titleMarginTop: '0px',
|
|
|
+ firstRowMarginTop: '32px',
|
|
|
+ normalRowMarginTop: '55px',
|
|
|
+ lastRowMarginTop: '56px'
|
|
|
+ };
|
|
|
+ legendStyle = {
|
|
|
+ marginTop: '476px'
|
|
|
+ };
|
|
|
+ containerStyle = {
|
|
|
+ marginTop: (this.marginTop + 14) + 'px',
|
|
|
+ left: '28px'
|
|
|
+ };
|
|
|
+ }else {
|
|
|
+ pulseStyle = {
|
|
|
+ titleMarginTop: '0px',
|
|
|
+ firstRowMarginTop: '32px',
|
|
|
+ normalRowMarginTop: '55px',
|
|
|
+ lastRowMarginTop: '56px'
|
|
|
+ };
|
|
|
+ temperatureStyle = {
|
|
|
+ titleMarginTop: '0px',
|
|
|
+ firstRowMarginTop: '32px',
|
|
|
+ normalRowMarginTop: '55px',
|
|
|
+ lastRowMarginTop: '56px'
|
|
|
+ };
|
|
|
+ legendStyle = {
|
|
|
+ marginTop: '476px'
|
|
|
+ };
|
|
|
+ containerStyle = {
|
|
|
+ marginTop: this.marginTop + 'px',
|
|
|
+ left: '28px'
|
|
|
+ };
|
|
|
+ }
|
|
|
}
|
|
|
}else {
|
|
|
if(window.devicePixelRatio < 1) {
|