重置
@@ -75,6 +75,9 @@ contentnomore: "没有更多数据了", }, status: '', + timeArray:[], + timeName:'', + reportPhase:'', } }, @@ -82,6 +85,14 @@ this.page = 0; this.hasMore = true; this.listData = []; + this.queryTime(); + this.loadMore() + }, + onPullDownRefresh() { + this.page = 0; + this.hasMore = true; + this.listData = []; + this.queryTime(); this.loadMore() }, methods: { @@ -94,7 +105,8 @@ pageSize:this.pageSize, reportDateStart:this.timeRange.length !== 0 ? this.timeRange[0] : '', reportDateEnd:this.timeRange.length !== 0 ? this.timeRange[1] : '', - _t:Date.parse(new Date()) + _t:Date.parse(new Date()), + statPeriod:this.reportPhase } this.$request(getApp().globalData.baseUrl + '/api/biz/busdata/list',params,"GET").then(res =>{ console.log(res) @@ -117,6 +129,13 @@ handleSearch(){ this.$refs.popup.open('bottom') }, + //时段 + queryTime() { + this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=airport_time' + '&_t=' + Date.parse( + new Date()), {}, 'GET').then(res => { + this.timeArray = res.data; + }) + }, // 点击筛选弹窗中的筛选按钮 searchList(){ this.hasMore = true; @@ -128,12 +147,23 @@ // 点击筛选弹窗中的重置按钮 searchReset(){ this.timeRange = []; + this.timeName = ''; + this.reportPhase = '' this.listData = []; this.hasMore = true; this.page = 0; this.$refs.popup.close() this.loadMore(); }, + // 选中时段数据 + bindPickerChange(e){ + let index = e.target.value //取其下标 + var selected = this.timeArray[index] //获取选中的数组 + console.log(selected) + this.timeName = selected.dictLabel + this.reportPhase = selected.dictValue; + // this.timeName = this.timeArray[index].dictLabel) + }, // 跳转编辑页面 editItem(row){ uni.navigateTo({ @@ -299,10 +329,8 @@ left: 0; right: 0; bottom: 0; - display: flex; - justify-content: space-around; background-color: #F8F8F8; - padding: 20px 30rpx; + padding: 20px 30rpx 40px; .act_btn { width: 690rpx; diff --git a/pages/portShipping/pilotStation/form.vue b/pages/portShipping/pilotStation/form.vue index 8da7674..72be864 100644 --- a/pages/portShipping/pilotStation/form.vue +++ b/pages/portShipping/pilotStation/form.vue @@ -231,10 +231,11 @@ import { calcMom, calcYoy, checkNotEmpty, getDateStr } from '../../../common/uti this.timeName = item.dictLabel } }) - // this.getRatio() + this.getYoyMom() }else if(this.pageType == 'add'){ let now = new Date(); - let dateStr = getDateStr(now,0); + // let dateStr = getDateStr(now,0); + let dateStr = getDateStr(now, 0).replaceAll('-','/'); if(new Date(dateStr + ' 11:00').getTime() < new Date().getTime() && new Date().getTime() < new Date(dateStr + ' 13:30').getTime()) { this.form.statPeriod = "0012"; this.index = this.roadTime.findIndex(item => item.dictValue == "0012") diff --git a/pages/portShipping/pilotStation/list.vue b/pages/portShipping/pilotStation/list.vue index 7379dba..bab4a22 100644 --- a/pages/portShipping/pilotStation/list.vue +++ b/pages/portShipping/pilotStation/list.vue @@ -26,7 +26,7 @@重置
@@ -75,13 +75,23 @@ contentnomore: "没有更多数据了", }, status: '', - + timeArray:[], + timeName:'', + reportPhase:'', } }, onShow() { this.page = 0; this.hasMore = true; this.listData = []; + this.queryTime(); + this.loadMore() + }, + onPullDownRefresh() { + this.page = 0; + this.hasMore = true; + this.listData = []; + this.queryTime(); this.loadMore() }, methods: { @@ -94,7 +104,8 @@ pageSize:this.pageSize, reportDateStart:this.timeRange.length !== 0 ? this.timeRange[0] : '', reportDateEnd:this.timeRange.length !== 0 ? this.timeRange[1] : '', - _t:Date.parse(new Date()) + _t:Date.parse(new Date()), + statPeriod:this.reportPhase } this.$request(getApp().globalData.baseUrl + '/api/biz/bizPilotData/list',params,"GET").then(res =>{ console.log(res) @@ -125,15 +136,33 @@ this.$refs.popup.close() this.loadMore() }, + //时段 + queryTime() { + this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=airport_time' + '&_t=' + Date.parse( + new Date()), {}, 'GET').then(res => { + this.timeArray = res.data; + }) + }, // 点击筛选弹窗中的重置按钮 searchReset(){ this.timeRange = []; + this.timeName = ''; + this.reportPhase = '' this.listData = []; this.hasMore = true; this.page = 0; this.$refs.popup.close() this.loadMore(); }, + // 选中时段数据 + bindPickerChange(e){ + let index = e.target.value //取其下标 + var selected = this.timeArray[index] //获取选中的数组 + console.log(selected) + this.timeName = selected.dictLabel + this.reportPhase = selected.dictValue; + // this.timeName = this.timeArray[index].dictLabel) + }, // 跳转编辑页面 editItem(row){ uni.navigateTo({ @@ -300,10 +329,8 @@ left: 0; right: 0; bottom: 0; - display: flex; - justify-content: space-around; background-color: #F8F8F8; - padding: 20px 30rpx; + padding: 20px 30rpx 40px; .act_btn { width: 690rpx; diff --git a/pages/roadTransport/dataSubmission/form.vue b/pages/roadTransport/dataSubmission/form.vue index fd5c1eb..2bd227d 100644 --- a/pages/roadTransport/dataSubmission/form.vue +++ b/pages/roadTransport/dataSubmission/form.vue @@ -159,7 +159,8 @@ this.timeName = this.roadTime.find(item => item.dictValue == this.synthData.reportPhase).dictLabel }else if(this.pageType == 'add'){ let now = new Date(); - let dateStr = getDateStr(now,0); + // let dateStr = getDateStr(now,0); + let dateStr = getDateStr(now, 0).replaceAll('-','/'); if(new Date(dateStr + ' 11:00').getTime() < new Date().getTime() && new Date().getTime() < new Date(dateStr + ' 13:30').getTime()){ this.synthData.reportPhase = "0012"; this.index = this.roadTime.findIndex(item => item.dictValue == "0012") diff --git a/pages/roadTransport/dataSubmission/list.vue b/pages/roadTransport/dataSubmission/list.vue index 40c6939..97601dd 100644 --- a/pages/roadTransport/dataSubmission/list.vue +++ b/pages/roadTransport/dataSubmission/list.vue @@ -37,7 +37,7 @@重置
@@ -87,12 +87,23 @@ contentnomore: "没有更多数据了", }, status: '', + reportPhase:'', + timeArray:[], + timeName:'', } }, onShow(){ this.page = 0; this.hasMore = true; - this.synthData = [] + this.synthData = []; + this.queryTime() + this.loadMore() + }, + onPullDownRefresh() { + this.page = 0; + this.hasMore = true; + this.synthData = []; + this.queryTime() this.loadMore() }, methods: { @@ -107,7 +118,8 @@ _t:Date.parse(new Date()), reportDatetimeStart:this.timeRange.length != 0 ? this.timeRange[0] : '', reportDatetimeEnd:this.timeRange.length != 0 ? this.timeRange[1] : '', - departmentId:this.unit ? this.unit : '' + departmentId:this.unit ? this.unit : '', + statPeriod:this.reportPhase } this.$request(getApp().globalData.baseUrl + '/api/biz/roadtransport/operation/list',params,"GET").then(res =>{ console.log(res) @@ -124,6 +136,13 @@ }) } }, + //时段 + queryTime() { + this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=airport_time' + '&_t=' + Date.parse( + new Date()), {}, 'GET').then(res => { + this.timeArray = res.data; + }) + }, // 点击编辑按钮 editItem(row){ @@ -159,9 +178,20 @@ this.$refs.popup.close() this.loadMore() }, + // 选中时段数据 + bindPickerChange(e){ + let index = e.target.value //取其下标 + var selected = this.timeArray[index] //获取选中的数组 + console.log(selected) + this.timeName = selected.dictLabel + this.reportPhase = selected.dictValue; + // this.timeName = this.timeArray[index].dictLabel) + }, // 点击筛选弹窗中的重置按钮 searchReset(){ this.timeRange = []; + this.timeName = ''; + this.reportPhase = '' this.hasMore = true; this.synthData = []; this.page = 0; @@ -314,10 +344,8 @@ left: 0; right: 0; bottom: 0; - display: flex; - justify-content: space-around; background-color: #F8F8F8; - padding: 20px 30rpx; + padding: 20px 30rpx 40px; .act_btn { width: 690rpx; diff --git a/pages/roadTransport/transportData/form.vue b/pages/roadTransport/transportData/form.vue index bb44494..141187c 100644 --- a/pages/roadTransport/transportData/form.vue +++ b/pages/roadTransport/transportData/form.vue @@ -76,37 +76,39 @@投放运力-班车数
投放运力-定线通勤包车(辆)
运送农民工报车(辆)
+投放运力-运送农民工包车(辆)
投放运力-除定线、农民工包车(辆)
+投放运力-除定线通勤、农民工包车(辆)
投放运力-包车数
{{roadData.capacityCharter}}
+投放运力-总客车数
{{roadData.capacityTotalBus}}
投放运力-加班数
投放运力-班车班次
投放运力-定线通勤班次
投放运力-运送农民工班次
投放运力-除定线通勤包车、农民工包车班次
投放运力-包车班次
{{roadData.capacityCharterTrips}}
+投放运力-班次
{{roadData.capacityTotalTrips}}
+班车客运量(万)
定线通勤包车客运量(万)
运送农民工包车客运量(万)
+除定线通勤包车、农民工包车以外的客运量(万)
包车客运量(万)
{{roadData.charterPassengerVolume}}
+完成客运量(万)
{{roadData.totalPassengerVolume}}
+运送农民工包车客运量(万)
-定制客运量(万人)
重置
@@ -125,6 +126,7 @@ size:10, timeArray:[], timeName:'', + reportPhase:'', } }, onShow(){ @@ -184,7 +186,7 @@ var selected = this.timeArray[index] //获取选中的数组 console.log(selected) this.timeName = selected.dictLabel - // this.roadData.reportPhase = selected.dictValue; + this.reportPhase = selected.dictValue; // this.timeName = this.timeArray[index].dictLabel) }, // 点击筛选弹窗中的筛选按钮 @@ -198,6 +200,8 @@ // 点击筛选弹窗中的重置按钮 searchReset(){ this.unit = ''; + this.timeName = ''; + this.reportPhase = '' this.timeRange = []; this.listData = []; this.hasMore = true; @@ -215,7 +219,8 @@ pageSize:this.size, statisticalDateStart:this.timeRange.length !== 0 ? this.timeRange[0] : '', statisticalDateEnd:this.timeRange.length !== 0 ? this.timeRange[1] : '', - _t:Date.parse(new Date()) + _t:Date.parse(new Date()), + statPeriod:this.reportPhase } this.$request(getApp().globalData.baseUrl + '/api/biz/roadtransport/road/list',params,"GET").then(res =>{ console.log(res) @@ -339,6 +344,13 @@ text-align: center; margin-bottom: 30rpx; } + .unit_station { + color: #666; + font-size: 24rpx; + font-family: PingFang SC-Regular, PingFang SC; + font-weight: 400; + text-align: right; + } .item{ width: 570rpx; @@ -440,10 +452,8 @@ left: 0; right: 0; bottom: 0; - display: flex; - justify-content: space-around; background-color: #F8F8F8; - padding: 20px 30rpx; + padding: 20px 30rpx 40px; .act_btn { width: 690rpx;