提交 08ea8979 authored 作者: Ras's avatar Ras

日志同步筛选修改,表关系修补分页漏洞

上级 21e33fbe
......@@ -11,6 +11,7 @@
style="width: 100%; margin-bottom: 20px"
row-key="id"
border
setScrollLeft="left"
>
<el-table-column type="selection" width="55" />
<el-table-column prop="tableName" label="表名称" />
......@@ -21,10 +22,10 @@
label="父表名(-1代表没有)"
align="center"
/>
<el-table-column prop="primaryKey" label="主键" align="center" />
<el-table-column prop="foreignKey" label="外键" align="center" />
<el-table-column prop="createTime" label="创建时间" align="center" />
<el-table-column fixed="right" label="操作" align="center">
<el-table-column prop="primaryKey" label="主键" align="center"/>
<el-table-column prop="foreignKey" label="外键" align="center"/>
<el-table-column prop="createTime" label="创建时间" align="center"/>
<el-table-column :fixed="false" label="操作" align="center">
<template #default="scope">
<el-button
link
......@@ -45,7 +46,7 @@
</el-table>
<el-pagination
v-model:currentPage="currentPage"
v-model:page-size="pageSize"
v-model:page-size="pageSizes"
:page-sizes="[10, 20, 30]"
layout="->, total, sizes, prev, pager, next, jumper"
:total="total"
......@@ -138,7 +139,7 @@ import {
const tableRelationRef = ref<FormInstance>();
const tableRelationList = ref([]);
const currentPage = ref(1);
const pageSize = ref(10);
const pageSizes = ref(10);
const total = ref(0);
const modifyId = ref();
const tableRelationForm = ref({
......@@ -154,7 +155,7 @@ const tableRelationForm = ref({
const rules = ref({});
const dialogVisible = ref(false);
const init = (val?: number, pageSize?: number) => {
getTableRelation(val, pageSize).then((res: any) => {
getTableRelation(currentPage.value, pageSizes.value).then((res: any) => {
tableRelationList.value = res.data.records;
total.value = res.data.total;
console.log(res);
......@@ -168,17 +169,16 @@ const addToTableRelation = () => {
};
const handleSizeChange = (val: number) => {
if (val === pageSize.value) val = currentPage.value;
init(val, pageSize.value);
if (val === pageSizes.value) val = currentPage.value;
init(val, pageSizes.value);
};
const handleCurrentChange = (val: number) => {
init(val, pageSize.value);
init(val, pageSizes.value);
};
const handleClose = () => {
dialogVisible.value = false;
};
const modifyTableRelation = (scope: any) => {
console.log(scope);
tableRelationForm.value = scope;
modifyId.value = scope.id;
dialogVisible.value = true;
......
......@@ -60,8 +60,8 @@
prop="flag"
label="同步状态"
:filters="[
{ text: '同步成功', value: '0' },
{ text: '同步失败', value: '1' },
{ text: '同步成功', value: '1' },
{ text: '同步失败', value: '0' },
]"
:filter-multiple="false"
filter-placement="bottom-end"
......@@ -70,21 +70,16 @@
>
<template #default="scope">
<el-tag
:type="scope.row.flag === 0 ? 'success' : ''"
:type="scope.row.flag === 1 ? 'success' : ''"
disable-transitions
>{{ scope.row.flag === 0 ? "同步成功" : "同步失败" }}</el-tag
>{{ scope.row.flag === 1 ? "同步成功" : "同步失败" }}</el-tag
>
</template>
</el-table-column>
<el-table-column prop="name" label="名称" align="center" />
<el-table-column prop="content" label="内容" align="center" />
<el-table-column prop="createTime" label="创建时间" align="center" />
<el-table-column
fixed="right"
label="操作"
align="center"
width="155px"
>
<el-table-column label="操作" align="center" width="155px">
<template #default="scope">
<el-button
link
......@@ -201,7 +196,7 @@
</template>
<script setup lang="ts">
import { ref } from "vue";
import { ref, nextTick } from "vue";
import moment from "moment";
import { ElTable } from "element-plus";
import {
......@@ -246,11 +241,14 @@ const { tableList, total, loading, pageSize, currentPage } =
useXyunLogTableList();
// 同步筛选
const filterChange = (filters: any) => {
let flag = filters["el-table_1_column_2"][0];
getQueryxyunLog2(currentPage.value, pageSize.value, flag).then((res: any) => {
tableList.value = res.data.records;
total.value = res.data.total;
console.log(res, "可以的");
nextTick(() => {
const flag = filters["el-table_1_column_2"][0];
getQueryxyunLog2(currentPage.value, pageSize.value, flag).then(
(res: any) => {
tableList.value = res.data.records;
total.value = res.data.total;
}
);
});
};
const dateChange = (value: any) => {
......@@ -291,7 +289,6 @@ const handleScreen = () => {
filterForm.value.dateTo = "";
}
});
console.log("点击筛选", filterForm.value);
};
// 筛选
const page = (
......@@ -305,7 +302,6 @@ const page = (
) => {
getQueryxyunLog(val, currentPage, name, dateTo, dateFrom, content, flag).then(
(res) => {
console.log("筛选", res);
tableList.value = res.data.records;
total.value = res.data.total;
}
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论