diff --git a/src/packages/components/Charts/Scatters/ScatterBasic/config.ts b/src/packages/components/Charts/Scatters/ScatterBasic/config.ts index 4de44ca3..305f7029 100644 --- a/src/packages/components/Charts/Scatters/ScatterBasic/config.ts +++ b/src/packages/components/Charts/Scatters/ScatterBasic/config.ts @@ -9,7 +9,6 @@ export const includes = ['legend', 'xAxis', 'yAxis'] export const option = { dataset: dataJson, tooltip: { - // trigger: 'axis', showDelay: 0, axisPointer: { show: true, diff --git a/src/packages/components/Charts/Scatters/ScatterBasic/config.vue b/src/packages/components/Charts/Scatters/ScatterBasic/config.vue index c8e59af4..b716886c 100644 --- a/src/packages/components/Charts/Scatters/ScatterBasic/config.vue +++ b/src/packages/components/Charts/Scatters/ScatterBasic/config.vue @@ -1,17 +1,31 @@ + diff --git a/src/packages/components/Charts/Scatters/ScatterLogarithmicRegression/config.ts b/src/packages/components/Charts/Scatters/ScatterLogarithmicRegression/config.ts index ae9eb7ff..49a9c7b4 100644 --- a/src/packages/components/Charts/Scatters/ScatterLogarithmicRegression/config.ts +++ b/src/packages/components/Charts/Scatters/ScatterLogarithmicRegression/config.ts @@ -24,7 +24,7 @@ export const option = { legend: { data: dataJson .filter(i => i?.transform?.type === 'filter' && i?.transform?.config?.eq) - .map(i => i.transform?.config?.eq) + .map(i => i.transform?.config?.eq?.toString()) }, xAxis: { diff --git a/src/packages/components/Charts/Scatters/ScatterMuitData/config.ts b/src/packages/components/Charts/Scatters/ScatterMuitData/config.ts index 958ee1ac..49d34552 100644 --- a/src/packages/components/Charts/Scatters/ScatterMuitData/config.ts +++ b/src/packages/components/Charts/Scatters/ScatterMuitData/config.ts @@ -10,6 +10,37 @@ export const seriesItem = { type: 'scatter', emphasis: { focus: 'series' + }, + symbolSize: 12, + + markArea: { + silent: true, + itemStyle: { + color: 'transparent', + borderWidth: 1, + borderType: 'dashed' + }, + data: [ + [ + { + xAxis: 'min', + yAxis: 'min' + }, + { + xAxis: 'max', + yAxis: 'max' + } + ] + ] + }, + + markPoint: { + symbol: 'pin', + symbolSize: 50, + data: [ + { type: 'max', name: 'Max' }, + { type: 'min', name: 'Min' } + ] } } @@ -26,28 +57,12 @@ export const option = { } } }, - legend: {}, - // visualMap: { - // min: 0, - // max: 360, - // dimension: 1, - // orient: 'vertical', - // right: 10, - // top: 'center', - // text: ['高', '低'], - // calculable: true, - // inRange: { - // color: ['#f2c31a', '#24b7f2'] - // } - // }, + legend: {}, xAxis: { type: 'value', scale: true, - // axisLabel: { - // formatter: '{value} cm' - // }, splitLine: { show: false } @@ -56,22 +71,13 @@ export const option = { yAxis: { type: 'value', scale: true, - // axisLabel: { - // formatter: '{value} kg' - // }, splitLine: { show: false } }, - // series: [ - // { ...seriesItem, datasetIndex: 0 }, - // { ...seriesItem, datasetIndex: 1 } - // ], - series: dataJson.map((item, index) => ({ ...seriesItem, - // name: (item.dimensions && item.dimensions[0]) || `data${index}`, datasetIndex: index })) } diff --git a/src/packages/components/Charts/Scatters/ScatterMuitData/config.vue b/src/packages/components/Charts/Scatters/ScatterMuitData/config.vue index c8e59af4..649e26e5 100644 --- a/src/packages/components/Charts/Scatters/ScatterMuitData/config.vue +++ b/src/packages/components/Charts/Scatters/ScatterMuitData/config.vue @@ -1,17 +1,54 @@