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/packages/components/Charts/MyComponents/LineGraph01/icon01.png b/src/packages/components/Charts/MyComponents/LineGraph01/assets/icon01.png similarity index 100% rename from src/packages/components/Charts/MyComponents/LineGraph01/icon01.png rename to src/packages/components/Charts/MyComponents/LineGraph01/assets/icon01.png diff --git a/src/packages/components/Charts/MyComponents/LineGraph01/config.ts b/src/packages/components/Charts/MyComponents/LineGraph01/config.ts index aee4fda..1082f3c 100644 --- a/src/packages/components/Charts/MyComponents/LineGraph01/config.ts +++ b/src/packages/components/Charts/MyComponents/LineGraph01/config.ts @@ -2,7 +2,6 @@ import { echartOptionProfixHandle, PublicConfigClass } from '@/packages/public' import { LineGraph01Config } 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,14 +100,22 @@ 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 { public key: string = LineGraph01Config.key public chartConfig = cloneDeep(LineGraph01Config) 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/LineGraph01/index.vue b/src/packages/components/Charts/MyComponents/LineGraph01/index.vue index 89b194e..474dca4 100644 --- a/src/packages/components/Charts/MyComponents/LineGraph01/index.vue +++ b/src/packages/components/Charts/MyComponents/LineGraph01/index.vue @@ -196,8 +196,15 @@
- {{ configData.title }} -
@@ -228,7 +235,7 @@
- + {{ configData.tip }} ({ +// width: props.chartConfig.attr.w + 'px', +// height: "16%" +// })) // dataset 无法变更条数的补丁 (保持不变) @@ -430,7 +442,7 @@ onUnmounted(() => { 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/index.ts b/src/packages/components/Charts/MyComponents/index.ts index 91d84b2..4b3d95f 100644 --- a/src/packages/components/Charts/MyComponents/index.ts +++ b/src/packages/components/Charts/MyComponents/index.ts @@ -6,14 +6,14 @@ 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' export default [ - SmallBorderConfig, + AlarmListConfig, SceneDistributionConfig, TopAlarmsConfig, @@ -23,6 +23,7 @@ export default [ LineDropdownConfig, PieCenterConfig, MaxTrimConfig, - // LineGraph01Config, - // LineGraph02Config, + LineGraph01Config, + LineGraph02Config, + SmallBorderConfig ]