From 57d37b58c2d9e8edbafbad28a6a326fa3eb33721 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期三, 01 十一月 2023 19:40:04 +0800
Subject: [PATCH] Merge branch 'wn' of http://192.168.5.5:10010/r/web/bulletin-board-style1 into dev
---
src/views/dashboard/components/DeviceStatusInfo.vue | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/src/views/dashboard/components/DeviceStatusInfo.vue b/src/views/dashboard/components/DeviceStatusInfo.vue
index 1593dc7..146ff75 100644
--- a/src/views/dashboard/components/DeviceStatusInfo.vue
+++ b/src/views/dashboard/components/DeviceStatusInfo.vue
@@ -71,7 +71,10 @@
</span>
</span>
<div class="device-info">涓昏妭鐐�</div>
- <div class="device-b title-bng"><span>鑺傜偣鏁�</span> <i>120</i></div>
+ <div class="device-b title-bng">
+ <img src="~@/assets/images/leaf.png" />
+ <span>鑺傜偣鏁�</span> <i>120</i>
+ </div>
</div>
</div>
</template>
@@ -164,20 +167,30 @@
border-radius: 8px;
}
.title-bng {
- height: 32px;
- line-height: 32px;
- background: url('../../../assets/images/number.png') no-repeat center center / cover;
+ width: calc(90% - 1px);
+ margin: 10px auto 0;
+ height: 29px;
+ line-height: 29px;
+ font-size: 14px;
+ background: url('../../../assets/images/nodeNumber.png') no-repeat center center / cover;
+ img {
+ height: 16px;
+ display: inline-block;
+ float: left;
+ margin: 8px 5px 0 5px;
+ }
span {
height: 32px;
display: inline-block;
text-align: center;
display: inline-block;
float: left;
- margin-left: 35%;
+ font-weight: bold;
}
i {
float: right;
margin-right: 15px;
+ font-weight: bold;
}
}
}
--
Gitblit v1.8.0