From 8705e7fd1fa9c77d814f3fd088ebf339f613621f Mon Sep 17 00:00:00 2001 From: sunfree <17315650350@163.com> Date: Mon, 5 Aug 2024 09:06:12 +0800 Subject: [PATCH] add new --- index.html | 2 +- src/components/blogs/header/CarouselImg.vue | 6 +- src/stores/index.ts | 3 +- src/tools/request.ts | 2 +- src/types/custom.d.ts | 10 +++ src/views/admin/ClassticManageView.vue | 15 +++-- src/views/admin/CommonLinkManageView.vue | 19 ++++-- src/views/admin/blogmanage/BlogLabelView.vue | 2 +- .../admin/diarymanage/DiaryManageView.vue | 10 ++- src/views/admin/diarymanage/DiaryTypeView.vue | 3 + src/views/blog/AboutMe.vue | 14 ----- src/views/blog/AmountChartView.vue | 61 ++++++++++--------- src/views/blog/ContentDetail.vue | 1 + src/views/blog/blogcontent/BlogListView.vue | 18 +----- 14 files changed, 87 insertions(+), 79 deletions(-) diff --git a/index.html b/index.html index a888544..325abbb 100644 --- a/index.html +++ b/index.html @@ -4,7 +4,7 @@ - Vite App + SunFree
diff --git a/src/components/blogs/header/CarouselImg.vue b/src/components/blogs/header/CarouselImg.vue index 1e4b827..d4a921a 100644 --- a/src/components/blogs/header/CarouselImg.vue +++ b/src/components/blogs/header/CarouselImg.vue @@ -12,9 +12,9 @@ import { toRefs } from 'vue'; const { idShow } = homePageStore() const { show_carousel } = toRefs(idShow) const imgdatas: string[] = [ - "/src/assets/images/nav01.jpg", - "/src/assets/images/nav02.jpg", - "/src/assets/images/nav03.jpg" + "http://www.wuruilin.cn/personself/nav01.jpg", + "http://www.wuruilin.cn/personself/nav02.jpg", + "http://www.wuruilin.cn/personself/nav03.jpg" ] diff --git a/src/stores/index.ts b/src/stores/index.ts index 987bc5f..93b1c05 100644 --- a/src/stores/index.ts +++ b/src/stores/index.ts @@ -20,6 +20,7 @@ export const homePageStore = defineStore("homePage", () => { get(`/statistics/searchtitle?title=${query}`).then(res => { homepagelist.value = res.data.data.map((items:any)=>({ ...items, + imglink: items.imglink || 'http://www.wuruilin.cn/personself/暂无图片.jpg', create_at:dayjs(items.create_at).format('YYYY-MM-DD HH:mm:ss'), update_at: dayjs(items.update_at).format('YYYY-MM-DD HH:mm:ss'), })); @@ -107,7 +108,7 @@ export const classticStore = defineStore("classtic", () => { const delControl = reactive({ open: false, - ids: "" + ids: "", }) const editControl = reactive({ diff --git a/src/tools/request.ts b/src/tools/request.ts index e8e799e..b71f8c7 100644 --- a/src/tools/request.ts +++ b/src/tools/request.ts @@ -3,7 +3,7 @@ import { type AxiosRequestConfig } from 'axios'; import router from '@/router'; const instance = axios.create({ // 添加url - baseURL: 'http://localhost:8000/', + baseURL: 'http://www.wuruilin.cn:8000/', timeout: 5000, }); diff --git a/src/types/custom.d.ts b/src/types/custom.d.ts index 705ce1b..b88350e 100644 --- a/src/types/custom.d.ts +++ b/src/types/custom.d.ts @@ -2,4 +2,14 @@ // declare module 'echarts'; // declare module 'ant-design-vue/es/menu' // declare module 'animejs/lib/anime.es.js' +declare module '@kangc/v-md-editor/lib/plugins/tip/index' +declare module '@kangc/v-md-editor/lib/plugins/line-number/index' +declare module '@kangc/v-md-editor/lib/plugins/align' +declare module '@kangc/v-md-editor/lib/plugins/copy-code/index' +declare module '@kangc/v-md-editor/lib/plugins/todo-list/index' +declare module 'codemirror' +declare module '@kangc/v-md-editor/lib/theme/github.js' +declare module '@kangc/v-md-editor/lib/codemirror-editor' +declare module '@kangc/v-md-editor/lib/plugins/emoji/index' +declare module '@kangc/v-md-editor/lib/preview' declare module 'APlayer' diff --git a/src/views/admin/ClassticManageView.vue b/src/views/admin/ClassticManageView.vue index dba1a01..d29380d 100644 --- a/src/views/admin/ClassticManageView.vue +++ b/src/views/admin/ClassticManageView.vue @@ -10,7 +10,7 @@
- + @@ -24,10 +24,10 @@ - +

确认删除吗？

 - + @@ -60,7 +60,8 @@ diff --git a/src/views/blog/AmountChartView.vue b/src/views/blog/AmountChartView.vue index ec3a0aa..da7a00e 100644 --- a/src/views/blog/AmountChartView.vue +++ b/src/views/blog/AmountChartView.vue @@ -343,19 +343,33 @@ const pieChartOptions = reactive>({ ] } }) + + const updateLineChart = () => { if (linechart.value) { createEcharts(linechart, lineChartOptions[selectedLinePeriod.value]); + if (selectedLinePeriod.value) { + fetchLineAndUpdateChart(lineChartOptions[selectedLinePeriod.value], selectedLinePeriod.value); + } } }; const updateLinesChart = () => { if (lineschart.value) { createEcharts(lineschart, linesChartOptions[selectedLinesPeriod.value]); + console.log(`output->`,selectedLinesPeriod.value) + if(selectedLinesPeriod.value==="thisyear"){ + fetchLinesAndUpdateChart(0, linesChartOptions.thisyear) + }else{ + fetchLinesAndUpdateChart(1, linesChartOptions.thisyear) + } } }; const updatePieChart = () => { if (piechart.value) { createEcharts(piechart, pieChartOptions[selectedPiePeriod.value]); + if(selectedPiePeriod.value){ + fetchPieAndUpdateChart(pieChartOptions[selectedPiePeriod.value], selectedPiePeriod.value); + } } }; @@ -371,18 +385,23 @@ const updateLinesChartData = (disbursetype: any, disbursedate: any, disbursedata const updatePieChartData = (pieData: any, chartOptions: any) => { chartOptions.series[0].data = pieData; } -const updateBarChartData = (barData:any) => { - barChartOptions.dataset.source=barData; +const updateBarChartData = (barData: any) => { + barChartOptions.dataset.source = barData; } -const fetchLineAndUpdateChart = async (days: number, chartOptions: any) => { - const response = await get("/disburses/list/specificdate", { days }); +const fetchLineAndUpdateChart = async (chartOptions: any, datetype:any="nighweek" ) => { + const response = await get(`/disburses/line/${datetype}`); const data = response.data.data; const createDates = data.map((item: any) => item.create_date); const totalDisbursePrices = data.map((item: any) => item.total_disburseprice); updateLineChartData(createDates, totalDisbursePrices, chartOptions); createEcharts(linechart, chartOptions); } - +const fetchPieAndUpdateChart = async (chartOptions: any, datetype:any="nighweek") => { + const response = await get(`/disburses/pie/${datetype}`); + const data = response.data.data; + updatePieChartData(data, chartOptions); + createEcharts(piechart, chartOptions); +} const fetchLinesAndUpdateChart = async (days: number, chartOptions: any) => { const now = new Date(); let currentYear = now.getFullYear(); @@ -409,41 +428,25 @@ const fetchLinesAndUpdateChart = async (days: number, chartOptions: any) => { createEcharts(lineschart, chartOptions); } -const fetchPieAndUpdateChart = async (days: number, chartOptions: any) => { - const response = await get("/disburses/list/classifieddata", { days }); - const data = response.data.data; - updatePieChartData(data, chartOptions); - createEcharts(piechart, chartOptions); -} const fetchBarAndUpdateChart = async () => { const response = await get("/disburses/list/calendar"); const data = response.data.data; updateBarChartData(data); createEcharts(barchart, barChartOptions); } -const getLineWeekList = () => fetchLineAndUpdateChart(7, lineChartOptions.nighweek); -const getLineMonthList = () => fetchLineAndUpdateChart(30, lineChartOptions.nighmonth); -const getLineYearList = () => fetchLineAndUpdateChart(365, lineChartOptions.nighyear); -const getPieWeekList = () => fetchPieAndUpdateChart(7, pieChartOptions.nighweek); -const getPieMonthList = () => fetchPieAndUpdateChart(30, pieChartOptions.nighmonth); -const getPieYearList = () => fetchPieAndUpdateChart(365, pieChartOptions.nighyear); + +const getLineWeekList = () => fetchLineAndUpdateChart(lineChartOptions.nighweek, 'nighweek'); +const getPieWeekList = () => fetchPieAndUpdateChart(pieChartOptions.nighweek, 'nighweek'); const getLinesThisYearList = () => fetchLinesAndUpdateChart(0, linesChartOptions.thisyear) -const getLinesLastYearList = () => fetchLinesAndUpdateChart(1, linesChartOptions.lastyear) + onMounted(() => { - getLineWeekList() - getLineMonthList() - getLineYearList() getPieWeekList() - getPieMonthList() - getPieYearList() + getLineWeekList() getLinesThisYearList() - getLinesLastYearList() fetchBarAndUpdateChart() - createEcharts(lineschart, linesChartOptions.thisyear) - createEcharts(linechart, lineChartOptions.nighweek); - createEcharts(piechart, pieChartOptions.nighweek); - createEcharts(barchart, barChartOptions); -}); +}) + + diff --git a/src/views/blog/ContentDetail.vue b/src/views/blog/ContentDetail.vue index dea0b4f..8491bb1 100644 --- a/src/views/blog/ContentDetail.vue +++ b/src/views/blog/ContentDetail.vue @@ -29,6 +29,7 @@ const previewProps = { // Fetch content const fetchContent = async () => { + store.setContent(''); try { const response = await get(`${props.apiUrl}/${route.params.id}`); if (response.data.data) { diff --git a/src/views/blog/blogcontent/BlogListView.vue b/src/views/blog/blogcontent/BlogListView.vue index 2baa5b3..05284ab 100644 --- a/src/views/blog/blogcontent/BlogListView.vue +++ b/src/views/blog/blogcontent/BlogListView.vue @@ -85,20 +85,6 @@ const onShowSizeChange = (page: number) => { current.value = page; blogList(page, pageSizeRef.value) }; -// const blogList = async (page: number, pageSize: number) => { -// try { -// const response = await get('/blogs/list', { -// page, -// page_size: pageSize, -// }) -// bloglist.value = response.data.data.blogs; -// total.value = response.data.data.total; // 更新总数 -// pageSizeRef.value = pageSize; // 更新页大小，如果需要从接口返回页大小也可以改为 response.data.data.page_size -// dataLoaded.value = true -// } catch (error) { -// console.error('Failed to fetch data', error); -// } -// }; const blogList = async (page: number, pageSize: number) => { try { const response = await get('/blogs/list', { @@ -117,7 +103,7 @@ const blogList = async (page: number, pageSize: number) => { update_at: dayjs(items.update_at).format('YYYY-MM-DD HH:mm:ss'), readnum: items.readnum, readminite: Math.round(items.blogcontent.length/ 200), - imglink: items.imglink || 'http://www.wuruilin.cn/personself/暂无图片信息空状态.jpg', + imglink: items.imglink || 'http://www.wuruilin.cn/personself/暂无图片.jpg', })) total.value = response.data.data.total; // 更新总数 @@ -133,7 +119,7 @@ const blogCount=async (id:any)=>{ const readMore = (id: any) => { router.push(`/blog/${id}`) - blogCount(id) + bloglist.value = ([]) } onMounted(() => {