diff --git a/admin/src/api/monitor/client.ts b/admin/src/api/monitor/client.ts index 6470a41..69aae28 100644 --- a/admin/src/api/monitor/client.ts +++ b/admin/src/api/monitor/client.ts @@ -13,7 +13,11 @@ export type type_monitor_client = { UserId?: string Os?: string Browser?: string + Country?: string + Province?: string City?: string + Operator?: string + Ip?: string Width?: number Height?: number Ua?: string @@ -26,14 +30,16 @@ export type type_monitor_client_query = { UserId?: string Os?: string Browser?: string + Country?: string + Province?: string City?: string + Operator?: string + Ip?: string Width?: number Height?: number Ua?: string CreateTimeStart?: string CreateTimeEnd?: string - ClientTimeStart?: string - ClientTimeEnd?: string } // 添加编辑 export type type_monitor_client_edit = { @@ -43,7 +49,11 @@ export type type_monitor_client_edit = { UserId?: string Os?: string Browser?: string + Country?: string + Province?: string City?: string + Operator?: string + Ip?: string Width?: number Height?: number Ua?: string diff --git a/admin/src/views/monitor/client/edit.vue b/admin/src/views/monitor/client/edit.vue index 4938c28..81ea57e 100644 --- a/admin/src/views/monitor/client/edit.vue +++ b/admin/src/views/monitor/client/edit.vue @@ -81,7 +81,12 @@ const formData = reactive({ UserId: null, Os: null, Browser: null, + Country: null, + Province: null, City: null, + Operator: null, + Ip: null, + Width: null, Height: null, Ua: null, diff --git a/admin/src/views/monitor/client/index.vue b/admin/src/views/monitor/client/index.vue index 10cf8a4..b503bab 100644 --- a/admin/src/views/monitor/client/index.vue +++ b/admin/src/views/monitor/client/index.vue @@ -6,7 +6,7 @@ class="mb-[-16px]" :model="queryParams" :inline="true" - label-width="70px" + label-width="90px" label-position="left" > @@ -32,9 +32,21 @@ + + + + + + + + + + + + @@ -120,9 +132,15 @@ + + - - + + + + + + @@ -182,14 +200,16 @@ const queryParams = reactive({ UserId: null, Os: null, Browser: null, + Country: null, + Province: null, City: null, + Operator: null, + Ip: null, Width: null, Height: null, Ua: null, CreateTimeStart: null, - CreateTimeEnd: null, - ClientTimeStart: null, - ClientTimeEnd: null + CreateTimeEnd: null }) const { pager, getLists, resetPage, resetParams } = usePaging({ diff --git a/admin/src/views/monitor/error/details.vue b/admin/src/views/monitor/error/details.vue index 00aa3e8..bf42bf1 100644 --- a/admin/src/views/monitor/error/details.vue +++ b/admin/src/views/monitor/error/details.vue @@ -10,7 +10,7 @@ @close="handleClose" > - +