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 index e5a09dbe..ff6f63b3 100644 --- a/src/packages/components/Charts/Pies/PieCircle/config.ts +++ b/src/packages/components/Charts/Pies/PieCircle/config.ts @@ -29,33 +29,27 @@ const option = { hoverAnimation: true, color: ["#00bcd44a", "transparent"], label: { - normal: { - show: false - } + show: false }, data: [ { value: [25], itemStyle: { - normal: { - color: "#03a9f4", - shadowBlur: 10, - shadowColor:"#97e2f5" - } + color: "#03a9f4", + shadowBlur: 10, + shadowColor:"#97e2f5" } }, { value: [75], itemStyle: { - normal: { - color: "#00bcd44a", - shadowBlur: 0, - shadowColor:"#00bcd44a" - } + color: "#00bcd44a", + shadowBlur: 0, + shadowColor:"#00bcd44a" } } ] - } + }, ] } diff --git a/src/packages/components/Charts/Pies/PieCircle/config.vue b/src/packages/components/Charts/Pies/PieCircle/config.vue index 258bafc7..9a5a19bb 100644 --- a/src/packages/components/Charts/Pies/PieCircle/config.vue +++ b/src/packages/components/Charts/Pies/PieCircle/config.vue @@ -1,6 +1,6 @@