diff --git a/src/hooks/commonDataComponents/usePointRealTimeRes.ts b/src/hooks/commonDataComponents/usePointRealTimeRes.ts new file mode 100644 index 00000000..f805dc69 --- /dev/null +++ b/src/hooks/commonDataComponents/usePointRealTimeRes.ts @@ -0,0 +1,16 @@ +import { publicInterface } from "@/api/path"; +import { commonDataType, PointRealTimeType } from '@/store/modules/chartEditStore/chartEditStore.d' +import { CreateComponentType } from '@/packages/index.d' + +export const handlePointRealTime = (targetComponent: CreateComponentType) => { + let { enable, point_uid, limit, with_device_name, space_complete_name_prefix } = (targetComponent.commonData as commonDataType).pointRealTime as PointRealTimeType + if(!enable) return + + const query = { + point_uid, + limit, + with_device_name, + space_complete_name_prefix, + } + return publicInterface('/dcim/system/custom_large_screen', 'get_point_realtime_data', query) +} diff --git a/src/hooks/useChartCommonData.hook.ts b/src/hooks/useChartCommonData.hook.ts index f8cb81cd..1fdf2914 100644 --- a/src/hooks/useChartCommonData.hook.ts +++ b/src/hooks/useChartCommonData.hook.ts @@ -9,6 +9,7 @@ import { cloneDeep } from 'lodash' import { handlePointHistory } from './commonDataComponents/usePointHistoryRes' import { handleEnergyUseHistory } from './commonDataComponents/useEnergyUseHistoryRes'; import { handleRecordValueHistory } from './commonDataComponents/useRecordValueHistoryRes' +import { handlePointRealTime } from './commonDataComponents/usePointRealTimeRes' import { ResultErrcode } from '@/enums/httpEnum' // 获取类型 @@ -85,13 +86,15 @@ export const useChartCommonData = ( case CurrentSourceEnum.RECORDVALUEHISTORY: res = await handleRecordValueHistory(targetComponent) break; + case CurrentSourceEnum.POINTREALTIME: + res = await handlePointRealTime(targetComponent) + break; default: break; } if (res && res.errcode === ResultErrcode.SUCCESS) { try { const { data } = res - console.log(data) if(Object.prototype.toString.call(data) === '[object Array]') { if(data.length) echartsUpdateHandle(data[0]) } diff --git a/src/packages/components/CustomComponents/AlarmDiagram/DeviceAlarmOverview/config.ts b/src/packages/components/CustomComponents/AlarmDiagram/DeviceAlarmOverview/config.ts new file mode 100644 index 00000000..c61a5fe1 --- /dev/null +++ b/src/packages/components/CustomComponents/AlarmDiagram/DeviceAlarmOverview/config.ts @@ -0,0 +1,32 @@ +import { PublicConfigClass } from '@/packages/public' +import { CreateComponentType } from '@/packages/index.d' +import { DeviceAlarmOverviewConfig } from './index' +import cloneDeep from 'lodash/cloneDeep' +// import logo from '@/assets/logo.png' + +export const option = { + // 图片路径 + dataset: '', + // 适应方式 + fit: 'contain', + // 圆角 + borderRadius: 0 +} + +export default class Config extends PublicConfigClass implements CreateComponentType +{ + constructor() { + super(); + this.attr.w = 450 + this.attr.h = 300 + this.request.requestInterval = 15 + } + public key = DeviceAlarmOverviewConfig.key + public chartConfig = cloneDeep(DeviceAlarmOverviewConfig) + public option = cloneDeep(option) + public customData = cloneDeep({ + title: '当前设备告警概况', + showInterval: true, + space_complete_id: '', + }) +} diff --git a/src/packages/components/CustomComponents/AlarmDiagram/DeviceAlarmOverview/config.vue b/src/packages/components/CustomComponents/AlarmDiagram/DeviceAlarmOverview/config.vue new file mode 100644 index 00000000..ae2cf42d --- /dev/null +++ b/src/packages/components/CustomComponents/AlarmDiagram/DeviceAlarmOverview/config.vue @@ -0,0 +1,7 @@ + + + diff --git a/src/packages/components/CustomComponents/AlarmDiagram/DeviceAlarmOverview/configData.vue b/src/packages/components/CustomComponents/AlarmDiagram/DeviceAlarmOverview/configData.vue new file mode 100644 index 00000000..ddf37372 --- /dev/null +++ b/src/packages/components/CustomComponents/AlarmDiagram/DeviceAlarmOverview/configData.vue @@ -0,0 +1,17 @@ + + + + + diff --git a/src/packages/components/CustomComponents/AlarmDiagram/DeviceAlarmOverview/index.ts b/src/packages/components/CustomComponents/AlarmDiagram/DeviceAlarmOverview/index.ts new file mode 100644 index 00000000..be5f81a7 --- /dev/null +++ b/src/packages/components/CustomComponents/AlarmDiagram/DeviceAlarmOverview/index.ts @@ -0,0 +1,15 @@ +import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d' +import { ChatCategoryEnum, ChatCategoryEnumName } from '@/packages/components/CustomComponents/index.d' + +export const DeviceAlarmOverviewConfig: ConfigType = { + key: 'DeviceAlarmOverview', + chartKey: 'VDeviceAlarmOverview', + conKey: 'VCDeviceAlarmOverview', + conDataKey: 'VCDDeviceAlarmOverview', + title: '当前设备告警概况', + category: ChatCategoryEnum.ALARMDIAGRAM, + categoryName: ChatCategoryEnumName.ALARMDIAGRAM, + package: PackagesCategoryEnum.CUSTOMCOMPONENTS, + chartFrame: ChartFrameEnum.COMMON, + image: 'DeviceAlarmOverview.png' +} diff --git a/src/packages/components/CustomComponents/AlarmDiagram/DeviceAlarmOverview/index.vue b/src/packages/components/CustomComponents/AlarmDiagram/DeviceAlarmOverview/index.vue new file mode 100644 index 00000000..cda1e626 --- /dev/null +++ b/src/packages/components/CustomComponents/AlarmDiagram/DeviceAlarmOverview/index.vue @@ -0,0 +1,196 @@ + + + + + diff --git a/src/packages/components/CustomComponents/AlarmDiagram/RealTimeAlarmStatistics/Svg.vue b/src/packages/components/CustomComponents/AlarmDiagram/RealTimeAlarmStatistics/Svg.vue new file mode 100644 index 00000000..71fd86ce --- /dev/null +++ b/src/packages/components/CustomComponents/AlarmDiagram/RealTimeAlarmStatistics/Svg.vue @@ -0,0 +1,568 @@ + + + + + diff --git a/src/packages/components/CustomComponents/AlarmDiagram/RealTimeAlarmStatistics/config.ts b/src/packages/components/CustomComponents/AlarmDiagram/RealTimeAlarmStatistics/config.ts new file mode 100644 index 00000000..ad550d2b --- /dev/null +++ b/src/packages/components/CustomComponents/AlarmDiagram/RealTimeAlarmStatistics/config.ts @@ -0,0 +1,32 @@ +import { PublicConfigClass } from '@/packages/public' +import { CreateComponentType } from '@/packages/index.d' +import { RealTimeAlarmStatisticsConfig } from './index' +import cloneDeep from 'lodash/cloneDeep' +// import background from '@/assets/customComponents/theme1/backgrond.jpg' + +export const option = { + // 图片路径 + dataset: '', + // 适应方式 + fit: 'contain', + // 圆角 + borderRadius: 0 +} + +export default class Config extends PublicConfigClass implements CreateComponentType +{ + constructor() { + super(); + this.attr.w = 450 + this.attr.h = 300 + this.request.requestInterval = 15 + } + public key = RealTimeAlarmStatisticsConfig.key + public chartConfig = cloneDeep(RealTimeAlarmStatisticsConfig) + public option = cloneDeep(option) + public customData = cloneDeep({ + title: '实时告警统计', + showInterval: true, + space_complete_id: '', + }) +} diff --git a/src/packages/components/CustomComponents/AlarmDiagram/RealTimeAlarmStatistics/config.vue b/src/packages/components/CustomComponents/AlarmDiagram/RealTimeAlarmStatistics/config.vue new file mode 100644 index 00000000..d1759a1d --- /dev/null +++ b/src/packages/components/CustomComponents/AlarmDiagram/RealTimeAlarmStatistics/config.vue @@ -0,0 +1,67 @@ + + + diff --git a/src/packages/components/CustomComponents/AlarmDiagram/RealTimeAlarmStatistics/configData.vue b/src/packages/components/CustomComponents/AlarmDiagram/RealTimeAlarmStatistics/configData.vue new file mode 100644 index 00000000..ddf37372 --- /dev/null +++ b/src/packages/components/CustomComponents/AlarmDiagram/RealTimeAlarmStatistics/configData.vue @@ -0,0 +1,17 @@ + + + + + diff --git a/src/packages/components/CustomComponents/AlarmDiagram/RealTimeAlarmStatistics/index.ts b/src/packages/components/CustomComponents/AlarmDiagram/RealTimeAlarmStatistics/index.ts new file mode 100644 index 00000000..efe66303 --- /dev/null +++ b/src/packages/components/CustomComponents/AlarmDiagram/RealTimeAlarmStatistics/index.ts @@ -0,0 +1,18 @@ +import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d' +import { ChatCategoryEnum,ChatCategoryEnumName } from '@/packages/components/CUSTOMCOMPONENTS/index.d' + +export const RealTimeAlarmStatisticsConfig: ConfigType = { + key: 'RealTimeAlarmStatistics', + chartKey: 'VRealTimeAlarmStatistics', + conKey: 'VCRealTimeAlarmStatistics', + conDataKey: 'VCDRealTimeAlarmStatistics', + title: '实时告警统计', + // category: ChatCategoryEnum.THEMES, + // categoryName: ChatCategoryEnumName.THEMES, + // package: PackagesCategoryEnum.THEMESANDLAYOUTS, + category: ChatCategoryEnum.ALARMDIAGRAM, + categoryName: ChatCategoryEnumName.ALARMDIAGRAM, + package: PackagesCategoryEnum.CUSTOMCOMPONENTS, + chartFrame: ChartFrameEnum.COMMON, + image: 'RealTimeAlarmStatistics.png' +} diff --git a/src/packages/components/CustomComponents/AlarmDiagram/RealTimeAlarmStatistics/index.vue b/src/packages/components/CustomComponents/AlarmDiagram/RealTimeAlarmStatistics/index.vue new file mode 100644 index 00000000..1562be98 --- /dev/null +++ b/src/packages/components/CustomComponents/AlarmDiagram/RealTimeAlarmStatistics/index.vue @@ -0,0 +1,329 @@ + + + + + diff --git a/src/packages/components/CustomComponents/AlarmDiagram/RealTimeEvent/BorderBoxV2.vue b/src/packages/components/CustomComponents/AlarmDiagram/RealTimeEvent/BorderBoxV2.vue new file mode 100644 index 00000000..d2dd37c6 --- /dev/null +++ b/src/packages/components/CustomComponents/AlarmDiagram/RealTimeEvent/BorderBoxV2.vue @@ -0,0 +1,121 @@ + + + + + diff --git a/src/packages/components/CustomComponents/AlarmDiagram/RealTimeEvent/VModal.vue b/src/packages/components/CustomComponents/AlarmDiagram/RealTimeEvent/VModal.vue new file mode 100644 index 00000000..3a241d1c --- /dev/null +++ b/src/packages/components/CustomComponents/AlarmDiagram/RealTimeEvent/VModal.vue @@ -0,0 +1,146 @@ + + + + + + diff --git a/src/packages/components/CustomComponents/AlarmDiagram/RealTimeEvent/VModalV1.vue b/src/packages/components/CustomComponents/AlarmDiagram/RealTimeEvent/VModalV1.vue new file mode 100644 index 00000000..7f565df9 --- /dev/null +++ b/src/packages/components/CustomComponents/AlarmDiagram/RealTimeEvent/VModalV1.vue @@ -0,0 +1,143 @@ + + + + + + diff --git a/src/packages/components/CustomComponents/AlarmDiagram/RealTimeEvent/config.ts b/src/packages/components/CustomComponents/AlarmDiagram/RealTimeEvent/config.ts new file mode 100644 index 00000000..e9225f66 --- /dev/null +++ b/src/packages/components/CustomComponents/AlarmDiagram/RealTimeEvent/config.ts @@ -0,0 +1,33 @@ +import { PublicConfigClass } from '@/packages/public' +import { CreateComponentType } from '@/packages/index.d' +import { RealTimeEventConfig } from './index' +import cloneDeep from 'lodash/cloneDeep' +// import logo from '@/assets/logo.png' + +export const option = { + // 图片路径 + dataset: '', + // 适应方式 + fit: 'contain', + // 圆角 + borderRadius: 0 +} + +export default class Config extends PublicConfigClass implements CreateComponentType +{ + constructor() { + super(); + this.attr.w = 950 + this.attr.h = 300 + this.request.requestInterval = 15 + } + public key = RealTimeEventConfig.key + public chartConfig = cloneDeep(RealTimeEventConfig) + public option = cloneDeep(option) + public customData = cloneDeep({ + title: '实时事件', + showInterval: true, + showFilter: false, + space_complete_id: '', + }) +} diff --git a/src/packages/components/CustomComponents/AlarmDiagram/RealTimeEvent/config.vue b/src/packages/components/CustomComponents/AlarmDiagram/RealTimeEvent/config.vue new file mode 100644 index 00000000..d1759a1d --- /dev/null +++ b/src/packages/components/CustomComponents/AlarmDiagram/RealTimeEvent/config.vue @@ -0,0 +1,67 @@ + + + diff --git a/src/packages/components/CustomComponents/AlarmDiagram/RealTimeEvent/configData.vue b/src/packages/components/CustomComponents/AlarmDiagram/RealTimeEvent/configData.vue new file mode 100644 index 00000000..157336f2 --- /dev/null +++ b/src/packages/components/CustomComponents/AlarmDiagram/RealTimeEvent/configData.vue @@ -0,0 +1,23 @@ + + + + + diff --git a/src/packages/components/CustomComponents/AlarmDiagram/RealTimeEvent/index.ts b/src/packages/components/CustomComponents/AlarmDiagram/RealTimeEvent/index.ts new file mode 100644 index 00000000..6d390092 --- /dev/null +++ b/src/packages/components/CustomComponents/AlarmDiagram/RealTimeEvent/index.ts @@ -0,0 +1,16 @@ +import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d' +import { ChatCategoryEnum, ChatCategoryEnumName } from '@/packages/components/CustomComponents/index.d' + +export const RealTimeEventConfig: ConfigType = { + key: 'RealTimeEvent', + chartKey: 'VRealTimeEvent', + conKey: 'VCRealTimeEvent', + // VCD开头 + conDataKey: 'VCDRealTimeEvent', + title: '实时事件', + category: ChatCategoryEnum.ALARMDIAGRAM, + categoryName: ChatCategoryEnumName.ALARMDIAGRAM, + package: PackagesCategoryEnum.CUSTOMCOMPONENTS, + chartFrame: ChartFrameEnum.COMMON, + image: 'RealTimeEvent.png' +} diff --git a/src/packages/components/CustomComponents/AlarmDiagram/RealTimeEvent/index.vue b/src/packages/components/CustomComponents/AlarmDiagram/RealTimeEvent/index.vue new file mode 100644 index 00000000..28b9ee4b --- /dev/null +++ b/src/packages/components/CustomComponents/AlarmDiagram/RealTimeEvent/index.vue @@ -0,0 +1,394 @@ + + + + + diff --git a/src/packages/components/CustomComponents/AlarmDiagram/components/BorderBox.vue b/src/packages/components/CustomComponents/AlarmDiagram/components/BorderBox.vue new file mode 100644 index 00000000..dbef1f35 --- /dev/null +++ b/src/packages/components/CustomComponents/AlarmDiagram/components/BorderBox.vue @@ -0,0 +1,58 @@ + + + + + diff --git a/src/packages/components/CustomComponents/AlarmDiagram/index.ts b/src/packages/components/CustomComponents/AlarmDiagram/index.ts new file mode 100644 index 00000000..769d6cfa --- /dev/null +++ b/src/packages/components/CustomComponents/AlarmDiagram/index.ts @@ -0,0 +1,9 @@ +import { DeviceAlarmOverviewConfig } from './DeviceAlarmOverview' +import { RealTimeAlarmStatisticsConfig } from './RealTimeAlarmStatistics' +import { RealTimeEventConfig } from './RealTimeEvent' + +export default [ + DeviceAlarmOverviewConfig, + RealTimeAlarmStatisticsConfig, + RealTimeEventConfig, +] \ No newline at end of file diff --git a/src/packages/components/CustomComponents/CustomComponents/DeviceAlarmOverview/config.ts b/src/packages/components/CustomComponents/CustomComponents/DeviceAlarmOverview/config.ts index dccc5df3..c61a5fe1 100644 --- a/src/packages/components/CustomComponents/CustomComponents/DeviceAlarmOverview/config.ts +++ b/src/packages/components/CustomComponents/CustomComponents/DeviceAlarmOverview/config.ts @@ -27,5 +27,6 @@ export default class Config extends PublicConfigClass implements CreateComponent public customData = cloneDeep({ title: '当前设备告警概况', showInterval: true, + space_complete_id: '', }) } diff --git a/src/packages/components/CustomComponents/CustomComponents/DeviceAlarmOverview/config.vue b/src/packages/components/CustomComponents/CustomComponents/DeviceAlarmOverview/config.vue index d1759a1d..ae2cf42d 100644 --- a/src/packages/components/CustomComponents/CustomComponents/DeviceAlarmOverview/config.vue +++ b/src/packages/components/CustomComponents/CustomComponents/DeviceAlarmOverview/config.vue @@ -1,67 +1,7 @@ diff --git a/src/packages/components/CustomComponents/CustomComponents/DeviceAlarmOverview/configData.vue b/src/packages/components/CustomComponents/CustomComponents/DeviceAlarmOverview/configData.vue index 2c83af5e..ddf37372 100644 --- a/src/packages/components/CustomComponents/CustomComponents/DeviceAlarmOverview/configData.vue +++ b/src/packages/components/CustomComponents/CustomComponents/DeviceAlarmOverview/configData.vue @@ -1,9 +1,10 @@ + + \ No newline at end of file diff --git a/src/views/chart/ContentConfigurations/components/ChartDataV2/components/RecordValueHistory.vue b/src/views/chart/ContentConfigurations/components/ChartDataV2/components/RecordValueHistory.vue index bb29fa1f..aa59ddb1 100644 --- a/src/views/chart/ContentConfigurations/components/ChartDataV2/components/RecordValueHistory.vue +++ b/src/views/chart/ContentConfigurations/components/ChartDataV2/components/RecordValueHistory.vue @@ -15,7 +15,7 @@ - + + import PointHistory from './components/PointHistory.vue' import EnergyUseHistory from './components/EnergyUseHistory.vue' -import RecordValueHistoryType from './components/RecordValueHistory.vue' +import RecordValueHistory from './components/RecordValueHistory.vue' +import PointRealTime from './components/PointRealTime.vue' import type { Ref } from 'vue' import { loadAsyncComponent } from '@/utils' import { SettingItemBox } from '@/components/Pages/ChartItemSetting'