diff --git a/src/App.vue b/src/App.vue index 00f60e9..3133a1f 100644 --- a/src/App.vue +++ b/src/App.vue @@ -23,12 +23,12 @@ export default { ...mapGetters(['showToast', 'showAlert']) }, mounted () { - const htmlStyle = document.getElementsByTagName('html')[0].style - if (window.screen.height <= 1080) { - htmlStyle.height = 1080 - } else { - htmlStyle.height = 1200 - } + // const htmlStyle = document.getElementsByTagName('html')[0].style + // if (window.screen.height <= 1080) { + // htmlStyle.height = 1080 + // } else { + // htmlStyle.height = 1200 + // } } } diff --git a/src/assets/css/reset.css b/src/assets/css/reset.css index eae30bf..af6fe4e 100644 --- a/src/assets/css/reset.css +++ b/src/assets/css/reset.css @@ -82,7 +82,9 @@ li { /* 顺安大屏尺寸1920*1200 */ html, body { width: 1920px; - height: 100%; + height: 1200px; + /* height: 1080px; */ + /* height: 100%; */ } body { diff --git a/src/pages/shunhe/LogisticsProcess/canvas_1.vue b/src/pages/shunhe/LogisticsProcess/canvas_1.vue index 8f65b1b..88cf22b 100644 --- a/src/pages/shunhe/LogisticsProcess/canvas_1.vue +++ b/src/pages/shunhe/LogisticsProcess/canvas_1.vue @@ -1,6 +1,6 @@ diff --git a/src/pages/shunhe/LogisticsProcess/canvas_2.vue b/src/pages/shunhe/LogisticsProcess/canvas_2.vue index 056e600..c7c293a 100644 --- a/src/pages/shunhe/LogisticsProcess/canvas_2.vue +++ b/src/pages/shunhe/LogisticsProcess/canvas_2.vue @@ -1,6 +1,6 @@ diff --git a/src/pages/shunhe/LogisticsProcess/index.vue b/src/pages/shunhe/LogisticsProcess/index.vue index ab3267e..4be656e 100644 --- a/src/pages/shunhe/LogisticsProcess/index.vue +++ b/src/pages/shunhe/LogisticsProcess/index.vue @@ -283,11 +283,11 @@ export default { clearInterval(this.timer1) clearInterval(this.timer2) this.refresh() - if (window.screen.height <= 1080) { - this.$refs.container.style.paddingTop = '0.8%' - this.$refs.container.style.height = '90%' - this.$refs.bottom.style.height = '2%' - } + // if (window.screen.height <= 1080) { + // this.$refs.container.style.paddingTop = '0.8%' + // this.$refs.container.style.height = '90%' + // this.$refs.bottom.style.height = '2%' + // } }, beforeDestroy () { this.$once('hook:beforeDestroy', () => { diff --git a/src/pages/shunhe/LogisticsProcess/workshop.vue b/src/pages/shunhe/LogisticsProcess/workshop.vue index ca72709..950a9e0 100644 --- a/src/pages/shunhe/LogisticsProcess/workshop.vue +++ b/src/pages/shunhe/LogisticsProcess/workshop.vue @@ -651,14 +651,15 @@