From c9e283c3c8b94bc4bf96ddbbf0abb0097317a259 Mon Sep 17 00:00:00 2001 From: zhaohy <1695786511@qq.com> Date: Fri, 19 Jul 2024 16:22:15 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=B1=82=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../alarmManagement/alarmSettings/deviceAlarms.ts | 9 +++++ .../alarmManagement/alarmSettings/energyAlarm.ts | 9 +++++ .../alarmSettings/notificationManagements.ts | 5 +++ .../src/api/alarmSettings/deviceAlarms.ts | 9 ----- .../src/api/alarmSettings/energyAlarm.ts | 9 ----- .../api/alarmSettings/notificationManagements.ts | 5 --- hx-ai-intelligent/src/router/alarmManagement.ts | 38 +++++++++++----------- .../energyAlarm/configureEnergyAlarms.vue | 3 +- .../energyAlarm/editConfigureEnergyAlarm.vue | 3 +- .../alarmSettings/energyAlarm/editeEnergyAlarm.vue | 3 +- .../equipmentAlarm/configureDeviceAlarms.vue | 3 +- .../equipmentAlarm/editConfigureDeviceAlarm.vue | 3 +- .../equipmentAlarm/editeEquipmentAlarm.vue | 3 +- .../view/alarmManagement/alarmSettings/index.vue | 7 ++-- .../alarmSettings/notificationManagement/index.vue | 3 +- .../alarmSettings/ts/energyAlarmConfig.ts | 2 +- .../alarmSettings/ts/equipmentAlarmConfig.ts | 3 +- .../ts/notificationManagementConfig.ts | 2 +- .../alarmManagement/equipmentAlarm/ts/config.ts | 2 +- .../view/alarmManagement/gatewayAlarm/ts/config.ts | 10 +----- 20 files changed, 65 insertions(+), 66 deletions(-) create mode 100644 hx-ai-intelligent/src/api/alarmManagement/alarmSettings/deviceAlarms.ts create mode 100644 hx-ai-intelligent/src/api/alarmManagement/alarmSettings/energyAlarm.ts create mode 100644 hx-ai-intelligent/src/api/alarmManagement/alarmSettings/notificationManagements.ts delete mode 100644 hx-ai-intelligent/src/api/alarmSettings/deviceAlarms.ts delete mode 100644 hx-ai-intelligent/src/api/alarmSettings/energyAlarm.ts delete mode 100644 hx-ai-intelligent/src/api/alarmSettings/notificationManagements.ts diff --git a/hx-ai-intelligent/src/api/alarmManagement/alarmSettings/deviceAlarms.ts b/hx-ai-intelligent/src/api/alarmManagement/alarmSettings/deviceAlarms.ts new file mode 100644 index 0000000..b78f725 --- /dev/null +++ b/hx-ai-intelligent/src/api/alarmManagement/alarmSettings/deviceAlarms.ts @@ -0,0 +1,9 @@ +export enum deviceAlarms { + getTableList = '/carbon-smart/api/AlarmEquipment/selectAlarmEquipment', //设备告警分页 + addOrUpNewData = '/carbon-smart/api/AlarmEquipment/creatOrUpdate', //设备告警添加 修改 + del = '/carbon-smart/api/AlarmEquipment/delete', //设备告警删除 + configGetTableList = '/carbon-smart/api/AlarmEquipmentRule/selectAlarmEquipmentRule', //配置设备告警分页 + configAddOrUpNewData = '/carbon-smart/api/AlarmEquipmentRule/creatOrUpdate', //配置设备告警添加 修改 + configFindById = '/carbon-smart/api/AlarmEquipmentRule/findById', //配置设备告警 查询详情 + configDel = '/carbon-smart/api/AlarmEquipmentRule/delete', //配置设备告警删除 +} diff --git a/hx-ai-intelligent/src/api/alarmManagement/alarmSettings/energyAlarm.ts b/hx-ai-intelligent/src/api/alarmManagement/alarmSettings/energyAlarm.ts new file mode 100644 index 0000000..88a661d --- /dev/null +++ b/hx-ai-intelligent/src/api/alarmManagement/alarmSettings/energyAlarm.ts @@ -0,0 +1,9 @@ +export enum energyAlarms { + getTableList = '/carbon-smart/api/AlarmEnergyConsumption/selectAlarmEnergyConsumption', //能耗告警分页 + addOrUpNewData = '/carbon-smart/api/AlarmEnergyConsumption/creatOrUpdate', //能耗告警添加 修改 + del = '/carbon-smart/api/AlarmEnergyConsumption/delete', //能耗删除 + configGetTableList = '/carbon-smart/api/AlarmEnergyConsumptionRule/selectAlarmEnergyConsumptionRule', //配置设备告警分页 + configAddOrUpNewData = '/carbon-smart/api/AlarmEnergyConsumptionRule/creatOrUpdate', //配置设备告警添加 修改 + configFindById = '/carbon-smart/api/AlarmEnergyConsumptionRule/findById', //配置设备告警 查询详情 + configDel = '/carbon-smart/api/AlarmEnergyConsumptionRule/delete', //配置设备告警删除 +} diff --git a/hx-ai-intelligent/src/api/alarmManagement/alarmSettings/notificationManagements.ts b/hx-ai-intelligent/src/api/alarmManagement/alarmSettings/notificationManagements.ts new file mode 100644 index 0000000..3751491 --- /dev/null +++ b/hx-ai-intelligent/src/api/alarmManagement/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/api/alarmSettings/deviceAlarms.ts b/hx-ai-intelligent/src/api/alarmSettings/deviceAlarms.ts deleted file mode 100644 index b78f725..0000000 --- a/hx-ai-intelligent/src/api/alarmSettings/deviceAlarms.ts +++ /dev/null @@ -1,9 +0,0 @@ -export enum deviceAlarms { - getTableList = '/carbon-smart/api/AlarmEquipment/selectAlarmEquipment', //设备告警分页 - addOrUpNewData = '/carbon-smart/api/AlarmEquipment/creatOrUpdate', //设备告警添加 修改 - del = '/carbon-smart/api/AlarmEquipment/delete', //设备告警删除 - configGetTableList = '/carbon-smart/api/AlarmEquipmentRule/selectAlarmEquipmentRule', //配置设备告警分页 - configAddOrUpNewData = '/carbon-smart/api/AlarmEquipmentRule/creatOrUpdate', //配置设备告警添加 修改 - configFindById = '/carbon-smart/api/AlarmEquipmentRule/findById', //配置设备告警 查询详情 - configDel = '/carbon-smart/api/AlarmEquipmentRule/delete', //配置设备告警删除 -} diff --git a/hx-ai-intelligent/src/api/alarmSettings/energyAlarm.ts b/hx-ai-intelligent/src/api/alarmSettings/energyAlarm.ts deleted file mode 100644 index 88a661d..0000000 --- a/hx-ai-intelligent/src/api/alarmSettings/energyAlarm.ts +++ /dev/null @@ -1,9 +0,0 @@ -export enum energyAlarms { - getTableList = '/carbon-smart/api/AlarmEnergyConsumption/selectAlarmEnergyConsumption', //能耗告警分页 - addOrUpNewData = '/carbon-smart/api/AlarmEnergyConsumption/creatOrUpdate', //能耗告警添加 修改 - del = '/carbon-smart/api/AlarmEnergyConsumption/delete', //能耗删除 - configGetTableList = '/carbon-smart/api/AlarmEnergyConsumptionRule/selectAlarmEnergyConsumptionRule', //配置设备告警分页 - configAddOrUpNewData = '/carbon-smart/api/AlarmEnergyConsumptionRule/creatOrUpdate', //配置设备告警添加 修改 - configFindById = '/carbon-smart/api/AlarmEnergyConsumptionRule/findById', //配置设备告警 查询详情 - configDel = '/carbon-smart/api/AlarmEnergyConsumptionRule/delete', //配置设备告警删除 -} diff --git a/hx-ai-intelligent/src/api/alarmSettings/notificationManagements.ts b/hx-ai-intelligent/src/api/alarmSettings/notificationManagements.ts deleted file mode 100644 index 3751491..0000000 --- a/hx-ai-intelligent/src/api/alarmSettings/notificationManagements.ts +++ /dev/null @@ -1,5 +0,0 @@ -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/router/alarmManagement.ts b/hx-ai-intelligent/src/router/alarmManagement.ts index fde362d..f9b326a 100644 --- a/hx-ai-intelligent/src/router/alarmManagement.ts +++ b/hx-ai-intelligent/src/router/alarmManagement.ts @@ -43,25 +43,25 @@ const alarmManagement = { }, ], }, - // { - // path: 'gatewayAlarm', - // name: 'GatewayAlarm', - // meta: { title: '网关告警', hideChildren: true, icon: 'gaojingguanli' }, - // component: Base, - // redirect: { name: 'GatewayAlarmIndex' }, - // children: [ - // { - // path: 'index', - // name: 'GatewayAlarmIndex', - // component: () => import('/@/view/alarmManagement/gatewayAlarm/index.vue'), - // meta: { - // title: '网关告警', - // keepAlive: false, - // // backApi: [], - // }, - // }, - // ], - // }, + { + path: 'gatewayAlarm', + name: 'GatewayAlarm', + meta: { title: '网关告警', hideChildren: true, icon: 'gaojingguanli' }, + component: Base, + redirect: { name: 'GatewayAlarmIndex' }, + children: [ + { + path: 'index', + name: 'GatewayAlarmIndex', + component: () => import('/@/view/alarmManagement/gatewayAlarm/index.vue'), + meta: { + title: '网关告警', + keepAlive: false, + // backApi: [], + }, + }, + ], + }, { path: 'alarmSettings', name: 'AlarmSettings', diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/configureEnergyAlarms.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/configureEnergyAlarms.vue index 79bc3cf..3aa322d 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/configureEnergyAlarms.vue +++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/configureEnergyAlarms.vue @@ -24,7 +24,7 @@ import { http } from '/nerv-lib/util'; import { NsMessage, NsModal } from '/nerv-lib/component'; import editConfigureEnergyAlarm from './editConfigureEnergyAlarm.vue'; - import { energyAlarms } from '/@/api/alarmSettings/energyAlarm'; + import { energyAlarms } from '/@/api/alarmManagement/alarmSettings/energyAlarm'; import { ExclamationCircleOutlined } from '@ant-design/icons-vue'; import { device } from '/@/api/deviceManage'; import { dict } from '/@/api'; @@ -362,3 +362,4 @@ background-color: grey !important; } +../../../../api/alarmManagement/alarmSettings/energyAlarm diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editConfigureEnergyAlarm.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editConfigureEnergyAlarm.vue index eb35977..a5d0067 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editConfigureEnergyAlarm.vue +++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editConfigureEnergyAlarm.vue @@ -135,7 +135,7 @@ import type { SelectProps } from 'ant-design-vue'; import type { ShowSearchType } from 'ant-design-vue/es/cascader'; import { device, group } from '/@/api/deviceManage'; - import { energyAlarms } from '/@/api/alarmSettings/energyAlarm'; + import { energyAlarms } from '/@/api/alarmManagement/alarmSettings/energyAlarm'; import { http } from '/nerv-lib/util'; import { dict } from '/@/api'; import { async } from '@antv/x6/lib/registry/marker/async'; @@ -508,3 +508,4 @@ width: 23%; } +../../../../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 f13f7ae..c9973a4 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editeEnergyAlarm.vue +++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editeEnergyAlarm.vue @@ -74,7 +74,7 @@ import { ref } from 'vue'; import { NsMessage } from '/nerv-lib/component'; import { http } from '/nerv-lib/util'; - import { energyAlarms } from '/@/api/alarmSettings/energyAlarm'; + import { energyAlarms } from '/@/api/alarmManagement/alarmSettings/energyAlarm'; const visible = ref(false); //表单数据 @@ -307,3 +307,4 @@ 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 c90e467..7187627 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/configureDeviceAlarms.vue +++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/configureDeviceAlarms.vue @@ -24,7 +24,7 @@ import { http } from '/nerv-lib/util'; import { NsMessage, NsModal } from '/nerv-lib/component'; import editConfigureDeviceAlarm from '../equipmentAlarm/editConfigureDeviceAlarm.vue'; - import { deviceAlarms } from '/@/api/alarmSettings/deviceAlarms'; + import { deviceAlarms } from '/@/api/alarmManagement/alarmSettings/deviceAlarms'; import { ExclamationCircleOutlined } from '@ant-design/icons-vue'; import { device } from '/@/api/deviceManage'; @@ -323,3 +323,4 @@ background-color: grey !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 8d50e75..530006a 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue +++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue @@ -150,7 +150,7 @@ import type { SelectProps } from 'ant-design-vue'; import type { ShowSearchType } from 'ant-design-vue/es/cascader'; import { device } from '/@/api/deviceManage'; - import { deviceAlarms } from '/@/api/alarmSettings/deviceAlarms'; + import { deviceAlarms } from '/@/api/alarmManagement/alarmSettings/deviceAlarms'; import { http } from '/nerv-lib/util'; @@ -519,3 +519,4 @@ width: 23%; } +../../../../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 d25ea76..9ecbbd8 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editeEquipmentAlarm.vue +++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editeEquipmentAlarm.vue @@ -80,7 +80,7 @@ import { ref } from 'vue'; import { NsMessage } from '/nerv-lib/component'; import { http } from '/nerv-lib/util'; - import { deviceAlarms } from '/@/api/alarmSettings/deviceAlarms'; + import { deviceAlarms } from '/@/api/alarmManagement/alarmSettings/deviceAlarms'; const visible = ref(false); //表单数据 @@ -307,3 +307,4 @@ width: 23%; } +../../../../api/alarmManagement/alarmSettings/deviceAlarms diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/index.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/index.vue index d584357..46f7807 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/index.vue +++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/index.vue @@ -151,10 +151,10 @@ import notificationManagement from './notificationManagement/index.vue'; import configureEnergyAlarms from './energyAlarm/configureEnergyAlarms.vue'; import configureDeviceAlarms from './equipmentAlarm/configureDeviceAlarms.vue'; - import { deviceAlarms } from '/@/api/alarmSettings/deviceAlarms'; - import { energyAlarms } from '/@/api/alarmSettings/energyAlarm'; + import { deviceAlarms } from '/@/api/alarmManagement/alarmSettings/deviceAlarms'; + import { energyAlarms } from '/@/api/alarmManagement/alarmSettings/energyAlarm'; import { ExclamationCircleOutlined } from '@ant-design/icons-vue'; - import { notificationManagementApi } from '/@/api/alarmSettings/notificationManagements'; + import { notificationManagementApi } from '/@/api/alarmManagement/alarmSettings/notificationManagements'; export default { name: 'AlarmSettingsIndex', @@ -339,3 +339,4 @@ background-color: grey !important; } +../../../api/alarmManagement/alarmSettings/deviceAlarms../../../api/alarmManagement/alarmSettings/energyAlarm../../../api/alarmManagement/alarmSettings/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 fccaaaf..6f62923 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/index.vue +++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/index.vue @@ -72,7 +72,7 @@ import { NsMessage } from '/nerv-lib/component'; import { http } from '/nerv-lib/util'; import linkPeople from './linkPeople/index.vue'; - import { notificationManagementApi } from '/@/api/alarmSettings/notificationManagements'; + import { notificationManagementApi } from '/@/api/alarmManagement/alarmSettings/notificationManagements'; import { async } from '@antv/x6/lib/registry/marker/async'; //table 数据 @@ -301,3 +301,4 @@ width: 20%; } +../../../../api/alarmManagement/alarmSettings/notificationManagements 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 4fff834..86059b8 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/energyAlarmConfig.ts +++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/energyAlarmConfig.ts @@ -1,6 +1,6 @@ import { http } from '/nerv-lib/util'; import { NsMessage } from '/nerv-lib/component'; -import { energyAlarms } from '/@/api/alarmSettings/energyAlarm'; +import { energyAlarms } from '/@/api/alarmManagement/alarmSettings/energyAlarm'; const tableKeyMap = [ { 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 ab56877..2aba285 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/equipmentAlarmConfig.ts +++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/equipmentAlarmConfig.ts @@ -1,7 +1,6 @@ import { http } from '/nerv-lib/util'; import { NsMessage } from '/nerv-lib/component'; -import { deviceAlarms } from '/@/api/alarmSettings/deviceAlarms'; - +import { deviceAlarms } from '/@/api/alarmManagement/alarmSettings/deviceAlarms'; const tableKeyMap = [ { title: '序号', diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/notificationManagementConfig.ts b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/notificationManagementConfig.ts index 37602d5..b67ab03 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/notificationManagementConfig.ts +++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/notificationManagementConfig.ts @@ -1,6 +1,6 @@ import { dateUtil } from '/nerv-lib/util/date-util'; import { http } from '/nerv-lib/util'; -import { notificationManagementApi } from '/@/api/alarmSettings/notificationManagements'; +import { notificationManagementApi } from '/@/api/alarmManagement/alarmSettings/notificationManagements'; import { ref } from 'vue'; const tableKeyMap = [ diff --git a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/ts/config.ts b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/ts/config.ts index 069127e..f57b354 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/ts/config.ts +++ b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/ts/config.ts @@ -140,7 +140,7 @@ export const notificationtableConfig = (look: any, status: any) => { }, { field: 'createTime', - label: '生产日期', + label: '数据日期', component: 'NsRangePicker', fieldMap: ['manufactureBeginDate', 'manufactureEndDate'], componentProps: { diff --git a/hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/ts/config.ts b/hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/ts/config.ts index 03ca249..8f4ac67 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/ts/config.ts +++ b/hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/ts/config.ts @@ -133,16 +133,8 @@ export const notificationtableConfig = (look: any, status: any) => { }, }, { - field: 'provider', - label: '错误码', - component: 'NsInput', - componentProps: { - placeholder: '请输入告警错误码', - }, - }, - { field: 'createTime', - label: '生产日期', + label: '数据日期', component: 'NsRangePicker', fieldMap: ['manufactureBeginDate', 'manufactureEndDate'], componentProps: {