diff --git a/src/views/bigScreen/bigScreen.vue b/src/views/bigScreen/bigScreen.vue index 84c7592..58d23aa 100644 --- a/src/views/bigScreen/bigScreen.vue +++ b/src/views/bigScreen/bigScreen.vue @@ -104,6 +104,12 @@ import drawMixin from "@/mixin/drawMixin"; import backBtn from './component/backBtn.vue' export default { mixins: [ drawMixin ], + provide() { + return { + load: this.load, + cancelLoading: this.cancelLoading + } + }, components: { Icon, @@ -129,8 +135,8 @@ export default { }, mounted() { //document.documentElement.requestFullscreen(); - this.timeFn() - this.cancelLoading() + this.timeFn(); + this.cancelLoading(); }, beforeDestroy () { clearInterval(this.timing) @@ -143,6 +149,10 @@ export default { this.dateWeek = this.weekday[new Date().getDay()] }, 1000) }, + + load () { + this.loading = true; + }, cancelLoading() { setTimeout(() => { this.loading = false diff --git a/src/views/bigScreen/component/centerRight1.vue b/src/views/bigScreen/component/centerRight1.vue index 29f193a..0892001 100644 --- a/src/views/bigScreen/component/centerRight1.vue +++ b/src/views/bigScreen/component/centerRight1.vue @@ -1,21 +1,55 @@ @@ -150,6 +233,8 @@ $box-width: 100%; .board-item { width: 31%; height: 100%; + display: flex; + flex-direction: column; &__title { width: 40%; @@ -157,15 +242,21 @@ $box-width: 100%; text-align: center; font-size: 17px; line-height: 44px; + flex: 0; margin: auto; margin-top: 20px; } - } - .dv-scr-board { - height: calc(100% - 44px - 20px - 20px); + &-container { + overflow: hidden; + flex: 1; - margin-top: 20px; + margin-top: 20px; + + &-item { + width: 100%; + } + } } } diff --git a/src/views/bigScreen/component/transferBoard.vue b/src/views/bigScreen/component/transferBoard.vue new file mode 100644 index 0000000..4887056 --- /dev/null +++ b/src/views/bigScreen/component/transferBoard.vue @@ -0,0 +1,282 @@ + + + + +