diff --git a/hx-ai-intelligent/src/router/equipmentControl.ts b/hx-ai-intelligent/src/router/equipmentControl.ts index dcb244b..fbb8c7f 100644 --- a/hx-ai-intelligent/src/router/equipmentControl.ts +++ b/hx-ai-intelligent/src/router/equipmentControl.ts @@ -43,6 +43,25 @@ const equipmentControl = { }, ], }, + { + path: 'electricDoor', + name: 'electricDoor', + meta: { title: '电动门系统', hideChildren: true, icon: 'shebeiqunkong' }, + component: Base, + redirect: { name: 'electricDoorIndex' }, + children: [ + { + path: 'index', + name: 'electricDoorIndex', + component: () => import('/@/view/equipmentControl/electricDoor/index.vue'), + meta: { + title: '电动门系统', + keepAlive: false, + // backApi: [], + }, + }, + ], + }, ], }; export default equipmentControl; diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/index.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/index.vue index f767104..ab3910d 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/index.vue +++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/index.vue @@ -199,6 +199,7 @@ mainEnergyAlarmConfig, energyAlarm, configureEnergyAlarms, + mainRef, ); //设备告警配置 const equipmentAlarmConfig = equipmentAlarmTableConfig( @@ -206,6 +207,7 @@ mainRefEquipmentAlarm, equipmentAlarm, configureDeviceAlarms, + mainRef, ); //返回设备告警 const backequipmentAlarm = () => { diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/energyAlarmConfig.ts b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/energyAlarmConfig.ts index 83e9d3a..3e40645 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/energyAlarmConfig.ts +++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/energyAlarmConfig.ts @@ -63,6 +63,7 @@ export const energyAlarmConfigs = ( mainEnergyAlarmConfig: any, energyAlarm: any, configureDeviceAlarms: any, + mainRef: any, ) => { return { title: '告警规则', @@ -149,6 +150,7 @@ export const energyAlarmConfigs = ( http.post(energyAlarms.del, { id: data.id }).then(() => { NsMessage.success('操作成功'); mainEnergyAlarmConfig.value?.nsTableRef.reload(); + mainRef.value?.nsTableRef.reload(); }); }, }, diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/equipmentAlarmConfig.ts b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/equipmentAlarmConfig.ts index 92eef89..a59d8e8 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/equipmentAlarmConfig.ts +++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/equipmentAlarmConfig.ts @@ -63,6 +63,7 @@ export const equipmentAlarmTableConfig = ( mainRefEquipmentAlarm: any, equipmentAlarm: any, configureDeviceAlarms: any, + mainRef: any, ) => { return { title: '告警规则', @@ -148,6 +149,7 @@ export const equipmentAlarmTableConfig = ( http.post(deviceAlarms.del, { id: data.id }).then(() => { NsMessage.success('告警删除成功'); mainRefEquipmentAlarm.value?.nsTableRef.reload(); + mainRef.value?.nsTableRef.reload(); }); }, }, diff --git a/hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/status.vue b/hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/status.vue index 1c4b3ab..2c0a8be 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/status.vue +++ b/hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/status.vue @@ -9,31 +9,7 @@ placement="right" @close="handleClose"> - -
- - - - - - - - -
-
- + @@ -54,7 +30,6 @@ setup() { const visible = ref(false); - const infoObject = ref({}); const stateOptions = ref(); const logList = ref([ { realName: '李四', state: 3, createTime: '2024-03-10 10:00:00', remarks: '完成' }, @@ -76,7 +51,6 @@ const toggle = async (data) => { let states = await getEnum({ params: { enumType: 'AlarmLogStateEnum' } }); stateOptions.value = states.data; - infoObject.value = { ...logList.value[0] }; let stateMap = { 1: '待处理', 2: '处理中', @@ -99,7 +73,6 @@ visible.value = true; }; return { - infoObject, stateOptions, btnClick, visible, diff --git a/hx-ai-intelligent/src/view/equipmentControl/electricDoor/index.vue b/hx-ai-intelligent/src/view/equipmentControl/electricDoor/index.vue new file mode 100644 index 0000000..bc3a834 --- /dev/null +++ b/hx-ai-intelligent/src/view/equipmentControl/electricDoor/index.vue @@ -0,0 +1,347 @@ + + + diff --git a/hx-ai-intelligent/src/view/equipmentControl/electricDoor/tables.vue b/hx-ai-intelligent/src/view/equipmentControl/electricDoor/tables.vue new file mode 100644 index 0000000..a7cc383 --- /dev/null +++ b/hx-ai-intelligent/src/view/equipmentControl/electricDoor/tables.vue @@ -0,0 +1,132 @@ + + + diff --git a/hx-ai-intelligent/src/view/equipmentControl/image/door-detail.svg b/hx-ai-intelligent/src/view/equipmentControl/image/door-detail.svg new file mode 100644 index 0000000..54f6257 --- /dev/null +++ b/hx-ai-intelligent/src/view/equipmentControl/image/door-detail.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/hx-ai-intelligent/src/view/equipmentControl/image/electricDoor.png b/hx-ai-intelligent/src/view/equipmentControl/image/electricDoor.png new file mode 100644 index 0000000..502a0cc Binary files /dev/null and b/hx-ai-intelligent/src/view/equipmentControl/image/electricDoor.png differ