From d242a87191f1ba78b447b1205e355b231152e828 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Mon, 18 Mar 2024 10:11:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=B3=BB=E7=BB=9F=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=92=8C=E6=8E=A5=E5=8F=A3=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=9F=A5=E8=AF=A2=E6=97=B6=E9=97=B4=E5=B8=A6?=
 =?UTF-8?q?=E6=97=B6=E5=88=86=E7=A7=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/log/login/index.vue   | 32 ++++++++++++++------------
 src/views/system/log/operate/index.vue | 22 +++++++++++-------
 2 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/src/views/system/log/login/index.vue b/src/views/system/log/login/index.vue
index 6926e1b0..cce4a3f7 100644
--- a/src/views/system/log/login/index.vue
+++ b/src/views/system/log/login/index.vue
@@ -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>
diff --git a/src/views/system/log/operate/index.vue b/src/views/system/log/operate/index.vue
index ce8e0f10..bf39236b 100644
--- a/src/views/system/log/operate/index.vue
+++ b/src/views/system/log/operate/index.vue
@@ -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)">