diff --git a/pages/portShipping/pilotStation/form.vue b/pages/portShipping/pilotStation/form.vue index 72be864..723afce 100644 --- a/pages/portShipping/pilotStation/form.vue +++ b/pages/portShipping/pilotStation/form.vue @@ -36,7 +36,7 @@

引航站每日引航艘次数:

- + @@ -52,7 +52,7 @@

青岛港区引航量:

- + @@ -68,7 +68,7 @@

董家口港区引航量:

- + diff --git a/pages/roadTransport/dataSubmission/form.vue b/pages/roadTransport/dataSubmission/form.vue index 2bd227d..0bedf49 100644 --- a/pages/roadTransport/dataSubmission/form.vue +++ b/pages/roadTransport/dataSubmission/form.vue @@ -47,38 +47,38 @@

交通运输情况：

- +

较大以上安全事故次数

- +

当日人员伤者数(人)

- +

交通运行情况

- +

当日人员亡者数(人)

- +

应急情况报告

- + @@ -108,7 +108,7 @@

投放运力-总客车数

-

{{roadData.capacityTotalBus}}

+

{{roadData.capacityTotalBus ? roadData.capacityTotalBus : ''}}

投放运力-加班数

- + @@ -140,7 +140,7 @@

投放运力-定线通勤班次

- + @@ -152,58 +152,58 @@

投放运力-除定线通勤包车、农民工包车班次

- +

投放运力-包车班次

-

{{roadData.capacityCharterTrips}}

+

{{roadData.capacityCharterTrips ? roadData.capacityCharterTrips : ''}}

投放运力-班次

-

{{roadData.capacityTotalTrips}}

+

{{roadData.capacityTotalTrips ? roadData.capacityTotalTrips : ''}}

 -

班车客运量(万)

+

班车客运量(人)

- + -

定线通勤包车客运量(万)

+

定线通勤包车客运量(人)

- + -

运送农民工包车客运量(万)

+

运送农民工包车客运量(人)

- + -

除定线通勤包车、农民工包车以外的客运量(万)

+

除定线通勤包车、农民工包车以外的客运量(人)

- + -

包车客运量(万)

+

包车客运量(人)

-

{{roadData.charterPassengerVolume}}

+

{{roadData.charterPassengerVolume ? roadData.charterPassengerVolume : ''}}

 -

完成客运量(万)

+

完成客运量(人)

-

{{roadData.totalPassengerVolume}}

+

{{roadData.totalPassengerVolume ? roadData.totalPassengerVolume : ''}}

 @@ -222,25 +222,25 @@

总客位数(座)

- + -

营运收入(万)

+

营运收入(元)

- + -

联网售票张数(万张)

+

联网售票张数(张)

- + -

定制客运量(万人)

+

定制客运量(人)

