diff --git a/src/components/blogs/HomePage.vue b/src/components/blogs/HomePage.vue index 3818bba..ac75f61 100644 --- a/src/components/blogs/HomePage.vue +++ b/src/components/blogs/HomePage.vue @@ -429,7 +429,6 @@ const statistics = reactive([ ]) // 日历热力图 const heat = ref(null); -const newData = []; function generateDates(numDays: number) { const dates = []; @@ -446,17 +445,42 @@ function generateDates(numDays: number) { // 初始化60天的数据 const data = generateDates(60); // 重新排列数据 +const rawData = ref([]); +const statisticList = async () => { + await get("/statistics/list").then(response => { + rawData.value = response.data.data + // let value = response.data.data; + // let handleValue = formattedData(value); + // rawData.value = handleValue; + rawData.value.forEach(newDataItem => { + const item = newData.find((d: any) => d.date === newDataItem.date); + if (item) { + item.writCount = newDataItem.writCount; + } + }); + }) +} +const newData = []; for (let i = 0; i < 60; i += 15) { // 取出每个15天的数据,并反转顺序 const chunk = data.slice(i, i + 15).reverse(); newData.push(...chunk); } +console.log(`output->rawData`,rawData) +console.log(`output->newData`,newData) -const rawData = ref([]); +const getWritCountValues = () => { + const writCounts = rawData.value.map(item => item.writCount); + return writCounts; +}; + +// 在适当的地方调用 getWritCountValues 来获取 writCount 值数组 +const writCounts = getWritCountValues(); +console.log(`output->writCounts`,writCounts) 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', @@ -523,18 +547,7 @@ const heatMapData = { } }] }; -const statisticList = async () => { - await get("/statistics/list").then(response => { - rawData.value = response.data.data - rawData.value.forEach(newDataItem => { - const item = newData.find((d: any) => d.date === newDataItem.date); - if (item) { - item.writCount = newDataItem.writCount; - } - }); - }) -} // 音乐组件 const random = ref(); diff --git a/src/components/blogs/ceshi.vue b/src/components/blogs/ceshi.vue index bb04ccf..ffc7afd 100644 --- a/src/components/blogs/ceshi.vue +++ b/src/components/blogs/ceshi.vue @@ -1,63 +1,77 @@ - - + \ No newline at end of file diff --git a/src/views/admin/ClassticManageView.vue b/src/views/admin/ClassticManageView.vue index f931099..2157623 100644 --- a/src/views/admin/ClassticManageView.vue +++ b/src/views/admin/ClassticManageView.vue @@ -64,6 +64,7 @@ import type { classticInterface } from "@/api/admin/index" import { get, post, remove, put } from '@/tools/request'; const { delControl, addControl, editControl } = classticStore() const classticlist = ref([]) +console.log(`output->classticlist.value`,classticlist.value) const searchlist = reactive({ title: "" })