From 57f57b451d81cceca3cfa7a4b4ad2ad170205e2d Mon Sep 17 00:00:00 2001 From: chengdandan <2549057906@qq.com> Date: Sat, 22 Apr 2023 17:53:16 +0800 Subject: [PATCH] 20230422 --- src/views/alarm.vue | 2 ++ src/views/energySaving.vue | 2 ++ src/views/index.vue | 16 ++++++++++++---- src/views/security.vue | 5 ++++- 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/src/views/alarm.vue b/src/views/alarm.vue index 864172a..944ab12 100644 --- a/src/views/alarm.vue +++ b/src/views/alarm.vue @@ -343,6 +343,7 @@ export default { align-items: center; justify-content: flex-start; line-height: 2; + font-size: 0.6rem; .warnArrayBox { margin-left: 3%; display: flex; @@ -418,6 +419,7 @@ export default { align-items: center; justify-content: flex-start; line-height: 2; + font-size: 0.6rem; .warnArrayBox { // display: flex; // flex-direction: column; diff --git a/src/views/energySaving.vue b/src/views/energySaving.vue index 7f010ad..8855431 100644 --- a/src/views/energySaving.vue +++ b/src/views/energySaving.vue @@ -1519,6 +1519,7 @@ export default { justify-content: center; align-items: center; margin-left: 6%; + font-size: 0.7rem; } .equipmentBtnAc { width: 26.4%; @@ -1546,6 +1547,7 @@ export default { padding-right: 20%; box-sizing: border-box; color: #fff; + font-size: 0.7rem; } } ::-webkit-scrollbar { diff --git a/src/views/index.vue b/src/views/index.vue index d488eae..b68545f 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -1512,8 +1512,10 @@ export default { justify-content: space-around; align-items: center; .btnList { - width: 13%; - height: 38%; + // width: 13%; + // height: 38%; + width: 17%; + height: 41%; background: url(../assets/images/warnBtn.png) no-repeat; background-size: 100% 100%; color: #fff; @@ -1521,10 +1523,13 @@ export default { display: flex; align-items: center; justify-content: center; + font-size: 0.7rem; } .btnListAc { - width: 13%; - height: 38%; + // width: 13%; + // height: 38%; + width: 17%; + height: 41%; background: url(../assets/images/warnBtnAc.png) no-repeat; background-size: 100% 100%; color: #fff; @@ -1532,6 +1537,7 @@ export default { display: flex; align-items: center; justify-content: center; + font-size: 0.7rem; } } .warnList { @@ -1540,6 +1546,7 @@ export default { background: url(../assets/images/warnDottedLine.png) no-repeat; background-size: 100% 100%; overflow: auto; + .warnListContent { height: 25%; width: 100%; @@ -1551,6 +1558,7 @@ export default { align-items: center; padding-left: 3%; box-sizing: border-box; + font-size: 0.7rem; .warnArray { width: 100%; display: flex; diff --git a/src/views/security.vue b/src/views/security.vue index fee18ed..a595dff 100644 --- a/src/views/security.vue +++ b/src/views/security.vue @@ -552,6 +552,7 @@ export default { align-items: center; justify-content: center; flex-direction: column; + font-size: 0.7rem; } } } @@ -622,9 +623,11 @@ export default { flex-wrap: nowrap; align-items: center; justify-content: space-around; - padding-right: 20%; + // padding-right: 20%; + padding-right: 5%; box-sizing: border-box; color: #fff; + font-size: 0.7rem; } } ::-webkit-scrollbar {