diff --git a/src/views/components/systemTime/digit.vue b/src/views/components/systemTime/digit.vue index acb7e818d..26b20ee9a 100644 --- a/src/views/components/systemTime/digit.vue +++ b/src/views/components/systemTime/digit.vue @@ -1,32 +1,32 @@ @@ -35,10 +35,6 @@ export default { name: 'Digit', props: { - top: { - type: Number, - required: true - }, zoom: { type: Number, required: true @@ -57,9 +53,6 @@ export default { } }, computed: { - zblod() { - return parseInt(this.fine * this.zoom); - }, isShowOne() { return [2, 3, 5, 6, 7, 8, 9, 0].indexOf(this.number) != -1; }, @@ -80,6 +73,27 @@ export default { }, isShowSeven() { return [2, 3, 4, 5, 6, 8, 9].indexOf(this.number) != -1; + }, + b1() { + return this.fine * 2; + }, + b2() { + return this.fine * 4; + }, + z1() { + return this.zoom * 4; + }, + z2() { + return this.zoom * 8; + }, + p() { + return this.fine * 2; + }, + w() { + return this.zoom * 4 + this.fine * 4 + this.p*2; + }, + h() { + return this.zoom * 8 + this.fine * 4 + this.p*2; } }, methods: { @@ -92,9 +106,8 @@ export default { diff --git a/src/views/components/systemTime/index.vue b/src/views/components/systemTime/index.vue index a964e1645..84f8e61bb 100644 --- a/src/views/components/systemTime/index.vue +++ b/src/views/components/systemTime/index.vue @@ -1,8 +1,5 @@ @@ -77,6 +74,7 @@ export default { } .display-time{ + padding: 5px; box-shadow: 0px 0px 5px #eee; border-radius: 3px; }