diff --git a/pages.json b/pages.json index 8de1360..0d24beb 100644 --- a/pages.json +++ b/pages.json @@ -21,7 +21,8 @@ { "path": "pages/highway/runData/list", "style": { - "navigationBarTitleText": "高速运行数据" + "navigationBarTitleText": "高速运行数据", + "enablePullDownRefresh": true } }, { @@ -39,7 +40,8 @@ { "path": "pages/highway/runStatusData/list", "style": { - "navigationBarTitleText": "高速运行情况" + "navigationBarTitleText": "高速运行情况", + "enablePullDownRefresh": true } }, { @@ -57,7 +59,8 @@ { "path": "pages/railway/railwayRunData/list", "style": { - "navigationBarTitleText": "铁路运行数据" + "navigationBarTitleText": "铁路运行数据", + "enablePullDownRefresh": true } }, { @@ -75,7 +78,8 @@ { "path": "pages/railway/runStatus/list", "style": { - "navigationBarTitleText": "铁路运行情况" + "navigationBarTitleText": "铁路运行情况", + "enablePullDownRefresh": true } }, { @@ -87,7 +91,8 @@ { "path": "pages/water/TransportData/list", "style": { - "navigationBarTitleText": "水运运输数据" + "navigationBarTitleText": "水运运输数据", + "enablePullDownRefresh": true } }, { @@ -99,7 +104,8 @@ { "path": "pages/water/waterWay/list", "style": { - "navigationBarTitleText": "水路(陆岛)数据" + "navigationBarTitleText": "水路(陆岛)数据", + "enablePullDownRefresh": true } }, { @@ -111,7 +117,8 @@ { "path": "pages/water/transportation/list", "style": { - "navigationBarTitleText": "水运运输情况" + "navigationBarTitleText": "水运运输情况", + "enablePullDownRefresh": true } }, { @@ -178,9 +185,9 @@ ], "globalStyle": { "pageOrientation": "portrait", - "navigationBarTitleText": "Hello uniapp", - "navigationBarTextStyle": "white", - "navigationBarBackgroundColor": "#007AFF", + "navigationBarTitleText": "交通运输局一体化平台", + "navigationBarTextStyle": "black", + "navigationBarBackgroundColor": "#ffffff", "backgroundColor": "#F8F8F8", "backgroundColorTop": "#F4F5F6", "backgroundColorBottom": "#F4F5F6", diff --git a/pages/highWay/runData/form.vue b/pages/highWay/runData/form.vue index 8a6f9dc..d2abe6b 100644 --- a/pages/highWay/runData/form.vue +++ b/pages/highWay/runData/form.vue @@ -1,721 +1,818 @@ - - - - \ No newline at end of file + + + + diff --git a/pages/railway/railwayRunData/form.vue b/pages/railway/railwayRunData/form.vue index fb3cc0d..aed5029 100644 --- a/pages/railway/railwayRunData/form.vue +++ b/pages/railway/railwayRunData/form.vue @@ -61,14 +61,14 @@ - + + :style="form.inboundRailwayDo && form.inboundRailwayDo == yoyMom.yesterdayData.inboundRailwayDo ? 'color: #EB4747' : ''"> 终到车次环比(%) + :style="form.inboundRailwayDo && form.inboundRailwayDo == yoyMom.yesterdayData.inboundRailwayDo ? 'color: #EB4747' : ''"> {{form.inRailwayYomDo ? form.inRailwayYomDo.toFixed(2) : ''}} @@ -89,14 +89,14 @@ - + 人数环比(%) + :style="form.inPepole && form.inPepole == yoyMom.yesterdayData.inPepole ? 'color: #EB4747' : ''">人数环比(%) + :style="form.inPepole && form.inPepole == yoyMom.yesterdayData.inPepole ? 'color: #EB4747' : ''"> {{form.inPepoleYoyDo ? form.inPepoleYoyDo.toFixed(2) : ''}} @@ -140,14 +140,13 @@ - + + :style="form.outboundRailwayDo && form.outboundRailwayDo == yoyMom.yesterdayData.outboundRailwayDo ? 'color: #EB4747' : ''"> 始发车次环比(%) + :style="form.outboundRailwayDo && form.outboundRailwayDo == yoyMom.yesterdayData.outboundRailwayDo ? 'color: #EB4747' : ''"> {{form.outRailwayYomDo ? form.outRailwayYomDo.toFixed(2) : ''}} @@ -168,14 +167,13 @@ - + 人数环比(%) + :style="form.outPepole && form.outPepole == yoyMom.yesterdayData.outPeople ? 'color: #EB4747' : ''">人数环比(%) + :style="form.outPepole && form.outPepole == yoyMom.yesterdayData.outPeople ? 'color: #EB4747' : ''"> {{form.outPepoleYoyDo ? form.outPepoleYoyDo.toFixed(2) : ''}} @@ -214,22 +212,22 @@ return { form: { "inMark": "", - "inPepole": 0, - "inPepoleMomDo": 0.0, - "inPepoleYoyDo": 0.0, - "inRailwayMomDo": 0.0, - "inRailwayYomDo": 0.0, - "inboundPassengersDo": 0, - "inboundRailwayDo": 0, + "inPepole": '', + "inPepoleMomDo": '', + "inPepoleYoyDo": '', + "inRailwayMomDo": '', + "inRailwayYomDo": '', + "inboundPassengersDo": '', + "inboundRailwayDo": '', "isHoliday": "", "outMark": "", - "outPepole": 0, - "outPepoleMomDo": 0.0, - "outPepoleYoyDo": 0.0, - "outRailwayMomDo": 0.0, - "outRailwayYomDo": 0.0, - "outboundPassengersDo": 0, - "outboundRailwayDo": 0, + "outPepole": '', + "outPepoleMomDo": '', + "outPepoleYoyDo": '', + "outRailwayMomDo": '', + "outRailwayYomDo": '', + "outboundPassengersDo": '', + "outboundRailwayDo": '', "railwayName": "", "statDate": "", "statPeriod": "" @@ -251,13 +249,11 @@ this.pageType = 'add'; let now = new Date(); this.form.statDate = getDateStr(now, -1); //默认前一天 - this.queryYoyMom(); //同比环比 this.queryTime(); //统计时段 } else if (options.id) { this.$request(getApp().globalData.baseUrl + '/api/biz/railwayRunData/find/' + options.id, {}, "GET").then( res => { this.form = res.data; - this.queryYoyMom(); this.queryTime(); //统计时段 }); } @@ -281,32 +277,83 @@ console.log('同比环比计算') if (this.yoyMom.yesterdayData) { //环比 - this.form.inRailwayYomDo = !checkNotEmpty(this.yoyMom.yesterdayData.inboundRailwayDo) ||this.yoyMom.yesterdayData.inboundRailwayDo === 0 ? 100 : this.form.inboundRailwayDo ? ( - parseInt(this.form.inboundRailwayDo) - this.yoyMom.yesterdayData.inboundRailwayDo) / this - .yoyMom.yesterdayData.inboundRailwayDo * 100 : ''; - this.form.inPepoleYoyDo = !checkNotEmpty(this.yoyMom.yesterdayData.inPepole) || this.yoyMom.yesterdayData.inPepole === 0 ? 100 : this.form.inPepole ? (parseInt(this - .form.inPepole) - this.yoyMom.yesterdayData.inPepole) / this.yoyMom.yesterdayData.inPepole * - 100 : ''; - this.form.outRailwayYomDo = !checkNotEmpty(this.yoyMom.yesterdayData.outboundRailwayDo) || this.yoyMom.yesterdayData.outboundRailwayDo === 0 ? 100 : this.form - .outboundRailwayDo ? (parseInt(this.form.outboundRailwayDo) - this.yoyMom.yesterdayData - .outboundRailwayDo) / this.yoyMom.yesterdayData.outboundRailwayDo * 100 : ''; - this.form.outPepoleYoyDo = !checkNotEmpty(this.yoyMom.yesterdayData.outPepole) || this.yoyMom.yesterdayData.outPepole === 0 ? 100 : this.form.outPepole ? (parseInt(this - .form.outPepole) - this.yoyMom.yesterdayData.outPepole) / this.yoyMom.yesterdayData.outPepole * - 100 : ''; + if (checkNotEmpty(this.form.inboundRailwayDo)) { + this.form.inRailwayYomDo = !checkNotEmpty(this.yoyMom.yesterdayData.inboundRailwayDo) || this + .yoyMom.yesterdayData.inboundRailwayDo === 0 ? 100 : ( + parseInt(this.form.inboundRailwayDo) - this.yoyMom.yesterdayData.inboundRailwayDo) / this + .yoyMom.yesterdayData.inboundRailwayDo * 100; + }else{ + this.form.inRailwayYomDo = ''; + } + if (this.form.inPepole) { + this.form.inPepoleYoyDo = !checkNotEmpty(this.yoyMom.yesterdayData.inPepole) || this.yoyMom + .yesterdayData.inPepole === 0 ? 100 : (parseInt(this + .form.inPepole) - this.yoyMom.yesterdayData.inPepole) / this.yoyMom.yesterdayData + .inPepole * + 100; + }else{ + this.form.inPepoleYoyDo = ''; + } + if (checkNotEmpty(this.form.outboundRailwayDo)) { + this.form.outRailwayYomDo = !checkNotEmpty(this.yoyMom.yesterdayData.outboundRailwayDo) || this + .yoyMom.yesterdayData.outboundRailwayDo === 0 ? 100 : (parseInt(this.form.outboundRailwayDo) - + this.yoyMom.yesterdayData + .outboundRailwayDo) / this.yoyMom.yesterdayData.outboundRailwayDo * 100; + }else{ + this.form.outRailwayYomDo = ''; + } + if (checkNotEmpty(this.form.outPepole)) { + this.form.outPepoleYoyDo = !checkNotEmpty(this.yoyMom.yesterdayData.outPepole) || this.yoyMom + .yesterdayData.outPepole === 0 ? 100 : (parseInt(this + .form.outPepole) - this.yoyMom.yesterdayData.outPepole) / this.yoyMom.yesterdayData + .outPepole * + 100; + }else{ + this.form.outPepoleYoyDo = ''; + } } if (this.yoyMom.lastYearData) { //同比 - this.form.inRailwayMomDo = !checkNotEmpty(this.yoyMom.lastYearData.inboundRailwayDo) || this.yoyMom.lastYearData.inboundRailwayDo === 0 ? 100 : this.form.inboundRailwayDo ? ( - parseInt(this.form.inboundRailwayDo) - this.yoyMom.lastYearData.inboundRailwayDo) / this.yoyMom - .lastYearData.inboundRailwayDo * 100 : ''; - this.form.inPepoleMomDo = !checkNotEmpty(this.yoyMom.lastYearData.inPepole) || this.yoyMom.lastYearData.inPepole === 0 ? 100 : this.form.inPepole ? (parseInt(this.form - .inPepole) - this.yoyMom.lastYearData.inPepole) / this.yoyMom.lastYearData.inPepole * 100 : ''; - this.form.outRailwayMomDo = !checkNotEmpty(this.yoyMom.lastYearData.outboundRailwayDo) || this.yoyMom.lastYearData.outboundRailwayDo === 0 ? 100 : this.form.outboundRailwayDo ? - (parseInt(this.form.outboundRailwayDo) - this.yoyMom.lastYearData.outboundRailwayDo) / this.yoyMom - .lastYearData.outboundRailwayDo * 100 : ''; - this.form.outPepoleMomDo = !checkNotEmpty(this.yoyMom.lastYearData.outPepole) || this.yoyMom.lastYearData.outPepole ===0 ? 100 : this.form.outPepole ? (parseInt(this - .form.outPepole) - this.yoyMom.lastYearData.outPepole) / this.yoyMom.lastYearData.outPepole * - 100 : ''; + if (checkNotEmpty(this.form.inboundRailwayDo)) { + this.form.inRailwayMomDo = !checkNotEmpty(this.yoyMom.lastYearData.inboundRailwayDo) || this.yoyMom + .lastYearData.inboundRailwayDo === 0 ? 100 : ( + parseInt(this.form.inboundRailwayDo) - this.yoyMom.lastYearData.inboundRailwayDo) / this + .yoyMom + .lastYearData.inboundRailwayDo * 100; + }else{ + this.form.inRailwayMomDo = ''; + } + + if (checkNotEmpty(this.form.inPepole)) { + this.form.inPepoleMomDo = !checkNotEmpty(this.yoyMom.lastYearData.inPepole) || this.yoyMom + .lastYearData + .inPepole === 0 ? 100 : (parseInt(this.form + .inPepole) - this.yoyMom.lastYearData.inPepole) / this.yoyMom.lastYearData.inPepole * 100; + }else{ + this.form.inPepoleMomDo = ''; + } + + if (checkNotEmpty(this.form.outboundRailwayDo)) { + this.form.outRailwayMomDo = !checkNotEmpty(this.yoyMom.lastYearData.outboundRailwayDo) || this + .yoyMom + .lastYearData.outboundRailwayDo === 0 ? 100 : + (parseInt(this.form.outboundRailwayDo) - this.yoyMom.lastYearData.outboundRailwayDo) / this + .yoyMom + .lastYearData.outboundRailwayDo * 100; + }else{ + this.form.outRailwayMomDo = ''; + } + + if (checkNotEmpty(this.form.outPepole)) { + this.form.outPepoleMomDo = !checkNotEmpty(this.yoyMom.lastYearData.outPepole) || this.yoyMom + .lastYearData.outPepole === 0 ? 100 : (parseInt(this + .form.outPepole) - this.yoyMom.lastYearData.outPepole) / this.yoyMom.lastYearData + .outPepole * + 100; + }else{ + this.form.outPepoleMomDo = ''; + } + } }, //车站权限列表 @@ -351,17 +398,22 @@ let now = new Date(); //11:00-13:30 默认选择0-12 let dateStr = getDateStr(now, 0); - if (new Date(dateStr + ' 11:00').getTime() < new Date().getTime() && new Date().getTime() < new Date(dateStr + + 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.array.findIndex(item => item.dictValue == '0012'); + let idx = this.array.findIndex(item => item.dictValue == '0012'); + this.index = idx > -1 ? idx : ''; } else { this.form.statPeriod = '03'; //默认0-24 - this.index = this.array.findIndex(item => item.dictValue == '03'); + let idx = this.array.findIndex(item => item.dictValue == '03'); + this.index = idx > -1 ? idx : ''; } - }else{ - this.index = this.array.findIndex(item => item.dictValue == this.form.statPeriod); - } + } else { + let idx = this.array.findIndex(item => item.dictValue == this.form.statPeriod); + this.index = idx > -1 ? idx : ''; + } + this.queryYoyMom(); //同比环比 }) }, //确认提交 @@ -433,15 +485,14 @@ title: '报送提交成功', icon: 'none', success: () => { - if(this.form.id == undefined) { - setTimeout(() => { - uni.redirectTo({ - url: '/pages/railway/railwayRunData/list' - }) - }, 300) - } - else { - uni.navigateBack(); + if (this.form.id == undefined) { + setTimeout(() => { + uni.redirectTo({ + url: '/pages/railway/railwayRunData/list' + }) + }, 300) + } else { + uni.navigateBack(); } } }) diff --git a/pages/water/TransportData/form.vue b/pages/water/TransportData/form.vue index 27197ec..95345da 100644 --- a/pages/water/TransportData/form.vue +++ b/pages/water/TransportData/form.vue @@ -175,12 +175,20 @@ calcYoyMom() { console.log('同比计算') if (this.yoyMom.lastYearData) { - //同比 - this.form.passengerWatertransportMomDo = !checkNotEmpty(this.yoyMom.lastYearData.passengerWatertransportMomDo) || this.yoyMom.lastYearData.passengerWatertransportMomDo === 0 ? 100 : this.form.passengerWatertransportMomDo ? ( - parseInt(this.form.passengerWatertransportMomDo) - this.yoyMom.lastYearData.passengerWatertransportMomDo) / this.yoyMom - .lastYearData.passengerWatertransportMomDo * 100 : ''; - this.form.voyageWatertransportMomDo = !checkNotEmpty(this.yoyMom.lastYearData.voyageWatertransportMomDo) || this.yoyMom.lastYearData.voyageWatertransportMomDo === 0 ? 100 : this.form.voyageWatertransportMomDo ? (parseInt(this.form - .voyageWatertransportMomDo) - this.yoyMom.lastYearData.voyageWatertransportMomDo) / this.yoyMom.lastYearData.voyageWatertransportMomDo * 100 : ''; + //同比 + if(checkNotEmpty(this.form.outboundWatertransportDo)){ + this.form.passengerWatertransportMomDo = !checkNotEmpty(this.yoyMom.lastYearData.outboundWatertransportDo) || this.yoyMom.lastYearData.outboundWatertransportDo === 0 ? 100 : ( + parseInt(this.form.outboundWatertransportDo) - this.yoyMom.lastYearData.outboundWatertransportDo) / this.yoyMom + .lastYearData.outboundWatertransportDo * 100; + }else{ + this.form.passengerWatertransportMomDo = ''; + } + if(checkNotEmpty(this.form.inboundWatertransportDo)){ + this.form.voyageWatertransportMomDo = !checkNotEmpty(this.yoyMom.lastYearData.inboundWatertransportDo) || this.yoyMom.lastYearData.inboundWatertransportDo === 0 ? 100 : (parseInt(this.form + .inboundWatertransportDo) - this.yoyMom.lastYearData.inboundWatertransportDo) / this.yoyMom.lastYearData.inboundWatertransportDo * 100; + }else{ + this.form.voyageWatertransportMomDo = ''; + } } }, //统计时段切换选择 diff --git a/pages/water/waterWay/form.vue b/pages/water/waterWay/form.vue index ddcb50f..0ca25d1 100644 --- a/pages/water/waterWay/form.vue +++ b/pages/water/waterWay/form.vue @@ -61,13 +61,13 @@ - + 航次环比(%) + :style="item.voyage && item.voyage == item.yesterdayVoyage ? 'color: #EB4747' : ''">航次环比(%) + :style="item.voyage && item.voyage == item.yesterdayVoyage ? 'color: #EB4747' : ''"> {{item.voyageRingRatio === 0 ? item.voyageRingRatio : item.voyageRingRatio ? item.voyageRingRatio.toFixed(2) : ''}} @@ -89,13 +89,13 @@ + :class="item.numberOfPeople && item.numberOfPeople == item.yesterdayNumberOfPeople ? 'danger' : '' "> 人数环比(%) + :style="item.numberOfPeople && item.numberOfPeople == item.yesterdayNumberOfPeople ? 'color: #EB4747' : ''">人数环比(%) + :style="item.numberOfPeople && item.numberOfPeople == item.yesterdayNumberOfPeople ? 'color: #EB4747' : ''"> {{item.peopleRingRatio === 0 ? item.peopleRingRatio : item.peopleRingRatio ? item.peopleRingRatio.toFixed(2) : ''}} @@ -233,10 +233,10 @@ this.form.bizWaterwayIslandDataSaveOrUpdateDTOList[index].lastYearNumberOfPeople = checkNotEmpty(lastYearData.numberOfPeople) ? lastYearData.numberOfPeople : 0; //环比-同比 let obj = this.form.bizWaterwayIslandDataSaveOrUpdateDTOList[index]; - this.form.bizWaterwayIslandDataSaveOrUpdateDTOList[index].voyageRingRatio = !checkNotEmpty(yesterdayData.voyage) || yesterdayData.voyage === 0 ? 100 : obj.voyage ? (parseInt(obj.voyage) - yesterdayData.voyage) / yesterdayData.voyage * 100 : ''; - this.form.bizWaterwayIslandDataSaveOrUpdateDTOList[index].voyageYearOnYear = !checkNotEmpty(lastYearData.voyage) || lastYearData.voyage === 0 ? 100 : obj.voyage ? (parseInt(obj.voyage) - lastYearData.voyage) / lastYearData.voyage * 100 : ''; - this.form.bizWaterwayIslandDataSaveOrUpdateDTOList[index].peopleRingRatio = !checkNotEmpty(yesterdayData.numberOfPeople) || yesterdayData.numberOfPeople === 0 ? 100 : obj.numberOfPeople ? (parseInt(obj.numberOfPeople) - yesterdayData.numberOfPeople) / yesterdayData.numberOfPeople * 100 : ''; - this.form.bizWaterwayIslandDataSaveOrUpdateDTOList[index].peopleYearOnYear = !checkNotEmpty(lastYearData.numberOfPeople) || lastYearData.numberOfPeople === 0 ? 100 : obj.numberOfPeople ? (parseInt(obj.numberOfPeople) - lastYearData.numberOfPeople) / lastYearData.numberOfPeople * 100 : ''; + this.form.bizWaterwayIslandDataSaveOrUpdateDTOList[index].voyageRingRatio = !checkNotEmpty(obj.voyage) ? '' : !checkNotEmpty(yesterdayData.voyage) || yesterdayData.voyage === 0 ? 100 : (parseInt(obj.voyage) - yesterdayData.voyage) / yesterdayData.voyage * 100 ; + this.form.bizWaterwayIslandDataSaveOrUpdateDTOList[index].voyageYearOnYear = !checkNotEmpty(obj.voyage) ? '' : !checkNotEmpty(lastYearData.voyage) || lastYearData.voyage === 0 ? 100 : (parseInt(obj.voyage) - lastYearData.voyage) / lastYearData.voyage * 100; + this.form.bizWaterwayIslandDataSaveOrUpdateDTOList[index].peopleRingRatio = !checkNotEmpty(obj.numberOfPeople) ? '' : !checkNotEmpty(yesterdayData.numberOfPeople) || yesterdayData.numberOfPeople === 0 ? 100 : (parseInt(obj.numberOfPeople) - yesterdayData.numberOfPeople) / yesterdayData.numberOfPeople * 100; + this.form.bizWaterwayIslandDataSaveOrUpdateDTOList[index].peopleYearOnYear = !checkNotEmpty(obj.numberOfPeople) ? '' : !checkNotEmpty(lastYearData.numberOfPeople) || lastYearData.numberOfPeople === 0 ? 100 : (parseInt(obj.numberOfPeople) - lastYearData.numberOfPeople) / lastYearData.numberOfPeople * 100; console.log('环比同比', this.form.bizWaterwayIslandDataSaveOrUpdateDTOList[index]) }) }, diff --git a/static/image/bus01.png b/static/image/bus01.png new file mode 100644 index 0000000..ca403d3 Binary files /dev/null and b/static/image/bus01.png differ diff --git a/static/image/railway01.png b/static/image/railway01.png new file mode 100644 index 0000000..ca403d3 Binary files /dev/null and b/static/image/railway01.png differ diff --git a/static/image/roadTransport01.png b/static/image/roadTransport01.png new file mode 100644 index 0000000..ca403d3 Binary files /dev/null and b/static/image/roadTransport01.png differ diff --git a/static/image/water01.png b/static/image/water01.png new file mode 100644 index 0000000..ca403d3 Binary files /dev/null and b/static/image/water01.png differ