diff --git a/src/packages/components/Charts/MyComponents/ParkingScene/assets/dot.png b/src/packages/components/Charts/MyComponents/ParkingScene/assets/dot.png new file mode 100644 index 0000000..88dbbb9 Binary files /dev/null and b/src/packages/components/Charts/MyComponents/ParkingScene/assets/dot.png differ diff --git a/src/packages/components/Charts/MyComponents/ParkingScene/config.ts b/src/packages/components/Charts/MyComponents/ParkingScene/config.ts index 0ee5776..2c8e252 100644 --- a/src/packages/components/Charts/MyComponents/ParkingScene/config.ts +++ b/src/packages/components/Charts/MyComponents/ParkingScene/config.ts @@ -11,7 +11,7 @@ export const option = { linkColor: '#00E5FF', linkText: '查看更多>>', sceneNameColor: '#ccc', - sceneNameSize: 16, + sceneNameSize: 18, labelColor: '#ccc', labelSize: 14, valueColor: '#DFAB0F', diff --git a/src/packages/components/Charts/MyComponents/ParkingScene/index.vue b/src/packages/components/Charts/MyComponents/ParkingScene/index.vue index 10ed356..e46e6ca 100644 --- a/src/packages/components/Charts/MyComponents/ParkingScene/index.vue +++ b/src/packages/components/Charts/MyComponents/ParkingScene/index.vue @@ -200,7 +200,7 @@
- ··· + {{ scene.name }}
@@ -255,7 +255,7 @@ const option = computed(() => props.chartConfig.option) } .scene-item:nth-child(n+2) { - margin-top: 8px;; + margin-top: 7px;; } .scene-header { diff --git a/src/packages/components/Charts/MyComponents/WorkshopScene/assets/04.png b/src/packages/components/Charts/MyComponents/WorkshopScene/assets/04.png index a76a6e3..3e5a2b2 100644 Binary files a/src/packages/components/Charts/MyComponents/WorkshopScene/assets/04.png and b/src/packages/components/Charts/MyComponents/WorkshopScene/assets/04.png differ diff --git a/src/packages/components/Charts/MyComponents/WorkshopScene/config.ts b/src/packages/components/Charts/MyComponents/WorkshopScene/config.ts index e022df1..9fd2396 100644 --- a/src/packages/components/Charts/MyComponents/WorkshopScene/config.ts +++ b/src/packages/components/Charts/MyComponents/WorkshopScene/config.ts @@ -2,20 +2,45 @@ import { PublicConfigClass } from '@/packages/public' import { CreateComponentType } from '@/packages/index.d' import { WorkshopSceneConfig } from './index' import dataJson from './data.json' +export enum FontWeightEnum { + NORMAL = '常规', + BOLD = '加粗', +} +export enum FontStyleEnum { + NORMAL = '常规', + ITALIC = '斜体', +} + +export const FontWeightObject = { + [FontWeightEnum.NORMAL]: 'normal', + [FontWeightEnum.BOLD]: 'bold', +} + +export const FontStyleObject = { + [FontStyleEnum.NORMAL]: 'normal', + [FontStyleEnum.ITALIC]: 'italic', +} export const option = { dataset: dataJson.source, title: '场景分布概况', titleColor: '#ffffff', titleSize: 20, + iconColor: '#00E5FF', + fontWeight: 'normal', + fontStyle: 'normal', + paddingX: 10, + paddingY: -12, + letterSpacing: 1, + isShowButton: false, linkColor: '#00E5FF', - linkText: '查看更多>>', + linkText: '', sceneNameColor: '#ffffff', - sceneNameSize: 18, + sceneNameSize: 20, labelColor: '#B0E0E6', - labelSize: 14, + labelSize: 16, valueColor: '#ffffff', - valueSize: 24, + valueSize: 28, pointColor1: '#00E5FF', pointColor2: '#FFD700' } diff --git a/src/packages/components/Charts/MyComponents/WorkshopScene/config.vue b/src/packages/components/Charts/MyComponents/WorkshopScene/config.vue index d7e0209..a5d7bd7 100644 --- a/src/packages/components/Charts/MyComponents/WorkshopScene/config.vue +++ b/src/packages/components/Charts/MyComponents/WorkshopScene/config.vue @@ -1,31 +1,87 @@ diff --git a/src/packages/components/Charts/MyComponents/WorkshopScene/index.vue b/src/packages/components/Charts/MyComponents/WorkshopScene/index.vue index 6bfc63a..631f4b0 100644 --- a/src/packages/components/Charts/MyComponents/WorkshopScene/index.vue +++ b/src/packages/components/Charts/MyComponents/WorkshopScene/index.vue @@ -1,40 +1,44 @@