diff --git a/src/router/index.js b/src/router/index.js index 727fabe..19e5a5f 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -190,6 +190,24 @@ const router = createRouter({ breadcrumb: false } }, + { + path: '/todolist', + name: 'Todolist', + component: () => import('@/views/todoList/index.vue'), + meta: { + title: '待办', + breadcrumb: false + } + }, + { + path: '/donelist', + name: 'Donelist', + component: () => import('@/views/doneList/index.vue'), + meta: { + title: '已办', + breadcrumb: false + } + }, ] }, { diff --git a/src/views/doneList/index.vue b/src/views/doneList/index.vue new file mode 100644 index 0000000..71980ec --- /dev/null +++ b/src/views/doneList/index.vue @@ -0,0 +1,139 @@ + + + + + diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 496bef5..b577673 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -20,8 +20,10 @@
@@ -31,7 +33,7 @@ 您有{{ todoList?.length || 0 }}条待办需要处理
-
+
查看更多 @@ -75,7 +77,7 @@ 您有{{ todoList.length }}条待办需要处理
-
+
查看更多 @@ -293,7 +295,7 @@ import {useAuthStore} from '@/stores/userstore.js' import * as echarts from 'echarts' import {toThousands} from "@/utils/changePrice.js"; import {ElNotification} from "element-plus"; -import {getHomeTaskInfo, getDoneTaskInfo,getHomeStatistics, getSpecialFundChart} from "@/api/home"; +import {getHomeTaskInfo, getDoneTaskInfo, getHomeStatistics, getSpecialFundChart} from "@/api/home"; import {getResearchFundChart} from "@/api/research-fund"; import {getArticle} from "@/api/article"; @@ -331,7 +333,7 @@ const taskTabList = ref([ color: '#DCCEFA', textColor: '#8600C5', icon: 'home2.png', - num:0, + num: 0, type: 'approved' }, { @@ -518,6 +520,17 @@ onMounted(async () => { helpDocList.value = await getArticleList(2) problemList.value = await getArticleList(3) }) +const handleTodoList = (type) => { + if (type == 1) { + router.push({ + path: '/todolist', + }) + } else if (type == 2){ + router.push({ + path: '/donelist', + }) + } +} const handleGoToArticleDetail = (row) => { router.push({ name: 'Article/detail', @@ -542,9 +555,8 @@ const goToSpecialFund = () => { }) } const refreshTodoOrDoneList = (name) => { - console.info("🚀 ~method:refreshTodoOrDoneList -----", name) - // getTodoList() - // getDoneList() + getTodoList() + getDoneList() } const initFundCharts = () => { data.fundPieCharts = echarts.init(document.getElementById('fundPie')).setOption(fundPieOption.value) @@ -556,10 +568,10 @@ const initMoneyCharts = () => { const getTaskStatistics = () => { getHomeStatistics().then(res => { if (res.code === 1000) { - taskTabList.value[0].num = res.data.stayInitiation||0 - taskTabList.value[1].num = res.data.approvedProject||0 - taskTabList.value[2].num = res.data.implementation||0 - taskTabList.value[3].num = res.data.acceptanceCheck||0 + taskTabList.value[0].num = res.data.stayInitiation || 0 + taskTabList.value[1].num = res.data.approvedProject || 0 + taskTabList.value[2].num = res.data.implementation || 0 + taskTabList.value[3].num = res.data.acceptanceCheck || 0 } else { ElNotification({ title: '提示', @@ -598,9 +610,7 @@ const getDoneList = () => { }) } const changeResearchFundDataByYear = (year) => { - console.info("🚀 ~method:changeResearchFundDataByYear -----") if (year) { - console.info("🚀 243442-----") getResearchChart(year) } } @@ -1047,7 +1057,7 @@ const handleView = (row) => { } :deep(.el-tabs__new-tab ) { - width: auto !important; + width: 67px !important; border: none !important; color: #1476E3; font-size: 14px; diff --git a/src/views/todoList/index.vue b/src/views/todoList/index.vue new file mode 100644 index 0000000..556887b --- /dev/null +++ b/src/views/todoList/index.vue @@ -0,0 +1,144 @@ + + + + +