Commit 58fef6c8 authored by “yiyousong”'s avatar “yiyousong”

perf: 优化

parent 284a6a2d
...@@ -22,10 +22,10 @@ ...@@ -22,10 +22,10 @@
<!-- 部门管理 --> <!-- 部门管理 -->
<div class="department-list"> <div class="department-list">
<a-spin :spinning="deptLoading"> <a-spin :spinning="deptLoading">
<div v-if="department.length"> <div v-if="departList.length">
<div <div
:class="{ department_off: true, active: active === i }" :class="{ department_off: true, active: active === i }"
v-for="(v, i) in department" v-for="(v, i) in departList"
:key="v.id" :key="v.id"
@click="changeDept(v.id, i)" @click="changeDept(v.id, i)"
> >
...@@ -59,9 +59,7 @@ ...@@ -59,9 +59,7 @@
</div> </div>
</div> </div>
<div> <div>
<div class="department_span"> <div>简称:{{ v.deptAbb ? v.deptAbb : "--" }}</div>
简称:{{ v.deptAbb ? v.deptAbb : "--" }}
</div>
<div> <div>
联系电话:{{ v.deptTelphone ? v.deptTelphone : "--" }} 联系电话:{{ v.deptTelphone ? v.deptTelphone : "--" }}
</div> </div>
...@@ -127,7 +125,7 @@ ...@@ -127,7 +125,7 @@
<div class="table-content"> <div class="table-content">
<!-- 表格 --> <!-- 表格 -->
<a-table <a-table
:scroll="{ y: 560 }" :scroll="{ y: 550 }"
:loading="loading" :loading="loading"
bordered bordered
:columns="columns" :columns="columns"
...@@ -333,6 +331,7 @@ export default { ...@@ -333,6 +331,7 @@ export default {
visibleWork: false, visibleWork: false,
visibleAdd: false, visibleAdd: false,
department: [], // 部门列表 department: [], // 部门列表
departList: [], // 部门列表
deptTotal: 0, // 部门总数 deptTotal: 0, // 部门总数
windowData: [], // 窗口列表数据 windowData: [], // 窗口列表数据
page: 1, page: 1,
...@@ -351,19 +350,19 @@ export default { ...@@ -351,19 +350,19 @@ export default {
filters: { filters: {
workmanList(arr) { workmanList(arr) {
if (arr.length) { if (arr.length) {
let workers = arr let workerList = [...arr];
.map((v) => { let worker = workerList.sort((a, b) => {
return v.name; return b.lastLoginTime - a.lastLoginTime;
}) })[0].name;
.join("/"); return worker;
return workers;
} }
}, },
}, },
watch: { watch: {
deptSearchVal(newVal) { deptSearchVal(newVal) {
if (newVal === "") { if (newVal === "") {
this.getDeptListData(); this.departList = this.department;
// this.getDeptListData();
} }
}, },
}, },
...@@ -404,18 +403,18 @@ export default { ...@@ -404,18 +403,18 @@ export default {
}); });
}, },
// 获取部门列表 // 获取部门列表
async getDeptListData(obj = {}) { async getDeptListData() {
this.deptLoading = true; this.deptLoading = true;
let res = await getDeptList({ let res = await getDeptList({
siteId: this.siteId, siteId: this.siteId,
page: 1, page: 1,
size: -1, size: -1,
...obj,
}); });
this.deptLoading = false; this.deptLoading = false;
let { code, data } = res.data; let { code, data } = res.data;
if (code === 1) { if (code === 1) {
this.department = data.data; this.department = data.data;
this.departList = data.data;
this.deptTotal = data.total; this.deptTotal = data.total;
} }
}, },
...@@ -484,7 +483,7 @@ export default { ...@@ -484,7 +483,7 @@ export default {
let res = await delDept({ id: num }); let res = await delDept({ id: num });
let { code, msg } = res.data; let { code, msg } = res.data;
if (code === 1) { if (code === 1) {
_this.getDeptListData(_this.siteId); _this.getDeptListData();
_this.$message.success(msg); _this.$message.success(msg);
} }
}, },
...@@ -504,11 +503,15 @@ export default { ...@@ -504,11 +503,15 @@ export default {
deptId: this.deptId, deptId: this.deptId,
...obj, ...obj,
}); });
let { code, data } = res.data; this.loading = false;
if (code === 1) { if (res.data.code === 1) {
this.total = data.pageInfo.totalResult; let { total, data } = res.data.data;
this.windowData = data.data; if (!data.length && this.page > 1) {
this.loading = false; this.page -= 1;
this.getWindowListData();
}
this.total = total;
this.windowData = data;
} }
}, },
// 新增窗口 // 新增窗口
...@@ -542,7 +545,7 @@ export default { ...@@ -542,7 +545,7 @@ export default {
let res = await delWindow({ id: num }); let res = await delWindow({ id: num });
let { code, msg } = res.data; let { code, msg } = res.data;
if (code === 1) { if (code === 1) {
_this.getWindowListData(_this.siteId); _this.getWindowListData();
_this.$message.success(msg); _this.$message.success(msg);
} }
}, },
...@@ -563,8 +566,13 @@ export default { ...@@ -563,8 +566,13 @@ export default {
this.getWindowListData(); this.getWindowListData();
}, },
// 左边搜索 // 左边搜索
onSearch(value) { onSearch(val) {
this.getDeptListData({ name: `%${value}%` }); if (val != "") {
this.departList = this.department.filter((v) => {
return v.name.includes(val);
});
// this.getDeptListData();
}
}, },
// 右边搜索 // 右边搜索
onSearchRight() { onSearchRight() {
...@@ -687,7 +695,6 @@ export default { ...@@ -687,7 +695,6 @@ export default {
} }
.department_span { .department_span {
margin-right: 3px; margin-right: 3px;
font-size: 5px;
} }
.department_off { .department_off {
// margin-left: 20px; // margin-left: 20px;
......
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