+ 
{{ configData.tip }}
-
@@ -258,6 +262,7 @@ $border-gradient-end: rgba(128, 128, 128, 0);
}
& .svg-content {
+ // z-index: 2;
width: 100%;
height: 12%;
// background-color: antiquewhite;
diff --git a/src/packages/components/Charts/MyComponents/TopAlarms/config.ts b/src/packages/components/Charts/MyComponents/TopAlarms/config.ts
index 833117b..412dc1c 100644
--- a/src/packages/components/Charts/MyComponents/TopAlarms/config.ts
+++ b/src/packages/components/Charts/MyComponents/TopAlarms/config.ts
@@ -2,7 +2,6 @@ import { PublicConfigClass } from '@/packages/public'
import { CreateComponentType } from '@/packages/index.d'
import { TopAlarmsConfig } from './index'
import dataJson from './data.json'
-import { chartInitConfig } from '@/settings/designSetting'
export const option = {
dataset: dataJson.source,
title: '未处置报警数TOP5',
@@ -16,15 +15,14 @@ export const option = {
dropdownOptions: ['当日', '当月', '当年'],
dropdownDefault: '当日',
iconColor: '#00E5FF',
- letterSpacing:2,
+ letterSpacing: 1,
paddingX: 40,
paddingY: -5,
isShowButton: false
}
-
export default class Config extends PublicConfigClass implements CreateComponentType {
public key = TopAlarmsConfig.key
public chartConfig = TopAlarmsConfig
public option = option
- public attr = { ...chartInitConfig, x: 0, y: 0, w: 450, h: 300, zIndex: 1 }
+
}
diff --git a/src/packages/components/Charts/MyComponents/TopAlarms/index.vue b/src/packages/components/Charts/MyComponents/TopAlarms/index.vue
index 99befc3..b96dcbb 100644
--- a/src/packages/components/Charts/MyComponents/TopAlarms/index.vue
+++ b/src/packages/components/Charts/MyComponents/TopAlarms/index.vue
@@ -3,9 +3,6 @@
-
+
-
-
危化品库
-
-
-
- 场景总数
-
- 262
+
+ 危化品库
+
+
+
+ 场景总数
-
-
+
- 智控场景
-
- 6852
+ 262
+
+
+ 智控场景
+
+ 6852
+
+
-
危废品库
-
-
-
@@ -80,6 +87,7 @@ const option = computed(() => props.chartConfig.option)
.go-workshop-scene {
position: absolute;
top: 0;
+ left: 0;
width: 100%;
height: 100%;
padding: 12px;
@@ -98,7 +106,7 @@ const option = computed(() => props.chartConfig.option)
.title {
display: flex;
align-items: center;
- margin-left: 35px;
+ margin-left: 35px;
margin-top: 5px;
.title-text {
@@ -127,8 +135,8 @@ const option = computed(() => props.chartConfig.option)
.scene-row {
display: flex;
align-items: center;
- padding: 0 25px;
- height: 120px; // Taller rows
+ padding: 0 8px;
+ height: 95px; // Taller rows
background-size: 100% 100%;
background-repeat: no-repeat;
@@ -136,10 +144,10 @@ const option = computed(() => props.chartConfig.option)
flex-direction: row-reverse;
.scene-name-2 {
- margin-right: 90px;
+ margin-right: 95px;
margin-left: 25px;
}
-
+
.metrics-container {
margin-right: auto;
margin-left: 0;
@@ -195,7 +203,8 @@ const option = computed(() => props.chartConfig.option)
margin: 0 30px;
position: relative;
- &::before, &::after {
+ &::before,
+ &::after {
content: '';
position: absolute;
left: -2px;
@@ -204,9 +213,11 @@ const option = computed(() => props.chartConfig.option)
background-color: #00E5FF;
border-radius: 50%;
}
+
&::before {
top: -1px;
}
+
&::after {
bottom: -1px;
}
@@ -224,7 +235,12 @@ const option = computed(() => props.chartConfig.option)
.metric-label {
display: flex;
align-items: center;
- margin-bottom: 8px;
+ margin-bottom: 2px;
+
+ span {
+ margin-bottom: -5px;
+ margin-left: 3px;
+ }
.point {
width: 8px;
@@ -235,28 +251,30 @@ const option = computed(() => props.chartConfig.option)
}
.metric-value {
- font-weight: bold;
+ font-weight: normal;
position: relative;
- left: 9px; // Visually center the value under the text
+ left: 10px; // 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;
+ left: 70px;
}
}
-
-
diff --git a/src/packages/components/Charts/MyComponents/index.ts b/src/packages/components/Charts/MyComponents/index.ts
index 0804ef3..f2afeb0 100644
--- a/src/packages/components/Charts/MyComponents/index.ts
+++ b/src/packages/components/Charts/MyComponents/index.ts
@@ -8,12 +8,14 @@ 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'
export default [
- SmallBorderConfig,
+
AlarmListConfig,
SceneDistributionConfig,
TopAlarmsConfig,
@@ -25,4 +27,5 @@ export default [
MaxTrimConfig,
LineGraph01Config,
LineGraph02Config,
+ SmallBorderConfig
]
diff --git a/src/settings/designSetting.ts b/src/settings/designSetting.ts
index d49ecfb..d413ea0 100644
--- a/src/settings/designSetting.ts
+++ b/src/settings/designSetting.ts
@@ -24,7 +24,7 @@ export const theme = {
export const chartInitConfig = {
x: 50,
y: 50,
- w: 500,
+ w: 450,
h: 300,
// 不建议动 offset
offsetX: 0,
- 智控场景
-
- 6852
+
+ 危废品库
+
+
+
+ 智控场景
-
-
+
- 场景总数
-
- 262
+ 6852
+
+
+ 场景总数
+
+ 262
+
+