From a656cfbcd0fea1048a633434f1e530fe40d4e3a0 Mon Sep 17 00:00:00 2001
From: wujingjing <gersonwu@qq.com>
Date: 星期三, 25 九月 2024 11:07:10 +0800
Subject: [PATCH] Merge branch 'test' of http://47.103.154.90:83/r/WI/Web.V1.0 into test
---
src/components/chat/chatComponents/summaryCom/components/recordSet/RecordSet.vue | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/components/chat/chatComponents/summaryCom/components/recordSet/RecordSet.vue b/src/components/chat/chatComponents/summaryCom/components/recordSet/RecordSet.vue
index 52a8709..bd41005 100644
--- a/src/components/chat/chatComponents/summaryCom/components/recordSet/RecordSet.vue
+++ b/src/components/chat/chatComponents/summaryCom/components/recordSet/RecordSet.vue
@@ -1,3 +1,4 @@
+<!-- 鏄ㄦ棩渚涙按绠＄綉姒傚喌 -->
<template>
<div class="w-full">
<div class="flex mb-4 flex-wrap">
@@ -44,7 +45,6 @@
import { ChartTypeEnum } from '../../../types';
const chartRef = ref<HTMLDivElement>(null);
-const defaultDisplayType = 'line';
const yRange = ref({
min: null as number,
max: null as number,
@@ -116,8 +116,7 @@
let preData = null;
-let activeChartType: ChartTypeEnum = ChartTypeEnum.Line;
-
+let activeChartType: ChartTypeEnum = props.data.chart_type ?? ChartTypeEnum.Line;
const getChartTypeSeriesOption = (type: ChartTypeEnum) => {
let result = {};
switch (type) {
@@ -160,9 +159,7 @@
return {
name: item === 'default' ? '' : item,
data: values.map((item) => [item[timeIndex], item[valueIndex]]),
- type: defaultDisplayType,
- symbol: 'none',
- smooth: true,
+ ...getChartTypeSeriesOption(activeChartType)
};
});
}
@@ -172,7 +169,7 @@
},
legend: {
top: 19,
- show: series?.length > 1,
+ show: true,
type: 'scroll',
},
toolbox: {
--
Gitblit v1.9.3