diff --git a/hx-ai-intelligent/src/api/alarmManagement/alarmOverview.ts b/hx-ai-intelligent/src/api/alarmManagement/alarmOverview.ts index ca7f26f..6871554 100644 --- a/hx-ai-intelligent/src/api/alarmManagement/alarmOverview.ts +++ b/hx-ai-intelligent/src/api/alarmManagement/alarmOverview.ts @@ -1,8 +1,10 @@ +import { BASE_URL } from '../index'; + export enum alarmOverviewApi { - getAlarmEquipment = '/carbon-smart/api/AlarmOverview/alarmEquipment', //设备告警 数量 - getAlarmEnergyConsumption = '/carbon-smart/api/AlarmOverview/alarmEnergyConsumption', //能碳告警 数量 - getAlarmGateway = '/carbon-smart/api/AlarmOverview/alarmGateway', //网关告警 数量 - getPriority = '/carbon-smart/api/AlarmOverview/priority', //优先级 数量 - getProcessProgress = '/carbon-smart/api/AlarmOverview/processProgress', //进度 数量 - getAlarmTrend = '/carbon-smart/api/AlarmOverview/alarmTrend', //30天告警 数量 + getAlarmEquipment = `${BASE_URL}/api/AlarmOverview/alarmEquipment`, //设备告警 数量 + getAlarmEnergyConsumption = `${BASE_URL}/api/AlarmOverview/alarmEnergyConsumption`, //能碳告警 数量 + getAlarmGateway = `${BASE_URL}/api/AlarmOverview/alarmGateway`, //网关告警 数量 + getPriority = `${BASE_URL}/api/AlarmOverview/priority`, //优先级 数量 + getProcessProgress = `${BASE_URL}/api/AlarmOverview/processProgress`, //进度 数量 + getAlarmTrend = `${BASE_URL}/api/AlarmOverview/alarmTrend`, //30天告警 数量 } diff --git a/hx-ai-intelligent/src/api/alarmManagement/alarmSettings/deviceAlarms.ts b/hx-ai-intelligent/src/api/alarmManagement/alarmSettings/deviceAlarms.ts index b78f725..8236915 100644 --- a/hx-ai-intelligent/src/api/alarmManagement/alarmSettings/deviceAlarms.ts +++ b/hx-ai-intelligent/src/api/alarmManagement/alarmSettings/deviceAlarms.ts @@ -1,9 +1,11 @@ +import { BASE_URL } from '../../index'; + 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', //配置设备告警删除 + getTableList = `${BASE_URL}/api/AlarmEquipment/selectAlarmEquipment`, //设备告警分页 + addOrUpNewData = `${BASE_URL}/api/AlarmEquipment/creatOrUpdate`, //设备告警添加 修改 + del = `${BASE_URL}/api/AlarmEquipment/delete`, //设备告警删除 + configGetTableList = `${BASE_URL}/api/AlarmEquipmentRule/selectAlarmEquipmentRule`, //配置设备告警分页 + configAddOrUpNewData = `${BASE_URL}/api/AlarmEquipmentRule/creatOrUpdate`, //配置设备告警添加 修改 + configFindById = `${BASE_URL}/api/AlarmEquipmentRule/findById`, //配置设备告警 查询详情 + configDel = `${BASE_URL}/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 index 88a661d..ae3e0b3 100644 --- a/hx-ai-intelligent/src/api/alarmManagement/alarmSettings/energyAlarm.ts +++ b/hx-ai-intelligent/src/api/alarmManagement/alarmSettings/energyAlarm.ts @@ -1,9 +1,11 @@ +import { BASE_URL } from '../../index'; + 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', //配置设备告警删除 + getTableList = `${BASE_URL}/api/AlarmEnergyConsumption/selectAlarmEnergyConsumption`, //能耗告警分页 + addOrUpNewData = `${BASE_URL}/api/AlarmEnergyConsumption/creatOrUpdate`, //能耗告警添加 修改 + del = `${BASE_URL}/api/AlarmEnergyConsumption/delete`, //能耗删除 + configGetTableList = `${BASE_URL}/api/AlarmEnergyConsumptionRule/selectAlarmEnergyConsumptionRule`, //配置设备告警分页 + configAddOrUpNewData = `${BASE_URL}/api/AlarmEnergyConsumptionRule/creatOrUpdate`, //配置设备告警添加 修改 + configFindById = `${BASE_URL}/api/AlarmEnergyConsumptionRule/findById`, //配置设备告警 查询详情 + configDel = `${BASE_URL}/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 index 3751491..952b5a0 100644 --- a/hx-ai-intelligent/src/api/alarmManagement/alarmSettings/notificationManagements.ts +++ b/hx-ai-intelligent/src/api/alarmManagement/alarmSettings/notificationManagements.ts @@ -1,5 +1,7 @@ +import { BASE_URL } from '../../index'; + export enum notificationManagementApi { - getTableList = '/carbon-smart/api/AlarmContactInformation/selectAlarmContactInformation', //通知管理分页 - upData = '/carbon-smart/api/AlarmContactInformation/update', //通知管理 修改 - findById = '/carbon-smart/api/AlarmContactInformation/findById', //通知管理 查询详情 + getTableList = `${BASE_URL}/api/AlarmContactInformation/selectAlarmContactInformation`, //通知管理分页 + upData = `${BASE_URL}/api/AlarmContactInformation/update`, //通知管理 修改 + findById = `${BASE_URL}/api/AlarmContactInformation/findById`, //通知管理 查询详情 } diff --git a/hx-ai-intelligent/src/api/alarmManagement/energyAlarm.ts b/hx-ai-intelligent/src/api/alarmManagement/energyAlarm.ts index 2593816..27c755e 100644 --- a/hx-ai-intelligent/src/api/alarmManagement/energyAlarm.ts +++ b/hx-ai-intelligent/src/api/alarmManagement/energyAlarm.ts @@ -1,6 +1,8 @@ +import { BASE_URL } from '../index'; + export enum energyAlarmApi { - getTableList = '/carbon-smart/api/AlarmEnergyConsumptionLog/selectAlarmEnergyConsumptionLog', //能碳告警 列表 - getCodeList = '/carbon-smart/api/AlarmEnergyConsumptionLog/selectErrorCodeList ', //能碳告警 列表 - getSelectAlarmEnergyConsumptionLogStatusProcess = '/carbon-smart/api/AlarmEnergyConsumptionLogStatusProcess/selectAlarmEnergyConsumptionLogStatusProcess', //能碳告警 状态 没有创建工单log接口 - noCreatOrUpdateLog = '/carbon-smart/api/AlarmEnergyConsumptionLogStatusProcess/creatOrUpdate', //能碳告警 状态 没有创建工单 添加 修改状态log + getTableList = `${BASE_URL}/api/AlarmEnergyConsumptionLog/selectAlarmEnergyConsumptionLog`, //能碳告警 列表 + getCodeList = `${BASE_URL}/api/AlarmEnergyConsumptionLog/selectErrorCodeList `, //能碳告警 列表 + getSelectAlarmEnergyConsumptionLogStatusProcess = `${BASE_URL}/api/AlarmEnergyConsumptionLogStatusProcess/selectAlarmEnergyConsumptionLogStatusProcess`, //能碳告警 状态 没有创建工单log接口 + noCreatOrUpdateLog = `${BASE_URL}/api/AlarmEnergyConsumptionLogStatusProcess/creatOrUpdate`, //能碳告警 状态 没有创建工单 添加 修改状态log } diff --git a/hx-ai-intelligent/src/api/alarmManagement/equipmentAlarm.ts b/hx-ai-intelligent/src/api/alarmManagement/equipmentAlarm.ts index ef657b4..8505e34 100644 --- a/hx-ai-intelligent/src/api/alarmManagement/equipmentAlarm.ts +++ b/hx-ai-intelligent/src/api/alarmManagement/equipmentAlarm.ts @@ -1,6 +1,8 @@ +import { BASE_URL } from '../index'; + export enum equipmentAlarmApi { - getTableList = '/carbon-smart/api/AlarmEquipmentLog/selectAlarmEquipmentLog', //设备告警 列表 - getCodeList = '/carbon-smart/api/AlarmEquipmentLog/selectErrorCodeList', //设备告警 列表 - getSelectAlarmEquipmentLogStatusProcess = '/carbon-smart/api/AlarmEquipmentLogStatusProcess/selectAlarmEquipmentLogStatusProcess', //设备告警 状态 没有创建工单log接口 - noCreatOrUpdateLog = '/carbon-smart/api/AlarmEquipmentLogStatusProcess/creatOrUpdate', //设备告警 状态 没有创建工单 添加 修改状态log + getTableList = `${BASE_URL}/api/AlarmEquipmentLog/selectAlarmEquipmentLog`, //设备告警 列表 + getCodeList = `${BASE_URL}/api/AlarmEquipmentLog/selectErrorCodeList`, //设备告警 列表 + getSelectAlarmEquipmentLogStatusProcess = `${BASE_URL}/api/AlarmEquipmentLogStatusProcess/selectAlarmEquipmentLogStatusProcess`, //设备告警 状态 没有创建工单log接口 + noCreatOrUpdateLog = `${BASE_URL}/api/AlarmEquipmentLogStatusProcess/creatOrUpdate`, //设备告警 状态 没有创建工单 添加 修改状态log } diff --git a/hx-ai-intelligent/src/api/alarmManagement/gatewayAlarm.ts b/hx-ai-intelligent/src/api/alarmManagement/gatewayAlarm.ts index 69f2f66..8d88be4 100644 --- a/hx-ai-intelligent/src/api/alarmManagement/gatewayAlarm.ts +++ b/hx-ai-intelligent/src/api/alarmManagement/gatewayAlarm.ts @@ -1,3 +1,4 @@ +import { BASE_URL } from '../index'; export enum gatewayAlarmApi { - getTableList = '/carbon-smart/api/AlarmGatewayLog/selectAlarmGatewayLog', //网关告警 列表 + getTableList = `${BASE_URL}/api/AlarmGatewayLog/selectAlarmGatewayLog`, //网关告警 列表 } diff --git a/hx-ai-intelligent/src/view/alarmManagement/energyAlarm/look.vue b/hx-ai-intelligent/src/view/alarmManagement/energyAlarm/look.vue index 547f834..ffb2326 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/energyAlarm/look.vue +++ b/hx-ai-intelligent/src/view/alarmManagement/energyAlarm/look.vue @@ -210,13 +210,45 @@ }, }, ], + //滑块样式 dataZoom: [ { - height: 12, + type: 'inside', start: 0, end: 100, - handleSize: '300%', // 设置滑块的大小 - bottom: 15, + }, + { + type: 'slider', + // backgroundColor: 'yellow', + // fillerColor: 'yellow', + height: 12, // 设置slider的高度为15 + start: 0, + end: 100, + right: 60, + left: 60, + bottom: 10, + handleIcon: + 'path://M30.9,53.2C16.8,53.2,5.3,41.7,5.3,27.6S16.8,2,30.9,2C45,2,56.4,13.5,56.4,27.6S45,53.2,30.9,53.2z M30.9,3.5M36.9,35.8h-1.3z M27.8,35.8 h-1.3H27L27.8,35.8L27.8,35.8z', // 使用类似 axisPointer 的图标 + handleSize: '140%', // 放大按钮 + borderColor: 'none', + handleStyle: { + // color: 'red', + // shadowBlur: 6, + // shadowColor: 'yellow', + shadowOffsetX: 0, // 阴影偏移x轴多少 + shadowOffsetY: 0, // 阴影偏移y轴多少 + }, + // 显示的label的格式化器 + // 20050101 变为 2005\n0101 + // labelFormatter: function (index, value) { + // const year = value.slice(0, 4); + // const date = value.slice(4); + // return year + '\n' + date; + // }, + // textStyle: { + // fontStyle: 'italic', // 设置字体倾斜 + // }, + showDataShadow: false, // 隐藏数据阴影 }, ], series: [ diff --git a/hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/look.vue b/hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/look.vue index 063d799..fd60b86 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/look.vue +++ b/hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/look.vue @@ -197,13 +197,45 @@ interval: 1, // 设置 Y 轴刻度间隔为 1 }, ], + //滑块样式 dataZoom: [ { - height: 12, + type: 'inside', start: 0, end: 100, - handleSize: '300%', // 设置滑块的大小 - bottom: 15, + }, + { + type: 'slider', + // backgroundColor: 'yellow', + // fillerColor: 'yellow', + height: 12, // 设置slider的高度为15 + start: 0, + end: 100, + right: 60, + left: 60, + bottom: 10, + handleIcon: + 'path://M30.9,53.2C16.8,53.2,5.3,41.7,5.3,27.6S16.8,2,30.9,2C45,2,56.4,13.5,56.4,27.6S45,53.2,30.9,53.2z M30.9,3.5M36.9,35.8h-1.3z M27.8,35.8 h-1.3H27L27.8,35.8L27.8,35.8z', // 使用类似 axisPointer 的图标 + handleSize: '140%', // 放大按钮 + borderColor: 'none', + handleStyle: { + // color: 'red', + // shadowBlur: 6, + // shadowColor: 'yellow', + shadowOffsetX: 0, // 阴影偏移x轴多少 + shadowOffsetY: 0, // 阴影偏移y轴多少 + }, + // 显示的label的格式化器 + // 20050101 变为 2005\n0101 + // labelFormatter: function (index, value) { + // const year = value.slice(0, 4); + // const date = value.slice(4); + // return year + '\n' + date; + // }, + // textStyle: { + // fontStyle: 'italic', // 设置字体倾斜 + // }, + showDataShadow: false, // 隐藏数据阴影 }, ], series: [