diff --git a/src/components/Analysis/Index.vue b/src/components/Analysis/Index.vue index b622544..f8fc1a8 100644 --- a/src/components/Analysis/Index.vue +++ b/src/components/Analysis/Index.vue @@ -11,7 +11,9 @@ import EmptyContainer from '@/views/Survey/components/EmptyContainer.vue'; const tableData = ref([]); const analysis = defineModel('analysis'); -// series 信息 +// console.log('analysis', analysis.value); +const pieChart = useTemplateRef('pieChart'); + const series = ref([]); const dimension = defineModel('dimension'); // 图标高度 @@ -22,14 +24,11 @@ const chartHeight = computed(() => { // 做一些额外的检测, 如果 option 下面的title 字段超过 8 个,就把 addHeight 增加 analysis.value?.option?.forEach((item: any) => { - console.log(item); - if (item.title?.length > 8) { - addHeight += 2; + addHeight += 9; } }); - console.log(`addHeight`, addHeight); // 每三个选项高度增加 20px, 默认 300px return dimension.value ? 280 : 280 + addHeight; }); @@ -45,14 +44,16 @@ watch( option: getTableData(analysis.value) }; - // console.log(`tableData.value`, tableData.value); + // console.log(`图标的高度是`, chartHeight.value); series.value = formatData(dimension.value ? tableData.value : analysis.value, index.value); // console.log(`series value`, series.value); const pieChart = useTemplateRef('pieChart'); - if (!series.value?.data?.length) return; + if (series.value.data.length <= 0) { + series.value.data = [{ value: -1, name: '' }]; + } useSetPieChart(pieChart, series, { title: false, legend: false }); }, { immediate: true } @@ -65,9 +66,8 @@ const changeChart = (i: number) => { // console.log(`series value. by changeChart`, series.value); if (series.value.data.length <= 0) { - series.value.data = [{ value: 0, name: 0 }]; + series.value.data = [{ value: -1, name: '' }]; } - // const pieChart = useTemplateRef('pieChart'); // useSetPieChart(pieChart, series, { title: false, legend: false }); }; @@ -87,7 +87,7 @@ const chartVisible = computed(() => { const data = series.value?.data as { name: any; value: any }[]; // 过滤后的 data 数据, - const filterData = data.filter((item) => item.value != 0 && item.name != 0); + const filterData = data.filter((item) => item.value !== -1 && item.name != ""); return filterData.length; // series.value?.data.forEach((item: any`1[]) => { // if (item.value > 0) { diff --git a/src/components/YlTable/components/Tootips/Index.vue b/src/components/YlTable/components/Tootips/Index.vue index 1e46a20..d0112cb 100644 --- a/src/components/YlTable/components/Tootips/Index.vue +++ b/src/components/YlTable/components/Tootips/Index.vue @@ -4,13 +4,13 @@ const content = defineModel<{ row: any; column: any; cellValue: any }>('content'