-
-
+
![]()
+
-
+
+
+

+
请输入地图ID
+
diff --git a/src/packages/components/CustomComponents/CustomComponents/Theme2/configData.vue b/src/packages/components/CustomComponents/CustomComponents/Theme2/configData.vue
deleted file mode 100644
index 2c83af5e..00000000
--- a/src/packages/components/CustomComponents/CustomComponents/Theme2/configData.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/packages/components/CustomComponents/CustomComponents/Theme2/index.ts b/src/packages/components/CustomComponents/CustomComponents/Theme2/index.ts
deleted file mode 100644
index 0fe02fad..00000000
--- a/src/packages/components/CustomComponents/CustomComponents/Theme2/index.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-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
deleted file mode 100644
index 1d768199..00000000
--- a/src/packages/components/CustomComponents/CustomComponents/Theme2/index.vue
+++ /dev/null
@@ -1,291 +0,0 @@
-
-
-
-
-
- {{chartConfig?.customData?.title}}
-
-
-
- {{ showMoreMenuBts ? '全屏' : '退出全屏' }}
-
-
-
-
-
-
-
-
-
diff --git a/src/packages/components/CustomComponents/CustomComponents/Theme3/config.ts b/src/packages/components/CustomComponents/CustomComponents/Theme3/config.ts
deleted file mode 100644
index a6b8edfc..00000000
--- a/src/packages/components/CustomComponents/CustomComponents/Theme3/config.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-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/configData.vue b/src/packages/components/CustomComponents/CustomComponents/Theme3/configData.vue
deleted file mode 100644
index 2c83af5e..00000000
--- a/src/packages/components/CustomComponents/CustomComponents/Theme3/configData.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/packages/components/CustomComponents/CustomComponents/Theme3/index.ts b/src/packages/components/CustomComponents/CustomComponents/Theme3/index.ts
deleted file mode 100644
index 9425bc18..00000000
--- a/src/packages/components/CustomComponents/CustomComponents/Theme3/index.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-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
deleted file mode 100644
index 5cb48337..00000000
--- a/src/packages/components/CustomComponents/CustomComponents/Theme3/index.vue
+++ /dev/null
@@ -1,291 +0,0 @@
-
-
-
-
-
- {{chartConfig?.customData?.title}}
-
-
-
- {{ showMoreMenuBts ? '全屏' : '退出全屏' }}
-
-
-
-
-
-
-
-
-
diff --git a/src/packages/components/CustomComponents/CustomComponents/index.ts b/src/packages/components/CustomComponents/CustomComponents/index.ts
index f328e3ae..8b57cc38 100644
--- a/src/packages/components/CustomComponents/CustomComponents/index.ts
+++ b/src/packages/components/CustomComponents/CustomComponents/index.ts
@@ -1,6 +1,4 @@
-import { Theme1Config } from './Theme1/index'
-import { Theme2Config } from './Theme2/index'
-import { Theme3Config } from './Theme3/index'
+// import { Theme1Config } from './Theme1/index'
import { ComprehensivePUEConfig } from './ComprehensivePUE'
import { DeviceAlarmOverviewConfig } from './DeviceAlarmOverview'
import { RealTimeTrafficConfig } from './RealTimeTraffic'
@@ -11,9 +9,7 @@ import { GDMapConfig } from './GDMap'
import { MonitorRealTimeEventsConfig } from './MonitorRealTimeEvents'
export default [
- Theme1Config,
- Theme2Config,
- Theme3Config,
+ // Theme1Config,
ComprehensivePUEConfig,
DeviceAlarmOverviewConfig,
RealTimeTrafficConfig,
diff --git a/src/packages/components/CustomComponents/index.d.ts b/src/packages/components/CustomComponents/index.d.ts
index 12b3f775..5f75c71a 100644
--- a/src/packages/components/CustomComponents/index.d.ts
+++ b/src/packages/components/CustomComponents/index.d.ts
@@ -1,7 +1,9 @@
export enum ChatCategoryEnum {
CUSTOMCOMPONENTS = 'CustomComponents',
+ BACKGROUNDS = 'Backgrounds',
}
export enum ChatCategoryEnumName {
- CUSTOMCOMPONENTS = '自定义组件',
+ CUSTOMCOMPONENTS = '自定义',
+ BACKGROUNDS = '背景'
}
diff --git a/src/packages/components/CustomComponents/index.ts b/src/packages/components/CustomComponents/index.ts
index e437a6d9..ae393ad3 100644
--- a/src/packages/components/CustomComponents/index.ts
+++ b/src/packages/components/CustomComponents/index.ts
@@ -1,3 +1,4 @@
+import Backgrounds from './Backgrounds'
import CustomComponents from './CustomComponents'
-export const CustomComponentsList = [...CustomComponents]
+export const CustomComponentsList = [...Backgrounds, ...CustomComponents]
diff --git a/src/packages/components/ThemesAndLayouts/Themes/index.ts b/src/packages/components/ThemesAndLayouts/Themes/index.ts
deleted file mode 100644
index cfa76787..00000000
--- a/src/packages/components/ThemesAndLayouts/Themes/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-// import { Theme1Config } from './Theme1/index'
-
-export default []
diff --git a/src/packages/components/ThemesAndLayouts/index.d.ts b/src/packages/components/ThemesAndLayouts/index.d.ts
deleted file mode 100644
index d6ed6394..00000000
--- a/src/packages/components/ThemesAndLayouts/index.d.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export enum ChatCategoryEnum {
- THEMES = 'Themes',
-}
-
-export enum ChatCategoryEnumName {
- THEMES = '主题',
-}
diff --git a/src/packages/components/ThemesAndLayouts/index.ts b/src/packages/components/ThemesAndLayouts/index.ts
deleted file mode 100644
index 67e91740..00000000
--- a/src/packages/components/ThemesAndLayouts/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import Themes from './Themes'
-
-export const ThemesAndLayoutsList = [...Themes]
diff --git a/src/packages/index.d.ts b/src/packages/index.d.ts
index 6080292e..e79bd839 100644
--- a/src/packages/index.d.ts
+++ b/src/packages/index.d.ts
@@ -188,6 +188,7 @@ export enum PackagesCategoryEnum {
DECORATES = 'Decorates',
THEMESANDLAYOUTS = 'ThemesAndLayouts',
CUSTOMCOMPONENTS = 'CustomComponents',
+ BACKGROUNDS = 'Backgrounds',
}
// 包分类名称
@@ -199,7 +200,8 @@ export enum PackagesCategoryName {
ICONS = '图标',
DECORATES = '小组件',
THEMESANDLAYOUTS = '主题',
- CUSTOMCOMPONENTS = '自定义组件',
+ CUSTOMCOMPONENTS = '自定义',
+ BACKGROUNDS = '背景',
}
// 获取组件
diff --git a/src/packages/index.ts b/src/packages/index.ts
index 83b52c4a..de493518 100644
--- a/src/packages/index.ts
+++ b/src/packages/index.ts
@@ -4,7 +4,6 @@ import { InformationList } from '@/packages/components/Informations/index'
// import { TableList } from '@/packages/components/Tables/index'
// import { PhotoList } from '@/packages/components/Photos/index'
import { IconList } from '@/packages/components/Icons/index'
-// import { ThemesAndLayoutsList } from '@/packages/components/ThemesAndLayouts/index'
import { CustomComponentsList } from '@/packages/components/CustomComponents/index'
import { PackagesCategoryEnum, PackagesType, ConfigType, FetchComFlagType } from '@/packages/index.d'
@@ -29,7 +28,6 @@ export let packagesList: PackagesType = {
[PackagesCategoryEnum.DECORATES]: DecorateList,
// [PackagesCategoryEnum.PHOTOS]: PhotoList,
[PackagesCategoryEnum.ICONS]: IconList,
- // [PackagesCategoryEnum.THEMESANDLAYOUTS]: ThemesAndLayoutsList,
[PackagesCategoryEnum.CUSTOMCOMPONENTS]: CustomComponentsList,
}
diff --git a/src/plugins/icon.ts b/src/plugins/icon.ts
index a2fbccb3..46937f01 100644
--- a/src/plugins/icon.ts
+++ b/src/plugins/icon.ts
@@ -116,7 +116,8 @@ import {
import {
AssignmentTurnedInRound as AssignmentTurnedInRoundIcon,
- CheckCircleOutlined as CheckCircleOutlinedIcon
+ CheckCircleOutlined as CheckCircleOutlinedIcon,
+ InsertPhotoSharp as InsertPhotoSharpIcon,
} from '@vicons/material'
const ionicons5 = {
@@ -334,7 +335,9 @@ const material = {
// 批量确认
AssignmentTurnedInRoundIcon,
// 圆圈 勾
- CheckCircleOutlinedIcon
+ CheckCircleOutlinedIcon,
+ // 背景图
+ InsertPhotoSharpIcon,
}
// https://www.xicons.org/#/ 还有很多
diff --git a/src/views/chart/ContentCharts/hooks/useAside.hook.ts b/src/views/chart/ContentCharts/hooks/useAside.hook.ts
index 5061043e..836c549d 100644
--- a/src/views/chart/ContentCharts/hooks/useAside.hook.ts
+++ b/src/views/chart/ContentCharts/hooks/useAside.hook.ts
@@ -9,6 +9,7 @@ import { ChartLayoutStoreEnum } from '@/store/modules/chartLayoutStore/chartLayo
const { AirPlaneOutlineIcon, ImageIcon, BarChartIcon } = icon.ionicons5
const { TableSplitIcon, RoadmapIcon, SpellCheckIcon, GraphicalDataFlowIcon, AreaCustomIcon } = icon.carbon
const { Apps20RegularIcon } = icon.fluent
+const { InsertPhotoSharpIcon } = icon.material
// 图表
export type MenuOptionsType = {
@@ -50,6 +51,10 @@ const packagesListObj = {
[PackagesCategoryEnum.CUSTOMCOMPONENTS]: {
icon: renderIcon(AreaCustomIcon),
label: PackagesCategoryName.CUSTOMCOMPONENTS
+ },
+ [PackagesCategoryEnum.BACKGROUNDS]: {
+ icon: renderIcon(InsertPhotoSharpIcon),
+ label: PackagesCategoryName.BACKGROUNDS
}
}
@@ -71,10 +76,10 @@ export const useAsideHook = () => {
})
}
menuOptions.sort((a, b) => {
- if(a.key === 'ThemesAndLayouts') return -1
- else if(b.key === 'ThemesAndLayouts') return 1
- if(a.key === 'CustomComponents') return -1
- else if(b.key === 'CustomComponents') return 1
+ if(a.key === PackagesCategoryEnum.BACKGROUNDS) return -1
+ else if(b.key === PackagesCategoryEnum.BACKGROUNDS) return 1
+ if(a.key === PackagesCategoryEnum.CUSTOMCOMPONENTS) return -1
+ else if(b.key === PackagesCategoryEnum.CUSTOMCOMPONENTS) return 1
else return 0
})
}
diff --git a/src/views/chart/ContentConfigurations/components/ChartDataV2/index.vue b/src/views/chart/ContentConfigurations/components/ChartDataV2/index.vue
index b7a57ae7..d5f4f03e 100644
--- a/src/views/chart/ContentConfigurations/components/ChartDataV2/index.vue
+++ b/src/views/chart/ContentConfigurations/components/ChartDataV2/index.vue
@@ -1,5 +1,5 @@
-
+
@@ -22,7 +22,7 @@
-
+
@@ -40,6 +40,9 @@
+
+ 暂无数据
+