diff --git a/src/assets/images/chart/charts/LineGraph01.png b/src/assets/images/chart/charts/LineGraph01.png new file mode 100644 index 0000000..d19e6d2 Binary files /dev/null and b/src/assets/images/chart/charts/LineGraph01.png differ diff --git a/src/assets/images/chart/charts/LineGraph02.png b/src/assets/images/chart/charts/LineGraph02.png new file mode 100644 index 0000000..1299b95 Binary files /dev/null and b/src/assets/images/chart/charts/LineGraph02.png differ diff --git a/src/assets/images/chart/charts/MaxTrim.png b/src/assets/images/chart/charts/MaxTrim.png new file mode 100644 index 0000000..b026536 Binary files /dev/null and b/src/assets/images/chart/charts/MaxTrim.png differ diff --git a/src/assets/images/chart/charts/device_status.png b/src/assets/images/chart/charts/device_status.png new file mode 100644 index 0000000..f7f03d3 Binary files /dev/null and b/src/assets/images/chart/charts/device_status.png differ diff --git a/src/packages/components/Charts/MyComponents/AlarmList/config.ts b/src/packages/components/Charts/MyComponents/AlarmList/config.ts index 8556cd3..82a22b6 100644 --- a/src/packages/components/Charts/MyComponents/AlarmList/config.ts +++ b/src/packages/components/Charts/MyComponents/AlarmList/config.ts @@ -2,7 +2,6 @@ import { PublicConfigClass } from '@/packages/public' import { CreateComponentType } from '@/packages/index.d' import { AlarmListConfig } from './index' import dataJson from './data.json' -import { chartInitConfig } from '@/settings/designSetting' export enum FontWeightEnum { NORMAL = '常规', BOLD = '加粗', @@ -33,8 +32,8 @@ export const option = { '未解决': '#FF4D4F', '已解决': '#ffffff' }, - headerHeight: 30, - itemHeight: 30, + headerHeight: 28, + itemHeight: 28, fontSize: 12, title: '近60分钟报警信息', titleSize: 17, @@ -43,8 +42,8 @@ export const option = { fontWeight: 'normal', fontStyle: 'normal', paddingX: 40, - paddingY: -19, - letterSpacing: 2, + paddingY: -30, + letterSpacing: 1, isShowButton: false } @@ -52,6 +51,6 @@ export default class Config extends PublicConfigClass implements CreateComponent public key = AlarmListConfig.key public chartConfig = AlarmListConfig public option = option - public attr = { ...chartInitConfig, x: 0, y: 0, w: 450, h: 300, zIndex: 1 } + } diff --git a/src/packages/components/Charts/MyComponents/AlarmList/config.vue b/src/packages/components/Charts/MyComponents/AlarmList/config.vue index 101257f..889cffd 100644 --- a/src/packages/components/Charts/MyComponents/AlarmList/config.vue +++ b/src/packages/components/Charts/MyComponents/AlarmList/config.vue @@ -38,7 +38,7 @@ diff --git a/src/packages/components/Charts/MyComponents/LineGraph02/icon01.png b/src/packages/components/Charts/MyComponents/LineGraph02/assets/icon01.png similarity index 100% rename from src/packages/components/Charts/MyComponents/LineGraph02/icon01.png rename to src/packages/components/Charts/MyComponents/LineGraph02/assets/icon01.png diff --git a/src/packages/components/Charts/MyComponents/LineGraph02/config.ts b/src/packages/components/Charts/MyComponents/LineGraph02/config.ts index 3f12d2e..271e66a 100644 --- a/src/packages/components/Charts/MyComponents/LineGraph02/config.ts +++ b/src/packages/components/Charts/MyComponents/LineGraph02/config.ts @@ -2,7 +2,6 @@ import { echartOptionProfixHandle, PublicConfigClass } from '@/packages/public' import { LineGraph02Config } from './index' import { CreateComponentType } from '@/packages/index.d' import cloneDeep from 'lodash/cloneDeep' -import { chartInitConfig } from '@/settings/designSetting' import dataJson from './data.json' export interface DataSourceItem { dataname: string; @@ -101,6 +100,16 @@ export const option = { series: [seriesItem] }; +const configSet = { + titlefontWeight: 'normal', + titlefontSize: 17, + titlefontStyle: 'normal', + titlecolor: '#ffffff', + titlePaddingX: 0, + titlePaddingY: 0, + isShowButton: false +} +export { configSet } export default class Config extends PublicConfigClass implements CreateComponentType { @@ -109,6 +118,6 @@ export default class Config extends PublicConfigClass implements CreateComponent public mockData = dataJson // 图表配置项 public option = echartOptionProfixHandle(option, includes) - public attr = { ...chartInitConfig, x: 0, y: 0, w: 450, h: 300, zIndex: 1 } + } diff --git a/src/packages/components/Charts/MyComponents/LineGraph02/index.vue b/src/packages/components/Charts/MyComponents/LineGraph02/index.vue index 5862e72..4106584 100644 --- a/src/packages/components/Charts/MyComponents/LineGraph02/index.vue +++ b/src/packages/components/Charts/MyComponents/LineGraph02/index.vue @@ -2,10 +2,15 @@
- - {{ configData.title }} - -
@@ -36,7 +41,7 @@
- + {{ configData.tip }} -export default { - name: 'Componentz01' -} - + diff --git a/src/packages/components/Charts/MyComponents/SmallBorder/config.ts b/src/packages/components/Charts/MyComponents/SmallBorder/config.ts index ccf8d39..460d165 100644 --- a/src/packages/components/Charts/MyComponents/SmallBorder/config.ts +++ b/src/packages/components/Charts/MyComponents/SmallBorder/config.ts @@ -2,7 +2,6 @@ import { PublicConfigClass } from '@/packages/public' import { CreateComponentType } from '@/packages/index.d' import { SmallBorderConfig } from './index' import cloneDeep from 'lodash/cloneDeep' -import { chartInitConfig } from '@/settings/designSetting' export const option = { colors: ['#1089ff', '#0000ff'], @@ -13,6 +12,6 @@ export default class Config extends PublicConfigClass implements CreateComponent public key = SmallBorderConfig.key public chartConfig = cloneDeep(SmallBorderConfig) public option = cloneDeep(option) - public attr = { ...chartInitConfig, x: 0, y: 0, w: 450, h: 300, zIndex: 1 } + } diff --git a/src/packages/components/Charts/MyComponents/SmallBorder/index.vue b/src/packages/components/Charts/MyComponents/SmallBorder/index.vue index 62d4421..bb3ca49 100644 --- a/src/packages/components/Charts/MyComponents/SmallBorder/index.vue +++ b/src/packages/components/Charts/MyComponents/SmallBorder/index.vue @@ -1,208 +1,212 @@ @@ -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 @@
-