From 5d6283daa6f6f2a0b3959c3176ec6a27a1a91857 Mon Sep 17 00:00:00 2001
From: joylink_fanyuhong <18706759286@163.com>
Date: Fri, 25 Oct 2024 10:44:35 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E8=AE=B0=E5=BD=95&=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E8=AE=B0=E5=BD=95=E5=85=A5=E5=8F=82=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/LogApi.ts           |   5 +-
 src/pages/LoginRecord.vue   | 115 +++++++++++++++++++++++++++++++++++-
 src/pages/OperateRecord.vue | 115 +++++++++++++++++++++++++++++++++++-
 3 files changed, 230 insertions(+), 5 deletions(-)

diff --git a/src/api/LogApi.ts b/src/api/LogApi.ts
index e054910..a9e8fbe 100644
--- a/src/api/LogApi.ts
+++ b/src/api/LogApi.ts
@@ -19,7 +19,10 @@ export interface Record {
 }
 
 export class PagingQueryParams extends PageQueryDto {
-  logType = 'logType';
+  logType?: string;
+  name?: string;
+  beginDate?: string;
+  endDate?: string;
 }
 
 /**
diff --git a/src/pages/LoginRecord.vue b/src/pages/LoginRecord.vue
index 4a1a42e..4381bf6 100644
--- a/src/pages/LoginRecord.vue
+++ b/src/pages/LoginRecord.vue
@@ -15,6 +15,103 @@
       binary-state-sort
       @request="onRequest"
     >
+      <template v-slot:top-right>
+        <q-input
+          dense
+          class="q-mr-md"
+          debounce="1000"
+          v-model="filter.name"
+          label="操作人"
+        ></q-input>
+        <q-input
+          v-model="filter.beginDate"
+          label="开始时间"
+          debounce="1000"
+          class="q-mr-md"
+          dense
+        >
+          <template v-slot:prepend>
+            <q-icon name="event" class="cursor-pointer">
+              <q-popup-proxy
+                cover
+                transition-show="scale"
+                transition-hide="scale"
+              >
+                <q-date v-model="filter.beginDate" mask="YYYY-MM-DD HH:mm:ss">
+                  <div class="row items-center justify-end">
+                    <q-btn v-close-popup label="关闭" color="primary" flat />
+                  </div>
+                </q-date>
+              </q-popup-proxy>
+            </q-icon>
+          </template>
+
+          <template v-slot:append>
+            <q-icon name="access_time" class="cursor-pointer">
+              <q-popup-proxy
+                cover
+                transition-show="scale"
+                transition-hide="scale"
+              >
+                <q-time
+                  v-model="filter.beginDate"
+                  mask="YYYY-MM-DD HH:mm:ss"
+                  format24h
+                  with-seconds
+                >
+                  <div class="row items-center justify-end">
+                    <q-btn v-close-popup label="Close" color="primary" flat />
+                  </div>
+                </q-time>
+              </q-popup-proxy>
+            </q-icon>
+          </template>
+        </q-input>
+        <q-input
+          v-model="filter.endDate"
+          label="截止时间"
+          debounce="1000"
+          class="q-mr-md"
+          dense
+        >
+          <template v-slot:prepend>
+            <q-icon name="event" class="cursor-pointer">
+              <q-popup-proxy
+                cover
+                transition-show="scale"
+                transition-hide="scale"
+              >
+                <q-date v-model="filter.endDate" mask="YYYY-MM-DD HH:mm:ss">
+                  <div class="row items-center justify-end">
+                    <q-btn v-close-popup label="关闭" color="primary" flat />
+                  </div>
+                </q-date>
+              </q-popup-proxy>
+            </q-icon>
+          </template>
+
+          <template v-slot:append>
+            <q-icon name="access_time" class="cursor-pointer">
+              <q-popup-proxy
+                cover
+                transition-show="scale"
+                transition-hide="scale"
+              >
+                <q-time
+                  v-model="filter.endDate"
+                  mask="YYYY-MM-DD HH:mm:ss"
+                  format24h
+                  with-seconds
+                >
+                  <div class="row items-center justify-end">
+                    <q-btn v-close-popup label="Close" color="primary" flat />
+                  </div>
+                </q-time>
+              </q-popup-proxy>
+            </q-icon>
+          </template>
+        </q-input>
+      </template>
       <template v-slot:body-cell-subEventType="props">
         <q-td :props="props">
           <div class="q-gutter-sm row justify-center">
@@ -24,6 +121,15 @@
           </div>
         </q-td>
       </template>
+      <template v-slot:body-cell-requestSuccess="props">
+        <q-td :props="props">
+          <div class="q-gutter-sm row justify-center">
+            <q-chip outline size="sm" color="primary">
+              {{ props.row.requestSuccess === 1 ? '成功' : '失败' }}
+            </q-chip>
+          </div>
+        </q-td>
+      </template>
       <!-- <template v-slot:top-right>
         <q-input
           dense
@@ -66,11 +172,11 @@
 
 <script setup lang="ts">
 import { ref, reactive, onMounted, computed } from 'vue';
-import { useQuasar, type QTableColumn } from 'quasar';
+import { type QTableColumn } from 'quasar';
 import { pageQuery, Record } from '../api/LogApi';
 import { errorNotify } from '../utils/CommonNotify';
 
-const $q = useQuasar();
+// const $q = useQuasar(); useQuasar
 const props = withDefaults(
   defineProps<{
     sizeHeight: number;
@@ -123,6 +229,8 @@ const tableRef = ref();
 const rows = reactive([]);
 const filter = reactive({
   name: '',
+  beginDate: '',
+  endDate: '',
 });
 const loading = ref(false);
 const pagination = ref({
@@ -143,6 +251,9 @@ async function onRequest(props: any) {
       current: page,
       size: rowsPerPage,
       logType: 'LOGIN',
+      name: filter.name,
+      beginDate: filter.beginDate,
+      endDate: filter.endDate,
     });
 
     pagination.value.rowsNumber = response.total;
diff --git a/src/pages/OperateRecord.vue b/src/pages/OperateRecord.vue
index d6090f1..f72cef7 100644
--- a/src/pages/OperateRecord.vue
+++ b/src/pages/OperateRecord.vue
@@ -15,6 +15,103 @@
       binary-state-sort
       @request="onRequest"
     >
+      <template v-slot:top-right>
+        <q-input
+          dense
+          class="q-mr-md"
+          debounce="1000"
+          v-model="filter.name"
+          label="操作人"
+        ></q-input>
+        <q-input
+          v-model="filter.beginDate"
+          label="开始时间"
+          debounce="1000"
+          class="q-mr-md"
+          dense
+        >
+          <template v-slot:prepend>
+            <q-icon name="event" class="cursor-pointer">
+              <q-popup-proxy
+                cover
+                transition-show="scale"
+                transition-hide="scale"
+              >
+                <q-date v-model="filter.beginDate" mask="YYYY-MM-DD HH:mm:ss">
+                  <div class="row items-center justify-end">
+                    <q-btn v-close-popup label="关闭" color="primary" flat />
+                  </div>
+                </q-date>
+              </q-popup-proxy>
+            </q-icon>
+          </template>
+
+          <template v-slot:append>
+            <q-icon name="access_time" class="cursor-pointer">
+              <q-popup-proxy
+                cover
+                transition-show="scale"
+                transition-hide="scale"
+              >
+                <q-time
+                  v-model="filter.beginDate"
+                  mask="YYYY-MM-DD HH:mm:ss"
+                  format24h
+                  with-seconds
+                >
+                  <div class="row items-center justify-end">
+                    <q-btn v-close-popup label="Close" color="primary" flat />
+                  </div>
+                </q-time>
+              </q-popup-proxy>
+            </q-icon>
+          </template>
+        </q-input>
+        <q-input
+          v-model="filter.endDate"
+          label="截止时间"
+          debounce="1000"
+          class="q-mr-md"
+          dense
+        >
+          <template v-slot:prepend>
+            <q-icon name="event" class="cursor-pointer">
+              <q-popup-proxy
+                cover
+                transition-show="scale"
+                transition-hide="scale"
+              >
+                <q-date v-model="filter.endDate" mask="YYYY-MM-DD HH:mm:ss">
+                  <div class="row items-center justify-end">
+                    <q-btn v-close-popup label="关闭" color="primary" flat />
+                  </div>
+                </q-date>
+              </q-popup-proxy>
+            </q-icon>
+          </template>
+
+          <template v-slot:append>
+            <q-icon name="access_time" class="cursor-pointer">
+              <q-popup-proxy
+                cover
+                transition-show="scale"
+                transition-hide="scale"
+              >
+                <q-time
+                  v-model="filter.endDate"
+                  mask="YYYY-MM-DD HH:mm:ss"
+                  format24h
+                  with-seconds
+                >
+                  <div class="row items-center justify-end">
+                    <q-btn v-close-popup label="Close" color="primary" flat />
+                  </div>
+                </q-time>
+              </q-popup-proxy>
+            </q-icon>
+          </template>
+        </q-input>
+      </template>
       <template v-slot:body-cell-subEventType="props">
         <q-td :props="props">
           <div class="q-gutter-sm row justify-center">
@@ -24,6 +121,15 @@
           </div>
         </q-td>
       </template>
+      <template v-slot:body-cell-requestSuccess="props">
+        <q-td :props="props">
+          <div class="q-gutter-sm row justify-center">
+            <q-chip outline size="sm" color="primary">
+              {{ props.row.requestSuccess === 1 ? '成功' : '失败' }}
+            </q-chip>
+          </div>
+        </q-td>
+      </template>
       <!-- <template v-slot:top-right>
         <q-input
           dense
@@ -66,11 +172,11 @@
 
 <script setup lang="ts">
 import { ref, reactive, onMounted, computed } from 'vue';
-import { useQuasar, type QTableColumn } from 'quasar';
+import { type QTableColumn } from 'quasar';
 import { pageQuery, Record } from '../api/LogApi';
 import { errorNotify } from '../utils/CommonNotify';
 
-const $q = useQuasar();
+// const $q = useQuasar();
 const props = withDefaults(
   defineProps<{
     sizeHeight: number;
@@ -123,6 +229,8 @@ const tableRef = ref();
 const rows = reactive([]);
 const filter = reactive({
   name: '',
+  beginDate: '',
+  endDate: '',
 });
 const loading = ref(false);
 const pagination = ref({
@@ -143,6 +251,9 @@ async function onRequest(props: any) {
       current: page,
       size: rowsPerPage,
       logType: 'OPERATE',
+      name: filter.name,
+      beginDate: filter.beginDate,
+      endDate: filter.endDate,
     });
 
     pagination.value.rowsNumber = response.total;