diff --git a/src/views/InformationQuery.vue b/src/views/InformationQuery.vue index da9efec..e47af60 100644 --- a/src/views/InformationQuery.vue +++ b/src/views/InformationQuery.vue @@ -97,6 +97,19 @@ + +
+ +
@@ -133,7 +146,10 @@ export default { bgData: [], arr1: [], arr0: [], - conversion: [] + conversion: [], + pageSize: 1, + currentPage: 1, + totalCount: 1, }; }, computed: {}, @@ -143,6 +159,7 @@ export default { methods: { /** 筛选函数 */ scree() { + this.currentPage = 1; if (this.sub == 0) { this.sub = '' } else if (this.sub == 1) { @@ -150,7 +167,7 @@ export default { } else { this.sub = 1 } - this.getData(this.type_value, this.years[this.year_value], this.year_status, this.sub); + this.getData(this.type_value, this.years[this.year_value], this.year_status, this.sub, this.currentPage); if (this.sub == '') { this.sub = 0 } else if (this.sub == 0) { @@ -173,7 +190,7 @@ export default { let s = this.sub; s = index; this.sub = s; - + this.currentPage = 1; switch (this.sub) { case 0: this.getData(this.type_value, this.years[this.year_value], this.year_status); @@ -186,19 +203,24 @@ export default { } }, /** 获取后台数据 */ - getData(type = '', year = '', yearStatus = '', status = '') { + getData(type = this.type_value, year = this.years[this.year_value], yearStatus = this.year_status, status = '', page = this.currentPage) { if (type == "组织类型") { type = '' + // this.type_value = '' } if (year == '年检时间') { year = '' + // this.years[this.year_value] = '' } if (yearStatus == '年检结果') { yearStatus = '' + // this.year_status = '' } let _this = this + console.log(type); + this.$http({ method: 'post', url: 'v1/society/society', @@ -206,21 +228,31 @@ export default { type: type, year: year, yearStatus: yearStatus, - status: status + status: status, + page: page } }).then(res => { if (res.data.data.code !== 200) { return; } - _this.bgData = res.data.data.data.info - _this.conversion = _this.bgData - + // if (this.page == 1) { + if (res.data.data.data.info.length == 0) { + alert('您所查询的数据暂时没有!') + return; + } else { + _this.conversion = res.data.data.data.info + _this.totalCount = res.data.data.data.allPage + // console.log(_this.conversion); + } + _this.page++ }) // eslint-disable-next-line handle-callback-err .catch(err => { console.log(err) }) + // console.log(this.type_value); + if (this.type_value === '') { this.type_value = '组织类型' } @@ -272,13 +304,22 @@ export default { this.$message('您搜索的内容暂无~') } }, + handleSizeChange(val) { + this.pageSize = val; + this.getPackData(); + }, + handleCurrentChange(val) { + this.currentPage = val; + this.getData() + this.getPackData(); + }, + getPackData() { } }, created() { - this.getData() this.getDataG() + this.getData() }, - mounted() { - } + mounted() { } }; @@ -295,6 +336,51 @@ export default { box-sizing: border-box; padding: 35px 30px 86px; + .page { + margin-top: 60px; + height: 36px; + display: flex; + justify-content: flex-end; + align-items: center; + + /deep/ .el-pagination.is-background .el-pager li { + color: #333 !important; + } + + /deep/ .el-pagination.is-background .el-pager li:not(.disabled).active { + background-color: #e60012; + color: #fff !important; + } + + /deep/ .el-icon.el-icon-arrow-left::before { + content: '上一页'; + font-family: 'MicrosoftYaHei'; + font-size: 12px; + font-weight: normal; + font-stretch: normal; + letter-spacing: 1px; + color: #666; + } + + /deep/ .el-pagination .btn-prev { + width: 80px; + } + + /deep/ .el-pagination .btn-next { + width: 80px; + } + + /deep/ .el-icon.el-icon-arrow-right::before { + content: '下一页'; + font-family: 'MicrosoftYaHei'; + font-size: 12px; + font-weight: normal; + font-stretch: normal; + letter-spacing: 1px; + color: #666; + } + } + .box-table { width: 100%; margin-top: -25px; @@ -309,7 +395,7 @@ export default { counter-increment: items 1; /* 1 同样可以省略 */ &:before { content: counter(items); - font-family: "MicrosoftYaHei"; + font-family: 'MicrosoftYaHei'; font-size: 16px; font-weight: normal; font-stretch: normal; @@ -328,7 +414,7 @@ export default { line-height: 40px; text-align: center; height: 40px; - font-family: "MicrosoftYaHei"; + font-family: 'MicrosoftYaHei'; font-size: 16px; font-weight: normal; font-stretch: normal; @@ -342,27 +428,27 @@ export default { } &:nth-of-type(2) { width: 160px; - border-left: 1px solid #dcebf6!important; + border-left: 1px solid #dcebf6 !important; } &:nth-of-type(3) { width: 240px; - border-left: 1px solid #dcebf6!important; + border-left: 1px solid #dcebf6 !important; } &:nth-of-type(4) { width: 160px; - border-left: 1px solid #dcebf6!important; + border-left: 1px solid #dcebf6 !important; } &:nth-of-type(5) { width: 160px; - border-left: 1px solid #dcebf6!important; + border-left: 1px solid #dcebf6 !important; } &:nth-of-type(6) { width: 160px; - border-left: 1px solid #dcebf6!important; + border-left: 1px solid #dcebf6 !important; } &:nth-of-type(7) { width: 140px; - border-left: 1px solid #dcebf6!important; + border-left: 1px solid #dcebf6 !important; } } @@ -374,11 +460,11 @@ export default { } td { - border:none!important; + border: none !important; line-height: 40px; text-align: center; height: 40px; - font-family: "MicrosoftYaHei"; + font-family: 'MicrosoftYaHei'; font-size: 16px; font-weight: normal; font-stretch: normal; @@ -388,27 +474,27 @@ export default { &:nth-of-type(1) { width: 160px; - border-left: 1px solid #dcebf6!important; + border-left: 1px solid #dcebf6 !important; } &:nth-of-type(2) { width: 240px; - border-left: 1px solid #dcebf6!important; + border-left: 1px solid #dcebf6 !important; } &:nth-of-type(3) { width: 160px; - border-left: 1px solid #dcebf6!important; + border-left: 1px solid #dcebf6 !important; } &:nth-of-type(4) { width: 160px; - border-left: 1px solid #dcebf6!important; + border-left: 1px solid #dcebf6 !important; } &:nth-of-type(5) { width: 160px; - border-left: 1px solid #dcebf6!important; + border-left: 1px solid #dcebf6 !important; } &:nth-of-type(6) { width: 140px; - border-left: 1px solid #dcebf6!important; + border-left: 1px solid #dcebf6 !important; } /* &:nth-of-type(7) { @@ -431,7 +517,7 @@ export default { display: inline-block; height: 38px; text-align: center; - font-family: "MicrosoftYaHei"; + font-family: 'MicrosoftYaHei'; font-size: 20px; font-weight: normal; font-stretch: normal; @@ -455,7 +541,7 @@ export default { position: relative; &::after { - content: ""; + content: ''; width: 100%; height: 2px; background-image: linear-gradient(#e60012, #e60012), @@ -479,7 +565,7 @@ export default { border-radius: 4px; border: solid 1px #c7c7c7; padding: 10px 24px; - font-family: "MicrosoftYaHei"; + font-family: 'MicrosoftYaHei'; font-size: 18px; font-weight: normal; font-stretch: normal; @@ -506,9 +592,10 @@ export default { -moz-appearance: none; -webkit-appearance: none; /* 右侧添加小箭头的背景图 */ - background: url("../../static/img/xa.png") 126px center no-repeat; + background: url('../../static/img/xa.png') 90% center no-repeat; background-size: 14px 8px; - width: 170px; + // width: 170px; + padding: 0 30px; height: 38px; background-color: #f9f8f8; border-radius: 4px; @@ -519,7 +606,7 @@ export default { -moz-appearance: none; -webkit-appearance: none; /* 右侧添加小箭头的背景图 */ - background: url("../../static/img/xa.png") 126px center no-repeat; + background: url('../../static/img/xa.png') 126px center no-repeat; background-size: 14px 8px; width: 170px; height: 38px; @@ -544,7 +631,7 @@ export default { margin-bottom: 30px; input { - font-family: "MicrosoftYaHei"; + font-family: 'MicrosoftYaHei'; font-size: 18px; font-weight: normal; font-stretch: normal; @@ -562,7 +649,7 @@ export default { width: 96px; height: 50px; background-color: #e60012; - font-family: "MicrosoftYaHei"; + font-family: 'MicrosoftYaHei'; font-size: 18px; font-weight: normal; font-stretch: normal; diff --git a/src/views/project/Application.vue b/src/views/project/Application.vue index 4170e1f..f8fb401 100644 --- a/src/views/project/Application.vue +++ b/src/views/project/Application.vue @@ -53,7 +53,12 @@