From 893fc457a2daeb0aa33a5a9d0b32eef7db238c1f Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 23 十月 2023 21:58:07 +0800
Subject: [PATCH] bug修改
---
src/views/systemSetting/device/bayonet/index.vue | 148 +++++++++++++++++++++++++++++--------------------
1 files changed, 87 insertions(+), 61 deletions(-)
diff --git a/src/views/systemSetting/device/bayonet/index.vue b/src/views/systemSetting/device/bayonet/index.vue
index 05b495f..0b7b9ba 100644
--- a/src/views/systemSetting/device/bayonet/index.vue
+++ b/src/views/systemSetting/device/bayonet/index.vue
@@ -4,35 +4,35 @@
<div class="header-content">
<div class="search">
<span style="padding-right: 20px">绛涢�夋潯浠�:</span>
- <el-select
- v-model="context"
- placeholder="璇烽�夋嫨"
- @change="getBayonetListData"
- >
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
+ <el-input v-model="context" placeholder="璇疯緭鍏�"></el-input>
</div>
- </div>
- </header>
- <main>
- <div class="main-content">
+
<div class="main-title">
+ <el-button
+ type="primary"
+ icon="el-icon-search"
+ @click="getBayonetListData"
+ >鏌ヨ
+ </el-button>
<el-button
class="el-icon-plus button-addition"
type="primary"
@click="showDialog(false, null)"
>娣诲姞</el-button
>
- <el-button @click="handleExport">瀵煎嚭鍗″彛</el-button>
+
+ <el-button @click="handleExport" type="primary">瀵煎嚭鍗″彛</el-button>
</div>
+ </div>
+ </header>
+ <main>
+ <div class="main-content">
<!-- 鏁版嵁灞曠ず -->
- <MyTable :tableOption="tableOption" :tableData="list" :pageShow="false">
+ <MyTable
+ :tableOption="tableOption"
+ :get-table-list="getBayonetListData"
+ :tableData="list"
+ >
<template #operation="info">
<el-link
:underline="false"
@@ -50,6 +50,25 @@
>
</template>
</MyTable>
+
+ <div class="tools">
+ <div class="funs">
+ <div class="funsItem funs-sp"></div>
+ <div class="funsItem funs-sp"></div>
+ <div class="funsItem"></div>
+ </div>
+ <div class="pagination">
+ <el-pagination
+ background
+ :current-page="current"
+ layout="prev, pager, next"
+ :total="total"
+ :page-size="size"
+ @current-change="changeCurrentPage"
+ >
+ </el-pagination>
+ </div>
+ </div>
</div>
</main>
<footer>
@@ -99,6 +118,7 @@
list: [],
current: 1,
size: 10,
+ total: 0,
tableOption: {
group: [
{
@@ -154,12 +174,18 @@
current: this.current,
size: this.size,
})
- .then(({ records }) => {
+ .then(({ records, total }) => {
this.list = records;
+ this.total = total;
})
.catch((err) => {
this.$message({ type: "error", message: err });
});
+ },
+ // 褰撳墠椤垫敼鍙樿Е鍙戜簨浠�
+ changeCurrentPage(page) {
+ this.current = page;
+ this.getBayonetListData();
},
// 寮圭獥鍏抽棴
handleClose(done) {
@@ -178,7 +204,7 @@
.exportBayonetList({
bayonetName: this.context,
current: this.current,
- size: this.size
+ size: this.size,
})
.then((res) => {
downloadFile(res);
@@ -210,14 +236,14 @@
<style lang="scss" scoped>
.userList {
text-align: left;
- margin: 10px 20px;
- color: #4b9bb7;
-
+ padding: 10px 20px;
+ // color: #4b9bb7;
+ border: 1px solid #ccc;
header {
- background-color: #09152f;
+ // background-color: white;
.header-content {
- padding: 0 40px;
+ padding: 0;
display: flex;
line-height: 100px;
justify-content: space-between;
@@ -233,26 +259,26 @@
.el-input {
flex: 2;
- color: #1d3f57;
+ // color: #1d3f57;
- &::v-deep .el-input__inner {
- background-color: #09152f;
- border: 1px solid #17324c;
- }
+ // &::v-deep .el-input__inner {
+ // background-color: #09152f;
+ // border: 1px solid #17324c;
+ // }
}
+ }
+
+ .main-title {
+ line-height: 60px;
+ padding: 10px 0px;
}
}
}
main {
- background-color: #09152f;
+ // background-color: #09152f;
margin-top: 20px;
padding-bottom: 50px;
-
- .main-title {
- line-height: 60px;
- padding: 10px 20px;
- }
.tools {
display: flex;
@@ -267,7 +293,7 @@
line-height: 28px;
display: flex;
align-items: center;
- border: 1px solid #17324c;
+ // border: 1px solid #17324c;
border-radius: 4px;
font-size: 12px;
margin-left: 10px;
@@ -281,18 +307,18 @@
width: 120px;
}
- &::v-deep .el-input__inner {
- border: none;
- background-color: #09152f;
- }
+ // &::v-deep .el-input__inner {
+ // border: none;
+ // background-color: #09152f;
+ // }
- &:hover {
- border: 1px solid #4b9bb7;
- }
+ // &:hover {
+ // border: 1px solid #4b9bb7;
+ // }
- &:hover .el-checkbox {
- color: #4b9bb7;
- }
+ // &:hover .el-checkbox {
+ // color: #4b9bb7;
+ // }
}
}
@@ -303,24 +329,24 @@
justify-content: center;
.el-pagination {
- &::v-deep li,
- &::v-deep .btn-prev,
- &::v-deep .btn-next {
- background-color: #071f39;
- color: #4b9bb7;
- }
+ // &::v-deep li,
+ // &::v-deep .btn-prev,
+ // &::v-deep .btn-next {
+ // background-color: #071f39;
+ // color: #4b9bb7;
+ // }
- &::v-deep .active {
- background-color: #409eff;
- color: #fff;
- }
+ // &::v-deep .active {
+ // background-color: #409eff;
+ // color: #fff;
+ // }
}
}
}
.el-table {
- color: #4b9bb7;
- font-size: 10px;
+ // color: #4b9bb7;
+ // font-size: 10px;
.cell {
display: flex;
@@ -339,4 +365,4 @@
.line {
padding: 0 5px;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.8.0