diff --git a/src/assets/images/chart/charts/AlarmList.png b/src/assets/images/chart/charts/alarm_list.png similarity index 100% rename from src/assets/images/chart/charts/AlarmList.png rename to src/assets/images/chart/charts/alarm_list.png diff --git a/src/assets/images/chart/charts/top_alarms.png b/src/assets/images/chart/charts/top_alarms.png new file mode 100644 index 0000000..0174846 Binary files /dev/null and b/src/assets/images/chart/charts/top_alarms.png differ diff --git a/src/packages/components/Charts/MyComponents/TopAlarms/config.ts b/src/packages/components/Charts/MyComponents/TopAlarms/config.ts index a66d567..833117b 100644 --- a/src/packages/components/Charts/MyComponents/TopAlarms/config.ts +++ b/src/packages/components/Charts/MyComponents/TopAlarms/config.ts @@ -2,24 +2,29 @@ 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', titleColor: '#ffffff', - titleSize: 18, - rankColor: '#ffffff', - nameColor: '#B0E0E6', - valueColor: '#ffffff', - barColorStart: '#00D9FF', - barColorEnd: '#0055FF', + titleSize: 17, + rankColor: '#5AA1AD', + nameColor: '#eeeeee', + valueColor: '#eeeeee', + barColorStart: '#2f72b5', + barColorEnd: '#99C6E6', dropdownOptions: ['当日', '当月', '当年'], dropdownDefault: '当日', - iconColor: '#00E5FF' + iconColor: '#00E5FF', + letterSpacing:2, + 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 2ffb20d..99befc3 100644 --- a/src/packages/components/Charts/MyComponents/TopAlarms/index.vue +++ b/src/packages/components/Charts/MyComponents/TopAlarms/index.vue @@ -1,54 +1,64 @@