+
@@ -10,6 +10,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/chart/ContentConfigurations/components/ChartDataV2/components/AreaDevCount.vue b/src/views/chart/ContentConfigurations/components/ChartDataV2/components/AreaDevCount.vue
new file mode 100644
index 00000000..6e3e0f1b
--- /dev/null
+++ b/src/views/chart/ContentConfigurations/components/ChartDataV2/components/AreaDevCount.vue
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/chart/ContentConfigurations/components/ChartDataV2/components/AssetsClass.vue b/src/views/chart/ContentConfigurations/components/ChartDataV2/components/AssetsClass.vue
new file mode 100644
index 00000000..01d84256
--- /dev/null
+++ b/src/views/chart/ContentConfigurations/components/ChartDataV2/components/AssetsClass.vue
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/chart/ContentConfigurations/components/ChartDataV2/components/CategoryBrandCountTable.vue b/src/views/chart/ContentConfigurations/components/ChartDataV2/components/CategoryBrandCountTable.vue
new file mode 100644
index 00000000..96c9ad50
--- /dev/null
+++ b/src/views/chart/ContentConfigurations/components/ChartDataV2/components/CategoryBrandCountTable.vue
@@ -0,0 +1,78 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/chart/ContentConfigurations/components/ChartDataV2/components/CompanyTempTop.vue b/src/views/chart/ContentConfigurations/components/ChartDataV2/components/CompanyTempTop.vue
new file mode 100644
index 00000000..e61c4435
--- /dev/null
+++ b/src/views/chart/ContentConfigurations/components/ChartDataV2/components/CompanyTempTop.vue
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/chart/ContentConfigurations/components/ChartDataV2/components/ComponentsType.d.ts b/src/views/chart/ContentConfigurations/components/ChartDataV2/components/ComponentsType.d.ts
new file mode 100644
index 00000000..3bc63788
--- /dev/null
+++ b/src/views/chart/ContentConfigurations/components/ChartDataV2/components/ComponentsType.d.ts
@@ -0,0 +1,64 @@
+import { DateTypeEnum, MethodsTypeEnum, PolicyTypeEnum } from '@/store/modules/chartEditStore/chartEditStore.d'
+
+type DateOptionsItemType = {
+ label: string,
+ value: DateTypeEnum,
+ duration: number
+}
+export const DateOptions: DateOptionsItemType[] = [
+ {
+ label: '近一天',
+ value: DateTypeEnum.DAY,
+ // 颗粒度为 秒数
+ // duration: 60 * 60
+ },
+ {
+ label: '近一月',
+ value: DateTypeEnum.MONTH,
+ // duration: 24 * 60 * 60
+ },
+ {
+ label: '近一年',
+ value: DateTypeEnum.YEAR,
+ // duration: 30 * 24 * 60 * 60
+ },
+]
+
+type MethodsOptionsItemType = {
+ label: string,
+ value: MethodsTypeEnum
+}
+export const MethodsOptions: MethodsOptionsItemType[] = [
+ {
+ label: '平均值',
+ value: MethodsTypeEnum.AVG
+ },
+ {
+ label: '最小值',
+ value: MethodsTypeEnum.MIN
+ },
+ {
+ label: '最大值',
+ value: MethodsTypeEnum.MAX
+ }
+]
+
+type PolicyOptionsItemType = {
+ label: string,
+ value: PolicyTypeEnum
+}
+
+export const PolicyOptions: PolicyOptionsItemType[] = [
+ {
+ label: '平均值',
+ value: PolicyTypeEnum.AVG
+ },
+ {
+ label: '最小值',
+ value: PolicyTypeEnum.MIN
+ },
+ {
+ label: '最大值',
+ value: PolicyTypeEnum.MAX
+ }
+]
\ No newline at end of file
diff --git a/src/views/chart/ContentConfigurations/components/ChartDataV2/components/DeviceClass.vue b/src/views/chart/ContentConfigurations/components/ChartDataV2/components/DeviceClass.vue
new file mode 100644
index 00000000..a0a527eb
--- /dev/null
+++ b/src/views/chart/ContentConfigurations/components/ChartDataV2/components/DeviceClass.vue
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/chart/ContentConfigurations/components/ChartDataV2/components/EnergyUseHistory.vue b/src/views/chart/ContentConfigurations/components/ChartDataV2/components/EnergyUseHistory.vue
new file mode 100644
index 00000000..926eb262
--- /dev/null
+++ b/src/views/chart/ContentConfigurations/components/ChartDataV2/components/EnergyUseHistory.vue
@@ -0,0 +1,90 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ handleChange(v, i)"
+ min="1"
+ :show-button="false"
+ placeholder="请输入报表ID"
+ size="small"
+ clearable
+ />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/chart/ContentConfigurations/components/ChartDataV2/components/ManualInput.vue b/src/views/chart/ContentConfigurations/components/ChartDataV2/components/ManualInput.vue
new file mode 100644
index 00000000..4cc679c0
--- /dev/null
+++ b/src/views/chart/ContentConfigurations/components/ChartDataV2/components/ManualInput.vue
@@ -0,0 +1,57 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/chart/ContentConfigurations/components/ChartDataV2/components/ManualInputSingle.vue b/src/views/chart/ContentConfigurations/components/ChartDataV2/components/ManualInputSingle.vue
new file mode 100644
index 00000000..d98baf6d
--- /dev/null
+++ b/src/views/chart/ContentConfigurations/components/ChartDataV2/components/ManualInputSingle.vue
@@ -0,0 +1,58 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/chart/ContentConfigurations/components/ChartDataV2/components/MonthAlarmClass.vue b/src/views/chart/ContentConfigurations/components/ChartDataV2/components/MonthAlarmClass.vue
new file mode 100644
index 00000000..dbab46de
--- /dev/null
+++ b/src/views/chart/ContentConfigurations/components/ChartDataV2/components/MonthAlarmClass.vue
@@ -0,0 +1,103 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/chart/ContentConfigurations/components/ChartDataV2/components/NoParam.vue b/src/views/chart/ContentConfigurations/components/ChartDataV2/components/NoParam.vue
new file mode 100644
index 00000000..fc42732a
--- /dev/null
+++ b/src/views/chart/ContentConfigurations/components/ChartDataV2/components/NoParam.vue
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/chart/ContentConfigurations/components/ChartDataV2/components/PointHistory.vue b/src/views/chart/ContentConfigurations/components/ChartDataV2/components/PointHistory.vue
new file mode 100644
index 00000000..63167f5f
--- /dev/null
+++ b/src/views/chart/ContentConfigurations/components/ChartDataV2/components/PointHistory.vue
@@ -0,0 +1,92 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ handleChange(v, i)"
+ placeholder="请输入测点编码"
+ size="small"
+ clearable
+ />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/chart/ContentConfigurations/components/ChartDataV2/components/PointRealTime.vue b/src/views/chart/ContentConfigurations/components/ChartDataV2/components/PointRealTime.vue
new file mode 100644
index 00000000..11547688
--- /dev/null
+++ b/src/views/chart/ContentConfigurations/components/ChartDataV2/components/PointRealTime.vue
@@ -0,0 +1,104 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ handleChange(v, i)"
+ placeholder="请输入测点编码"
+ size="small"
+ clearable
+ />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/chart/ContentConfigurations/components/ChartDataV2/components/PointTable.vue b/src/views/chart/ContentConfigurations/components/ChartDataV2/components/PointTable.vue
new file mode 100644
index 00000000..ce9f13cc
--- /dev/null
+++ b/src/views/chart/ContentConfigurations/components/ChartDataV2/components/PointTable.vue
@@ -0,0 +1,84 @@
+
+
+
+
+
+
+
+
+
+ handleChange(v, i)"
+ placeholder="请输入测点编码"
+ size="small"
+ clearable
+ />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/chart/ContentConfigurations/components/ChartDataV2/components/RecordValueHistory.vue b/src/views/chart/ContentConfigurations/components/ChartDataV2/components/RecordValueHistory.vue
new file mode 100644
index 00000000..9f274e51
--- /dev/null
+++ b/src/views/chart/ContentConfigurations/components/ChartDataV2/components/RecordValueHistory.vue
@@ -0,0 +1,98 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ handleChange(v, i)"
+ min="1"
+ :show-button="false"
+ placeholder="请输入报表ID"
+ size="small"
+ clearable
+ />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/chart/ContentConfigurations/components/ChartDataV2/components/SinglePoint.vue b/src/views/chart/ContentConfigurations/components/ChartDataV2/components/SinglePoint.vue
new file mode 100644
index 00000000..3265a21b
--- /dev/null
+++ b/src/views/chart/ContentConfigurations/components/ChartDataV2/components/SinglePoint.vue
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/chart/ContentConfigurations/components/ChartDataV2/index.d.ts b/src/views/chart/ContentConfigurations/components/ChartDataV2/index.d.ts
new file mode 100644
index 00000000..2e5b1249
--- /dev/null
+++ b/src/views/chart/ContentConfigurations/components/ChartDataV2/index.d.ts
@@ -0,0 +1,203 @@
+import { RequestHttpEnum, RequestHttpIntervalEnum, RequestDataTypeEnum, SelectHttpTimeNameObj } from '@/enums/httpEnum'
+import { CurrentSourceEnum } from '@/store/modules/chartEditStore/chartEditStore.d'
+
+// 匹配结果
+export enum DataResultEnum {
+ NULL = 0,
+ SUCCESS = 1,
+ FAILURE = 2,
+}
+
+export enum TimelineTitleEnum {
+ FILTER = '数据过滤',
+ MAPPING = '数据映射',
+ CONTENT = '数据内容',
+}
+
+export enum SelectCreateDataEnum {
+ STATIC = '静态数据',
+ AJAX = '动态请求',
+ Pond = '公共接口',
+}
+
+export interface SelectCreateDataType {
+ label: SelectCreateDataEnum
+ value: RequestDataTypeEnum
+ disabled?: boolean
+}
+
+// ajax 请求类型
+export interface SelectHttpType {
+ label: RequestHttpEnum
+ value: RequestHttpEnum
+ disabled?: boolean
+ style?: object
+}
+
+// 类型选项
+export const selectTypeOptions: SelectHttpType[] = [
+ {
+ label: RequestHttpEnum.GET,
+ value: RequestHttpEnum.GET,
+ style: {
+ color: 'greenyellow',
+ fontWeight: 'bold'
+ }
+ },
+ {
+ label: RequestHttpEnum.POST,
+ value: RequestHttpEnum.POST,
+ style: {
+ color: 'skyblue',
+ fontWeight: 'bold'
+ }
+ },
+ {
+ label: RequestHttpEnum.PUT,
+ value: RequestHttpEnum.PUT,
+ style: {
+ color: 'goldenrod',
+ fontWeight: 'bold'
+ }
+ },
+ {
+ label: RequestHttpEnum.PATCH,
+ value: RequestHttpEnum.PATCH,
+ style: {
+ color: 'violet',
+ fontWeight: 'bold'
+ }
+ },
+ {
+ label: RequestHttpEnum.DELETE,
+ value: RequestHttpEnum.DELETE,
+ disabled: true,
+ style: {
+ fontWeight: 'bold'
+ }
+ },
+]
+
+// ajax 请求间隔
+export interface SelectHttpTimeType {
+ label: string
+ value: RequestHttpIntervalEnum
+ disabled?: boolean
+ unit: number
+}
+
+// 时间选项
+export const selectTimeOptions: SelectHttpTimeType[] = [
+ {
+ label: SelectHttpTimeNameObj[RequestHttpIntervalEnum.SECOND],
+ value: RequestHttpIntervalEnum.SECOND,
+ unit: 1000,
+ },
+ {
+ label: SelectHttpTimeNameObj[RequestHttpIntervalEnum.MINUTE],
+ value: RequestHttpIntervalEnum.MINUTE,
+ unit: 60000,
+ },
+ {
+ label: SelectHttpTimeNameObj[RequestHttpIntervalEnum.HOUR],
+ value: RequestHttpIntervalEnum.HOUR,
+ unit: 3600000,
+ },
+ {
+ label: SelectHttpTimeNameObj[RequestHttpIntervalEnum.DAY],
+ value: RequestHttpIntervalEnum.DAY,
+ unit: 86400000,
+ },
+]
+
+export enum optionTypeEnum {
+ // 多个值
+ MULTIPLE = 'multiple',
+ // 单个值的数据源 环形图等
+ SINGLE = 'single'
+}
+
+export interface sourceOptionsItemType {
+ label: string,
+ value: CurrentSourceEnum,
+ type: optionTypeEnum
+}
+
+// 通用组件数据源选项
+export const sourceOptions: sourceOptionsItemType[] = [
+ {
+ label: '测点历史',
+ value: CurrentSourceEnum.POINTHISTORY,
+ type: optionTypeEnum.MULTIPLE,
+ },
+ {
+ label: '能耗历史',
+ value: CurrentSourceEnum.ENERGYUSEHISTORY,
+ type: optionTypeEnum.MULTIPLE,
+ },
+ {
+ label: '记录值历史',
+ value: CurrentSourceEnum.RECORDVALUEHISTORY,
+ type: optionTypeEnum.MULTIPLE,
+ },
+ {
+ label: '测点实时值',
+ value: CurrentSourceEnum.POINTREALTIME,
+ type: optionTypeEnum.MULTIPLE,
+ },
+ {
+ label: '设备分类统计',
+ value: CurrentSourceEnum.DEVICECLASS,
+ type: optionTypeEnum.MULTIPLE,
+ },
+ {
+ label: '分类统计',
+ value: CurrentSourceEnum.ASSETSCLASS,
+ type: optionTypeEnum.MULTIPLE,
+ },
+ {
+ label: '局房温度Top10',
+ value: CurrentSourceEnum.COMPANYTEMPTOP,
+ type: optionTypeEnum.MULTIPLE,
+ },
+ {
+ label: '告警趋势',
+ value: CurrentSourceEnum.ALARMTREND,
+ type: optionTypeEnum.MULTIPLE,
+ },
+ {
+ label: '区域设备个数',
+ value: CurrentSourceEnum.AREADEVCOUNT,
+ type: optionTypeEnum.MULTIPLE,
+ },
+ {
+ label: '当月告警分类统计',
+ value: CurrentSourceEnum.MONTHALARMCLASS,
+ type: optionTypeEnum.MULTIPLE,
+ },
+ {
+ label: '测点表格值',
+ value: CurrentSourceEnum.POINTTABLE,
+ type: optionTypeEnum.MULTIPLE,
+ },
+ {
+ label: '分类品牌表格值',
+ value: CurrentSourceEnum.CATEGORYBRANDCOUNTTABLE,
+ type: optionTypeEnum.MULTIPLE,
+ },
+ {
+ label: '手动输入值',
+ value: CurrentSourceEnum.MANUALINPUT,
+ type: optionTypeEnum.MULTIPLE,
+ },
+ {
+ label: '单测点实时值',
+ value: CurrentSourceEnum.SINGLEPOINT,
+ type: optionTypeEnum.SINGLE,
+ },
+ {
+ label: '手动输入值(单值)',
+ value: CurrentSourceEnum.MANUALINPUTSINGLE,
+ type: optionTypeEnum.SINGLE,
+ },
+]
diff --git a/src/views/chart/ContentConfigurations/components/ChartDataV2/index.vue b/src/views/chart/ContentConfigurations/components/ChartDataV2/index.vue
new file mode 100644
index 00000000..71417a91
--- /dev/null
+++ b/src/views/chart/ContentConfigurations/components/ChartDataV2/index.vue
@@ -0,0 +1,158 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 暂无数据
+
+
+
diff --git a/src/views/chart/ContentConfigurations/components/ChartEvent/index.vue b/src/views/chart/ContentConfigurations/components/ChartEvent/index.vue
index 6e632cc5..18bb0c2c 100644
--- a/src/views/chart/ContentConfigurations/components/ChartEvent/index.vue
+++ b/src/views/chart/ContentConfigurations/components/ChartEvent/index.vue
@@ -5,19 +5,88 @@
组件 id:
{{ targetData.id }}
-
-
-
+
+
+
+
+
diff --git a/src/views/chart/ContentConfigurations/components/ChartSetting/index.vue b/src/views/chart/ContentConfigurations/components/ChartSetting/index.vue
index 21c7d96a..206ae7f0 100644
--- a/src/views/chart/ContentConfigurations/components/ChartSetting/index.vue
+++ b/src/views/chart/ContentConfigurations/components/ChartSetting/index.vue
@@ -9,7 +9,7 @@
-
+