From a2a18a11ac3a83b62b25e196c1fd681a702c2610 Mon Sep 17 00:00:00 2001 From: lingling <1077478963@qq.com> Date: Thu, 20 Feb 2025 23:23:10 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=B1=95=E7=A4=BA=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/dashboard.ts | 15 +- src/api/jobuser.ts | 8 + src/api/withdraw.ts | 2 +- src/locale/en-US.ts | 1 + src/locale/zh-CN.ts | 1 + src/router/routes/modules/jobuser.ts | 20 +- src/router/routes/modules/list.ts | 72 +++---- .../dashboard/workplace/components/amonut.vue | 102 +++++++++ .../components/data-panel-search.vue | 32 +-- .../workplace/components/data-panel.vue | 13 +- src/views/dashboard/workplace/index.vue | 7 +- src/views/jobuser/index.vue | 2 +- src/views/jobuser/searchusertime.vue | 201 ++++++++++++++++++ 13 files changed, 407 insertions(+), 69 deletions(-) create mode 100644 src/views/dashboard/workplace/components/amonut.vue create mode 100644 src/views/jobuser/searchusertime.vue diff --git a/src/api/dashboard.ts b/src/api/dashboard.ts index f936a8d..25673bd 100644 --- a/src/api/dashboard.ts +++ b/src/api/dashboard.ts @@ -1,5 +1,6 @@ import axios from 'axios'; import type { TableData } from '@arco-design/web-vue/es/table/interface'; +import dayjs from 'dayjs'; export interface ContentDataRecord { x: string; @@ -36,6 +37,16 @@ export function useranalysis() { * @param 获取仪表盘 时间查询 * @returns */ -export function useranalysis_time() { - return axios.post('/admin/api/v1/Dashboard/useranalysis_time'); +export function useranalysis_time(start_time:any,end_time:any) { + const startTimestamp = dayjs(start_time).startOf('day').unix(); // 开始时间的时间戳（00:00:00） + const endTimestamp = dayjs(end_time).endOf('day').unix(); + return axios.post('/admin/api/v1/Dashboard/useranalysis_time',{start_time:startTimestamp,end_time:endTimestamp}); +} +/** + * + * @param 获取仪表盘 第三方支付余额 + * @returns + */ +export function shopGetBalance() { + return axios.post('/admin/api/v1/Dashboard/shopGetBalance'); } \ No newline at end of file diff --git a/src/api/jobuser.ts b/src/api/jobuser.ts index c73aa2f..86592c5 100644 --- a/src/api/jobuser.ts +++ b/src/api/jobuser.ts @@ -113,4 +113,12 @@ export function set_user_remark(id: number,remark:string) { */ export function get_user_withdraw(id: number) { return axios.post('/admin/api/v1/jobuser/get_user_withdraw', { id }); +} +/** + * + * @param 获取用户在线时长 + * @returns + */ +export function get_user_wphone(username:string) { + return axios.post('/admin/api/v1/jobuser/get_user_wphone', { username }); } \ No newline at end of file diff --git a/src/api/withdraw.ts b/src/api/withdraw.ts index ce6fcfd..7b57f70 100644 --- a/src/api/withdraw.ts +++ b/src/api/withdraw.ts @@ -51,5 +51,5 @@ export function lists(params: ListParams) { * @returns */ export function pushMoney(params:any) { - return axios.post('/api/withdraw/pushMoney',params); + return axios.post('/admin/api/v1/withdraw/pushMoney',params); } diff --git a/src/locale/en-US.ts b/src/locale/en-US.ts index f284340..1fb8133 100644 --- a/src/locale/en-US.ts +++ b/src/locale/en-US.ts @@ -54,6 +54,7 @@ export default { 'menu.hotinformation': 'Hotinformation', 'menu.carousel': 'carousel', 'menu.volunteerservicecorps':'volunteerservicecorps', + "menu.searchusertime": '用户在线时长', ...localeSettings, ...localeMessageBox, ...localeLogin, diff --git a/src/locale/zh-CN.ts b/src/locale/zh-CN.ts index 3cfde48..53bc60d 100644 --- a/src/locale/zh-CN.ts +++ b/src/locale/zh-CN.ts @@ -61,6 +61,7 @@ export default { 'menu.jobuser':'用户', "menu.dictionary":'客服', "menu.withdraw": '提现管理', + "menu.searchusertime": '用户在线时长', ...localeSettings, ...localeMessageBox, ...localeLogin, diff --git a/src/router/routes/modules/jobuser.ts b/src/router/routes/modules/jobuser.ts index 3198456..030a78e 100644 --- a/src/router/routes/modules/jobuser.ts +++ b/src/router/routes/modules/jobuser.ts @@ -22,16 +22,16 @@ const JOBUSER: AppRouteRecordRaw = { roles: ['*'], }, }, - // { - // path: 'monitor', - // name: 'Monitor', - // component: () => import('@/views/jobuser/monitor/index.vue'), - // meta: { - // locale: 'menu.jobuser.monitor', - // requiresAuth: true, - // roles: ['admin'], - // }, - // }, + { + path: 'searchusertime', + name: 'searchusertime', + component: () => import('@/views/jobuser/searchusertime.vue'), + meta: { + locale: 'menu.searchusertime', + requiresAuth: true, + roles: ['admin'], + }, + }, ], }; diff --git a/src/router/routes/modules/list.ts b/src/router/routes/modules/list.ts index ba0bba6..fea0d84 100644 --- a/src/router/routes/modules/list.ts +++ b/src/router/routes/modules/list.ts @@ -1,38 +1,38 @@ -import { DEFAULT_LAYOUT } from '../base'; -import { AppRouteRecordRaw } from '../types'; +// import { DEFAULT_LAYOUT } from '../base'; +// import { AppRouteRecordRaw } from '../types'; -const LIST: AppRouteRecordRaw = { - path: '/list', - name: 'list', - component: DEFAULT_LAYOUT, - meta: { - locale: 'menu.list', - requiresAuth: true, - icon: 'icon-list', - order: 2, - }, - children: [ - { - path: 'search-table', // The midline path complies with SEO specifications - name: 'SearchTable', - component: () => import('@/views/list/search-table/index.vue'), - meta: { - locale: 'menu.list.searchTable', - requiresAuth: true, - roles: ['*'], - }, - }, - { - path: 'card', - name: 'Card', - component: () => import('@/views/list/card/index.vue'), - meta: { - locale: 'menu.list.cardList', - requiresAuth: true, - roles: ['*'], - }, - }, - ], -}; +// const LIST: AppRouteRecordRaw = { +// path: '/list', +// name: 'list', +// component: DEFAULT_LAYOUT, +// meta: { +// locale: 'menu.list', +// requiresAuth: true, +// icon: 'icon-list', +// order: 2, +// }, +// children: [ +// { +// path: 'search-table', // The midline path complies with SEO specifications +// name: 'SearchTable', +// component: () => import('@/views/list/search-table/index.vue'), +// meta: { +// locale: 'menu.list.searchTable', +// requiresAuth: true, +// roles: ['*'], +// }, +// }, +// { +// path: 'card', +// name: 'Card', +// component: () => import('@/views/list/card/index.vue'), +// meta: { +// locale: 'menu.list.cardList', +// requiresAuth: true, +// roles: ['*'], +// }, +// }, +// ], +// }; -export default LIST; +// export default LIST; diff --git a/src/views/dashboard/workplace/components/amonut.vue b/src/views/dashboard/workplace/components/amonut.vue new file mode 100644 index 0000000..daf25be --- /dev/null +++ b/src/views/dashboard/workplace/components/amonut.vue @@ -0,0 +1,102 @@ + + + \ No newline at end of file diff --git a/src/views/dashboard/workplace/components/data-panel-search.vue b/src/views/dashboard/workplace/components/data-panel-search.vue index 79f1b81..fc84d4a 100644 --- a/src/views/dashboard/workplace/components/data-panel-search.vue +++ b/src/views/dashboard/workplace/components/data-panel-search.vue @@ -37,7 +37,7 @@ avatar - + @@ -50,7 +50,7 @@ avatar - + @@ -63,9 +63,9 @@ avatar - + @@ -90,13 +90,13 @@ + + + \ No newline at end of file From 9e1c9412754cde90704ddf45a02af1e91c36fe32 Mon Sep 17 00:00:00 2001 From: lingling <1077478963@qq.com> Date: Thu, 20 Feb 2025 23:28:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=9A=90=E8=97=8F=E4=B8=8D=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E7=9A=84=E8=8A=82=E7=82=B9=E5=A2=9E=E5=8A=A0=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=AC=AC=E4=B8=89=E6=96=B9=E4=BD=99=E9=A2=9D=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/carousel.ts | 4 ++-- src/api/dictionary.ts | 4 ++-- src/router/routes/modules/dashboard.ts | 20 ++++++++++---------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/api/carousel.ts b/src/api/carousel.ts index d10aebc..c440580 100644 --- a/src/api/carousel.ts +++ b/src/api/carousel.ts @@ -65,12 +65,12 @@ export function carouselChang(id:number,type:Number,img_url:string) { * @returns */ export function getAll() { - return axios.post('/api/v1/ExchangeRate/lists'); + return axios.post('/admin/api/v1/ExchangeRate/lists'); } /** * 更新汇率 * @returns */ export function setAll(item:any) { - return axios.post('/api/v1/ExchangeRate/updateId',item); + return axios.post('/admin/api/v1/ExchangeRate/updateId',item); } \ No newline at end of file diff --git a/src/api/dictionary.ts b/src/api/dictionary.ts index 069729b..b82238b 100644 --- a/src/api/dictionary.ts +++ b/src/api/dictionary.ts @@ -65,12 +65,12 @@ export function carouselChang(id:number,type:Number,img_url:string) { * @returns */ export function getAll() { - return axios.post('/api/v1/dictionary/lists'); + return axios.post('/admin/api/v1/dictionary/lists'); } /** * 更新汇率 * @returns */ export function setAll(item:any) { - return axios.post('/api/v1/dictionary/updateId',item); + return axios.post('/admin/api/v1/dictionary/updateId',item); } \ No newline at end of file diff --git a/src/router/routes/modules/dashboard.ts b/src/router/routes/modules/dashboard.ts index baeae09..5ae13e0 100644 --- a/src/router/routes/modules/dashboard.ts +++ b/src/router/routes/modules/dashboard.ts @@ -23,16 +23,16 @@ const DASHBOARD: AppRouteRecordRaw = { }, }, - { - path: 'monitor', - name: 'Monitor', - component: () => import('@/views/dashboard/monitor/index.vue'), - meta: { - locale: 'menu.dashboard.monitor', - requiresAuth: true, - roles: ['admin'], - }, - }, + // { + // path: 'monitor', + // name: 'Monitor', + // component: () => import('@/views/dashboard/monitor/index.vue'), + // meta: { + // locale: 'menu.dashboard.monitor', + // requiresAuth: true, + // roles: ['admin'], + // }, + // }, ], };