diff --git a/src/api/mock/index.ts b/src/api/mock/index.ts index bf9b2f52..eea66104 100644 --- a/src/api/mock/index.ts +++ b/src/api/mock/index.ts @@ -15,6 +15,7 @@ export const radarUrl = '/mock/radarData' export const heatMapUrl = '/mock/heatMapData' export const scatterBasicUrl = '/mock/scatterBasic' export const mapUrl = '/mock/map' +export const capsuleUrl = '/mock/capsule' export const wordCloudUrl = '/mock/wordCloud' export const treemapUrl = '/mock/treemap' export const threeEarth01Url = '/mock/threeEarth01Data' @@ -82,6 +83,11 @@ const mockObject: MockMethod[] = [ method: RequestHttpEnum.GET, response: () => test.fetchMap }, + { + url: capsuleUrl, + method: RequestHttpEnum.GET, + response: () => test.fetchCapsule + }, { url: wordCloudUrl, method: RequestHttpEnum.GET, diff --git a/src/api/mock/test.mock.ts b/src/api/mock/test.mock.ts index 65afb3d4..3126c69c 100644 --- a/src/api/mock/test.mock.ts +++ b/src/api/mock/test.mock.ts @@ -39,6 +39,22 @@ export default { ] } }, + // 胶囊图 + fetchCapsule:{ + code: 0, + status: 200, + msg: '请求成功', + data: { + dimensions: ['name', 'value'], + "source": [ + { "name": "厦门", "value|0-40": 20 }, + { "name": "南阳", "value|20-60": 40 }, + { "name": "北京", "value|40-80": 60 }, + { "name": "上海", "value|60-100": 80 }, + { "name": "新疆", "value": 100 } + ] + } + }, // 图表 fetchMockData: { code: 0, diff --git a/src/packages/components/Charts/Mores/CapsuleChart/config.ts b/src/packages/components/Charts/Mores/CapsuleChart/config.ts index 86b362b5..46e523f5 100644 --- a/src/packages/components/Charts/Mores/CapsuleChart/config.ts +++ b/src/packages/components/Charts/Mores/CapsuleChart/config.ts @@ -8,7 +8,7 @@ import dataJson from './data.json' export const option = { - dataSet:dataJson, + dataset:dataJson, colors: ['#e062ae', '#fb7293', '#e690d1', '#32c5e9', '#96bfff'], unit: '', itemHeight:10, diff --git a/src/packages/components/Charts/Mores/CapsuleChart/config.vue b/src/packages/components/Charts/Mores/CapsuleChart/config.vue index f662fa37..d4da8742 100644 --- a/src/packages/components/Charts/Mores/CapsuleChart/config.vue +++ b/src/packages/components/Charts/Mores/CapsuleChart/config.vue @@ -10,6 +10,7 @@ + @@ -39,5 +40,5 @@ const props = defineProps({ } }) -console.log(props.optionData) +console.log("optionData",props.optionData) diff --git a/src/packages/components/Charts/Mores/CapsuleChart/index.vue b/src/packages/components/Charts/Mores/CapsuleChart/index.vue index b7ae58ba..f74bb6e9 100644 --- a/src/packages/components/Charts/Mores/CapsuleChart/index.vue +++ b/src/packages/components/Charts/Mores/CapsuleChart/index.vue @@ -1,15 +1,17 @@