-../../../../api/alarmManagement/alarmSettings/energyAlarm
diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editeEnergyAlarm.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editeEnergyAlarm.vue
index 9fc566c..2a2b37c 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editeEnergyAlarm.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editeEnergyAlarm.vue
@@ -8,6 +8,22 @@
:cancel="handleClose"
placement="right"
@close="handleClose">
+
@@ -260,24 +276,26 @@
background-color: linear-gradient(
180deg,
rgba(1, 206, 255, 1) 0%,
- rgba(0, 150, 229, 1) 100%
+ rgba(57, 215, 187, 1) 100%
) !important;
}
.grey-background.ant-switch {
- background-color: grey !important;
+ background-color: rgba(238, 238, 238, 1) !important;
}
.blue-background.ant-switch-checked .ant-switch-handle {
background-color: linear-gradient(
180deg,
rgba(1, 206, 255, 1) 0%,
- rgba(0, 150, 229, 1) 100%
+ rgba(57, 215, 187, 1) 100%
) !important;
}
-
+ .ant-switch-checked {
+ background-color: rgba(57, 215, 187, 1) !important;
+ }
.grey-background.ant-switch .ant-switch-handle {
- background-color: grey !important;
+ background-color: rgba(238, 238, 238, 1) !important;
}
:deep(.ant-form-item-label) {
z-index: 20;
@@ -285,4 +303,3 @@
width: 23%;
}
-../../../../api/alarmManagement/alarmSettings/energyAlarm
diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/configureDeviceAlarms.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/configureDeviceAlarms.vue
index 63b1284..9881856 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/configureDeviceAlarms.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/configureDeviceAlarms.vue
@@ -145,6 +145,7 @@
customRender: (text: any) => {
return text.index + 1;
},
+ width: 80,
},
{
title: '规则id',
@@ -157,6 +158,7 @@
{
title: '告警点位',
dataIndex: 'devicePointName',
+ width: 120,
},
{
title: '判断条件',
@@ -165,6 +167,7 @@
{
title: '取值类型',
dataIndex: 'valueType',
+ width: 140,
},
{
title: '异常描述',
@@ -173,11 +176,16 @@
{
title: '启用状态',
dataIndex: 'enableRules',
+ width: 120,
},
],
// rowSelection: null, 选择按钮
+ scroll: { x: 2500 },
columnActions: {
title: '操作',
+ width: 200,
+ fixed: 'right',
+ dataIndex: 'tableAction',
actions: [
{
label: '编辑',
@@ -304,24 +312,25 @@
background-color: linear-gradient(
180deg,
rgba(1, 206, 255, 1) 0%,
- rgba(0, 150, 229, 1) 100%
+ rgba(57, 215, 187, 1) 100%
) !important;
}
.grey-background.ant-switch {
- background-color: grey !important;
+ background-color: rgba(238, 238, 238, 1) !important;
}
.blue-background.ant-switch-checked .ant-switch-handle {
background-color: linear-gradient(
180deg,
rgba(1, 206, 255, 1) 0%,
- rgba(0, 150, 229, 1) 100%
+ rgba(57, 215, 187, 1) 100%
) !important;
}
-
+ .ant-switch-checked {
+ background-color: rgba(57, 215, 187, 1) !important;
+ }
.grey-background.ant-switch .ant-switch-handle {
- background-color: grey !important;
+ background-color: rgba(238, 238, 238, 1) !important;
}
-../../../../api/alarmManagement/alarmSettings/deviceAlarms
diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue
index 59e66ea..82dfbfb 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue
@@ -2,13 +2,29 @@
-
+
+
-
+
-../../../../api/alarmManagement/alarmSettings/deviceAlarms
diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editeEquipmentAlarm.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editeEquipmentAlarm.vue
index 773f6ac..58a64fb 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editeEquipmentAlarm.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editeEquipmentAlarm.vue
@@ -2,12 +2,28 @@
+
@@ -320,24 +336,27 @@
background-color: linear-gradient(
180deg,
rgba(1, 206, 255, 1) 0%,
- rgba(0, 150, 229, 1) 100%
+ rgba(57, 215, 187, 1) 100%
) !important;
}
.grey-background.ant-switch {
- background-color: grey !important;
+ background-color: rgba(238, 238, 238, 1) !important;
}
.blue-background.ant-switch-checked .ant-switch-handle {
background-color: linear-gradient(
180deg,
rgba(1, 206, 255, 1) 0%,
- rgba(0, 150, 229, 1) 100%
+ rgba(57, 215, 187, 1) 100%
) !important;
}
.grey-background.ant-switch .ant-switch-handle {
- background-color: grey !important;
+ background-color: alarmSettings !important;
+ }
+ .ant-switch-checked {
+ background-color: rgba(57, 215, 187, 1) !important;
}
:deep(.ant-form-item-label) {
z-index: 20;
diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/index.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/index.vue
index 828fc03..bb82861 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/index.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/index.vue
@@ -326,23 +326,25 @@
background-color: linear-gradient(
180deg,
rgba(1, 206, 255, 1) 0%,
- rgba(0, 150, 229, 1) 100%
+ rgba(57, 215, 187, 1) 100%
) !important;
}
.grey-background.ant-switch {
- background-color: grey !important;
+ background-color: rgba(238, 238, 238, 1) !important;
}
.blue-background.ant-switch-checked .ant-switch-handle {
background-color: linear-gradient(
180deg,
rgba(1, 206, 255, 1) 0%,
- rgba(0, 150, 229, 1) 100%
+ rgba(57, 215, 187, 1) 100%
) !important;
}
-
+ .ant-switch-checked {
+ background-color: rgba(57, 215, 187, 1) !important;
+ }
.grey-background.ant-switch .ant-switch-handle {
- background-color: grey !important;
+ background-color: rgba(238, 238, 238, 1) !important;
}
diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/index.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/index.vue
index 069ff52..8c4c7c8 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/index.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/index.vue
@@ -2,13 +2,29 @@