diff --git a/src/components/blogs/HomePage.vue b/src/components/blogs/HomePage.vue index f2da61d..471ed24 100644 --- a/src/components/blogs/HomePage.vue +++ b/src/components/blogs/HomePage.vue @@ -332,7 +332,7 @@ const comLinkClick = (url: string) => { router.push(url); // 否则使用 Vue Router 的 push 方法导航 } } -const comlinklist=ref([]) +const comlinklist = ref([]) const comLinkList = async () => { try { await get("/comlinks/list").then(response => { @@ -432,7 +432,6 @@ const heat = ref(null); const newData = []; // 初始化60天的数据 const data = generateDates(60); -console.log(data) // 重新排列数据 for (let i = 0; i < 60; i += 15) { // 取出每个15天的数据,并反转顺序 @@ -452,11 +451,14 @@ function generateDates(numDays: number) { } return dates; } -const writList = [10,9, 8, 7, 6, 5, 4] -writList.forEach((item, index) => { - data[index].writCount = item; -}) -const formattedData = newData.map((value: any, index: number) => [index % 15, Math.floor(index / 15), value.writCount]); + +const rawData = ref([]); +console.log(`output->newData`,newData) + +const formattedData = newData.map(( item:any,index: number) => { + return [index % 15, Math.floor(index / 15),item.writCount] +}); +console.log(`output->formattedData`,formattedData) const heatMapData = { tooltip: { position: 'top', @@ -493,7 +495,7 @@ const heatMapData = { }, visualMap: { min: 0, - max: 10, + max: 20, calculable: true, orient: 'horizontal', left: 'center', @@ -523,6 +525,18 @@ const heatMapData = { } }] }; +const statisticList = async () => { + await get("/statistics/list").then(response => { + rawData.value = response.data.data + rawData.value.forEach(newData => { + const item = data.find(d => d.date === newData.date); + if (item) { + item.writCount = newData.writCount; + } + }); + }) + +} // 音乐组件 const random = ref(); @@ -533,6 +547,7 @@ onMounted(() => { blogList() diaryList() comLinkList() + statisticList() updateCurrentDate(); setInterval(updateCurrentDate, 24 * 60 * 60 * 1000); nextTick(() => { diff --git a/src/components/blogs/ceshi.vue b/src/components/blogs/ceshi.vue index 916d3f6..bb04ccf 100644 --- a/src/components/blogs/ceshi.vue +++ b/src/components/blogs/ceshi.vue @@ -1,67 +1,63 @@ - +