OMC/fe.ems.vue3
1
0
Fork 0
Code Issues Releases 3 Activity

fix: 系统日志登录和接口操作记录查询时间带时分秒

Browse Source
This commit is contained in:
TsMask
2024-03-18 10:11:49 +08:00
parent e1eaba0d68
commit d242a87191
2 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/views/system/log/login/index.vue
View File

@@ -139,7 +139,7 @@ let tableColumns: ColumnsType = [
key: 'status',
align: 'center',
width: 100,
},
},
{
title: t('views.system.log.login.loginTime'),
dataIndex: 'loginTime',
@@ -412,20 +412,6 @@ onMounted(() => {
</a-select>
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :xs="24">
<a-form-item
:label="t('views.system.log.login.loginTime')"
name="queryRangePicker"
>
<a-range-picker
v-model:value="queryRangePicker"
allow-clear
bordered
value-format="YYYY-MM-DD"
style="width: 100%"
></a-range-picker>
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :xs="24">
<a-form-item>
<a-space :size="8">
@@ -440,6 +426,22 @@ onMounted(() => {
</a-space>
</a-form-item>
</a-col>
<a-col :lg="8" :md="12" :xs="24">
<a-form-item
:label="t('views.system.log.login.loginTime')"
name="queryRangePicker"
>
<a-range-picker
v-model:value="queryRangePicker"
allow-clear
bordered
:show-time="{ format: 'HH:mm:ss' }"
format="YYYY-MM-DD HH:mm:ss"
value-format="YYYY-MM-DD HH:mm:ss"
style="width: 100%"
></a-range-picker>
</a-form-item>
</a-col>
</a-row>
</a-form>
</a-card>

22
src/views/system/log/operate/index.vue
View File

@@ -370,7 +370,11 @@ function fnGetList(pageNum?: number) {
}
tablePagination.total = res.total;
tableState.data = res.rows;
if (tablePagination.total <=(queryParams.pageNum - 1) * tablePagination.pageSize &&queryParams.pageNum !== 1) {
if (
tablePagination.total <=
(queryParams.pageNum - 1) * tablePagination.pageSize &&
queryParams.pageNum !== 1
) {
tableState.loading = false;
fnGetList(queryParams.pageNum - 1);
}
@@ -407,7 +411,7 @@ onMounted(() => {
<!-- 表格搜索栏 -->
<a-form :model="queryParams" name="queryParams" layout="horizontal">
<a-row :gutter="16">
<a-col :lg="6" :md="12" :xs="24">
<a-col :lg="8" :md="12" :xs="24">
<a-form-item
:label="t('views.system.log.operate.operModule')"
name="title"
@@ -415,7 +419,7 @@ onMounted(() => {
<a-input v-model:value="queryParams.title" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :xs="24">
<a-col :lg="8" :md="12" :xs="24">
<a-form-item
:label="t('views.system.log.operate.operUser')"
name="operName"
@@ -426,7 +430,7 @@ onMounted(() => {
></a-input>
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :xs="24">
<a-col :lg="8" :md="12" :xs="24">
<a-form-item
:label="t('views.system.log.operate.workType')"
name="businessType"
@@ -439,7 +443,7 @@ onMounted(() => {
</a-select>
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :xs="24">
<a-col :lg="8" :md="12" :xs="24">
<a-form-item
:label="t('views.system.log.operate.operStatus')"
name="status"
@@ -452,7 +456,7 @@ onMounted(() => {
</a-select>
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :xs="24">
<a-col :lg="8" :md="12" :xs="24">
<a-form-item
:label="t('views.system.log.operate.operTime')"
name="queryRangePicker"
@@ -461,12 +465,14 @@ onMounted(() => {
v-model:value="queryRangePicker"
allow-clear
bordered
value-format="YYYY-MM-DD"
:show-time="{ format: 'HH:mm:ss' }"
format="YYYY-MM-DD HH:mm:ss"
value-format="YYYY-MM-DD HH:mm:ss"
style="width: 100%"
></a-range-picker>
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :xs="24">
<a-col :lg="8" :md="12" :xs="24">
<a-form-item>
<a-space :size="8">
<a-button type="primary" @click.prevent="fnGetList(1)">