From dff404a76987de5b632ae635a6dea6c95dc37a4d Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 17 四月 2024 16:58:59 +0800
Subject: [PATCH] 合并冲突
---
src/components/view/a6-device-overview.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/components/view/a6-device-overview.vue b/src/components/view/a6-device-overview.vue
index 9b0b5b4..eb4bfab 100644
--- a/src/components/view/a6-device-overview.vue
+++ b/src/components/view/a6-device-overview.vue
@@ -39,13 +39,13 @@
.card {
list-style-type: none;
display: grid;
- grid-template-columns: repeat(auto-fit, 375px);
+ grid-template-columns: repeat(auto-fit, 415px);
/* justify-content: center; */
grid-gap: 16px;
min-height: 300px;
}
.card li{
- width: 375px;
+ width: 415px;
height: 165px;
border-radius: 8px 8px 8px 8px;
border: 1px solid #EEEEEE;
@@ -261,15 +261,15 @@
this.total = res.data.body.total
let list = res.data.body.records.map(m=>{
switch (m.deviceStatus){
- case '0':
+ case 0:
// 姝ｅ父
m.type ='success'
break;
- case '1':
+ case 1:
// 鎶ュ簾
m.type ='warning'
break;
- case '2':
+ case 2:
// 淇濅慨
m.type ='danger'
break;
--
Gitblit v1.9.3