From 279ee6197ef95b683733d450616ee80539f0a8bb Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 09 Apr 2021 17:10:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/supervisoryConsole/data.vue | 36 +++++++++++++++++++++---------------
1 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/src/views/supervisoryConsole/data.vue b/src/views/supervisoryConsole/data.vue
index 440211c..6504e09 100644
--- a/src/views/supervisoryConsole/data.vue
+++ b/src/views/supervisoryConsole/data.vue
@@ -168,17 +168,23 @@
var that = this;
getList().then((res) => {
res.data.data.forEach((item) => {
- that.tableData.push({
- waringType:
- item.waringType == "紧急求救" ? "一键求助" : item.waringType,
- alarmTime: item.alarmTime,
- oneContacts: item.oneContacts,
- onePhone: item.onePhone,
- galarmPeople: item.galarmPeople,
- jtype:
- item.jtype == 0 ? "未处理" : item.jtype == 1 ? "处理中" : "已处理",
- alarmPeople: item.alarmPeople,
- });
+ if (item.waringType == "紧急求救") {
+ that.tableData.push({
+ waringType:
+ item.waringType == "紧急求救" ? "一键求助" : item.waringType,
+ alarmTime: item.alarmTime,
+ oneContacts: item.oneContacts,
+ onePhone: item.onePhone,
+ galarmPeople: item.galarmPeople,
+ jtype:
+ item.jtype == 0
+ ? "未处理"
+ : item.jtype == 1
+ ? "处理中"
+ : "已处理",
+ alarmPeople: item.alarmPeople,
+ });
+ }
});
});
@@ -549,7 +555,7 @@
background-color: #29c093;
}
&:nth-child(3)::before {
- background-color: #F48F57;
+ background-color: #f48f57;
}
&:nth-child(4)::before {
background-color: #dfdfdf;
@@ -610,8 +616,8 @@
color: #29c194;
}
.active-list:nth-child(2) > div:nth-child(1) span {
- border: 1px solid #F48F57;
- color: #F48F57;
+ border: 1px solid #f48f57;
+ color: #f48f57;
}
.active-list:nth-child(1) > div:nth-child(1) span:hover {
background: rgba(41, 192, 147, 0.15);
@@ -623,7 +629,7 @@
color: #29c194;
}
.active-list:nth-child(2) > div:nth-child(2) span {
- color: #F48F57;
+ color: #f48f57;
}
}
.info-active-top,
--
Gitblit v1.9.3