admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'shenzhen-dev' of http://10.0.0.60/dhp/zhgdyun into shenzhen-dev

Browse Source
This commit is contained in:
Jack 2022-08-03 14:14:16 +08:00
commit b96e323419
4 changed files with 142 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
src/views/messageV2.vue
View File

@ -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() {

32
src/views/projectAdmin/dataBoard/projectHuScreen/envirManage/alarmBtn.vue Normal file
View File

@ -0,0 +1,32 @@
<template>
<div class="alarmType">
</div>
</template>
<script>
export default {
}
</script>
<style lang="less" scoped>
.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;
}
</style>

62
src/views/projectAdmin/dataBoard/projectHuScreen/envirManage/leftCenter.vue
View File

@ -24,7 +24,10 @@
{{ item.deviceName }}
</td>
<td>{{ item.tempAlarmTime }}</td>
<td>{{ item.alarmTypeName }}</td>
<td>
<div :class=" !item.show ? 'unAlarm' : 'alarmType'">
</div>
</td>
</tr>
</tbody>
</table>
@ -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;
}
}
</style>

1
src/views/projectAdmin/dataBoard/projectHuScreen/envirManage/rightBottom.vue
View File

@ -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;