Browse Source

fix:修改设备告警逻辑 修改冲突样式

temp
zhaohy 3 months ago
parent
commit
d15f8e8ed5
  1. 5
      hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/configureDeviceAlarms.vue
  2. 3
      hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue
  3. 4
      hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/look.vue
  4. 4
      hx-ai-intelligent/src/view/equipmentControl/components/doubleSingleModel.vue
  5. 3
      hx-ai-intelligent/src/view/equipmentControl/electricDoor/index.vue

5
hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/configureDeviceAlarms.vue

@ -242,12 +242,15 @@
dynamicParams: {
deviceCode: 'deviceInfoCode', //
},
defaultParams: {
type: 0,
},
componentProps: {
api: device.queryDevicePoint,
allowClear: true,
resultField: 'data',
placeholder: '请选择设备点位',
labelField: 'code',
labelField: 'name',
valueField: 'id',
dependency: 'deviceInfoCode',
showSearch: true,

3
hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue

@ -217,13 +217,14 @@
//
const getDevicePoint = (value: any) => {
devicePointData.value = [];
value.type = 0;
http.post(device.queryDevicePoint, value).then((res) => {
if (res.msg === 'success') {
res.data.forEach((item: any) => {
//
devicePointData.value.push({
value: item.id,
label: item.code + ' ( ' + item.unit + ' ) ',
label: item.name + ' ( ' + item.unit + ' ) ',
});
});
}

4
hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/look.vue

@ -10,7 +10,7 @@
@close="handleClose">
<div style="width: 100%; height: 100%; overflow-y: auto; overflow-x: hidden">
<!-- top -->
<div class="box">
<div class="boxstyle">
<div class="card"></div>
<div style="left: 25px; position: absolute; height: 35px; line-height: 35px">
告警编号{{ infoObject.alarmCode }}
@ -271,7 +271,7 @@
});
</script>
<style scoped lang="less">
.box {
.boxstyle {
width: 100%;
height: 35px;
display: flex;

4
hx-ai-intelligent/src/view/equipmentControl/components/doubleSingleModel.vue

@ -1,6 +1,6 @@
<!-- 双图 -->
<template>
<div class="box">
<div class="boxs">
<div class="box-title title">
{{ dataSource.title }}
</div>
@ -88,7 +88,7 @@
};
</script>
<style lang="less" scoped>
.box {
.boxs {
width: 192px;
height: 125px;
background: inherit;

3
hx-ai-intelligent/src/view/equipmentControl/electricDoor/index.vue

@ -343,4 +343,7 @@
:deep(.ant-tabs) {
overflow-y: auto !important;
}
:deep(.ant-empty-description) {
color: white !important;
}
</style>

Loading…
Cancel
Save