diff --git a/.env b/.env
index cad75cf2..13143dd4 100644
--- a/.env
+++ b/.env
@@ -3,9 +3,9 @@ VITE_DEV_PORT = '8080'
# development path
# VITE_DEV_PATH = 'http://192.168.0.34:11887'
-VITE_DEV_PATH = 'http://192.168.0.34:8102/'
+VITE_DEV_PATH = 'http://192.168.0.34:8025/'
# VITE_DEV_PATH = 'http://192.168.0.120:3001'
-VITE_DEV_TOKEN = '09c7cb6a-ab85-4c92-ad0f-5a25d72d71f7'
+VITE_DEV_TOKEN = "1f58b5b5-4eae-415b-bce9-d206adb1477b"
# production path
VITE_PRO_PATH = 'http://192.168.0.235:8177'
diff --git a/src/hooks/commonDataComponents/useAlarmTrendRes.ts b/src/hooks/commonDataComponents/useAlarmTrendRes.ts
new file mode 100644
index 00000000..959b2c94
--- /dev/null
+++ b/src/hooks/commonDataComponents/useAlarmTrendRes.ts
@@ -0,0 +1,39 @@
+import { publicInterface } from "@/api/path";
+import { CreateComponentType } from '@/packages/index.d'
+import { ResultErrcode } from "@/enums/httpEnum";
+import { AlarmTrendType } from '@/store/modules/chartEditStore/chartEditStore.d'
+import dataJson from "./data.json";
+
+export const handleAlarmTrend =async (targetComponent: CreateComponentType) => {
+ console.log(targetComponent.commonData,'targetComponent.commonData');
+
+ const obj = targetComponent.commonData[targetComponent.commonData.currentSource] as AlarmTrendType
+ let { enable, signal_ids,alarmConfirmStatus,alarmRecoveryStatus,level} = obj
+ if(!enable) return {
+ errcode: ResultErrcode.SUCCESS,
+ data: { ...dataJson },
+ errmsg: ''
+ }
+ const queryParams = {
+ signal_ids,
+ alarmConfirmStatus:alarmConfirmStatus.length ? alarmConfirmStatus.split(',') : [],
+ alarmRecoveryStatus:alarmRecoveryStatus.length ? alarmRecoveryStatus.split(',') : [],
+ level:level.length ? alarmRecoveryStatus.split(',') : []
+ }
+
+ const res = await publicInterface('/dcim/dems/devie_history_alarm', 'trend_chart', queryParams)
+ if (res && res.data) {
+ console.log(res,'res_handleAlarmTrend');
+ // res.data = {
+ // // dimensions: res?.data.brand_count.map((item: {})=>Object.keys(item).join('')),
+ // dimensions: ['名称','温度值'],
+ // source:res?.data.map((item: any)=>{
+ // return {
+ // '名称':`${item.node_name}-${item.dems_device_point.node_name}`,
+ // '温度值':item.dems_device_point.node_value,
+ // }
+ // })
+ // }
+ return res
+ }
+}
diff --git a/src/hooks/commonDataComponents/useCompanyTempTopRes.ts b/src/hooks/commonDataComponents/useCompanyTempTopRes.ts
new file mode 100644
index 00000000..eafd26f2
--- /dev/null
+++ b/src/hooks/commonDataComponents/useCompanyTempTopRes.ts
@@ -0,0 +1,32 @@
+import { publicInterface } from "@/api/path";
+import { CreateComponentType } from '@/packages/index.d'
+import { ResultErrcode } from "@/enums/httpEnum";
+import { CompanyTempTopType } from '@/store/modules/chartEditStore/chartEditStore.d'
+import dataJson from "./data.json";
+
+export const handleCompanyTempTop =async (targetComponent: CreateComponentType) => {
+ console.log(targetComponent.commonData,'targetComponent.commonData');
+
+ const obj = targetComponent.commonData[targetComponent.commonData.currentSource] as CompanyTempTopType
+ let { enable, space_complete_id, signal_ids} = obj
+ if(!enable) return {
+ errcode: ResultErrcode.SUCCESS,
+ data: { ...dataJson },
+ errmsg: ''
+ }
+ const res = await publicInterface('/dcim/dems/device_point', 'temp_list_dashboard', {signal_ids:[signal_ids],space_complete_id})
+ if (res && res.data) {
+ console.log(res,'res_handleCompanyTempTop');
+ res.data = {
+ // dimensions: res?.data.brand_count.map((item: {})=>Object.keys(item).join('')),
+ dimensions: ['名称','温度值'],
+ source:res?.data.map((item: any)=>{
+ return {
+ '名称':`${item.node_name}-${item.dems_device_point.node_name}`,
+ '温度值':item.dems_device_point.node_value,
+ }
+ })
+ }
+ return res
+ }
+}
diff --git a/src/hooks/useChartCommonData.hook.ts b/src/hooks/useChartCommonData.hook.ts
index fddd60ba..c1236ce2 100644
--- a/src/hooks/useChartCommonData.hook.ts
+++ b/src/hooks/useChartCommonData.hook.ts
@@ -14,6 +14,8 @@ import { handleSinglePoint } from './commonDataComponents/useSinglePointRes'
import { handleMonthAlarmClass } from './commonDataComponents/useMonthAlarmClassRes'
import { handleDeviceClass } from './commonDataComponents/useDeviceClassRes'
import { handleAssetsClass } from './commonDataComponents/useAssetsClassRes'
+import { handleCompanyTempTop } from './commonDataComponents/useCompanyTempTopRes'
+import { handleAlarmTrend } from './commonDataComponents/useAlarmTrendRes'
import { handleAreaDevCountClass } from './commonDataComponents/useAreaDevCountRes'
import { handlePointTable } from "./commonDataComponents/usePointTableRes";
import { handleCategoryBrandCountTable } from "./commonDataComponents/useCategoryBrandCountTableRes";
@@ -138,6 +140,12 @@ export const useChartCommonData = (
case CurrentSourceEnum.ASSETSCLASS:
res = await handleAssetsClass(targetComponent)
break;
+ case CurrentSourceEnum.COMPANYTEMPTOP:
+ res = await handleCompanyTempTop(targetComponent)
+ break;
+ case CurrentSourceEnum.ALARMTREND:
+ res = await handleAlarmTrend(targetComponent)
+ break;
case CurrentSourceEnum.AREADEVCOUNT:
res = await handleAreaDevCountClass(targetComponent)
break;
@@ -177,7 +185,7 @@ export const useChartCommonData = (
else throw Error()
}
else if(Object.prototype.toString.call(data) === '[object Object]'){
- console.log(data,'data');
+ console.log(data,'data_isMultiple');
if(data.dimensions && data.source) {
if(typeof targetComponent.commonData.dataLength === 'number') {
diff --git a/src/packages/components/Charts/Lines/LineGradientSingle/data.json b/src/packages/components/Charts/Lines/LineGradientSingle/data.json
index b0dbe05f..97cff2f5 100644
--- a/src/packages/components/Charts/Lines/LineGradientSingle/data.json
+++ b/src/packages/components/Charts/Lines/LineGradientSingle/data.json
@@ -2,7 +2,7 @@
"dimensions": ["product", "data1"],
"source": [
{
- "product": "Mon",
+ "product": "Mon1",
"data1": 120
},
{
diff --git a/src/packages/components/CustomComponents/AlarmDiagram/RealTimeAlarmStatistics/config.ts b/src/packages/components/CustomComponents/AlarmDiagram/RealTimeAlarmStatistics/config.ts
index ad550d2b..537c98e5 100644
--- a/src/packages/components/CustomComponents/AlarmDiagram/RealTimeAlarmStatistics/config.ts
+++ b/src/packages/components/CustomComponents/AlarmDiagram/RealTimeAlarmStatistics/config.ts
@@ -28,5 +28,8 @@ export default class Config extends PublicConfigClass implements CreateComponent
title: '实时告警统计',
showInterval: true,
space_complete_id: '',
+ confirm_statuss:[],
+ signal_ids:'',
+
})
}
diff --git a/src/packages/components/CustomComponents/AlarmDiagram/RealTimeAlarmStatistics/configData.vue b/src/packages/components/CustomComponents/AlarmDiagram/RealTimeAlarmStatistics/configData.vue
index ddf37372..059f9b2e 100644
--- a/src/packages/components/CustomComponents/AlarmDiagram/RealTimeAlarmStatistics/configData.vue
+++ b/src/packages/components/CustomComponents/AlarmDiagram/RealTimeAlarmStatistics/configData.vue
@@ -5,12 +5,24 @@
+
+
+
+
+
+
+
+
diff --git a/src/packages/components/CustomComponents/CustomComponents/AlarmLevelStatistic/index.ts b/src/packages/components/CustomComponents/CustomComponents/AlarmLevelStatistic/index.ts
new file mode 100644
index 00000000..0ac685ac
--- /dev/null
+++ b/src/packages/components/CustomComponents/CustomComponents/AlarmLevelStatistic/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 AlarmLevelStatistic: ConfigType = {
+ key: 'AlarmLevelStatistic',
+ chartKey: 'VAlarmLevelStatistic',
+ conKey: 'VCAlarmLevelStatistic',
+ // VCD开头
+ conDataKey: 'VCDAlarmLevelStatistic',
+ title: '告警数统计',
+ category: ChatCategoryEnum.CUSTOMCOMPONENTS,
+ categoryName: ChatCategoryEnumName.CUSTOMCOMPONENTS,
+ package: PackagesCategoryEnum.CUSTOMCOMPONENTS,
+ chartFrame: ChartFrameEnum.COMMON,
+ image: 'AlarmLevelStatistic.png'
+}
diff --git a/src/packages/components/CustomComponents/CustomComponents/AlarmLevelStatistic/index.vue b/src/packages/components/CustomComponents/CustomComponents/AlarmLevelStatistic/index.vue
new file mode 100644
index 00000000..5fbf20fd
--- /dev/null
+++ b/src/packages/components/CustomComponents/CustomComponents/AlarmLevelStatistic/index.vue
@@ -0,0 +1,670 @@
+
+
+
+ 今日
+ 本月
+ 年度
+
+
+
+
+
+
+
+