|
|
@@ -38,7 +38,7 @@
|
|
|
}
|
|
|
|
|
|
.van-steps--vertical {
|
|
|
- padding: .2rem 0 0 .8rem;
|
|
|
+ padding: 0 0 0 .8rem;
|
|
|
}
|
|
|
|
|
|
.van-step--vertical {
|
|
|
@@ -261,6 +261,7 @@
|
|
|
.timebox.collection .van-dropdown-menu__title{
|
|
|
color: #5F5E64 !important;
|
|
|
font-size: .28rem;
|
|
|
+ line-height: .4rem;
|
|
|
}
|
|
|
.timebox.collection .van-dropdown-menu__title.van-dropdown-menu__title--active {
|
|
|
color: #2ABED1 !important;
|
|
|
@@ -317,6 +318,7 @@
|
|
|
font-size: 0.28rem;
|
|
|
background: #f5f6f7;
|
|
|
margin-left:-0.8rem;
|
|
|
+ line-height: .44rem;
|
|
|
}
|
|
|
.export-row .highlight{
|
|
|
color: #2ABED1;
|
|
|
@@ -456,6 +458,7 @@
|
|
|
noData: false, // 无数据
|
|
|
},
|
|
|
list: [],
|
|
|
+ allSearchTotal: 0, // 进页面默认全部筛选时记录的total，用于传给服务端判断无数据的code返回
|
|
|
totalCount: 0,
|
|
|
distinctCount: 0, // 数据导出的标讯数量
|
|
|
page: 1,
|
|
|
@@ -528,6 +531,7 @@
|
|
|
this.endTime = pData.endTime
|
|
|
this.exact = pData.exact
|
|
|
this.selectArea = pData.selectArea
|
|
|
+ this.allSearchTotal = pData.allSearchTotal
|
|
|
} else {
|
|
|
this.getList()
|
|
|
}
|
|
|
@@ -557,18 +561,23 @@
|
|
|
sessionStorage.removeItem('$data-forecast_list')
|
|
|
}
|
|
|
var that = this;
|
|
|
+ var searchAll = that.dataType==='fwl' && !that.startTime && !that.endTime && !that.selectArea
|
|
|
that.loading = true
|
|
|
that.resetSet()
|
|
|
+ var searchParams = {
|
|
|
+ pageNum: that.page,
|
|
|
+ dataType: that.dataType,
|
|
|
+ startTime: that.startTime,
|
|
|
+ endTime: that.endTime,
|
|
|
+ area: that.selectArea,
|
|
|
+ }
|
|
|
+ if(that.dataType==='fwl' && (that.startTime || that.endTime || that.selectArea)) {
|
|
|
+ searchParams.total = that.allSearchTotal
|
|
|
+ }
|
|
|
$.ajax({
|
|
|
type: 'POST',
|
|
|
url: '/bigmember/forecast/forPList?t=' + new Date().getTime(),
|
|
|
- data: {
|
|
|
- pageNum: that.page,
|
|
|
- dataType: that.dataType,
|
|
|
- startTime: that.startTime,
|
|
|
- endTime: that.endTime,
|
|
|
- area: that.selectArea
|
|
|
- },
|
|
|
+ data:searchParams,
|
|
|
success: function (res) {
|
|
|
that.loading = false;
|
|
|
if (res.error_code == 0) {
|
|
|
@@ -587,6 +596,10 @@
|
|
|
}
|
|
|
that.totalCount = res.data.count || 0
|
|
|
that.distinctCount = res.data.distinctCount || 0
|
|
|
+ // 默认筛选全部的时候，记录当前总数（服务端需要参数）
|
|
|
+ if(that.dataType==='fwl' && !that.startTime && !that.endTime && !that.selectArea) {
|
|
|
+ that.allSearchTotal = res.data.count || 0
|
|
|
+ }
|
|
|
if (res.data.list) {
|
|
|
that.loading = false;
|
|
|
res.data.list.forEach(function (v, i) {
|
