From 635beb8e5c95f1f72abff03e98722b41ddb69de8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AA=86=E4=B9=90?= <342503599@qq.com>
Date: Wed, 3 Aug 2022 10:46:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B9=96=E9=87=8C=E5=A4=A7=E5=B1=8F(=E7=8E=AF?=
=?UTF-8?q?=E5=A2=83=E7=AE=A1=E7=90=86)=EF=BC=9A=E6=9B=B4=E6=94=B9?=
=?UTF-8?q?=E9=9B=BE=E7=82=AE=E5=96=B7=E6=B7=8B=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/messageV2.vue | 98 +++++++++----------
.../projectHuScreen/envirManage/alarmBtn.vue | 32 ++++++
.../envirManage/leftCenter.vue | 62 +++++++++++-
.../envirManage/rightBottom.vue | 1 +
4 files changed, 142 insertions(+), 51 deletions(-)
create mode 100644 src/views/projectAdmin/dataBoard/projectHuScreen/envirManage/alarmBtn.vue
diff --git a/src/views/messageV2.vue b/src/views/messageV2.vue
index f67836c4..05e8775c 100644
--- a/src/views/messageV2.vue
+++ b/src/views/messageV2.vue
@@ -129,62 +129,62 @@ export default {
pageNo: 1,
pageSize: 20,
tableData: [],
- // options:[{
- // label: "防疫人员通知",
- // value: "17"
- // },{
- // label: "访客通知",
- // value: "18"
- // }],
options:[{
- label: "高空火警",
- value: "8"
- },{
- label: "考勤提醒",
- value: "1"
- },{
label: "防疫人员通知",
value: "2"
- },{
- label: "防疫车辆通知",
- value: "3"
},{
label: "访客通知",
value: "16"
- },{
- label: "混凝土监测",
- value: "4"
- },{
- label: "卸料平台",
- value: "5"
- },{
- label: "配电箱",
- value: "6"
- },{
- label: "扬尘",
- value: "7"
- },{
- label: "标养室",
- value: "9"
- },{
- label: "安全检查",
- value: "10"
- },{
- label: "质量检查",
- value: "11"
- },{
- label: "塔吊",
- value: "12"
- },{
- label: "升降机",
- value: "13"
- },{
- label: "电表",
- value: "14"
- },{
- label: "水表",
- value: "15"
}],
+ // options:[{
+ // label: "高空火警",
+ // value: "8"
+ // },{
+ // label: "考勤提醒",
+ // value: "1"
+ // },{
+ // label: "防疫人员通知",
+ // value: "2"
+ // },{
+ // label: "防疫车辆通知",
+ // value: "3"
+ // },{
+ // label: "访客通知",
+ // value: "16"
+ // },{
+ // label: "混凝土监测",
+ // value: "4"
+ // },{
+ // label: "卸料平台",
+ // value: "5"
+ // },{
+ // label: "配电箱",
+ // value: "6"
+ // },{
+ // label: "扬尘",
+ // value: "7"
+ // },{
+ // label: "标养室",
+ // value: "9"
+ // },{
+ // label: "安全检查",
+ // value: "10"
+ // },{
+ // label: "质量检查",
+ // value: "11"
+ // },{
+ // label: "塔吊",
+ // value: "12"
+ // },{
+ // label: "升降机",
+ // value: "13"
+ // },{
+ // label: "电表",
+ // value: "14"
+ // },{
+ // label: "水表",
+ // value: "15"
+ // }],
};
},
created() {
diff --git a/src/views/projectAdmin/dataBoard/projectHuScreen/envirManage/alarmBtn.vue b/src/views/projectAdmin/dataBoard/projectHuScreen/envirManage/alarmBtn.vue
new file mode 100644
index 00000000..1a498d82
--- /dev/null
+++ b/src/views/projectAdmin/dataBoard/projectHuScreen/envirManage/alarmBtn.vue
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/projectAdmin/dataBoard/projectHuScreen/envirManage/leftCenter.vue b/src/views/projectAdmin/dataBoard/projectHuScreen/envirManage/leftCenter.vue
index 5e8c7d82..a042221d 100644
--- a/src/views/projectAdmin/dataBoard/projectHuScreen/envirManage/leftCenter.vue
+++ b/src/views/projectAdmin/dataBoard/projectHuScreen/envirManage/leftCenter.vue
@@ -24,7 +24,10 @@
{{ item.deviceName }}
{{ item.tempAlarmTime }} |
- {{ item.alarmTypeName }} |
+
+
+
+ |
@@ -57,9 +60,25 @@ export default {
{
deviceName: "一号设备",
tempAlarmTime: "塔吊喷淋",
- alarmTypeName: ""
+ show: true,
+ },
+ {
+ deviceName: "一号设备",
+ tempAlarmTime: "塔吊喷淋",
+ show: false,
+ },
+ {
+ deviceName: "一号设备",
+ tempAlarmTime: "塔吊喷淋",
+ show: false,
+ },
+ {
+ deviceName: "一号设备",
+ tempAlarmTime: "塔吊喷淋",
+ show: true,
}
],
+
value:true,
};
}
@@ -80,13 +99,52 @@ export default {
}
.greenTable{
margin-top: 30px;
+
th {
color: #6adce8;
+ border-bottom: 1px solid rgba(31, 68, 86, 0.3);
}
td{
color: white;
+
}
}
+ .alarmType{
+ position:relative;
+ left: 40%;
+ width: 35px;
+ height: 15px;
+ background-color: #08b58a;
+ border-radius: 8px ;
+ }
+ .alarmType::before{
+ content: '';
+ position: absolute;
+ top: 1px;
+ left: 3px;
+ width: 12px;
+ height: 12px;
+ border-radius: 50%;
+ background-color: #fff;
+ }
+ .unAlarm{
+ position:relative;
+ left: 40%;
+ width: 35px;
+ height: 15px;
+ background-color: #6d7077;
+ border-radius: 8px ;
+ }
+ .unAlarm::before{
+ content: '';
+ position: absolute;
+ top: 1px;
+ right: 3px;
+ width: 12px;
+ height: 12px;
+ border-radius: 50%;
+ background-color: #fff;
+ }
}
diff --git a/src/views/projectAdmin/dataBoard/projectHuScreen/envirManage/rightBottom.vue b/src/views/projectAdmin/dataBoard/projectHuScreen/envirManage/rightBottom.vue
index b0ca1ca2..8edcebea 100644
--- a/src/views/projectAdmin/dataBoard/projectHuScreen/envirManage/rightBottom.vue
+++ b/src/views/projectAdmin/dataBoard/projectHuScreen/envirManage/rightBottom.vue
@@ -98,6 +98,7 @@ export default {
margin-top: 30px;
th {
color: #6adce8;
+ border-bottom: 1px solid rgba(31, 68, 86, 0.3);
}
td{
color: white;