diff --git a/src/assets/images/chart/charts/capsule.png b/src/assets/images/chart/charts/capsule.png index e3d6dbd7..6dae56b4 100644 Binary files a/src/assets/images/chart/charts/capsule.png and b/src/assets/images/chart/charts/capsule.png differ diff --git a/src/packages/components/Charts/Mores/CapsuleChart/config.ts b/src/packages/components/Charts/Bars/CapsuleChart/config.ts similarity index 65% rename from src/packages/components/Charts/Mores/CapsuleChart/config.ts rename to src/packages/components/Charts/Bars/CapsuleChart/config.ts index 46e523f5..2d562849 100644 --- a/src/packages/components/Charts/Mores/CapsuleChart/config.ts +++ b/src/packages/components/Charts/Bars/CapsuleChart/config.ts @@ -1,4 +1,4 @@ -import { PublicConfigClass } from '@/packages/public' +import { PublicConfigClass } from '@/packages/public' import { CapsuleChartConfig } from './index' import { CreateComponentType } from '@/packages/index.d' import { chartInitConfig } from '@/settings/designSetting' @@ -6,18 +6,20 @@ import { chartInitConfig } from '@/settings/designSetting' import cloneDeep from 'lodash/cloneDeep' import dataJson from './data.json' - export const option = { - dataset:dataJson, - colors: ['#e062ae', '#fb7293', '#e690d1', '#32c5e9', '#96bfff'], + dataset: dataJson, + colors: ['#c4ebad', '#6be6c1', '#a0a7e6', '#96dee8', '#3fb1e3' ], unit: '', - itemHeight:10, + itemHeight: 10, + valueFontSize: 16, + paddingRight: 50, + paddingLeft: 50, showValue: true } export default class Config extends PublicConfigClass implements CreateComponentType { public key: string = CapsuleChartConfig.key - public attr = { ...chartInitConfig,w: 300, h: 200 ,zIndex: -1} + public attr = { ...chartInitConfig, zIndex: -1 } public chartConfig = cloneDeep(CapsuleChartConfig) public option = cloneDeep(option) } diff --git a/src/packages/components/Charts/Bars/CapsuleChart/config.vue b/src/packages/components/Charts/Bars/CapsuleChart/config.vue new file mode 100644 index 00000000..8fcb5024 --- /dev/null +++ b/src/packages/components/Charts/Bars/CapsuleChart/config.vue @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + 显示数值 + + + + + + + + + + + + diff --git a/src/packages/components/Charts/Mores/CapsuleChart/data.json b/src/packages/components/Charts/Bars/CapsuleChart/data.json similarity index 84% rename from src/packages/components/Charts/Mores/CapsuleChart/data.json rename to src/packages/components/Charts/Bars/CapsuleChart/data.json index 206bb50b..a7a26af8 100644 --- a/src/packages/components/Charts/Mores/CapsuleChart/data.json +++ b/src/packages/components/Charts/Bars/CapsuleChart/data.json @@ -3,7 +3,7 @@ "source": [ { "name": "厦门", "value": 20 }, { "name": "南阳", "value": 40 }, - { "name": "背景", "value": 60 }, + { "name": "北京", "value": 60 }, { "name": "上海", "value": 80 }, { "name": "新疆", "value": 100 } ] diff --git a/src/packages/components/Charts/Mores/CapsuleChart/index.ts b/src/packages/components/Charts/Bars/CapsuleChart/index.ts similarity index 85% rename from src/packages/components/Charts/Mores/CapsuleChart/index.ts rename to src/packages/components/Charts/Bars/CapsuleChart/index.ts index 96c24793..a0fc6291 100644 --- a/src/packages/components/Charts/Mores/CapsuleChart/index.ts +++ b/src/packages/components/Charts/Bars/CapsuleChart/index.ts @@ -7,8 +7,8 @@ export const CapsuleChartConfig: ConfigType = { chartKey: 'VCapsuleChart', conKey: 'VCCapsuleChart', title: '胶囊柱图', - category: ChatCategoryEnum.MORE, - categoryName: ChatCategoryEnumName.MORE, + category: ChatCategoryEnum.BAR, + categoryName: ChatCategoryEnumName.BAR, package: PackagesCategoryEnum.CHARTS, chartFrame: ChartFrameEnum.COMMON, image diff --git a/src/packages/components/Charts/Mores/CapsuleChart/index.vue b/src/packages/components/Charts/Bars/CapsuleChart/index.vue similarity index 57% rename from src/packages/components/Charts/Mores/CapsuleChart/index.vue rename to src/packages/components/Charts/Bars/CapsuleChart/index.vue index 6532af4f..4a0ed72f 100644 --- a/src/packages/components/Charts/Mores/CapsuleChart/index.vue +++ b/src/packages/components/Charts/Bars/CapsuleChart/index.vue @@ -1,223 +1,228 @@ - - - - - - - {{ item[state.mergedConfig.dataset.dimensions[0]] }} - - - - - - - - - {{ state.capsuleValue[index] }} - - - - - - - {{ label }} - - - - - - {{ state.mergedConfig.unit }} - - - - - - + + + + + {{ item[state.mergedConfig.dataset.dimensions[0]] }} + + + + + + + + + {{ state.capsuleValue[index] }} + + + + + + + {{ label }} + + + + + + {{ state.mergedConfig.unit }} + + + + + + + diff --git a/src/packages/components/Charts/Bars/index.ts b/src/packages/components/Charts/Bars/index.ts index 9613b804..a101acbd 100644 --- a/src/packages/components/Charts/Bars/index.ts +++ b/src/packages/components/Charts/Bars/index.ts @@ -1,4 +1,5 @@ import { BarCommonConfig } from './BarCommon/index' import { BarCrossrangeConfig } from './BarCrossrange/index' +import { CapsuleChartConfig } from './CapsuleChart/index' -export default [BarCommonConfig, BarCrossrangeConfig] +export default [BarCommonConfig, BarCrossrangeConfig, CapsuleChartConfig] diff --git a/src/packages/components/Charts/Mores/CapsuleChart/config.vue b/src/packages/components/Charts/Mores/CapsuleChart/config.vue deleted file mode 100644 index f04325e1..00000000 --- a/src/packages/components/Charts/Mores/CapsuleChart/config.vue +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/packages/components/Charts/Mores/index.ts b/src/packages/components/Charts/Mores/index.ts index 1828a518..7539cf21 100644 --- a/src/packages/components/Charts/Mores/index.ts +++ b/src/packages/components/Charts/Mores/index.ts @@ -4,7 +4,5 @@ import { FunnelConfig } from './Funnel/index' import { HeatmapConfig } from './Heatmap/index' import { WaterPoloConfig } from './WaterPolo/index' import { TreeMapConfig } from './TreeMap/index' -import { CapsuleChartConfig } from './CapsuleChart' - -export default [ProcessConfig, RadarConfig, FunnelConfig, HeatmapConfig, WaterPoloConfig, TreeMapConfig,CapsuleChartConfig] +export default [ProcessConfig, RadarConfig, FunnelConfig, HeatmapConfig, WaterPoloConfig, TreeMapConfig]