diff --git a/src/assets/images/chart/charts/pie-circle.png b/src/assets/images/chart/charts/pie-circle.png new file mode 100644 index 00000000..7d99ed04 Binary files /dev/null and b/src/assets/images/chart/charts/pie-circle.png differ diff --git a/src/assets/images/chart/charts/process.png b/src/assets/images/chart/charts/process.png index b4457696..4be18d73 100644 Binary files a/src/assets/images/chart/charts/process.png and b/src/assets/images/chart/charts/process.png differ diff --git a/src/packages/components/Charts/Mores/Process/config.ts b/src/packages/components/Charts/Mores/Process/config.ts index 0bac2293..34d86502 100644 --- a/src/packages/components/Charts/Mores/Process/config.ts +++ b/src/packages/components/Charts/Mores/Process/config.ts @@ -4,9 +4,36 @@ import { ProcessConfig } from './index' import { chartInitConfig } from '@/settings/designSetting' import cloneDeep from 'lodash/cloneDeep' + +export const types = [ + { + label: '线形', + value: 'line' + }, + { + label: '圆形', + value: 'circle' + }, + { + label: '仪表盘', + value: 'dashboard' + }, +] + +export const indicatorPlacements = [ + { + label: '内部', + value: 'inside' + }, + { + label: '外部', + value: 'outside' + } +] + export const option = { dataset: 36, - type: "circle", + type: types[2].value, color: '#4992FFFF', // 指标位置(线条时可用) indicatorPlacement: "outside" diff --git a/src/packages/components/Charts/Mores/Process/config.vue b/src/packages/components/Charts/Mores/Process/config.vue index c6b1909d..74003105 100644 --- a/src/packages/components/Charts/Mores/Process/config.vue +++ b/src/packages/components/Charts/Mores/Process/config.vue @@ -38,7 +38,7 @@ import { } from '@/components/Pages/ChartItemSetting' // 获取 option 的数据,便于使用 typeof 获取类型 -import { option } from './config' +import { option, types, indicatorPlacements} from './config' const props = defineProps({ optionData: { @@ -46,30 +46,4 @@ const props = defineProps({ required: true } }) - -const types = [ - { - label: '线形', - value: 'line' - }, - { - label: '圆形', - value: 'circle' - }, - { - label: '仪表盘', - value: 'dashboard' - }, -] - -const indicatorPlacements = [ - { - label: '里面', - value: 'inside' - }, - { - label: '外边', - value: 'outside' - } -] \ No newline at end of file diff --git a/src/packages/components/Charts/Mores/Process/index.ts b/src/packages/components/Charts/Mores/Process/index.ts index d841e4f9..093aa03a 100644 --- a/src/packages/components/Charts/Mores/Process/index.ts +++ b/src/packages/components/Charts/Mores/Process/index.ts @@ -13,7 +13,7 @@ export const ProcessConfig: ConfigType = { // 配置组件渲染 Components 格式: VC + key conKey: 'VCProcess', // 名称 - title: '多类进度条', + title: 'NaiveUI-进度', // 子分类目录 category: ChatCategoryEnum.MORE, // 子分类目录 diff --git a/src/packages/components/Charts/Pies/PieCircle/config.ts b/src/packages/components/Charts/Pies/PieCircle/config.ts new file mode 100644 index 00000000..ff6f63b3 --- /dev/null +++ b/src/packages/components/Charts/Pies/PieCircle/config.ts @@ -0,0 +1,63 @@ +import { echartOptionProfixHandle, publicConfig } from '@/packages/public' +import { PieCircleConfig } from './index' +import { CreateComponentType } from '@/packages/index.d' + +export const includes = ['legend'] +const option = { + tooltip: { + show: true, + trigger: 'item' + }, + legend: { + show: true, + }, + dataset: 0.25, + title: { + text: 25 + "%", + x: "center", + y: "center", + textStyle: { + color: "#56B9F8", + fontSize: 30 + } + }, + series: [ + { + type: "pie", + radius: ["75%", "80%"], + center: ["50%", "50%"], + hoverAnimation: true, + color: ["#00bcd44a", "transparent"], + label: { + show: false + }, + data: [ + { + value: [25], + itemStyle: { + color: "#03a9f4", + shadowBlur: 10, + shadowColor:"#97e2f5" + } + }, + { + value: [75], + itemStyle: { + color: "#00bcd44a", + shadowBlur: 0, + shadowColor:"#00bcd44a" + } + } + ] + }, + ] +} + +export default class Config extends publicConfig implements CreateComponentType { + public key: string = PieCircleConfig.key + + public chartConfig = PieCircleConfig + + // 图表配置项 + public option = echartOptionProfixHandle(option, includes) +} diff --git a/src/packages/components/Charts/Pies/PieCircle/config.vue b/src/packages/components/Charts/Pies/PieCircle/config.vue new file mode 100644 index 00000000..9a5a19bb --- /dev/null +++ b/src/packages/components/Charts/Pies/PieCircle/config.vue @@ -0,0 +1,89 @@ + + + diff --git a/src/packages/components/Charts/Pies/PieCircle/index.ts b/src/packages/components/Charts/Pies/PieCircle/index.ts new file mode 100644 index 00000000..deec7530 --- /dev/null +++ b/src/packages/components/Charts/Pies/PieCircle/index.ts @@ -0,0 +1,14 @@ +import image from '@/assets/images/chart/charts/pie-circle.png' +import { ConfigType, PackagesCategoryEnum } from '@/packages/index.d' +import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' + +export const PieCircleConfig: ConfigType = { + key: 'PieCircle', + chartKey: 'VPieCircle', + conKey: 'VCPieCircle', + title: '饼图-环形', + category: ChatCategoryEnum.PIE, + categoryName: ChatCategoryEnumName.PIE, + package: PackagesCategoryEnum.CHARTS, + image +} diff --git a/src/packages/components/Charts/Pies/PieCircle/index.vue b/src/packages/components/Charts/Pies/PieCircle/index.vue new file mode 100644 index 00000000..a4bf95da --- /dev/null +++ b/src/packages/components/Charts/Pies/PieCircle/index.vue @@ -0,0 +1,71 @@ + + + diff --git a/src/packages/components/Charts/Pies/index.ts b/src/packages/components/Charts/Pies/index.ts index f5ce290b..f89116fc 100644 --- a/src/packages/components/Charts/Pies/index.ts +++ b/src/packages/components/Charts/Pies/index.ts @@ -1,3 +1,4 @@ import { PieCommonConfig } from './PieCommon/index' +import { PieCircleConfig } from './PieCircle/index' -export default [PieCommonConfig] \ No newline at end of file +export default [PieCommonConfig, PieCircleConfig] \ No newline at end of file diff --git a/src/packages/components/Charts/index.ts b/src/packages/components/Charts/index.ts index 3f03e175..2dd3e54b 100644 --- a/src/packages/components/Charts/index.ts +++ b/src/packages/components/Charts/index.ts @@ -4,4 +4,4 @@ import Lines from './Lines' import Mores from './Mores' import Maps from './Maps' -export const ChartList = [...Bars, ...Pies, ...Lines, ...Maps , ...Mores] +export const ChartList = [...Bars, ...Pies, ...Lines, ...Maps, ...Mores] diff --git a/src/packages/components/Decorates/Mores/Number/config.ts b/src/packages/components/Decorates/Mores/Number/config.ts index b9fd8920..c3a8b940 100644 --- a/src/packages/components/Decorates/Mores/Number/config.ts +++ b/src/packages/components/Decorates/Mores/Number/config.ts @@ -7,6 +7,7 @@ export const option = { from: 50000, to: 100000, dur: 3, + precision: 0, showSeparator: true, numberSize: 24, numberColor: '#4a9ef8', diff --git a/src/packages/components/Decorates/Mores/Number/config.vue b/src/packages/components/Decorates/Mores/Number/config.vue index f7114a30..c951ed5e 100644 --- a/src/packages/components/Decorates/Mores/Number/config.vue +++ b/src/packages/components/Decorates/Mores/Number/config.vue @@ -28,6 +28,13 @@ 展示分割符 + + + diff --git a/src/packages/components/Decorates/Mores/Number/index.vue b/src/packages/components/Decorates/Mores/Number/index.vue index b4ddfb13..ccf30bd3 100644 --- a/src/packages/components/Decorates/Mores/Number/index.vue +++ b/src/packages/components/Decorates/Mores/Number/index.vue @@ -11,6 +11,7 @@ :to="to" :duration="dur * 1000" :show-separator="showSeparator" + :precision="precision" >