diff --git a/src/api/system/log.ts b/src/api/system/log.ts index 926d2dd..76f87f8 100644 --- a/src/api/system/log.ts +++ b/src/api/system/log.ts @@ -37,7 +37,7 @@ const LogAPI = { * @returns */ getVisitStats() { - return request({ + return request({ url: `${LOG_BASE_URL}/visit-stats`, method: "GET", }); @@ -108,17 +108,16 @@ export interface VisitTrendQuery { /** 访问统计 */ export interface VisitStatsVO { - /** 标题 */ - title: string; - /** 类型 */ - type: "pv" | "uv" | "ip"; - - /** 今日访问量 */ - todayCount: number; - /** 总访问量 */ - totalCount: number; + /** 今日访客数(UV) */ + todayUvCount: number; + /** 总访客数 */ + totalUvCount: number; + /** 访客数同比增长率(相对于昨天同一时间段的增长率) */ + uvGrowthRate: number; + /** 今日浏览量(PV) */ + todayPvCount: number; + /** 总浏览量 */ + totalPvCount: number; /** 同比增长率(相对于昨天同一时间段的增长率) */ - growthRate: number; - - totalCountOutput: number; + pvGrowthRate: number; } diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index c7f4ea1..df4658d 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -40,18 +40,24 @@ - + - + - {{ item.title }} - {{ item.todayCount }} + 访客数 + {{ visitStatsData.todayUvCount }} + + + + + + + + + + 浏览量 + {{ visitStatsData.todayPvCount }} @@ -111,40 +117,14 @@ interface VisitStats { const current = ref(0); -const visitStatsData = ref([ - { - type: "online", - title: "在线用户数", - icon: "/static/icons/user2.png", - growthRate: 0, - granularity: "-", - todayCount: 1, - }, - { - type: "pv", - title: "浏览量(PV)", - icon: "/static/icons/stat1.png", - growthRate: 0, - granularity: "日", - todayCount: 0, - }, - { - type: "uv", - title: "访客数(UV)", - icon: "/static/icons/visitor.png", - growthRate: 0, - granularity: "日", - todayCount: 0, - }, - { - type: "ip", - title: "访问IP数", - icon: "/static/icons/stat4.png", - growthRate: 0, - granularity: "日", - todayCount: 0, - }, -]); +const visitStatsData = ref({ + todayUvCount: 0, + uvGrowthRate: 0, + totalUvCount: 0, + todayPvCount: 0, + pvGrowthRate: 0, + totalPvCount: 0, +}); // 图表数据 const chartData = ref({}); @@ -157,7 +137,7 @@ const swiperList = ref(["https://oss.youlai.tech/blog/banner9.png"]); // 快捷导航列表 const navList = reactive([ { - icon: "/static/icons/user1.png", + icon: "/static/icons/user.png", title: "用户管理", url: "/pages/work/user/index", prem: "sys:user:query", @@ -191,14 +171,8 @@ function onChange(e: any) { // 加载访问统计数据 const loadVisitStatsData = async () => { - const list: VisitStatsVO[] = await LogAPI.getVisitStats(); - - visitStatsData.value?.forEach((item) => { - const data = list.find((v) => v.type === item.type); - if (data) { - item.todayCount = data.todayCount; - item.growthRate = data.growthRate; - } + LogAPI.getVisitStats().then((data) => { + visitStatsData.value = data; }); }; diff --git a/src/pages/mine/about/index.vue b/src/pages/mine/about/index.vue index 4962e49..02bf88c 100644 --- a/src/pages/mine/about/index.vue +++ b/src/pages/mine/about/index.vue @@ -2,7 +2,7 @@ - + vue-uniapp-template 版本 {{ version }} diff --git a/src/pages/work/index.vue b/src/pages/work/index.vue index 8aab27b..8197afa 100644 --- a/src/pages/work/index.vue +++ b/src/pages/work/index.vue @@ -28,7 +28,7 @@ const gridList = reactive([ title: "系统管理", children: [ { - icon: "/static/icons/user1.png", + icon: "/static/icons/user.png", title: "用户管理", url: "/pages/work/user/index", prem: "sys:user:query", diff --git a/src/static/icons/browser.png b/src/static/icons/browser.png new file mode 100644 index 0000000..fbadaa0 Binary files /dev/null and b/src/static/icons/browser.png differ diff --git a/src/static/icons/dict.png b/src/static/icons/dict.png deleted file mode 100644 index 2aca58c..0000000 Binary files a/src/static/icons/dict.png and /dev/null differ diff --git a/src/static/icons/log.png b/src/static/icons/log.png index 1430055..e9777db 100644 Binary files a/src/static/icons/log.png and b/src/static/icons/log.png differ diff --git a/src/static/icons/notice.png b/src/static/icons/notice.png index 95a986d..ebde028 100644 Binary files a/src/static/icons/notice.png and b/src/static/icons/notice.png differ diff --git a/src/static/icons/notice2.png b/src/static/icons/notice2.png deleted file mode 100644 index e7ef046..0000000 Binary files a/src/static/icons/notice2.png and /dev/null differ diff --git a/src/static/icons/role.png b/src/static/icons/role.png index dbdc7c9..890d96f 100644 Binary files a/src/static/icons/role.png and b/src/static/icons/role.png differ diff --git a/src/static/icons/setting.png b/src/static/icons/setting.png index a3a6a1c..45c0c1e 100644 Binary files a/src/static/icons/setting.png and b/src/static/icons/setting.png differ diff --git a/src/static/icons/stat1.png b/src/static/icons/stat1.png deleted file mode 100644 index fea4664..0000000 Binary files a/src/static/icons/stat1.png and /dev/null differ diff --git a/src/static/icons/stat2.png b/src/static/icons/stat2.png deleted file mode 100644 index 02336dc..0000000 Binary files a/src/static/icons/stat2.png and /dev/null differ diff --git a/src/static/icons/stat3.png b/src/static/icons/stat3.png deleted file mode 100644 index f2db179..0000000 Binary files a/src/static/icons/stat3.png and /dev/null differ diff --git a/src/static/icons/stat4.png b/src/static/icons/stat4.png deleted file mode 100644 index 2a667b5..0000000 Binary files a/src/static/icons/stat4.png and /dev/null differ diff --git a/src/static/icons/user.png b/src/static/icons/user.png index 799aa43..9f58ed0 100644 Binary files a/src/static/icons/user.png and b/src/static/icons/user.png differ diff --git a/src/static/icons/user1.png b/src/static/icons/user1.png deleted file mode 100644 index 8728517..0000000 Binary files a/src/static/icons/user1.png and /dev/null differ diff --git a/src/static/icons/user2.png b/src/static/icons/user2.png deleted file mode 100644 index 34d9ff9..0000000 Binary files a/src/static/icons/user2.png and /dev/null differ diff --git a/src/static/icons/visitor.png b/src/static/icons/visitor.png index 4cbdb7a..cf23b92 100644 Binary files a/src/static/icons/visitor.png and b/src/static/icons/visitor.png differ diff --git a/src/static/logo.png b/src/static/logo.png index 2c45027..a2cd0fd 100644 Binary files a/src/static/logo.png and b/src/static/logo.png differ