Commit 43510351 authored by 乐宝呗666's avatar 乐宝呗666

改用统一分页组件

parent a046937f
...@@ -37,12 +37,11 @@ ...@@ -37,12 +37,11 @@
height="100%" height="100%"
:data="tableData" :data="tableData"
> >
<el-table-column <el-table-column type="index" width="120" label="序号" align="center">
type="index" <template slot-scope="scope">
width="120" <span>{{ (page._index - 1) * 10 + scope.$index + 1 }}</span>
label="序号" </template>
align="center" </el-table-column>
></el-table-column>
<el-table-column <el-table-column
label="app版本号" label="app版本号"
prop="appVersion" prop="appVersion"
...@@ -53,8 +52,16 @@ ...@@ -53,8 +52,16 @@
<span>{{ scope.row.isCurrent ? "是" : "否" }}</span> <span>{{ scope.row.isCurrent ? "是" : "否" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="上传时间" prop="createTime"></el-table-column> <el-table-column
<el-table-column align="center" label="操作者" prop="userName"></el-table-column> align="center"
label="上传时间"
prop="createTime"
></el-table-column>
<el-table-column
align="center"
label="操作者"
prop="userName"
></el-table-column>
<el-table-column align="center" label="操作" header-align="center"> <el-table-column align="center" label="操作" header-align="center">
<template slot-scope="scope" width="220"> <template slot-scope="scope" width="220">
<div class="table-btn-group"> <div class="table-btn-group">
...@@ -73,31 +80,22 @@ ...@@ -73,31 +80,22 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<div class="partyt-pagination"> <party-pagination :page="page" @changePage="handleCurrentChange" />
<el-pagination
background
@current-change="handleCurrentChange"
:current-page="page.currentPage"
:page-size="page.pageSize"
layout="prev, pager, next, jumper"
:total="page.total"
></el-pagination>
</div>
</div> </div>
<add-dialog ref="addDialog" @refreshFn="onSearch" /> <add-dialog ref="addDialog" @refreshFn="onSearch" />
<detail-dialog ref="detailDialog" /> <detail-dialog ref="detailDialog" />
</div> </div>
</template> </template>
<script> <script>
import { partyPagination, partyTable } from "@/components/index"; import { partyPagination } from "@/components/index";
import { addDialog, detailDialog } from "./components/index"; import { addDialog, detailDialog } from "./components/index";
export default { export default {
data() { data() {
return { return {
page: { page: {
currentPage: 1, _index: 1,
pageSize: 10, _size: 10,
total: 0 total: 0,
}, },
form: { form: {
dateRange: [], dateRange: [],
...@@ -112,15 +110,15 @@ export default { ...@@ -112,15 +110,15 @@ export default {
methods: { methods: {
// 查询 // 查询
onSearch() { onSearch() {
this.page.currentPage = 1; this.page._index = 1;
this.getTableData(); this.getTableData();
}, },
// 获得数据接口 // 获得数据接口
getTableData() { getTableData() {
let vm = this let vm = this;
let param = { let param = {
_index: this.page.currentPage, _index: this.page._index,
_size: this.page.pageSize, _size: this.page._size,
startDate: this.form.dateRange.length ? this.form.dateRange[0] : "", startDate: this.form.dateRange.length ? this.form.dateRange[0] : "",
endDate: this.form.dateRange.length ? this.form.dateRange[1] : "", endDate: this.form.dateRange.length ? this.form.dateRange[1] : "",
}; };
...@@ -134,15 +132,15 @@ export default { ...@@ -134,15 +132,15 @@ export default {
) )
.then((res) => { .then((res) => {
if (res.data.resultCode === "200") { if (res.data.resultCode === "200") {
let data = res.data.data let data = res.data.data;
vm.page.total = data.total vm.page.total = data.total;
vm.tableData = data.records vm.tableData = data.records;
} else { } else {
this.$message.error(res.data.message) this.$message.error(res.data.message);
} }
}) })
.catch(function (err) { .catch(function (err) {
console.log(err) console.log(err);
}); });
}, },
// 新增弹框打开 // 新增弹框打开
...@@ -171,7 +169,7 @@ export default { ...@@ -171,7 +169,7 @@ export default {
}, },
// 启用 // 启用
updateVersion(row) { updateVersion(row) {
let vm = this let vm = this;
let param = { let param = {
id: row.id, id: row.id,
isCurrent: 1, isCurrent: 1,
...@@ -186,14 +184,14 @@ export default { ...@@ -186,14 +184,14 @@ export default {
) )
.then((res) => { .then((res) => {
if (res.data.resultCode === "200") { if (res.data.resultCode === "200") {
this.$message.success("操作成功") this.$message.success("操作成功");
this.onSearch() this.onSearch();
} else { } else {
this.$message.error(res.data.message) this.$message.error(res.data.message);
} }
}) })
.catch(function (err) { .catch(function (err) {
console.log(err) console.log(err);
}); });
}, },
// 重置 // 重置
...@@ -201,12 +199,12 @@ export default { ...@@ -201,12 +199,12 @@ export default {
this.form = { this.form = {
dateRange: [], dateRange: [],
}; };
this.onSearch() this.onSearch();
}, },
// 分页 // 分页
handleCurrentChange(val) { handleCurrentChange(val) {
this.page.currentPage = val this.page._index = val;
this.getTableData() this.getTableData();
}, },
}, },
}; };
......
...@@ -38,24 +38,14 @@ ...@@ -38,24 +38,14 @@
<div class="btn-group"> <div class="btn-group">
<el-button type="primary" @click="addBox">新建机顶盒账号</el-button> <el-button type="primary" @click="addBox">新建机顶盒账号</el-button>
</div> </div>
<party-table :feildList="feildList" :list="tableData"/> <party-table :currentPage="page._index" :feildList="feildList" :list="tableData"/>
<div class="partyt-pagination" style="margin: 0 20px"> <party-pagination :page="page" @changePage="handleCurrentChange"/>
<el-pagination
background
@current-change="handleCurrentChange"
:current-page="page.currentPage"
:page-size="page.pageSize"
layout="prev, pager, next, jumper"
:total="page.total"
></el-pagination>
</div>
</div> </div>
<custom-dialog ref="formItem" @refreshFn="onSearch" /> <custom-dialog ref="formItem" @refreshFn="onSearch" />
</div> </div>
</template> </template>
<script> <script>
import { partyPagination } from "@/components/index"; import { partyPagination,partyTable} from "@/components/index";
import partyTable from "@/components/table.vue";
import customDialog from "./components/dialog.vue"; import customDialog from "./components/dialog.vue";
import { getAreas } from "@/config/area.js"; import { getAreas } from "@/config/area.js";
import { getOrgListWithOutPage } from "@/config/organ.js"; import { getOrgListWithOutPage } from "@/config/organ.js";
...@@ -64,8 +54,8 @@ export default { ...@@ -64,8 +54,8 @@ export default {
data() { data() {
return { return {
page: { page: {
currentPage: 1, _index: 1,
pageSize: 10, _size: 10,
total: 0 total: 0
}, },
feildList: [ feildList: [
...@@ -103,15 +93,15 @@ export default { ...@@ -103,15 +93,15 @@ export default {
}, },
// 查询 // 查询
onSearch() { onSearch() {
this.page.currentPage = 1 this.page._index = 1
this.getTableData() this.getTableData()
}, },
// 获得数据接口 // 获得数据接口
getTableData() { getTableData() {
let vm = this; let vm = this;
let param = { let param = {
_index: this.page.currentPage, _index: this.page._index,
_size: this.page.pageSize, _size: this.page._size,
areaId: this.form.areaId.length ? this.form.areaId[this.form.areaId.length - 1] : '', areaId: this.form.areaId.length ? this.form.areaId[this.form.areaId.length - 1] : '',
organId: this.form.orgId organId: this.form.orgId
}; };
...@@ -150,7 +140,7 @@ export default { ...@@ -150,7 +140,7 @@ export default {
}, },
// 分页 // 分页
handleCurrentChange(val) { handleCurrentChange(val) {
this.page.currentPage = val; this.page._index = val;
this.getTableData(); this.getTableData();
}, },
}, },
...@@ -158,5 +148,4 @@ export default { ...@@ -158,5 +148,4 @@ export default {
</script> </script>
<style lang="less"> <style lang="less">
@import "~@/style/table.less"; @import "~@/style/table.less";
@import "~@/style/pagination.less";
</style> </style>
\ No newline at end of file
...@@ -56,27 +56,20 @@ ...@@ -56,27 +56,20 @@
</div> </div>
</div> </div>
</div> </div>
<div class="partyt-pagination" style="margin: 0 20px" v-show="tableData.length"> <party-pagination v-show="tableData.length" :page="page" @changePage="handleCurrentChange"/>
<el-pagination
background
@current-change="handleCurrentChange"
:current-page="page.currentPage"
:page-size="page.pageSize"
layout="prev, pager, next, jumper"
:total="page.total"
></el-pagination>
</div>
</el-card> </el-card>
</div> </div>
</template> </template>
<script> <script>
import { partyPagination} from "@/components/index";
export default { export default {
components: { partyPagination },
data() { data() {
return { return {
filterText: "", filterText: "",
page: { page: {
currentPage: 1, _index: 1,
pageSize: 10, _size: 10,
total: 0, total: 0,
}, },
treeData: [], treeData: [],
...@@ -101,7 +94,7 @@ export default { ...@@ -101,7 +94,7 @@ export default {
methods: { methods: {
// 查询 // 查询
onSearch() { onSearch() {
this.page.currentPage = 1; this.page._index = 1;
this.getTableData(); this.getTableData();
}, },
// 获得数据接口 // 获得数据接口
...@@ -109,8 +102,8 @@ export default { ...@@ -109,8 +102,8 @@ export default {
let vm = this; let vm = this;
vm.tableData = []; vm.tableData = [];
let param = { let param = {
_index: this.page.currentPage, _index: this.page._index,
_size: this.page.pageSize, _size: this.page._size,
orgId: this.selectAreaId, orgId: this.selectAreaId,
}; };
vm.$https( vm.$https(
...@@ -181,7 +174,7 @@ export default { ...@@ -181,7 +174,7 @@ export default {
}, },
// 分页 // 分页
handleCurrentChange(val) { handleCurrentChange(val) {
this.page.currentPage = val; this.page._index = val;
this.getTableData(); this.getTableData();
}, },
}, },
......
...@@ -52,43 +52,43 @@ ...@@ -52,43 +52,43 @@
height="100%" height="100%"
:data="tableData" :data="tableData"
> >
<el-table-column type="index" width="120" label="序号" align="center">
<template slot-scope="scope">
<span>{{ (page._index - 1) * 10 + scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column <el-table-column
type="index"
width="120"
label="序号"
align="center" align="center"
label="mac地址"
prop="mac"
></el-table-column>
<el-table-column
align="center"
label="所属单位"
prop="organName"
></el-table-column> ></el-table-column>
<el-table-column align="center" label="mac地址" prop="mac"></el-table-column>
<el-table-column align="center" label="所属单位" prop="organName"></el-table-column>
<el-table-column align="center" label="机顶盒状态" prop="status"> <el-table-column align="center" label="机顶盒状态" prop="status">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{statusOptions[scope.row.status-1].label}}</span> <span>{{ statusOptions[scope.row.status - 1].label }}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<div class="partyt-pagination" style="margin: 0 20px"> <party-pagination :page="page" @changePage="handleCurrentChange" />
<el-pagination
background
@current-change="handleCurrentChange"
:current-page="page.currentPage"
:page-size="page.pageSize"
layout="prev, pager, next, jumper"
:total="page.total"
></el-pagination>
</div>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import { partyPagination } from "@/components/index";
import { getAreas } from "@/config/area.js"; import { getAreas } from "@/config/area.js";
import { getOrgListWithOutPage } from "@/config/organ.js"; import { getOrgListWithOutPage } from "@/config/organ.js";
export default { export default {
components: { partyPagination },
data() { data() {
return { return {
page: { page: {
currentPage: 1, _index: 1,
pageSize: 10, _size: 10,
total: 0, total: 0,
}, },
orgOptions: [], // 单位信息 orgOptions: [], // 单位信息
...@@ -137,15 +137,15 @@ export default { ...@@ -137,15 +137,15 @@ export default {
}, },
// 查询 // 查询
onSearch() { onSearch() {
this.page.currentPage = 1; this.page._index = 1;
this.getTableData(); this.getTableData();
}, },
// 获得数据接口 // 获得数据接口
getTableData() { getTableData() {
let vm = this; let vm = this;
let param = { let param = {
_index: this.page.currentPage, _index: this.page._index,
_size: this.page.pageSize, _size: this.page._size,
areaId: this.form.areaId.length areaId: this.form.areaId.length
? this.form.areaId[this.form.areaId.length - 1] ? this.form.areaId[this.form.areaId.length - 1]
: "", : "",
...@@ -184,7 +184,7 @@ export default { ...@@ -184,7 +184,7 @@ export default {
}, },
// 分页 // 分页
handleCurrentChange(val) { handleCurrentChange(val) {
this.page.currentPage = val; this.page._index = val;
this.getTableData(); this.getTableData();
}, },
}, },
......
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