From c2e69b4d366fa6a74e3702cc4fe6c2aff069549f Mon Sep 17 00:00:00 2001 From: zhaohy <1695786511@qq.com> Date: Wed, 17 Jul 2024 11:13:56 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=B7=BB=E5=8A=A0=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E5=91=8A=E8=AD=A6=20=E6=8D=A2=E5=9B=BE=E6=A0=87=20=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E5=91=8A=E8=AD=A6=E8=AF=A6=E6=83=85=20=20=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E6=B5=81=E7=A8=8B=20=E6=8C=89=E9=92=AE=E6=9D=83?= =?UTF-8?q?=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hx-ai-intelligent/src/components/ns-steps.vue | 107 ++++++ hx-ai-intelligent/src/icon/gaojingguanli.svg | 13 +- hx-ai-intelligent/src/icon/gaojingtonglan.svg | 6 + hx-ai-intelligent/src/icon/status-0.svg | 6 + hx-ai-intelligent/src/icon/status-1.svg | 6 + hx-ai-intelligent/src/icon/status-2.svg | 6 + hx-ai-intelligent/src/icon/status-3.svg | 6 + hx-ai-intelligent/src/icon/status-4.svg | 6 + hx-ai-intelligent/src/router/alarmManagement.ts | 33 +- .../view/alarmManagement/alarmOverview/index.vue | 18 +- .../energyAlarm/configureEnergyAlarms.vue | 12 +- .../equipmentAlarm/configureDeviceAlarms.vue | 12 +- .../view/alarmManagement/alarmSettings/index.vue | 2 +- .../alarmSettings/ts/energyAlarmConfig.ts | 12 +- .../alarmSettings/ts/equipmentAlarmConfig.ts | 12 +- .../view/alarmManagement/equipmentAlarm/index.vue | 1 + .../view/alarmManagement/equipmentAlarm/look.vue | 412 +++++++++------------ .../view/alarmManagement/equipmentAlarm/status.vue | 99 ++++- .../alarmManagement/equipmentAlarm/ts/config.ts | 10 +- 19 files changed, 489 insertions(+), 290 deletions(-) create mode 100644 hx-ai-intelligent/src/components/ns-steps.vue create mode 100644 hx-ai-intelligent/src/icon/gaojingtonglan.svg create mode 100644 hx-ai-intelligent/src/icon/status-0.svg create mode 100644 hx-ai-intelligent/src/icon/status-1.svg create mode 100644 hx-ai-intelligent/src/icon/status-2.svg create mode 100644 hx-ai-intelligent/src/icon/status-3.svg create mode 100644 hx-ai-intelligent/src/icon/status-4.svg diff --git a/hx-ai-intelligent/src/components/ns-steps.vue b/hx-ai-intelligent/src/components/ns-steps.vue new file mode 100644 index 0000000..d55f6fd --- /dev/null +++ b/hx-ai-intelligent/src/components/ns-steps.vue @@ -0,0 +1,107 @@ + + + + diff --git a/hx-ai-intelligent/src/icon/gaojingguanli.svg b/hx-ai-intelligent/src/icon/gaojingguanli.svg index 23227d7..ef3dd02 100644 --- a/hx-ai-intelligent/src/icon/gaojingguanli.svg +++ b/hx-ai-intelligent/src/icon/gaojingguanli.svg @@ -1,12 +1 @@ - - - - + \ No newline at end of file diff --git a/hx-ai-intelligent/src/icon/gaojingtonglan.svg b/hx-ai-intelligent/src/icon/gaojingtonglan.svg new file mode 100644 index 0000000..0407a0a --- /dev/null +++ b/hx-ai-intelligent/src/icon/gaojingtonglan.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/hx-ai-intelligent/src/icon/status-0.svg b/hx-ai-intelligent/src/icon/status-0.svg new file mode 100644 index 0000000..d05487a --- /dev/null +++ b/hx-ai-intelligent/src/icon/status-0.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/hx-ai-intelligent/src/icon/status-1.svg b/hx-ai-intelligent/src/icon/status-1.svg new file mode 100644 index 0000000..7ded55c --- /dev/null +++ b/hx-ai-intelligent/src/icon/status-1.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/hx-ai-intelligent/src/icon/status-2.svg b/hx-ai-intelligent/src/icon/status-2.svg new file mode 100644 index 0000000..5e24ea9 --- /dev/null +++ b/hx-ai-intelligent/src/icon/status-2.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/hx-ai-intelligent/src/icon/status-3.svg b/hx-ai-intelligent/src/icon/status-3.svg new file mode 100644 index 0000000..3dcdc39 --- /dev/null +++ b/hx-ai-intelligent/src/icon/status-3.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/hx-ai-intelligent/src/icon/status-4.svg b/hx-ai-intelligent/src/icon/status-4.svg new file mode 100644 index 0000000..08e2ae4 --- /dev/null +++ b/hx-ai-intelligent/src/icon/status-4.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/hx-ai-intelligent/src/router/alarmManagement.ts b/hx-ai-intelligent/src/router/alarmManagement.ts index dd930f3..f9d7428 100644 --- a/hx-ai-intelligent/src/router/alarmManagement.ts +++ b/hx-ai-intelligent/src/router/alarmManagement.ts @@ -15,7 +15,6 @@ const alarmManagement = { { path: 'index', name: 'alarmOverviewIndex', - // component: () => import('/nerv-lib/saas/view/menuManage/index.vue'), component: () => import('/@/view/alarmManagement/alarmOverview/index.vue'), meta: { title: '告警总览', @@ -26,16 +25,15 @@ const alarmManagement = { ], }, { - path: 'equipmentAlarm ', + path: 'equipmentAlarm', name: 'EquipmentAlarm', meta: { title: '设备告警', hideChildren: true, icon: 'gaojingguanli' }, component: Base, - redirect: { name: 'equipmentAlarmIndex' }, + redirect: { name: 'EquipmentAlarmIndex' }, children: [ { path: 'index', - name: 'equipmentAlarmIndex', - // component: () => import('/nerv-lib/saas/view/menuManage/index.vue'), + name: 'EquipmentAlarmIndex', component: () => import('/@/view/alarmManagement/equipmentAlarm/index.vue'), meta: { title: '设备告警', @@ -55,11 +53,34 @@ const alarmManagement = { { path: 'index', name: 'alarmSettingsIndex', - // component: () => import('/nerv-lib/saas/view/menuManage/index.vue'), component: () => import('/@/view/alarmManagement/alarmSettings/index.vue'), meta: { title: '告警设置', keepAlive: true, + operates: [ + { title: '设备告警新增', code: 'equipmentAlarmAdd' }, + { title: '设备告警导入', code: 'equipmentAlarmImport' }, + { title: '设备告警导出', code: 'equipmentAlarmExports' }, + { title: '设备告警删除', code: 'equipmentAlarmDel' }, + { title: '设备告警编辑', code: 'equipmentAlarmEdit' }, + { title: '能源告警新增', code: 'energyAlarmAdd' }, + { title: '能源告警导入', code: 'energyAlarmImport' }, + { title: '能源告警导出', code: 'energyAlarmExports' }, + { title: '能源告警删除', code: 'energyAlarmDel' }, + { title: '能源告警编辑', code: 'energyAlarmEdit' }, + { title: '设备告警规则新增', code: 'configureEquipmentAlarmAdd' }, + { title: '设备告警规则导入', code: 'configureEquipmentAlarmImport' }, + { title: '设备告警规则导出', code: 'configureEquipmentAlarmExports' }, + { title: '设备告警规则批量删除', code: 'configureEquipmentAlarmDels' }, + { title: '设备告警规则编辑', code: 'configureEquipmentAlarmEdit' }, + { title: '设备告警规则删除', code: 'configureEquipmentAlarmDel' }, + { title: '能源告警规则新增', code: 'configureEnergyAlarmAdd' }, + { title: '能源告警规则导入', code: 'configureEnergyAlarmImport' }, + { title: '能源告警规则导出', code: 'configureEnergyAlarmExports' }, + { title: '能源告警规则批量删除', code: 'configureEnergyAlarmDels' }, + { title: '能源告警规则编辑', code: 'configureEnergyAlarmEdit' }, + { title: '能源告警规则删除', code: 'configureEnergyAlarmDel' }, + ], // backApi: [], }, }, diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmOverview/index.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmOverview/index.vue index 4793714..a26556e 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/alarmOverview/index.vue +++ b/hx-ai-intelligent/src/view/alarmManagement/alarmOverview/index.vue @@ -20,7 +20,7 @@
- +
@@ -45,7 +45,7 @@ import * as echarts from 'echarts'; defineOptions({ - name: 'alarmOverview', // 与页面路由name一致缓存才可生效 + name: 'alarmOverviewIndex', // 与页面路由name一致缓存才可生效 }); const info = ref({}); @@ -134,13 +134,13 @@ itemGap: 30, // 这里可以调整图例项之间的间距，单位为像素 }, ], - toolbox: { - show: true, - feature: { - restore: {}, - saveAsImage: {}, - }, - }, + // toolbox: { + // show: true, + // feature: { + // restore: {}, + // saveAsImage: {}, + // }, + // }, calculable: true, xAxis: [ { 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 02a3b8e..79bc3cf 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/configureEnergyAlarms.vue +++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/configureEnergyAlarms.vue @@ -106,7 +106,7 @@ headerActions: [ { label: '新增', - name: 'RoleTypeAdd', + name: 'configureEnergyAlarmAdd', type: 'primary', handle: () => { editConfigureEnergyAlarms.value.toggle(null, configureEnergyAlarmsData.value); @@ -114,7 +114,7 @@ }, { label: '导入', - name: 'groupImport', + name: 'configureEnergyAlarmImport', type: 'primary', extra: { // api: props.postImportApi, // 导入接口名 @@ -131,7 +131,7 @@ }, { label: '导出', - name: 'groupExports', + name: 'configureEnergyAlarmExports', type: 'primary', handle: () => { doWnload('/hx-ai-intelligent/asset/file/whiteListUser.xlsx'); @@ -140,7 +140,7 @@ { label: '批量删除', type: 'primary', - name: 'userBatchDel', + name: 'configureEnergyAlarmDels', confirm: true, dynamicDisabled: (data: any) => { return data.list.length === 0; @@ -205,7 +205,7 @@ actions: [ { label: '编辑', - name: 'FeedBackDetail', + name: 'configureEnergyAlarmEdit', dynamicParams: ['uuid', 'appealType'], handle: (data: any) => { editConfigureEnergyAlarms.value.toggle(data, configureEnergyAlarmsData.value); @@ -213,7 +213,7 @@ }, { label: '删除', - name: 'FeedBackDetail', + name: 'configureEnergyAlarmDel', dynamicParams: ['uuid', 'appealType'], confirm: true, handle: (data: any) => { 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 bcb9426..9945b04 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/configureDeviceAlarms.vue +++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/configureDeviceAlarms.vue @@ -79,7 +79,7 @@ headerActions: [ { label: '新增', - name: 'RoleTypeAdd', + name: 'configureEquipmentAlarmAdd', type: 'primary', handle: () => { editConfigureDeviceAlarms.value.toggle(null, configureDeviceAlarmsData.value); @@ -87,7 +87,7 @@ }, { label: '导入', - name: 'groupImport', + name: 'configureEquipmentAlarmImport', type: 'primary', extra: { // api: props.postImportApi, // 导入接口名 @@ -104,7 +104,7 @@ }, { label: '导出', - name: 'groupExports', + name: 'configureEquipmentAlarmExports', type: 'primary', handle: () => { doWnload('/hx-ai-intelligent/asset/file/whiteListUser.xlsx'); @@ -112,7 +112,7 @@ }, { label: '批量删除', - name: 'groupTemDownload', + name: 'configureEquipmentAlarmDels', type: 'primary', confirm: true, dynamicDisabled: (data: any) => { @@ -177,7 +177,7 @@ actions: [ { label: '编辑', - name: 'FeedBackDetail', + name: 'configureEquipmentAlarmEdit', dynamicParams: ['uuid', 'appealType'], handle: (data: any) => { editConfigureDeviceAlarms.value.toggle(data, configureDeviceAlarmsData); @@ -185,7 +185,7 @@ }, { label: '删除', - name: 'FeedBackDetail', + name: 'configureEquipmentAlarmDel', dynamicParams: ['uuid', 'appealType'], confirm: true, handle: (data: any) => { diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/index.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/index.vue index 6f59342..83fc3a1 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/index.vue +++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/index.vue @@ -126,7 +126,7 @@ import { ExclamationCircleOutlined } from '@ant-design/icons-vue'; export default { - name: 'AlarmSettings', + name: 'AlarmSettingsIndex', components: { editeEquipmentAlarm, configureDeviceAlarms, 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 d5caddf..5edbf31 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/energyAlarmConfig.ts +++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/energyAlarmConfig.ts @@ -57,7 +57,7 @@ export const energyAlarmConfigs = ( headerActions: [ { label: '新增', - name: 'RoleTypeAdd', + name: 'energyAlarmAdd', type: 'primary', handle: () => { editeEnergyAlarm.value.toggle(); @@ -65,7 +65,7 @@ export const energyAlarmConfigs = ( }, { label: '导入', - name: 'groupImport', + name: 'energyAlarmImport', type: 'primary', extra: { title: '设备信息', // 弹窗title @@ -81,7 +81,7 @@ export const energyAlarmConfigs = ( }, { label: '导出', - name: 'groupExports', + name: 'energyAlarmExports', type: 'primary', handle: () => { doWnload('/hx-ai-intelligent/asset/file/whiteListUser.xlsx'); @@ -95,7 +95,7 @@ export const energyAlarmConfigs = ( actions: [ { label: '编辑', - name: 'FeedBackDetail', + name: 'energyAlarmEdit', dynamicParams: ['uuid', 'appealType'], handle: (data: any) => { data.monitorFrequency = data.monitorFrequency.value; @@ -106,7 +106,7 @@ export const energyAlarmConfigs = ( }, { label: '配置', - name: 'FeedBackDetail', + name: 'alarmSettingsIndex', dynamicParams: ['uuid', 'appealType'], handle: (data: any) => { energyAlarm.value = !energyAlarm.value; @@ -115,7 +115,7 @@ export const energyAlarmConfigs = ( }, { label: '删除', - name: 'FeedBackDetail', + name: 'energyAlarmDel', dynamicParams: ['uuid', 'appealType'], confirm: true, handle: (data: any) => { 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 16cc06a..e435364 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/equipmentAlarmConfig.ts +++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/equipmentAlarmConfig.ts @@ -61,7 +61,7 @@ export const equipmentAlarmTableConfig = ( headerActions: [ { label: '新增', - name: 'RoleTypeAdd', + name: 'equipmentAlarmAdd', type: 'primary', handle: () => { editEquipmentAlarm.value.toggle(); @@ -69,7 +69,7 @@ export const equipmentAlarmTableConfig = ( }, { label: '导入', - name: 'groupImport', + name: 'equipmentAlarmImport', type: 'primary', extra: { // api: props.postImportApi, // 导入接口名 @@ -86,7 +86,7 @@ export const equipmentAlarmTableConfig = ( }, { label: '导出', - name: 'groupExports', + name: 'equipmentAlarmExports', type: 'primary', handle: () => { doWnload('/hx-ai-intelligent/asset/file/whiteListUser.xlsx'); @@ -100,7 +100,7 @@ export const equipmentAlarmTableConfig = ( actions: [ { label: '编辑', - name: 'FeedBackDetail', + name: 'equipmentAlarmEdit', dynamicParams: ['uuid', 'appealType'], handle: (data: any) => { data.priority = data.priority.value; @@ -111,7 +111,7 @@ export const equipmentAlarmTableConfig = ( }, { label: '配置', - name: 'FeedBackDetail', + name: 'alarmSettingsIndex', dynamicParams: ['uuid', 'appealType'], handle: (data: any) => { equipmentAlarm.value = !equipmentAlarm.value; @@ -120,7 +120,7 @@ export const equipmentAlarmTableConfig = ( }, { label: '删除', - name: 'FeedBackDetail', + name: 'equipmentAlarmDel', dynamicParams: ['uuid', 'appealType'], confirm: true, handle: (data: any) => { diff --git a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/index.vue b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/index.vue index 59d78bf..a8e00cc 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/index.vue +++ b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/index.vue @@ -12,6 +12,7 @@ import { ref } from 'vue'; export default { + name: 'EquipmentAlarmIndex', components: { Look, Status }, setup() { diff --git a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/look.vue b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/look.vue index 62e9a31..baeb5df 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/look.vue +++ b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/look.vue @@ -8,7 +8,7 @@ :cancel="handleClose" placement="right" @close="handleClose"> -
+
+
+
+
+ +
+ + 紧急 + 新告警 + C003 +
用电量超标
当日用电量超出预设值 + 1栋10层低压柜 + 0 + +
+ - diff --git a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/status.vue b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/status.vue index d6cb122..9ec1b01 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/status.vue +++ b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/status.vue @@ -8,16 +8,81 @@ :cancel="handleClose" placement="right" @close="handleClose"> - 状态 + + Content of Tab Pane 1 + + + + + + + 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 8adc472..8d4092f 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/ts/config.ts +++ b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/ts/config.ts @@ -132,16 +132,8 @@ export const notificationtableConfig = (look: any, status: any) => { }, { field: 'provider', - label: '告警标题', - component: 'NsInput', - componentProps: { - placeholder: '请输入告警标题关键字', - }, - }, - { - field: 'provider', label: '错误码', - component: 'NsInputApi', + component: 'NsInput', componentProps: { placeholder: '请输入告警错误码', },