0425b0b5 by zhaoqian

Merge remote-tracking branch 'origin/master'

2 parents ac783df5 c8f5310b
......@@ -219,7 +219,8 @@ export default {
width: 16px;
left: 9px;
top: 9px;
background: #c3c5c8;
background: url('../../assets/images/rowline.png');
background-position-y: center;
}
.third_layer::before {
content: "";
......@@ -238,7 +239,8 @@ export default {
width: 1px;
left: 9px;
top: 0px;
background: #c3c5c8;
background: url('../../assets/images/colline.png');
background-position-x: center;
}
.linkLine_first::after {
content: "";
......@@ -248,7 +250,8 @@ export default {
height: calc(100% + 14px);
width: 1px;
left: 9px;
background: #c3c5c8;
background: url('../../assets/images/colline.png');
background-position-x: center;
}
// 上半截
.linkLine_half_top::after {
......@@ -258,7 +261,8 @@ export default {
top: -14px;
width: 1px;
left: 9px;
background: #c3c5c8;
background: url('../../assets/images/colline.png');
background-position-x: center;
}
.linkLine_last::after {
content: "";
......@@ -267,7 +271,8 @@ export default {
width: 1px;
left: 9px;
top: 0px;
background: #c3c5c8;
background: url('../../assets/images/colline.png');
background-position-x: center;
}
.reTree_collapse_icon {
background: url("../../assets/images/reTree_collapse_.svg") no-repeat center
......
......@@ -55,6 +55,7 @@
total: 0,
pageNo: 1,
pageSize: 10,
qszt: 1,
queryData: {},
formData: {
user: "",
......@@ -68,7 +69,10 @@
created() {
},
mounted() {
this.getData({})
this.getData({
pageNo: this.pageNo,
pageSize: this.pageSize,
})
this.tableHeight = this.$refs.dataGrid.offsetHeight - 68;
},
methods: {
......@@ -79,6 +83,7 @@
this.getData(this.queryData);
},
getData(data) {
data['qszt'] = this.qszt
getSearchList(data).then(res => {
this.tableData = res.result.records
this.total = res.result.total
......
......@@ -42,7 +42,7 @@
</el-table>
<div class="pagination">
<el-pagination background layout="prev, pager, next" :total="total"
:current-page="pageNo" @current-change="handleCurrentChange">
:current-page="pageNo" @current-change="handleCurrentChange">
</el-pagination>
</div>
</div>
......@@ -59,6 +59,7 @@
props: {},
data() {
return {
qszt:2,
total: 0,
pageNo: 1,
pageSize: 10,
......@@ -90,6 +91,7 @@
this.getData(this.queryData);
},
getData(data) {
data['qszt'] = this.qszt
getSearchList(data).then(res => {
this.tableData = res.result.records
this.total = res.result.total
......@@ -136,7 +138,7 @@
width: 100%;
height: 100%;
box-sizing: border-box;
padding: 0 18px!important;
padding: 0 18px !important;
display: flex;
flex-direction: column;
background-color: #fcfdff;
......
......@@ -36,7 +36,7 @@
</el-table>
<div class="pagination">
<el-pagination background layout="prev, pager, next" :total="total"
:current-page="pageNo" @current-change="handleCurrentChange">
:current-page="pageNo" @current-change="handleCurrentChange">
</el-pagination>
</div>
</div>
......@@ -53,6 +53,7 @@
props: {},
data() {
return {
qszt: 1,
total: 0,
pageNo: 1,
pageSize: 10,
......@@ -80,6 +81,7 @@
this.getData(this.queryData);
},
getData(data) {
data['qszt'] = this.qszt
getSearchList(data).then(res => {
this.tableData = res.result.records
this.total = res.result.total
......