diff --git a/src/api/server/employeehosts/index.ts b/src/api/server/employeehosts/index.ts index 99b3a13..b821cb4 100644 --- a/src/api/server/employeehosts/index.ts +++ b/src/api/server/employeehosts/index.ts @@ -35,8 +35,8 @@ export const EmployeeHostsApi = { return await request.get({ url: `/server/employee-hosts/self_page`, params }) }, // 查询员工分配主播分页 - employeeCompleteBarChart: async (params: number[]) => { - return await request.post({ url: `/server/employee-hosts/employeeCompleteBarChart`, data: params }) + employeeCompleteBarChart: async (params: number[],days: number) => { + return await request.post({ url: `/server/employee-hosts/employeeCompleteBarChart`, data: {userId:params,days:days} }) }, // 查询管理员工分配主播分页 getMeangeEmployeeHostsPage: async (params: any) => { diff --git a/src/locales/en.ts b/src/locales/en.ts index 0b7c38e..717a783 100644 --- a/src/locales/en.ts +++ b/src/locales/en.ts @@ -487,9 +487,11 @@ export default { hostsKind: 'Host Type', placeHostsKind: 'Please enter live type, e.g., game', isAssigned: 'Assigned', + aiOperation: 'Ai Operation', sortType:'Sort Type', sortName:'Sort Name', placeIsAssigned: 'Please select assignment status', + placeaiOperation: 'Please select Ai operation', createTime: 'Created Time', updateTime: 'Update Time', invitationType: 'Invitation Type', diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index 9773163..9bb729b 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -487,9 +487,11 @@ export default { hostsKind: '主播类型', placeHostsKind: '请输入直播类型 如:游戏 ', isAssigned: '是否分配', + aiOperation: '是否AI介入', sortType:'排序类型', sortName:'排序名字', placeIsAssigned: '请选择是否已经分配给员工', + placeaiOperation: '请筛选是否AI介入', createTime: '创建时间', updateTime: '更新时间', invitationType: '邀请类型', diff --git a/src/views/Home/Index.vue b/src/views/Home/Index.vue index 362dbb5..625076a 100644 --- a/src/views/Home/Index.vue +++ b/src/views/Home/Index.vue @@ -94,10 +94,15 @@ --> + :xl="20" :lg="20" :md="24" :sm="24" :xs="24"> + + 近1天 + 近7天 + + - + @@ -179,12 +184,13 @@ import { useCache } from '@/hooks/web/useCache' import { getSimpleUserListPage, getSimpleUserList } from '@/api/system/user' import { EmployeeHostsApi } from '@/api/server/employeehosts' import { ref, reactive, onMounted, onActivated } from 'vue' +import WxMusic from '../mp/components/wx-music' let HostsOperationNum = ref(0) onMounted(async () => { await getAllApi() await getAllocationList() if (wsCache.get('roleRouters').find(item => item.id === 1)?.children.find(item => item.id === 100)) { - await fetchAllHostsCount() + await fetchAllHostsCount(1) } else { await fetchDailyHostsCount() } @@ -193,12 +199,16 @@ onMounted(async () => { }) - +let days = ref() // 每次页面“再次显示”时都会触发(前提:该路由组件被 keep-alive 缓存) onActivated(async () => { await fetchDailyHostsCount() - await fetchAllHostsCount() + await fetchAllHostsCount(1) }) + +async function updataDays(val) { + await fetchAllHostsCount(val) +} // import { useGlobalWebSocket } from '@/components/useGlobalWebSocket' // let messageList = useGlobalWebSocket().messageList // console.log(messageList.value) @@ -552,11 +562,11 @@ async function fetchDailyHostsCount() { } // ✅ 抽成函数:每天所有员工数量(用于多人柱状图) -async function fetchAllHostsCount() { +async function fetchAllHostsCount(val) { // 以“传入的用户 id”为准展示(顺序也按这里来) const ids = allocationUserList.value.map(item => item.value) - const res = await EmployeeHostsApi.employeeCompleteBarChart(ids) + const res = await EmployeeHostsApi.employeeCompleteBarChart(ids, val) const rawList: EmpBarItem[] = Array.isArray(res) ? res : (res?.data ?? []) // 补齐后端未返回的用户为 0 diff --git a/src/views/server/newhosts/index.vue b/src/views/server/newhosts/index.vue index f83e9bd..47ca869 100644 --- a/src/views/server/newhosts/index.vue +++ b/src/views/server/newhosts/index.vue @@ -100,6 +100,15 @@ :label="t(dict.label)" :value="dict.value" /> + + + + + + + @@ -331,6 +340,7 @@ const queryParams = reactive({ country: undefined, hostsKind: undefined, isAssigned: undefined, + aiOperation: undefined, sortName: "createTime", //排序字段 sort: 'desc', //排序方式 createTime: new Date().toISOString().split('T')[0] + ' 00:00:00',