From e612383d12b7f8ec75598ad6d72fc2bf447898fc Mon Sep 17 00:00:00 2001 From: simple321vip Date: Thu, 2 Feb 2023 23:01:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86dashboard=E5=92=8Clogin=E4=BB=A5?= =?UTF-8?q?=E5=A4=96=E7=9A=84=E9=A1=B5=E9=9D=A2=E8=AE=BE=E7=BD=AE=E4=B8=BA?= =?UTF-8?q?=E5=BC=82=E6=AD=A5=E5=8A=A0=E8=BD=BD=EF=BC=8C=E4=BB=A5=E6=8F=90?= =?UTF-8?q?=E5=8D=87=E5=88=9D=E6=AC=A1=E5=8A=A0=E8=BD=BD=E7=9A=84=E9=80=9F?= =?UTF-8?q?=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mock/blog.ts | 2 +- src/api/blog.ts | 2 +- src/api/bookmark.ts | 2 +- src/api/calendar.ts | 5 +++++ src/entity/index.ts | 4 ++-- src/router/index.ts | 35 ++++++++++++++++++----------------- src/view/calendar/index.vue | 16 ++++++++-------- src/view/dashboard/index.vue | 2 +- 8 files changed, 37 insertions(+), 31 deletions(-) diff --git a/mock/blog.ts b/mock/blog.ts index 9a64a99..aa8a488 100644 --- a/mock/blog.ts +++ b/mock/blog.ts @@ -75,7 +75,7 @@ export default [ }, }, { - url: '/wiki/api/v1/author/blogs/count', + url: '/wiki/api/v1/reader/blogs/count', method: 'GET', response: () => { return { diff --git a/src/api/blog.ts b/src/api/blog.ts index d024b01..758ad7f 100644 --- a/src/api/blog.ts +++ b/src/api/blog.ts @@ -94,7 +94,7 @@ const sortBlogs = (data: Object, btId: string) => { const countBlogs = () => { return service({ - url: '/wiki/api/v1/author/blogs/count', + url: '/wiki/api/v1/reader/blogs/count', method: 'GET', headers: headers, }) diff --git a/src/api/bookmark.ts b/src/api/bookmark.ts index 2f5cf50..241423e 100644 --- a/src/api/bookmark.ts +++ b/src/api/bookmark.ts @@ -51,7 +51,7 @@ const delete_bookmarks = (params: Object) => { const bookmarks_count = () => { return service({ - url: '/wiki/api/v1/author/blogs/count', + url: '/bookmark/api/v1/bookmark/count', method: 'GET', }) } diff --git a/src/api/calendar.ts b/src/api/calendar.ts index 5f96db8..436c67b 100644 --- a/src/api/calendar.ts +++ b/src/api/calendar.ts @@ -1,5 +1,9 @@ import { service } from '../utils/request' +const headers = { + 'Content-Type': 'application/json;charsetset=UTF-8' +} + const put_event = (data: Object) => { return service({ url: '/calendar/api/v1/event', @@ -12,6 +16,7 @@ const get_event = () => { return service({ url: '/calendar/api/v1/event', method: 'GET', + headers: headers }) } diff --git a/src/entity/index.ts b/src/entity/index.ts index 15ea20f..67b17d8 100644 --- a/src/entity/index.ts +++ b/src/entity/index.ts @@ -20,9 +20,9 @@ type DataTimeline = { } type Event = { - date: string, + event_date: string, title: string, - eventInfo: string, + event_info: string, } export { Tenant, Theme, DataTimeline, Event } diff --git a/src/router/index.ts b/src/router/index.ts index 1dd719c..83e5e1f 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -1,5 +1,6 @@ import { createRouter, createMemoryHistory, RouteRecordRaw } from 'vue-router' + const routes: Array = [ { path: "/", @@ -14,70 +15,70 @@ const routes: Array = [ }, { path: '/blog', - component: () => import('../view/blog/index.vue'), + component: resolve => (require('@/view/blog/index.vue'), resolve), meta: { name: '博客' } }, { path: '/bookmark', - component: () => import('../view/bookmark/index.vue'), + component: resolve => (require('@/view/bookmark/index.vue'), resolve), meta: { name: '书签' } }, { path: '/onenote', - component: () => import('../view/onenote/index.vue'), + component: resolve => (require('@/view/onenote/index.vue'), resolve), meta: { name: 'onenote' } }, { path: '/calendar', - component: () => import('../view/calendar/index.vue'), + component: resolve => (require('@/view/calendar/index.vue'), resolve), meta: { name: '日历' } }, { path: '/cloud', - component: () => import('../view/cloud/index.vue'), + component: resolve => (require('@/view/cloud/index.vue'), resolve), meta: { name: '个人云盘' } }, { path: '/market', - component: () => import('../view/recommend/index.vue'), + component: resolve => (require('@/view/recommend/index.vue'), resolve), meta: { name: '市场行情' } }, { path: '/capital', - component: () => import('../view/capital/index.vue'), + component: resolve => (require('@/view/capital/index.vue'), resolve), meta: { name: '资金管理' } }, { path: '/strategy', - component: () => import('../view/trader/cta_strategy_file.vue'), + component: resolve => (require('@/view/trader/cta_strategy_file.vue'), resolve), meta: { name: '策略模板' } }, { path: '/strategy_instance', - component: () => import('../view/trader/cta_strategy.vue'), + component: resolve => (require('@/view/trader/cta_strategy.vue'), resolve), meta: { name: 'CTA策略' } }, { path: '/settings', - component: () => import('../view/settings/index.vue'), + component: resolve => (require('@/view/settings/index.vue'), resolve), meta: { name: '设置' } @@ -86,31 +87,31 @@ const routes: Array = [ }, { path: "/feedback", - component: () => import('../view/blog/mdview.vue') + component: resolve => (require('@/view/blog/mdview.vue'), resolve), }, { path: "/BlogEditer", - component: () => import('../view/blog/createBlog.vue') + component: resolve => (require('@/view/blog/createBlog.vue'), resolve), }, { path: "/BlogViewer", - component: () => import('../view/blog/mdview.vue') + component: resolve => (require('@/view/blog/mdview.vue'), resolve), }, { path: "/login", - component: () => import('../components/login/login.vue') + component: () => import('@/components/login/login.vue') }, { path: "/illustration", - component: () => import('../components/illustration/index.vue') + component: resolve => (require('../components/illustration/login.vue'), resolve) }, { path: "/register", - component: () => import('../components/login/register.vue') + component: resolve => (require('../components/login/register.vue'), resolve) }, { path: "/sorryPage", - component: () => import('../components/login/sorry.vue') + component: resolve => (require('../components/login/sorry.vue'), resolve) }, ] diff --git a/src/view/calendar/index.vue b/src/view/calendar/index.vue index 4b33c77..f75f3b9 100644 --- a/src/view/calendar/index.vue +++ b/src/view/calendar/index.vue @@ -20,21 +20,21 @@ 待办事项 - + - + - {{ form.date }} + {{ form.event_date }} - + @@ -73,9 +73,9 @@ const holidays = reactive({}) const eventDataList = reactive([]) const eventDataObject = reactive({}) const form = reactive({ - date: '', + event_date: '', title: '', - eventInfo: '', + event_info: '', }) // -- REF OBJECT -- const value = ref(new Date()) @@ -89,7 +89,7 @@ const alerts = ['email', 'messageBox', '手机短信', '微信通知'] // -- EVENT DEFINITION const onclick = (date: Date) => { - form.date = toLocalDate(date) + form.event_date = toLocalDate(date) dialogFormVisible.value = true } @@ -129,7 +129,7 @@ onMounted(async () => { eventDataList.length = 0 response.data.forEach((record: Event) => { eventDataList.push(record) - eventDataObject[record.date] = record.title + eventDataObject[record.event_date] = record.title }) }) isComponentActive.value = true diff --git a/src/view/dashboard/index.vue b/src/view/dashboard/index.vue index 7d4947c..d2d231d 100644 --- a/src/view/dashboard/index.vue +++ b/src/view/dashboard/index.vue @@ -125,7 +125,7 @@ const statistics = ref({ const toolCards = ref([ { - label: 'Jenjins', + label: 'Jenkins', icon: 'camera', name: 'Jenkins', color: '#ff9c6e',