xuziqiang/SaaS-lib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix:修改设备告警 能源告警 回显 添加之后 刷新通知告警

Browse Source
This commit is contained in:
zhaohy
2024-07-22 11:38:36 +08:00
parent 088590beea
commit b82b97ebb1
4 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hx-ai-intelligent/src/view/alarmManagement/alarmSettings/index.vue
View File

@@ -274,10 +274,12 @@
// 设备告警 编辑或添加成功 刷新列表 // 设备告警 编辑或添加成功 刷新列表
const editObject = () => { const editObject = () => {
mainRefEquipmentAlarm.value?.nsTableRef.reload(); mainRefEquipmentAlarm.value?.nsTableRef.reload();
mainRef.value?.nsTableRef.reload();
}; };
// 能源告警 编辑或添加成功 刷新列表 // 能源告警 编辑或添加成功 刷新列表
const editeEnergyAlarmInfo = () => { const editeEnergyAlarmInfo = () => {
mainEnergyAlarmConfig.value?.nsTableRef.reload(); mainEnergyAlarmConfig.value?.nsTableRef.reload();
mainRef.value?.nsTableRef.reload();
}; };
return { return {
notificationConfig, notificationConfig,

4
hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/energyAlarmConfig.ts
View File

@@ -117,9 +117,7 @@ export const energyAlarmConfigs = (
if (obj.monitorFrequency) { if (obj.monitorFrequency) {
obj.monitorFrequency = data.monitorFrequency.value; obj.monitorFrequency = data.monitorFrequency.value;
} }
if (obj.createWorkOrder) { obj.createWorkOrder = obj.createWorkOrder + '';
obj.createWorkOrder = data.createWorkOrder + '';
}
if (obj.alarmFrequency !== 2) { if (obj.alarmFrequency !== 2) {
obj.repetitions = null; obj.repetitions = null;
obj.intervalDuration = null; obj.intervalDuration = null;

4
hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/equipmentAlarmConfig.ts
View File

@@ -114,9 +114,7 @@ export const equipmentAlarmTableConfig = (
if (obj.intervalDurationUnit) { if (obj.intervalDurationUnit) {
obj.intervalDurationUnit = data.intervalDurationUnit.value; obj.intervalDurationUnit = data.intervalDurationUnit.value;
} }
if (obj.createWorkOrder) { obj.createWorkOrder = obj.createWorkOrder + '';
obj.createWorkOrder = data.createWorkOrder + '';
}
if (obj.alarmFrequency !== 2) { if (obj.alarmFrequency !== 2) {
obj.repetitions = null; obj.repetitions = null;
obj.intervalDuration = null; obj.intervalDuration = null;

39
hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/status.vue
View File

@@ -63,14 +63,14 @@
const visible = ref(false); const visible = ref(false);
const showEdit = ref(true); const showEdit = ref(true);
const infoObject = ref({}); const infoObject = ref({});
const data = ref({}); const equipmentAlarm = ref({});
const statusOptions = ref(); const statusOptions = ref();
const logList = ref([ const logList = ref([
{ name: '李四', status: '3', time: '2024-03-10 10:00:00', desc: '完成' }, { name: '李四', status: 3, time: '2024-03-10 10:00:00', desc: '完成' },
{ name: '王五', status: '5', time: '2024-03-10 10:00:00' }, { name: '王五', status: 5, time: '2024-03-10 10:00:00' },
{ name: '王五', status: '4', time: '2024-03-10 10:00:00' }, { name: '王五', status: 4, time: '2024-03-10 10:00:00' },
{ name: '王五', status: '2', time: '2024-03-10 10:00:00', desc: '创建工单' }, { name: '王五', status: 2, time: '2024-03-10 10:00:00', desc: '创建工单' },
{ name: '赵六', status: '1', time: '2024-03-10 10:00:00' }, { name: '赵六', status: 1, time: '2024-03-10 10:00:00' },
]); ]);
const config = ref({ const config = ref({
size: logList.value.length, size: logList.value.length,
@@ -81,25 +81,28 @@
}; };
const btnClick = () => { const btnClick = () => {
NsMessage.success('操作成功'); NsMessage.success('操作成功');
delete infoObject.value.time;
console.log(infoObject.value, equipmentAlarm.value, '操作');
console.log('btnClick'); console.log('btnClick');
}; };
const toggle = (data) => { const toggle = (data) => {
data.value = data; console.log(data, '数据');
equipmentAlarm.value = data;
infoObject.value = { ...logList.value[0] }; infoObject.value = { ...logList.value[0] };
if (data.value.createWorkOrder === 1) { if (equipmentAlarm.value.createWorkOrder === 1) {
statusOptions.value = [ statusOptions.value = [
{ value: '1', label: '待处理' }, { value: 1, label: '待处理' },
{ value: '2', label: '处理中' }, { value: 2, label: '处理中' },
{ value: '3', label: '已完成' }, { value: 3, label: '已完成' },
{ value: '4', label: '超时' }, { value: 4, label: '超时' },
{ value: '5', label: '已关闭' }, { value: 5, label: '已关闭' },
]; ];
} else { } else {
statusOptions.value = [ statusOptions.value = [
{ value: '1', label: '待处理' }, { value: 1, label: '待处理' },
{ value: '2', label: '处理中' }, { value: 2, label: '处理中' },
{ value: '3', label: '已完成' }, { value: 3, label: '已完成' },
{ value: '5', label: '已关闭' }, { value: 5, label: '已关闭' },
]; ];
} }
let statusMap = { let statusMap = {
@@ -126,7 +129,7 @@
return { return {
infoObject, infoObject,
showEdit, showEdit,
data, equipmentAlarm,
statusOptions, statusOptions,
btnClick, btnClick,
visible, visible,