From d190d1520052d10d72e47e520bdb6e8ca19b688b Mon Sep 17 00:00:00 2001 From: lucashu <6125220@qq.com> Date: Fri, 22 Aug 2025 08:55:33 +0800 Subject: [PATCH 1/5] 123 --- .../MyComponents/WorkshopScene/index.vue | 53 +++++++++++++------ 1 file changed, 36 insertions(+), 17 deletions(-) diff --git a/src/packages/components/Charts/MyComponents/WorkshopScene/index.vue b/src/packages/components/Charts/MyComponents/WorkshopScene/index.vue index 631f4b0..401ed79 100644 --- a/src/packages/components/Charts/MyComponents/WorkshopScene/index.vue +++ b/src/packages/components/Charts/MyComponents/WorkshopScene/index.vue @@ -18,22 +18,38 @@ {{ option.linkText }}
-
-
{{ - scene.name }}
+
+
危化品库
-
@@ -196,22 +212,25 @@ const option = computed(() => props.chartConfig.option) .metric { display: flex; flex-direction: column; - align-items: flex-start; - + align-items: center; + .metric-label { display: flex; align-items: center; - margin-bottom: 10px; // More space + margin-bottom: 8px; + .point { - width: 0px; // Bigger point - height: 0px; + width: 8px; + height: 8px; border-radius: 50%; margin-right: 10px; } } + .metric-value { font-weight: bold; - margin-left: 40px; // Align with label text + position: relative; + left: 9px; // Visually center the value under the text } } } From aaeaaaa191e0c76acb2bf6c3a4ff18c242144395 Mon Sep 17 00:00:00 2001 From: lucashu <6125220@qq.com> Date: Fri, 22 Aug 2025 09:01:59 +0800 Subject: [PATCH 2/5] 123312 --- .../Charts/MyComponents/WorkshopScene/index.vue | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/packages/components/Charts/MyComponents/WorkshopScene/index.vue b/src/packages/components/Charts/MyComponents/WorkshopScene/index.vue index 401ed79..1ac36ec 100644 --- a/src/packages/components/Charts/MyComponents/WorkshopScene/index.vue +++ b/src/packages/components/Charts/MyComponents/WorkshopScene/index.vue @@ -19,7 +19,7 @@
-
危化品库
+
危化品库
@@ -36,7 +36,7 @@
-
危废品库
+
危废品库
@@ -135,9 +135,8 @@ const option = computed(() => props.chartConfig.option) &.reverse { flex-direction: row-reverse; - .scene-name { - margin-right: 0; - margin-left: 25px; + .scene-name-2 { + margin-right: 90px; } .metrics-container { @@ -174,9 +173,13 @@ const option = computed(() => props.chartConfig.option) } } - .scene-name { + .scene-name-1, + .scene-name-2 { font-weight: bold; - margin-left: 105px; + } + + .scene-name-1 { + margin-left: 95px; } .metrics-container { From ddac945cc158261729a770837a6de1326822350c Mon Sep 17 00:00:00 2001 From: lucashu <6125220@qq.com> Date: Fri, 22 Aug 2025 09:15:27 +0800 Subject: [PATCH 3/5] 123 --- .../MyComponents/WorkshopScene/index.vue | 32 ++++++++++++++++--- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/src/packages/components/Charts/MyComponents/WorkshopScene/index.vue b/src/packages/components/Charts/MyComponents/WorkshopScene/index.vue index 1ac36ec..4f9476f 100644 --- a/src/packages/components/Charts/MyComponents/WorkshopScene/index.vue +++ b/src/packages/components/Charts/MyComponents/WorkshopScene/index.vue @@ -21,13 +21,13 @@
危化品库
-
+
场景总数
262
-
+
智控场景
@@ -38,13 +38,13 @@
危废品库
-
+
智控场景
6852
-
+
场景总数
@@ -137,6 +137,7 @@ const option = computed(() => props.chartConfig.option) .scene-name-2 { margin-right: 90px; + margin-left: 25px; } .metrics-container { @@ -212,7 +213,10 @@ const option = computed(() => props.chartConfig.option) } } - .metric { + .metric-top-1, + .metric-top-2, + .metric-bottom-1, + .metric-bottom-2 { display: flex; flex-direction: column; align-items: center; @@ -236,5 +240,23 @@ const option = computed(() => props.chartConfig.option) left: 9px; // Visually center the value under the text } } + .metric-top-1 { + position: relative; + left: -85px; + } + .metric-top-2 { + position: relative; + left: -30px; + } + .metric-bottom-1 { + position: relative; + left: 15px; + } + .metric-bottom-2 { + position: relative; + left:70px; + } } + + From 826d455456a6a1dea114c01cbd57857e217ed078 Mon Sep 17 00:00:00 2001 From: lucashu <6125220@qq.com> Date: Fri, 22 Aug 2025 11:14:03 +0800 Subject: [PATCH 4/5] 123321 --- src/packages/components/Charts/MyComponents/index.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/packages/components/Charts/MyComponents/index.ts b/src/packages/components/Charts/MyComponents/index.ts index 91d84b2..0804ef3 100644 --- a/src/packages/components/Charts/MyComponents/index.ts +++ b/src/packages/components/Charts/MyComponents/index.ts @@ -6,8 +6,8 @@ import { WorkshopSceneConfig } from './WorkshopScene/index' import { DeviceStatusConfig } from './DeviceStatus/index' import { LineDropdownConfig } from './LineDropdown/index' import { PieCenterConfig } from './PieCenter/index' -// import { LineGraph01Config } from './LineGraph01/index' -// import { LineGraph02Config } from './LineGraph02/index' +import { LineGraph01Config } from './LineGraph01/index' +import { LineGraph02Config } from './LineGraph02/index' import { MaxTrimConfig } from './MaxTrim/index' import { SmallBorderConfig } from './SmallBorder/index' @@ -23,6 +23,6 @@ export default [ LineDropdownConfig, PieCenterConfig, MaxTrimConfig, - // LineGraph01Config, - // LineGraph02Config, + LineGraph01Config, + LineGraph02Config, ] From 128e25ae6c175c7392e2a5cc17362d4e0f05ba97 Mon Sep 17 00:00:00 2001 From: lucashu <6125220@qq.com> Date: Fri, 22 Aug 2025 11:22:39 +0800 Subject: [PATCH 5/5] 123123 --- .../MyComponents/DeviceStatus/config.ts | 32 +++- .../MyComponents/DeviceStatus/config.vue | 122 ++++++++++---- .../MyComponents/DeviceStatus/index.vue | 158 ++++++++---------- 3 files changed, 194 insertions(+), 118 deletions(-) diff --git a/src/packages/components/Charts/MyComponents/DeviceStatus/config.ts b/src/packages/components/Charts/MyComponents/DeviceStatus/config.ts index 69775d1..a24c363 100644 --- a/src/packages/components/Charts/MyComponents/DeviceStatus/config.ts +++ b/src/packages/components/Charts/MyComponents/DeviceStatus/config.ts @@ -3,6 +3,26 @@ import { CreateComponentType } from '@/packages/index.d' import { DeviceStatusConfig } 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, header: ['所属企业', '设备类型', '设备名称'], @@ -22,11 +42,15 @@ export const option = { onlineRate: 75, onlineDevice: 23, totalDevice: 100, - headerBgColor1: '#0059c9', - headerBgColor2: '#003a8c', - legendColors: ['#00E5FF', '#00FF7F', '#FFFFFF'], progressColor: '#00E5FF', - progressBgColor: '#1A385A' + progressBgColor: '#1A385A', + // new properties from AlarmList + fontWeight: 'normal', + fontStyle: 'normal', + paddingX: 40, + paddingY: -19, + letterSpacing: 2, + isShowButton: false } export default class Config extends PublicConfigClass implements CreateComponentType { diff --git a/src/packages/components/Charts/MyComponents/DeviceStatus/config.vue b/src/packages/components/Charts/MyComponents/DeviceStatus/config.vue index b55c8c9..9ece4c5 100644 --- a/src/packages/components/Charts/MyComponents/DeviceStatus/config.vue +++ b/src/packages/components/Charts/MyComponents/DeviceStatus/config.vue @@ -1,40 +1,102 @@ \ No newline at end of file + +const fontWeightOptions = [ + { + label: FontWeightEnum.NORMAL, + value: FontWeightObject[FontWeightEnum.NORMAL] + }, + { + label: FontWeightEnum.BOLD, + value: FontWeightObject[FontWeightEnum.BOLD] + } +] +const fontStyleOptions = [ + { + label: FontStyleEnum.NORMAL, + value: FontStyleObject[FontStyleEnum.NORMAL] + }, + { + label: FontStyleEnum.ITALIC, + value: FontStyleObject[FontStyleEnum.ITALIC] + } +] + diff --git a/src/packages/components/Charts/MyComponents/DeviceStatus/index.vue b/src/packages/components/Charts/MyComponents/DeviceStatus/index.vue index af0c9bd..645cb69 100644 --- a/src/packages/components/Charts/MyComponents/DeviceStatus/index.vue +++ b/src/packages/components/Charts/MyComponents/DeviceStatus/index.vue @@ -1,69 +1,74 @@