Commit 4dfd6782 authored by “yiyousong”'s avatar “yiyousong”

perf: 优化系统设置板块

parent 7b10c512
...@@ -21,64 +21,55 @@ ...@@ -21,64 +21,55 @@
</div> </div>
<!-- 表格 --> <!-- 表格 -->
<div class="table-content"> <div class="table-content">
<a-table <y-table
:columns="columns"
:data="tableData"
:pageSize.sync="size"
:page.sync="page"
:total="total"
:loading="loading"
:scroll="{ y: 560 }"
:row-selection="{ :row-selection="{
selectedRowKeys: selectedRowKeys, selectedRowKeys: selectedRowKeys,
onChange: onSelectChange, onChange: onSelectChange,
}" }"
:loading="loading" @changePagination="getSystemParameterList"
bordered
:scroll="{ y: 590 }"
:columns="columns"
:pagination="{
showTotal: (total) => `共 ${total} 条`,
current: current,
total: total,
pageSize: size,
showSizeChanger: true,
showQuickJumper: true,
pageSizeOptions: pageSizeOptions,
onChange: handleChange,
onShowSizeChange: showSizeChange,
}"
:data-source="tableData"
:rowKey="(record) => record.id"
> >
<!-- 序号 --> <span slot="index" slot-scope="{ index }">{{
<span slot="num" slot-scope="text, record, index">{{ (page - 1) * size + index + 1
(current - 1) * size + index + 1
}}</span> }}</span>
<!-- 有效状态 --> <!-- 有效状态 -->
<template slot="validStatus" slot-scope="text"> <template slot="validStatus" slot-scope="{ record }">
<a-tag>{{ filterItems(text.validStatus, dict.validStatus) }} </a-tag> <a-tag>{{ dict.validStatus[record.validStatus] }} </a-tag>
</template> </template>
<!-- 修改状态 --> <!-- 修改状态 -->
<template slot="modStatus" slot-scope="text"> <template slot="modStatus" slot-scope="{ record }">
<a-tag>{{ filterItems(text.modStatus, dict.modStatus) }} </a-tag> <a-tag>{{ dict.modStatus[record.modStatus] }} </a-tag>
</template> </template>
<!-- 展现类型 --> <!-- 展现类型 -->
<template slot="displayType" slot-scope="text"> <template slot="displayType" slot-scope="{ record }">
<!-- {{ text.displayType || "--" }} --> <!-- {{ text.displayType || "--" }} -->
<a-tag>{{ filterItems(text.displayType, dict.displayType) }} </a-tag> <a-tag>{{ dict.displayType[record.displayType] }} </a-tag>
</template> </template>
<!-- 操作 --> <!-- 操作 -->
<template slot="action" slot-scope="text"> <template slot="action" slot-scope="{ record }">
<a-space size="middle"> <a-space size="middle">
<span <span
href="javascript:;" href="javascript:;"
class="primary pointer" class="primary pointer"
@click="handleEdit(text)" @click="handleEdit(record)"
>编辑</span >编辑</span
> >
<span <span
href="javascript:;" href="javascript:;"
class="delete pointer" class="delete pointer"
@click="handleDel(text.id)" @click="handleDel(record.id)"
>删除</span >删除</span
> >
</a-space> </a-space>
</template> </template>
</a-table> </y-table>
</div> </div>
<!-- 新增 --> <!-- 新增 -->
<AddParameter <AddParameter
...@@ -95,9 +86,11 @@ ...@@ -95,9 +86,11 @@
import { getSystemParameterList, delSystemParameter } from "@/services/system"; import { getSystemParameterList, delSystemParameter } from "@/services/system";
import { pageSizeOptions } from "@/config/pageConfig.js"; import { pageSizeOptions } from "@/config/pageConfig.js";
import AddParameter from "./modal/AddParameter.vue"; import AddParameter from "./modal/AddParameter.vue";
import YTable from "@/components/YTable.vue";
export default { export default {
components: { components: {
AddParameter, AddParameter,
YTable,
}, },
data() { data() {
const columns = [ const columns = [
...@@ -106,7 +99,7 @@ export default { ...@@ -106,7 +99,7 @@ export default {
dataIndex: "num", dataIndex: "num",
width: "65px", width: "65px",
scopedSlots: { scopedSlots: {
customRender: "num", customRender: "index",
}, },
}, },
{ {
...@@ -173,7 +166,7 @@ export default { ...@@ -173,7 +166,7 @@ export default {
return { return {
columns, columns,
loading: false, loading: false,
current: 1, page: 1,
size: 10, size: 10,
total: 0, total: 0,
pageSizeOptions, pageSizeOptions,
...@@ -196,7 +189,7 @@ export default { ...@@ -196,7 +189,7 @@ export default {
async getSystemParameterList() { async getSystemParameterList() {
this.loading = true; this.loading = true;
let res = await getSystemParameterList({ let res = await getSystemParameterList({
page: this.current, page: this.page,
size: this.size, size: this.size,
name: `%${this.searchForm.name}%`, name: `%${this.searchForm.name}%`,
}); });
...@@ -204,8 +197,8 @@ export default { ...@@ -204,8 +197,8 @@ export default {
if (res.data.code == 1) { if (res.data.code == 1) {
let { total, data, dict } = res.data.data; let { total, data, dict } = res.data.data;
this.dict = dict; this.dict = dict;
if (!data.length && this.current > 1) { if (!data.length && this.page > 1) {
this.current -= 1; this.page -= 1;
this.getSystemParameterList(); this.getSystemParameterList();
} }
this.total = total; this.total = total;
...@@ -220,26 +213,18 @@ export default { ...@@ -220,26 +213,18 @@ export default {
}, },
// 搜索 // 搜索
onSearch() { onSearch() {
this.current = 1; this.page = 1;
this.selectedRowKeys = [];
this.getSystemParameterList(); this.getSystemParameterList();
}, },
// 重置搜索 // 重置搜索
resetSearch() { resetSearch() {
this.current = 1; this.page = 1;
this.selectedRowKeys = [];
Object.assign(this.searchForm, this.$options.data().searchForm); Object.assign(this.searchForm, this.$options.data().searchForm);
this.getSystemParameterList(); this.getSystemParameterList();
}, },
// 分页
handleChange(num) {
this.current = num;
this.getSystemParameterList();
},
// 改变每页显示数量
showSizeChange(current, size) {
this.current = current;
this.size = size;
this.getSystemParameterList();
},
// 选择 // 选择
onSelectChange(keys) { onSelectChange(keys) {
this.selectedRowKeys = keys; this.selectedRowKeys = keys;
...@@ -285,16 +270,6 @@ export default { ...@@ -285,16 +270,6 @@ export default {
}, },
}); });
}, },
// 过滤表格数据
filterItems(key, dict = {}) {
let val = "";
Object.keys(dict).forEach((keys) => {
if (key == keys) {
val = dict[keys];
}
});
return val;
},
}, },
}; };
</script> </script>
......
...@@ -14,34 +14,24 @@ ...@@ -14,34 +14,24 @@
</div> </div>
<!-- 表格 --> <!-- 表格 -->
<div class="table-content"> <div class="table-content">
<a-table <y-table
:loading="loading"
bordered
:scroll="{ y: 590 }"
:columns="columns" :columns="columns"
:pagination="{ :data="tableData"
showTotal: (total) => `共 ${total} 条`, :pageSize.sync="size"
current: current, :page.sync="page"
total: total, :total="total"
pageSize: size, :loading="loading"
showSizeChanger: true, :scroll="{ y: 560 }"
showQuickJumper: true, @changePagination="getSystemLogsList"
pageSizeOptions: pageSizeOptions,
onChange: handleChange,
onShowSizeChange: showSizeChange,
}"
:data-source="tableData"
:rowKey="(record) => record.id"
> >
<!-- 序号 --> <span slot="index" slot-scope="{ index }">{{
<span slot="num" slot-scope="text, record, index">{{ (page - 1) * size + index + 1
(current - 1) * size + index + 1
}}</span> }}</span>
<!-- 操作时间 --> <!-- 操作时间 -->
<template slot="logDate" slot-scope="text"> <template slot="logDate" slot-scope="{ record }">
{{ text.logDate | dateFormat }} {{ record.logDate | dateFormat }}
</template> </template>
</a-table> </y-table>
</div> </div>
</div> </div>
</template> </template>
...@@ -49,13 +39,13 @@ ...@@ -49,13 +39,13 @@
<script> <script>
import { getSystemLogsList } from "@/services/system"; import { getSystemLogsList } from "@/services/system";
import { pageSizeOptions } from "@/config/pageConfig.js"; import { pageSizeOptions } from "@/config/pageConfig.js";
import YTable from "@/components/YTable.vue";
const columns = [ const columns = [
{ {
title: "序号", title: "序号",
dataIndex: "num",
width: "65px", width: "65px",
scopedSlots: { scopedSlots: {
customRender: "num", customRender: "index",
}, },
}, },
{ {
...@@ -86,6 +76,9 @@ const columns = [ ...@@ -86,6 +76,9 @@ const columns = [
}, },
]; ];
export default { export default {
components: {
YTable,
},
data() { data() {
return { return {
columns, columns,
...@@ -122,17 +115,6 @@ export default { ...@@ -122,17 +115,6 @@ export default {
this.current = 1; this.current = 1;
this.getSystemLogsList(); this.getSystemLogsList();
}, },
// 分页
handleChange(num) {
this.current = num;
this.getSystemLogsList();
},
// 改变每页显示数量
showSizeChange(current, size) {
this.current = current;
this.size = size;
this.getSystemLogsList();
},
}, },
}; };
</script> </script>
......
...@@ -19,65 +19,54 @@ ...@@ -19,65 +19,54 @@
</div> </div>
<!-- 表格 --> <!-- 表格 -->
<div class="table-content"> <div class="table-content">
<a-table <y-table
:columns="columns"
:data="tableData"
:pageSize.sync="size"
:page.sync="page"
:total="total"
:loading="loading"
:scroll="{ y: 560 }"
:row-selection="{ :row-selection="{
selectedRowKeys: selectedRowKeys, selectedRowKeys: selectedRowKeys,
onChange: onSelectChange, onChange: onSelectChange,
}" }"
:loading="loading" @changePagination="getSystemTaskList"
bordered
:scroll="{ y: 590 }"
:columns="columns"
:pagination="{
showTotal: (total) => `共 ${total} 条`,
current: current,
total: total,
pageSize: size,
showSizeChanger: true,
showQuickJumper: true,
pageSizeOptions: pageSizeOptions,
onChange: handleChange,
onShowSizeChange: showSizeChange,
}"
:data-source="tableData"
:rowKey="(record) => record.id"
> >
<!-- 序号 --> <span slot="index" slot-scope="{ index }">{{
<span slot="num" slot-scope="text, record, index">{{ (page - 1) * size + index + 1
(current - 1) * size + index + 1
}}</span> }}</span>
<!-- 执行策略 --> <!-- 执行策略 -->
<template slot="excuteStrategy" slot-scope="text"> <template slot="excuteStrategy" slot-scope="{ record }">
<a-tag <a-tag>{{ dict.excuteStrategy[record.excuteStrategy] }} </a-tag>
>{{ filterItems(text.excuteStrategy, dict.excuteStrategy) }}
</a-tag>
</template> </template>
<!-- 最后执行时间 --> <!-- 最后执行时间 -->
<template slot="lastExcuteTime" slot-scope="text"> <template slot="lastExcuteTime" slot-scope="{ record }">
{{ text.lastExcuteTime | dateFormat }} {{ record.lastExcuteTime | dateFormat }}
</template> </template>
<!-- 任务状态 --> <!-- 任务状态 -->
<template slot="status" slot-scope="text"> <template slot="status" slot-scope="{ record }">
<a-tag>{{ filterItems(text.status, dict.status) }} </a-tag> <a-tag>{{ dict.status[record.status] }} </a-tag>
</template> </template>
<!-- 操作 --> <!-- 操作 -->
<template slot="action" slot-scope="text"> <template slot="action" slot-scope="{ record }">
<a-space size="middle"> <a-space size="middle">
<span <span
href="javascript:;" href="javascript:;"
class="primary pointer" class="primary pointer"
@click="handleEdit(text)" @click="handleEdit(record)"
>编辑</span >编辑</span
> >
<span <span
href="javascript:;" href="javascript:;"
class="delete pointer" class="delete pointer"
@click="handleDel(text.id)" @click="handleDel(record.id)"
>删除</span >删除</span
> >
</a-space> </a-space>
</template> </template>
</a-table> </y-table>
</div> </div>
<!-- 新增 --> <!-- 新增 -->
<AddTask <AddTask
...@@ -94,18 +83,19 @@ ...@@ -94,18 +83,19 @@
import { getSystemTaskList, delSystemTask } from "@/services/system"; import { getSystemTaskList, delSystemTask } from "@/services/system";
import { pageSizeOptions } from "@/config/pageConfig.js"; import { pageSizeOptions } from "@/config/pageConfig.js";
import AddTask from "./modal/AddTask.vue"; import AddTask from "./modal/AddTask.vue";
import YTable from "@/components/YTable.vue";
export default { export default {
components: { components: {
AddTask, AddTask,
YTable,
}, },
data() { data() {
const columns = [ const columns = [
{ {
title: "序号", title: "序号",
dataIndex: "num",
width: "65px", width: "65px",
scopedSlots: { scopedSlots: {
customRender: "num", customRender: "index",
}, },
}, },
{ {
...@@ -157,7 +147,7 @@ export default { ...@@ -157,7 +147,7 @@ export default {
return { return {
columns, columns,
loading: false, loading: false,
current: 1, page: 1,
size: 10, size: 10,
total: 0, total: 0,
pageSizeOptions, pageSizeOptions,
...@@ -177,7 +167,7 @@ export default { ...@@ -177,7 +167,7 @@ export default {
async getSystemTaskList() { async getSystemTaskList() {
this.loading = true; this.loading = true;
let res = await getSystemTaskList({ let res = await getSystemTaskList({
page: this.current, page: this.page,
size: this.size, size: this.size,
name: `%${this.searchValue}%`, name: `%${this.searchValue}%`,
}); });
...@@ -185,8 +175,8 @@ export default { ...@@ -185,8 +175,8 @@ export default {
if (res.data.code == 1) { if (res.data.code == 1) {
let { total, data, dict } = res.data.data; let { total, data, dict } = res.data.data;
this.dict = dict; this.dict = dict;
if (!data.length && this.current > 1) { if (!data.length && this.page > 1) {
this.current -= 1; this.page -= 1;
this.getSystemTaskList(); this.getSystemTaskList();
} }
this.total = total; this.total = total;
...@@ -201,20 +191,11 @@ export default { ...@@ -201,20 +191,11 @@ export default {
}, },
// 搜索 // 搜索
onSearch() { onSearch() {
this.current = 1; this.page = 1;
this.getSystemTaskList(); this.selectedRowKeys = [];
},
// 分页
handleChange(num) {
this.current = num;
this.getSystemTaskList();
},
// 改变每页显示数量
showSizeChange(current, size) {
this.current = current;
this.size = size;
this.getSystemTaskList(); this.getSystemTaskList();
}, },
// 选择 // 选择
onSelectChange(keys) { onSelectChange(keys) {
this.selectedRowKeys = keys; this.selectedRowKeys = keys;
...@@ -261,16 +242,6 @@ export default { ...@@ -261,16 +242,6 @@ export default {
}, },
}); });
}, },
// 过滤表格数据
filterItems(key, dict = {}) {
let val = "";
Object.keys(dict).forEach((keys) => {
if (key == keys) {
val = dict[keys];
}
});
return val;
},
}, },
}; };
</script> </script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment