diff --git a/hx-ai-intelligent/src/api/alarmSettings/notificationManagements.ts b/hx-ai-intelligent/src/api/alarmSettings/notificationManagements.ts
new file mode 100644
index 0000000..3751491
--- /dev/null
+++ b/hx-ai-intelligent/src/api/alarmSettings/notificationManagements.ts
@@ -0,0 +1,5 @@
+export enum notificationManagementApi {
+ getTableList = '/carbon-smart/api/AlarmContactInformation/selectAlarmContactInformation', //通知管理分页
+ upData = '/carbon-smart/api/AlarmContactInformation/update', //通知管理 修改
+ findById = '/carbon-smart/api/AlarmContactInformation/findById', //通知管理 查询详情
+}
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 c3aa677..c673609 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editeEnergyAlarm.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editeEnergyAlarm.vue
@@ -177,6 +177,25 @@
],
},
},
+ {
+ label: '是否创建工单',
+ field: 'createWorkOrder',
+ component: 'NsRadioGroup',
+ rules: [
+ {
+ required: true,
+ message: '是否创建工单不能为空',
+ trigger: 'change',
+ },
+ ],
+ componentProps: {
+ radioType: 'radio',
+ options: [
+ { label: '是', value: 1 },
+ { label: '否', value: 0 },
+ ],
+ },
+ },
],
},
},
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 7670079..4d0538c 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editeEquipmentAlarm.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editeEquipmentAlarm.vue
@@ -195,6 +195,25 @@
],
},
},
+ {
+ label: '是否创建工单',
+ field: 'createWorkOrder',
+ component: 'NsRadioGroup',
+ rules: [
+ {
+ required: true,
+ message: '是否创建工单不能为空',
+ trigger: 'change',
+ },
+ ],
+ componentProps: {
+ radioType: 'radio',
+ options: [
+ { label: '是', value: 1 },
+ { label: '否', value: 0 },
+ ],
+ },
+ },
],
},
},
diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/index.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/index.vue
index 83fc3a1..96398fe 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/index.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/index.vue
@@ -4,21 +4,27 @@
-
+
+
+ {{ record.priority ? record.priority.label : '' }}
+
+
+ {{ getNotificationMethod(record.notificationMethod) }}
+
-
+
- {{ record.priority.label }}
+ {{ record.priority ? record.priority.label : '-' }}
@@ -90,7 +96,7 @@
{{ record.repetitions.label }}
- {{ record.priority.label }}
+ {{ record.priority ? record.priority.label : '-' }}
@@ -124,6 +130,7 @@
import { deviceAlarms } from '/@/api/alarmSettings/deviceAlarms';
import { energyAlarms } from '/@/api/alarmSettings/energyAlarm';
import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
+ import { notificationManagementApi } from '/@/api/alarmSettings/notificationManagements';
export default {
name: 'AlarmSettingsIndex',
@@ -146,6 +153,22 @@
const equipmentAlarm = ref(true);
const energyAlarm = ref(true);
const notificationConfig = notificationtableConfig(notificationManagements);
+ //获取 通知方式
+ const getNotificationMethod = (data: any) => {
+ if (!data) return '';
+ const methods = [];
+ const notifications = data.split(',');
+
+ notifications.forEach((notification) => {
+ if (notification === '1') {
+ methods.push('站内信息');
+ } else if (notification === '2') {
+ methods.push('邮件');
+ }
+ });
+
+ return methods.join('/');
+ };
//能源告警配置
const energyAlarmConfig = energyAlarmConfigs(
editeEnergyAlarm,
@@ -169,6 +192,10 @@
energyAlarm.value = !energyAlarm.value;
configureEnergyAlarms.value.show = false;
};
+ //通知 修改成功
+ const updNotification = () => {
+ mainRef.value?.nsTableRef.reload();
+ };
const clickSwitch = (data: any) => {
NsModal.confirm({
title: '启用状态',
@@ -182,12 +209,14 @@
if (data.type === 1) {
//通知方式
http
- .post(deviceAlarms.addOrUpNewData, {
+ .post(notificationManagementApi.upData, {
id: data.record.id,
- enableRules: data.record.enableRules === 1 ? 0 : 1,
+ enableNotifications: data.record.enableNotifications === 1 ? 0 : 1,
})
.then(() => {
- NsMessage.success(data.record.enableRules === 1 ? '通知已关闭' : '通知已启用');
+ NsMessage.success(
+ data.record.enableNotifications === 1 ? '通知已关闭' : '通知已启用',
+ );
mainRef.value?.nsTableRef.reload();
});
}
@@ -232,6 +261,8 @@
equipmentAlarmConfig,
editObject,
editeEnergyAlarm,
+ updNotification,
+ getNotificationMethod,
clickSwitch,
editEquipmentAlarm,
notificationManagements,
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 74a5db0..e431323 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/index.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/index.vue
@@ -10,10 +10,10 @@
@close="handleClose">
-
+
-
-
-
联系人名单
+
- {{ record.userRoleInfos?.[0].deptRoleInfoList }}
+ {{ record?.deptRoleInfoList || record.userRoleInfos?.[0].deptRoleInfoList }}
- 移除
+ 移除
@@ -85,12 +69,12 @@