diff --git a/src/assets/customComponents/Theme2/background.jpg b/src/assets/customComponents/Theme2/background.jpg new file mode 100644 index 00000000..24989285 Binary files /dev/null and b/src/assets/customComponents/Theme2/background.jpg differ diff --git a/src/assets/customComponents/Theme3/background.png b/src/assets/customComponents/Theme3/background.png new file mode 100644 index 00000000..8403728d Binary files /dev/null and b/src/assets/customComponents/Theme3/background.png differ diff --git a/src/packages/components/CustomComponents/CustomComponents/Theme2/config.ts b/src/packages/components/CustomComponents/CustomComponents/Theme2/config.ts new file mode 100644 index 00000000..250d3e92 --- /dev/null +++ b/src/packages/components/CustomComponents/CustomComponents/Theme2/config.ts @@ -0,0 +1,34 @@ +import { PublicConfigClass } from '@/packages/public' +import { CreateComponentType } from '@/packages/index.d' +import { Theme2Config } 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 = { + ...this.attr, + w: 1920, + h: 1080, + x: 0, + y: 0, + } + } + public key = Theme2Config.key + public chartConfig = cloneDeep(Theme2Config) + public option = cloneDeep(option) + public customData = cloneDeep({ + title: '', + }) +} diff --git a/src/packages/components/CustomComponents/CustomComponents/Theme2/config.vue b/src/packages/components/CustomComponents/CustomComponents/Theme2/config.vue new file mode 100644 index 00000000..83836728 --- /dev/null +++ b/src/packages/components/CustomComponents/CustomComponents/Theme2/config.vue @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/packages/components/CustomComponents/CustomComponents/Theme2/configData.vue b/src/packages/components/CustomComponents/CustomComponents/Theme2/configData.vue new file mode 100644 index 00000000..2c83af5e --- /dev/null +++ b/src/packages/components/CustomComponents/CustomComponents/Theme2/configData.vue @@ -0,0 +1,16 @@ + + + + + + + + + + + diff --git a/src/packages/components/CustomComponents/CustomComponents/Theme2/index.ts b/src/packages/components/CustomComponents/CustomComponents/Theme2/index.ts new file mode 100644 index 00000000..0fe02fad --- /dev/null +++ b/src/packages/components/CustomComponents/CustomComponents/Theme2/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 Theme2Config: ConfigType = { + key: 'Theme2', + chartKey: 'VTheme2', + conKey: 'VCTheme2', + conDataKey: 'VCDTheme2', + title: '背景2', + // category: ChatCategoryEnum.THEMES, + // categoryName: ChatCategoryEnumName.THEMES, + // package: PackagesCategoryEnum.THEMESANDLAYOUTS, + category: ChatCategoryEnum.CUSTOMCOMPONENTS, + categoryName: ChatCategoryEnumName.CUSTOMCOMPONENTS, + package: PackagesCategoryEnum.CUSTOMCOMPONENTS, + chartFrame: ChartFrameEnum.COMMON, + image: 'theme2.png' +} diff --git a/src/packages/components/CustomComponents/CustomComponents/Theme2/index.vue b/src/packages/components/CustomComponents/CustomComponents/Theme2/index.vue new file mode 100644 index 00000000..1d768199 --- /dev/null +++ b/src/packages/components/CustomComponents/CustomComponents/Theme2/index.vue @@ -0,0 +1,291 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ time }} + + + {{ date }} + + + + + + + + + + + + + + + + + + + + + + + {{chartConfig?.customData?.title}} + + + + {{ showMoreMenuBts ? '全屏' : '退出全屏' }} + + + + + + + + + diff --git a/src/packages/components/CustomComponents/CustomComponents/Theme3/config.ts b/src/packages/components/CustomComponents/CustomComponents/Theme3/config.ts new file mode 100644 index 00000000..a6b8edfc --- /dev/null +++ b/src/packages/components/CustomComponents/CustomComponents/Theme3/config.ts @@ -0,0 +1,34 @@ +import { PublicConfigClass } from '@/packages/public' +import { CreateComponentType } from '@/packages/index.d' +import { Theme3Config } 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 = { + ...this.attr, + w: 1920, + h: 1080, + x: 0, + y: 0, + } + } + public key = Theme3Config.key + public chartConfig = cloneDeep(Theme3Config) + public option = cloneDeep(option) + public customData = cloneDeep({ + title: '', + }) +} diff --git a/src/packages/components/CustomComponents/CustomComponents/Theme3/config.vue b/src/packages/components/CustomComponents/CustomComponents/Theme3/config.vue new file mode 100644 index 00000000..83836728 --- /dev/null +++ b/src/packages/components/CustomComponents/CustomComponents/Theme3/config.vue @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/packages/components/CustomComponents/CustomComponents/Theme3/configData.vue b/src/packages/components/CustomComponents/CustomComponents/Theme3/configData.vue new file mode 100644 index 00000000..2c83af5e --- /dev/null +++ b/src/packages/components/CustomComponents/CustomComponents/Theme3/configData.vue @@ -0,0 +1,16 @@ + + + + + + + + + + + diff --git a/src/packages/components/CustomComponents/CustomComponents/Theme3/index.ts b/src/packages/components/CustomComponents/CustomComponents/Theme3/index.ts new file mode 100644 index 00000000..9425bc18 --- /dev/null +++ b/src/packages/components/CustomComponents/CustomComponents/Theme3/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 Theme3Config: ConfigType = { + key: 'Theme3', + chartKey: 'VTheme3', + conKey: 'VCTheme3', + conDataKey: 'VCDTheme3', + title: '背景3', + // category: ChatCategoryEnum.THEMES, + // categoryName: ChatCategoryEnumName.THEMES, + // package: PackagesCategoryEnum.THEMESANDLAYOUTS, + category: ChatCategoryEnum.CUSTOMCOMPONENTS, + categoryName: ChatCategoryEnumName.CUSTOMCOMPONENTS, + package: PackagesCategoryEnum.CUSTOMCOMPONENTS, + chartFrame: ChartFrameEnum.COMMON, + image: 'theme3.png' +} diff --git a/src/packages/components/CustomComponents/CustomComponents/Theme3/index.vue b/src/packages/components/CustomComponents/CustomComponents/Theme3/index.vue new file mode 100644 index 00000000..5cb48337 --- /dev/null +++ b/src/packages/components/CustomComponents/CustomComponents/Theme3/index.vue @@ -0,0 +1,291 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ time }} + + + {{ date }} + + + + + + + + + + + + + + + + + + + + + + + {{chartConfig?.customData?.title}} + + + + {{ showMoreMenuBts ? '全屏' : '退出全屏' }} + + + + + + + + + diff --git a/src/packages/components/CustomComponents/CustomComponents/index.ts b/src/packages/components/CustomComponents/CustomComponents/index.ts index e03c4fc3..f328e3ae 100644 --- a/src/packages/components/CustomComponents/CustomComponents/index.ts +++ b/src/packages/components/CustomComponents/CustomComponents/index.ts @@ -1,4 +1,6 @@ import { Theme1Config } from './Theme1/index' +import { Theme2Config } from './Theme2/index' +import { Theme3Config } from './Theme3/index' import { ComprehensivePUEConfig } from './ComprehensivePUE' import { DeviceAlarmOverviewConfig } from './DeviceAlarmOverview' import { RealTimeTrafficConfig } from './RealTimeTraffic' @@ -10,6 +12,8 @@ import { MonitorRealTimeEventsConfig } from './MonitorRealTimeEvents' export default [ Theme1Config, + Theme2Config, + Theme3Config, ComprehensivePUEConfig, DeviceAlarmOverviewConfig, RealTimeTrafficConfig, diff --git a/src/views/chart/ContentConfigurations/components/ChartDataV2/components/ChartDataPointHistory.vue b/src/views/chart/ContentConfigurations/components/ChartDataV2/components/ChartDataPointHistory.vue index 4d425f8c..422476ae 100644 --- a/src/views/chart/ContentConfigurations/components/ChartDataV2/components/ChartDataPointHistory.vue +++ b/src/views/chart/ContentConfigurations/components/ChartDataV2/components/ChartDataPointHistory.vue @@ -17,7 +17,7 @@ handleChange(v, i)" + @update:value="(v: string) => handleChange(v, i)" placeholder="请输入测点ID" size="small" clearable @@ -57,12 +57,12 @@ import { useTargetData } from '../../hooks/useTargetData.hook' import { DateOptions, MethodsOptions } from './ChartDataPointHistory.d' import { nanoid } from 'nanoid' import { icon } from '@/plugins/icon' -import { commonDataType } from '@/store/modules/chartEditStore/chartEditStore.d' +import { commonDataType, RequestConfigType } from '@/store/modules/chartEditStore/chartEditStore.d' import { selectTimeOptions } from '../index.d' const { CloseIcon } = icon.ionicons5 -const { targetData } = useTargetData() +const { targetData } = useTargetData() as { targetData: Ref<{ commonData: commonDataType, id: string, request: RequestConfigType }> } const templateValue = ref('')