- + - + @@ -433,21 +433,21 @@ import { calcMom, calcYoy, checkNotEmpty, getDateStr, lastYearDate } from '../.. regularCommuteCharter:'',//定线通勤包车辆 migrantWorkersCharter:'',//运送农民工报车辆 otherCharter:'',//除定线、农民工包车辆 - capacityCharter:0, //投放运力：包车数 + capacityCharter:null, //投放运力：包车数 capacityShuttle:'', //投放运力：班车数 - capacityTotalBus:0, //投放运力：总客车数 + capacityTotalBus:null, //投放运力：总客车数 regularCommuteTrips:"", //定线通勤班次 migrantWorkersTrips:"", //运送农民工班次 otherTrips:"", //除定线通勤包车、农民工包车班次 - capacityCharterTrips:0, //投放运力：包车班次 + capacityCharterTrips:null, //投放运力：包车班次 capacityShuttleTrips:"", //投放运力：班车班次 - capacityTotalTrips:0, //投放运力：班次 + capacityTotalTrips:null, //投放运力：班次 regularCommutePassengerVolume:"", //定线通勤包车客运量(万) migrantWorkersPassengerVolume:"", //运送农民工包车客运量(万) otherPassengerVolume:"", //除定线通勤包车、农民工包车以外的客运量(万) - charterPassengerVolume:0, //包车客运量(万) + charterPassengerVolume:null, //包车客运量(万) shuttlePassengerVolume:"", //班车客运量(万) - totalPassengerVolume:0, //完成客运量(万) + totalPassengerVolume:null, //完成客运量(万) totalSeatCapacity:"", //总客位数(座) passengerVolumeLastYear:"", //去年同期客运量(万) totalBusLastYear:"", //去年总客车量(辆) @@ -693,16 +693,18 @@ import { calcMom, calcYoy, checkNotEmpty, getDateStr, lastYearDate } from '../.. reportPhase:this.roadData.reportPhase, reportUnit:this.roadData.reportingUnitId } - this.$request(getApp().globalData.baseUrl + '/api/biz/roadtransport/road/findByStatisticalDate',params,"GET").then(res =>{ + this.$request(getApp().globalData.baseUrl + '/api/biz/roadtransport/road/getYoYMoM',params,"GET").then(res =>{ + console.log('同环比===>',res) this.lastData = res.data; // this.calcRatio() - // let yesterdayData = res.data.yesterdayData; - // let lastYearData = res.data.lastYearData; - // this.roadData.passengerVolumeYesterday = yesterdayData.totalPassengerVolume - // this.roadData.passengerVolumeLastYear = lastYearData.totalPassengerVolume + let yesterdayData = res.data.yesterdayData; + let lastYearData = res.data.lastYearData; - // this.roadData.totalBusYesterday = yesterdayData.capacityTotalBus - // this.roadData.totalBusLastYear = yesterdayData.capacityTotalBus + this.roadData.passengerVolumeYesterday = yesterdayData.totalPassengerVolume + this.roadData.passengerVolumeLastYear = lastYearData.totalPassengerVolume + + this.roadData.totalBusYesterday = yesterdayData.capacityTotalBus + this.roadData.totalBusLastYear = lastYearData.capacityTotalBus // 客运量与去年同期比率(%) // 同比逻辑： @@ -710,16 +712,19 @@ import { calcMom, calcYoy, checkNotEmpty, getDateStr, lastYearDate } from '../.. // 2、今日数据有值且不为0，去年数据无值为-，去年数据为0时为100； // 3、今日数据无值，去年数据无论有值或为0，同比为- // 4、今日、去年今日都有值且都不为0时，按照公式计算(今日-去年今日)/去年今日 * 100； - this.roadData.passengerVolumeYesterdayRatio = calcMom(checkNotEmpty(this.roadData.totalPassengerVolume) ? this.roadData.totalPassengerVolume * 10000 : this.roadData.totalPassengerVolume,checkNotEmpty(this.lastData.passengerVolumeYesterday) ? this.lastData.passengerVolumeYesterday * 10000 : this.lastData.passengerVolumeYesterday) - this.roadData.passengerVolumeRatio = calcYoy(checkNotEmpty(this.roadData.totalPassengerVolume) ? this.roadData.totalPassengerVolume * 10000 : this.roadData.totalPassengerVolume,checkNotEmpty(this.lastData.passengerVolumeLastYear) ? this.lastData.passengerVolumeLastYear * 10000 : this.lastData.passengerVolumeLastYear) + // this.roadData.passengerVolumeYesterdayRatio = calcMom(checkNotEmpty(this.roadData.totalPassengerVolume) ? this.roadData.totalPassengerVolume * 10000 : this.roadData.totalPassengerVolume,checkNotEmpty(yesterdayData.totalPassengerVolume) ? yesterdayData.totalPassengerVolume * 10000 : yesterdayData.totalPassengerVolume) + // this.roadData.passengerVolumeRatio = calcYoy(checkNotEmpty(this.roadData.totalPassengerVolume) ? this.roadData.totalPassengerVolume * 10000 : this.roadData.totalPassengerVolume,checkNotEmpty(lastYearData.totalPassengerVolume) ? lastYearData.totalPassengerVolume * 10000 : lastYearData.totalPassengerVolume) + + this.roadData.passengerVolumeYesterdayRatio = calcMom(this.roadData.totalPassengerVolume,yesterdayData.totalPassengerVolume); + this.roadData.passengerVolumeRatio = calcYoy( this.roadData.totalPassengerVolume,lastYearData.totalPassengerVolume) // (checkNotEmpty(this.roadData.totalPassengerVolume) && this.roadData.totalPassengerVolume != 0 && checkNotEmpty(this.lastData.totalPassengerVolume) && this.lastData.totalPassengerVolume === 0) ? 100 : // (checkNotEmpty(this.roadData.totalPassengerVolume) && checkNotEmpty(this.lastData.totalPassengerVolume) && this.roadData.totalPassengerVolume != 0 && this.lastData.totalPassengerVolume != 0) ? // (this.roadData.totalPassengerVolume - this.lastData.totalPassengerVolume) / this.lastData.totalPassengerVolume * 100 : // (this.roadData.totalPassengerVolume == 0 && this.lastData.totalPassengerVolume == 0) ? 0 : '' // // 客车总量同比上升 - this.roadData.totalBusIncreaseYesterdayRatio = calcMom(this.roadData.capacityTotalBus,this.lastData.totalBusYesterday) - this.roadData.totalBusIncreaseRatio = calcYoy(this.roadData.capacityTotalBus,this.lastData.totalBusLastYear) + this.roadData.totalBusIncreaseYesterdayRatio = calcMom(this.roadData.capacityTotalBus,yesterdayData.capacityTotalBus) + this.roadData.totalBusIncreaseRatio = calcYoy(this.roadData.capacityTotalBus,lastYearData.capacityTotalBus) // (checkNotEmpty(this.roadData.capacityTotalBus) && this.roadData.capacityTotalBus != 0 && checkNotEmpty(this.lastData.capacityTotalBus) && this.lastData.capacityTotalBus === 0) ? 100 : // (checkNotEmpty(this.roadData.capacityTotalBus) && checkNotEmpty(this.lastData.capacityTotalBus) && this.roadData.capacityTotalBus != 0 && this.lastData.capacityTotalBus != 0) ?