diff --git a/src/components/item-d/pieCharts.ts b/src/components/item-d/pieCharts.ts index 31a8079..d47bd55 100644 --- a/src/components/item-d/pieCharts.ts +++ b/src/components/item-d/pieCharts.ts @@ -14,7 +14,7 @@ export function screenPie(chartData, total, color) { borderColor: '#1b7ef2', }, legend: { - left: '72%', + right: '5%', top: 'center', orient: 'vertical', icon: 'circle', @@ -23,12 +23,13 @@ export function screenPie(chartData, total, color) { color: '#ffffff', fontSize: 16, }, + selectedMode: false }, series: [ { type: 'pie', - radius: ['50%', '76%'], - center: ['40%', '49%'], + radius: ['50%', '72%'], + center: ['37%', '49%'], avoidLabelOverlap: false, label: { show: true, @@ -50,7 +51,8 @@ export function screenPie(chartData, total, color) { //左侧圆 export function circleRing(chartData, total, color) { - const data = visibleChartLabel(chartData) + // const data = visibleChartLabel(chartData) + // const data = chartData return { color: color, tooltip: { @@ -72,6 +74,7 @@ export function circleRing(chartData, total, color) { color: '#ffffff', fontSize: 16, }, + selectedMode: false }, series: [ { @@ -89,7 +92,7 @@ export function circleRing(chartData, total, color) { labelLine: { show: false, }, - data: data, + data: chartData, }, ], }; diff --git a/src/components/secondaryScreen/screen-right/screenRightHooks.ts b/src/components/secondaryScreen/screen-right/screenRightHooks.ts index a81a7fb..45905bb 100644 --- a/src/components/secondaryScreen/screen-right/screenRightHooks.ts +++ b/src/components/secondaryScreen/screen-right/screenRightHooks.ts @@ -61,6 +61,7 @@ export function sleepCharts({ time, short, long, awake, type }) { borderColor: '#1b7ef2', }, legend: { + orient: 'horizontal', data: ['清醒', '浅睡', '深睡'], textStyle: { color: '#ffffff', @@ -69,7 +70,7 @@ export function sleepCharts({ time, short, long, awake, type }) { height: 40, itemHeight: 14, top: -5, - left: '52%', + right: '15%', }, color: ['#14B3F8', '#6D7BEB', '#5451DC'], xAxis: { diff --git a/src/components/secondaryScreen/screen-right/twoR.vue b/src/components/secondaryScreen/screen-right/twoR.vue index 8569265..93984a3 100644 --- a/src/components/secondaryScreen/screen-right/twoR.vue +++ b/src/components/secondaryScreen/screen-right/twoR.vue @@ -75,7 +75,7 @@ .count { position: absolute; - width: 77%; + width: 71%; top: 51%; display: flex; flex-direction: column; diff --git a/src/components/secondaryScreen/secondMap/secondMap.vue b/src/components/secondaryScreen/secondMap/secondMap.vue index f3d52f3..40e614e 100644 --- a/src/components/secondaryScreen/secondMap/secondMap.vue +++ b/src/components/secondaryScreen/secondMap/secondMap.vue @@ -105,6 +105,8 @@ setIsShow(true); } ); + } else { + Map.removeOverlayGroup(); } } catch {} }