日志筛选修改

src/services/api/log/logApi.ts

@@ -4,23 +4,13 @@ import { request } from "../config";
 export function getQueryxyunLog(
   pageNo?: number,
   pageSize?: number,
-  flag?: number,
-  name?: string,
-  dateFrom?: string,
-  dateTo?: string,
-  content?: string
 ) {
   return request({
     url: "/api/log/list",
     method: "get",
     params: {
-      pageNo: pageNo,
-      pageSize: pageSize,
-      name: name,
-      dateTo: dateTo,
-      dateFrom: dateFrom,
-      flag: flag,
-      content: content,
+      pageNo,
+      pageSize,
     },
   });
 }
@@ -31,18 +21,12 @@ export function getQueryxyunLog1(
   dateFrom?: string,
   dateTo?: string,
   name?: string,
-  content?: string
+  content?: string,
+  flag?: any
 ) {
   return request({
     url: "/api/log/list",
     method: "get",
-    params: { pageNo, pageSize, dateFrom, dateTo, name, content },
-  });
-}
-export function getQueryxyunLog2(pageNo?: any, pageSize?: any, flag?: any) {
-  return request({
-    url: "/api/log/list",
-    method: "get",
-    params: { pageNo, pageSize, flag },
+    params: { pageNo, pageSize, dateFrom, dateTo, name, content, flag },
   });
 }

src/views/system/tableRelation.vue

@@ -11,6 +11,7 @@
         style="width: 100%; margin-bottom: 20px"
         row-key="id"
         border
+        v-loading="loading"
         setScrollLeft="left"
       >
         <el-table-column type="selection" width="55" />
@@ -138,6 +139,7 @@ import {
 
 const tableRelationRef = ref<FormInstance>();
 const tableRelationList = ref([]);
+const loading = ref(true)
 const currentPage = ref(1);
 const pageSizes = ref(10);
 const total = ref(0);
@@ -158,7 +160,7 @@ const init = (val?: number, pageSize?: number) => {
   getTableRelation(currentPage.value, pageSizes.value).then((res: any) => {
     tableRelationList.value = res.data.records;
     total.value = res.data.total;
-    console.log(res);
+    loading.value = false
     console.log("表关系数据", tableRelationList.value);
   });
 };

src/views/system/test.vue

-<template>
-    <div class="router">
-        <Form></Form>
-    </div>
-</template>
-<script setup lang="ts">
-import Form from '@/components/form/MyForm.vue'
-</script>
-<style scoped>
-
-</style>
\ No newline at end of file

src/views/system/xyunLog.vue

@@ -236,19 +236,36 @@ const visible = ref(false);
 const multipleSelection = ref<List[]>([]);
 // 分页
 const disabled = ref(false);
-
+const filters = ref();
 const { tableList, total, loading, pageSize, currentPage } =
   useXyunLogTableList();
 // 同步筛选
-const filterChange = (filters: any) => {
+const filterChange = (value: any) => {
   nextTick(() => {
-    const flag = filters["el-table_1_column_2"][0];
-    getQueryxyunLog2(currentPage.value, pageSize.value, flag).then(
-      (res: any) => {
+    const flag = value["el-table_1_column_2"][0];
+    filters.value = flag;
+    // getQueryxyunLog2(currentPage.value, pageSize.value, flag).then(
+    //   (res: any) => {
+    //     tableList.value = res.data.records;
+    //     total.value = res.data.total;
+    //   }
+    // );
+    getQueryxyunLog1(
+      currentPage.value,
+      pageSize.value,
+      filterForm.value.dateFrom,
+      filterForm.value.dateTo,
+      filterForm.value.name,
+      filterForm.value.content,
+      filters.value
+    ).then((res: any) => {
+      if (res.code === 200) {
         tableList.value = res.data.records;
         total.value = res.data.total;
+        filterForm.value.dateFrom = "";
+        filterForm.value.dateTo = "";
       }
-    );
+    });
   });
 };
 const dateChange = (value: any) => {
@@ -280,7 +297,8 @@ const handleScreen = () => {
     filterForm.value.dateFrom,
     filterForm.value.dateTo,
     filterForm.value.name,
-    filterForm.value.content
+    filterForm.value.content,
+    filters.value
   ).then((res: any) => {
     if (res.code === 200) {
       tableList.value = res.data.records;
@@ -292,20 +310,19 @@ const handleScreen = () => {
 };
 // 筛选
 const page = (
-  val: any,
-  currentPage?: any,
-  name?: any,
-  dateTo?: any,
-  dateFrom?: any,
-  content?: any,
-  flag?: any
+  pageNo: any,
+  pageSize?: any,
 ) => {
-  getQueryxyunLog(val, currentPage, name, dateTo, dateFrom, content, flag).then(
-    (res) => {
-      tableList.value = res.data.records;
-      total.value = res.data.total;
-    }
-  );
+  filterForm.value.content,
+    getQueryxyunLog(
+      pageNo,
+      pageSize,
+    ).then((res: any) => {
+      if (res.code === 200) {
+        tableList.value = res.data.records;
+        total.value = res.data.total;
+      }
+    });
 };
 // 每页新条数
 const handleSizeChange = (val: number) => {