diff --git a/common/util.js b/common/util.js index 32b4740..b92aae9 100644 --- a/common/util.js +++ b/common/util.js @@ -100,6 +100,15 @@ function getDay(d, num) { return `${year}-${month}-${day}` } +// 计算环比 +function calcMom(cur, data) { + return !checkNotEmpty(cur) || !checkNotEmpty(data) ? '' : data === 0 && parseInt(cur) === 0 ? 0 : data === 0 && parseInt(cur) > 0 ? 100 : (parseInt(cur) - data) / data * 100; +} +// 计算同比 +function calcYoy(cur, data) { + return !checkNotEmpty(cur) || !checkNotEmpty(data) ? '' : data === 0 && parseInt(cur) === 0 ? 0 : data === 0 && parseInt(cur) > 0 ? 100 : (parseInt(cur) - data) / data * 100; +} + // 是否是闰年 function isLeap(year){ return (year % 4 == 0 && year % 100 != 0) || year % 400 == 0 @@ -125,5 +134,7 @@ export { getDateStr, dateUtils, checkNotEmpty, - lastYearDate + lastYearDate, + calcMom, + calcYoy } \ No newline at end of file diff --git a/main.js b/main.js index 48b0838..3b2db28 100644 --- a/main.js +++ b/main.js @@ -1,6 +1,7 @@ import App from './App' import store from './store' import { request, request1 } from "./util/request.js"; +import { calcMom, calcYoy } from "./common/util.js"; // #ifndef VUE3 import Vue from 'vue' @@ -23,6 +24,8 @@ app.$mount() //挂在request Vue.prototype.$request = request; Vue.prototype.$request1 = request1; +Vue.prototype.$calcMom = calcMom; +Vue.prototype.$calcYoy = calcYoy; // #ifdef VUE3 import { diff --git a/pages/airport/airport-runData/form.vue b/pages/airport/airport-runData/form.vue index 09cc40b..302816f 100644 --- a/pages/airport/airport-runData/form.vue +++ b/pages/airport/airport-runData/form.vue @@ -45,16 +45,16 @@ - 入青航班架次环比(%) + 入青航班架次环比 - {{form.inFlightsMomDo === 0 ? form.inFlightsMomDo : form.inFlightsMomDo ? form.inFlightsMomDo.toFixed(2) : ''}} + {{form.inFlightsMomDo === 0 ? form.inFlightsMomDo : form.inFlightsMomDo ? formatDigit(form.inFlightsMomDo) : '--'}}% - 入青航班架次同比(%) + 入青航班架次同比 - {{form.inFlightsYoyDo === 0 ? form.inFlightsYoyDo : form.inFlightsYoyDo ? form.inFlightsYoyDo.toFixed(2) : ''}} + {{form.inFlightsYoyDo === 0 ? form.inFlightsYoyDo : form.inFlightsYoyDo ? formatDigit(form.inFlightsYoyDo) : '--'}}% @@ -70,16 +70,16 @@ - 出青航班架次环比(%) + 出青航班架次环比 - {{form.outFlightsMomDo === 0 ? form.outFlightsMomDo : form.outFlightsMomDo ? form.outFlightsMomDo.toFixed(2) : ''}} + {{form.outFlightsMomDo === 0 ? form.outFlightsMomDo : form.outFlightsMomDo ? formatDigit(form.outFlightsMomDo) : '--'}}% - 出青航班架次同比(%) + 出青航班架次同比 - {{form.outFlightsYoyDo === 0 ? form.outFlightsYoyDo : form.outFlightsYoyDo ? form.outFlightsYoyDo.toFixed(2) : ''}} + {{form.outFlightsYoyDo === 0 ? form.outFlightsYoyDo : form.outFlightsYoyDo ? formatDigit(form.outFlightsYoyDo) : '--'}}% @@ -95,16 +95,16 @@ - 入青航班旅客环比(%) + 入青航班旅客环比 - {{form.inPassengersMomDo === 0 ? form.inPassengersMomDo : form.inPassengersMomDo ? form.inPassengersMomDo.toFixed(2) : ''}} + {{form.inPassengersMomDo === 0 ? form.inPassengersMomDo : form.inPassengersMomDo ? formatDigit(form.inPassengersMomDo) : '--'}}% - 入青航班旅客同比(%) + 入青航班旅客同比 - {{form.inPassengersYoyDo === 0 ? form.inPassengersYoyDo : form.inPassengersYoyDo ? form.inPassengersYoyDo.toFixed(2) : ''}} + {{form.inPassengersYoyDo === 0 ? form.inPassengersYoyDo : form.inPassengersYoyDo ? formatDigit(form.inPassengersYoyDo) : '--'}}% @@ -120,16 +120,16 @@ - 出青航班旅客环比(%) + 出青航班旅客环比 - {{form.outPassengersMomDo === 0 ? form.outPassengersMomDo : form.outPassengersMomDo ? form.outPassengersMomDo.toFixed(2) : ''}} + {{form.outPassengersMomDo === 0 ? form.outPassengersMomDo : form.outPassengersMomDo ? formatDigit(form.outPassengersMomDo) : '--'}}% - 出青航班旅客同比(%) + 出青航班旅客同比 - {{form.outPassengersYoyDo === 0 ? form.outPassengersYoyDo : form.outPassengersYoyDo ? form.outPassengersYoyDo.toFixed(2) : ''}} + {{form.outPassengersYoyDo === 0 ? form.outPassengersYoyDo : form.outPassengersYoyDo ? formatDigit(form.outPassengersYoyDo) : '--'}}% @@ -154,16 +154,16 @@ - 入青航班架次环比(%) + 入青航班架次环比 - {{form.inFlightsMomIn === 0 ? form.inFlightsMomIn : form.inFlightsMomIn ? form.inFlightsMomIn.toFixed(2) : ''}} + {{form.inFlightsMomIn === 0 ? form.inFlightsMomIn : form.inFlightsMomIn ? formatDigit(form.inFlightsMomIn) : '--'}}% - 入青航班架次同比(%) + 入青航班架次同比 - {{form.inFlightsYoyIn === 0 ? form.inFlightsYoyIn : form.inFlightsYoyIn ? form.inFlightsYoyIn.toFixed(2) : ''}} + {{form.inFlightsYoyIn === 0 ? form.inFlightsYoyIn : form.inFlightsYoyIn ? formatDigit(form.inFlightsYoyIn) : '--'}}% @@ -179,16 +179,16 @@ - 出青航班架次环比(%) + 出青航班架次环比 - {{form.outFlightsMomIn === 0 ? form.outFlightsMomIn : form.outFlightsMomIn ? form.outFlightsMomIn.toFixed(2) : ''}} + {{form.outFlightsMomIn === 0 ? form.outFlightsMomIn : form.outFlightsMomIn ? formatDigit(form.outFlightsMomIn) : '--'}}% - 出青航班架次同比(%) + 出青航班架次同比 - {{form.outFlightsYoyIn === 0 ? form.outFlightsYoyIn : form.outFlightsYoyIn ? form.outFlightsYoyIn.toFixed(2) : ''}} + {{form.outFlightsYoyIn === 0 ? form.outFlightsYoyIn : form.outFlightsYoyIn ? formatDigit(form.outFlightsYoyIn) : '--'}}% @@ -204,16 +204,16 @@ - 入青航班旅客环比(%) + 入青航班旅客环比 - {{form.inPassengersMomIn === 0 ? form.inPassengersMomIn : form.inPassengersMomIn ? form.inPassengersMomIn.toFixed(2) : ''}} + {{form.inPassengersMomIn === 0 ? form.inPassengersMomIn : form.inPassengersMomIn ? formatDigit(form.inPassengersMomIn) : '--'}}% - 入青航班旅客同比(%) + 入青航班旅客同比 - {{form.inPassengersYoyIn === 0 ? form.inPassengersYoyIn : form.inPassengersYoyIn ? form.inPassengersYoyIn.toFixed(2) : ''}} + {{form.inPassengersYoyIn === 0 ? form.inPassengersYoyIn : form.inPassengersYoyIn ? formatDigit(form.inPassengersYoyIn) : '--'}}% @@ -229,16 +229,16 @@ - 出青航班旅客环比(%) + 出青航班旅客环比 - {{form.outPassengersMomIn === 0 ? form.outPassengersMomIn : form.outPassengersMomIn ? form.outPassengersMomIn.toFixed(2) : ''}} + {{form.outPassengersMomIn === 0 ? form.outPassengersMomIn : form.outPassengersMomIn ? formatDigit(form.outPassengersMomIn) : '--'}}% - 出青航班旅客同比(%) + 出青航班旅客同比 - {{form.outPassengersYoyIn === 0 ? form.outPassengersYoyIn : form.outPassengersYoyIn ? form.outPassengersYoyIn.toFixed(2) : ''}} + {{form.outPassengersYoyIn === 0 ? form.outPassengersYoyIn : form.outPassengersYoyIn ? formatDigit(form.outPassengersYoyIn) : '--'}}% @@ -248,7 +248,7 @@ - 合计 + 合计 入青航班架次： @@ -260,16 +260,16 @@ - 入青航班架次环比(%) + 入青航班架次环比 - {{form.inFlightsMomTo === 0 ? form.inFlightsMomTo : form.inFlightsMomTo ? form.inFlightsMomTo.toFixed(2) : ''}} + {{form.inFlightsMomTo === 0 ? form.inFlightsMomTo : form.inFlightsMomTo ? formatDigit(form.inFlightsMomTo) : '--'}}% - 入青航班架次同比(%) + 入青航班架次同比 - {{form.inFlightsYoyTo === 0 ? form.inFlightsYoyTo : form.inFlightsYoyTo ? form.inFlightsYoyTo.toFixed(2) : ''}} + {{form.inFlightsYoyTo === 0 ? form.inFlightsYoyTo : form.inFlightsYoyTo ? formatDigit(form.inFlightsYoyTo) : '--'}}% @@ -283,16 +283,16 @@ - 出青航班架次环比(%) + 出青航班架次环比 - {{form.outFlightsMomTo === 0 ? form.outFlightsMomTo : form.outFlightsMomTo ? form.outFlightsMomTo.toFixed(2) : ''}} + {{form.outFlightsMomTo === 0 ? form.outFlightsMomTo : form.outFlightsMomTo ? formatDigit(form.outFlightsMomTo) : '--'}}% - 出青航班架次同比(%) + 出青航班架次同比 - {{form.outFlightsYoyTo === 0 ? form.outFlightsYoyTo : form.outFlightsYoyTo ? form.outFlightsYoyTo.toFixed(2) : ''}} + {{form.outFlightsYoyTo === 0 ? form.outFlightsYoyTo : form.outFlightsYoyTo ? formatDigit(form.outFlightsYoyTo) : '--'}}% @@ -306,16 +306,16 @@ - 入青航班旅客环比(%) + 入青航班旅客环比 - {{form.inPassengersMomTo === 0 ? form.inPassengersMomTo : form.inPassengersMomTo ? form.inPassengersMomTo.toFixed(2) : ''}} + {{form.inPassengersMomTo === 0 ? form.inPassengersMomTo : form.inPassengersMomTo ? formatDigit(form.inPassengersMomTo) : '--'}}% - 入青航班旅客同比(%) + 入青航班旅客同比 - {{form.inPassengersYoyTo === 0 ? form.inPassengersYoyTo : form.inPassengersYoyTo ? form.inPassengersYoyTo.toFixed(2) : ''}} + {{form.inPassengersYoyTo === 0 ? form.inPassengersYoyTo : form.inPassengersYoyTo ? formatDigit(form.inPassengersYoyTo) : '--'}}% @@ -329,16 +329,16 @@ - 出青航班旅客环比(%) + 出青航班旅客环比 - {{form.outPassengersMomTo === 0 ? form.outPassengersMomTo : form.outPassengersMomTo ? form.outPassengersMomTo.toFixed(2) : ''}} + {{form.outPassengersMomTo === 0 ? form.outPassengersMomTo : form.outPassengersMomTo ? formatDigit(form.outPassengersMomTo) : '--'}}% - 出青航班旅客同比(%) + 出青航班旅客同比 - {{form.outPassengersYoyTo === 0 ? form.outPassengersYoyTo : form.outPassengersYoyTo ? form.outPassengersYoyTo.toFixed(2) : ''}} + {{form.outPassengersYoyTo === 0 ? form.outPassengersYoyTo : form.outPassengersYoyTo ? formatDigit(form.outPassengersYoyTo) : '--'}}% @@ -346,8 +346,8 @@ - 取消 - 确认 + + {{btnText}} @@ -403,7 +403,8 @@ index: 2, //时段选择,默认0-24 userInfo: {}, pageType: '', - yoyMom: {} + yoyMom: {}, + btnText: '保存' } }, onLoad(options) { @@ -414,10 +415,12 @@ this.form.affiliatedUnit = this.userInfo.organizationName ? this.userInfo.organizationName : ''; this.form.statDate = getDateStr(now, -1); //默认前一天 this.queryTime(); //统计时段 - } else if(options.item) { + } else if(options.item) { + this.btnText = '修改并保存'; this.form = JSON.parse(options.item); this.queryTime(); } else if (options.id) { + this.btnText = '修改并保存'; this.$request(getApp().globalData.baseUrl + '/api/biz/watertransportRunData/find/' + options.id, {}, "GET") .then( res => { @@ -427,6 +430,9 @@ } }, methods: { + formatDigit(data) { + return (data+'').indexOf('.') > -1 && (data+'').substring((data+'').indexOf('.')).length > 2 ? data.toFixed(2) : data; + }, //环比同比 queryYoyMom() { if (this.form.statDate == '' || this.form.statPeriod == '') { @@ -446,39 +452,39 @@ let yesterdayData = this.yoyMom.yesterdayData; let lastYearData = this.yoyMom.lastYearData; //国内-入 - this.form.inFlightsMomDo = !checkNotEmpty(this.form.inboundFlightsDo) ? '' : yesterdayData.inboundFlightsDo === 0 ? 100 : checkNotEmpty(yesterdayData.inboundFlightsDo) ? (parseInt(this.form.inboundFlightsDo) - yesterdayData.inboundFlightsDo) / yesterdayData.inboundFlightsDo * 100 : ''; - this.form.inFlightsYoyDo = !checkNotEmpty(this.form.inboundFlightsDo) ? '' : lastYearData.inboundFlightsDo === 0 ? 100 : checkNotEmpty(lastYearData.inboundFlightsDo) ? (parseInt(this.form.inboundFlightsDo) - lastYearData.inboundFlightsDo) / lastYearData.inboundFlightsDo * 100 : ''; - this.form.inPassengersMomDo = !checkNotEmpty(this.form.inboundPassengersDo) ? '' : yesterdayData.inboundPassengersDo === 0 ? 100 : checkNotEmpty(yesterdayData.inboundPassengersDo) ? (parseInt(this.form.inboundPassengersDo) - yesterdayData.inboundFlightsDo) / yesterdayData.inboundPassengersDo * 100 : ''; - this.form.inPassengersYoyDo = !checkNotEmpty(this.form.inboundPassengersDo) ? '' : lastYearData.inboundPassengersDo === 0 ? 100 : checkNotEmpty(lastYearData.inboundPassengersDo) ? (parseInt(this.form.inboundPassengersDo) - lastYearData.inboundFlightsDo) / lastYearData.inboundPassengersDo * 100 : ''; + this.form.inFlightsMomDo = this.$calcMom(this.form.inboundFlightsDo,yesterdayData.inboundFlightsDo); + this.form.inFlightsYoyDo = this.$calcYoy(this.form.inboundFlightsDo,lastYearData.inboundFlightsDo); + this.form.inPassengersMomDo = this.$calcMom(this.form.inboundPassengersDo,yesterdayData.inboundPassengersDo); + this.form.inPassengersYoyDo =this.$calcYoy(this.form.inboundPassengersDo,lastYearData.inboundPassengersDo); //国内-出 - this.form.outFlightsMomDo = !checkNotEmpty(this.form.outboundFlightsDo) ? '' : yesterdayData.outboundFlightsDo === 0 ? 100 : checkNotEmpty(yesterdayData.outboundFlightsDo) ? (parseInt(this.form.outboundFlightsDo) - yesterdayData.outboundFlightsDo) / yesterdayData.outboundFlightsDo * 100 : ''; - this.form.outFlightsYoyDo = !checkNotEmpty(this.form.outboundFlightsDo) ? '' : lastYearData.outboundFlightsDo === 0 ? 100 : checkNotEmpty(lastYearData.outboundFlightsDo) ? (parseInt(this.form.outboundFlightsDo) - lastYearData.outboundFlightsDo) / lastYearData.outboundFlightsDo * 100 : ''; - this.form.outPassengersMomDo = !checkNotEmpty(this.form.outboundPassengersDo) ? '' : yesterdayData.outboundPassengersDo === 0 ? 100 : checkNotEmpty(yesterdayData.outboundPassengersDo) ? (parseInt(this.form.outboundPassengersDo) - yesterdayData.outboundPassengersDo) / yesterdayData.outboundPassengersDo * 100 : ''; - this.form.outPassengersYoyDo = !checkNotEmpty(this.form.outboundPassengersDo) ? '' : lastYearData.outboundPassengersDo === 0 ? 100 : checkNotEmpty(lastYearData.outboundPassengersDo) ? (parseInt(this.form.outboundPassengersDo) - lastYearData.outboundPassengersDo) / lastYearData.outboundPassengersDo * 100 : ''; + this.form.outFlightsMomDo = this.$calcMom(this.form.outboundFlightsDo,yesterdayData.outboundFlightsDo); + this.form.outFlightsYoyDo =this.$calcYoy(this.form.outboundFlightsDo,lastYearData.outboundFlightsDo); + this.form.outPassengersMomDo = this.$calcMom(this.form.outboundPassengersDo,yesterdayData.outboundPassengersDo); + this.form.outPassengersYoyDo =this.$calcYoy(this.form.outboundPassengersDo,lastYearData.outboundPassengersDo); //国际-入 - this.form.inFlightsMomIn = !checkNotEmpty(this.form.inboundFlightsIn) ? '' : yesterdayData.inboundFlightsIn === 0 ? 100 : checkNotEmpty(yesterdayData.inboundFlightsIn) ? (parseInt(this.form.inboundFlightsIn) - yesterdayData.inboundFlightsIn) / yesterdayData.inboundFlightsIn * 100 : ''; - this.form.inFlightsYoyIn = !checkNotEmpty(this.form.inboundFlightsIn) ? '' : lastYearData.inboundFlightsIn === 0 ? 100 : checkNotEmpty(lastYearData.inboundFlightsIn) ? (parseInt(this.form.inboundFlightsIn) - lastYearData.inboundFlightsIn) / lastYearData.inboundFlightsIn * 100 : ''; - this.form.inPassengersMomIn = !checkNotEmpty(this.form.inboundPassengersIn) ? '' : yesterdayData.inboundPassengersIn === 0 ? 100 : checkNotEmpty(yesterdayData.inboundPassengersIn) ? (parseInt(this.form.inboundPassengersIn) - yesterdayData.inboundPassengersIn) / yesterdayData.inboundPassengersIn * 100 : ''; - this.form.inPassengersYoyIn = !checkNotEmpty(this.form.inboundPassengersIn) ? '' : lastYearData.inboundPassengersIn === 0 ? 100 : checkNotEmpty(lastYearData.inboundPassengersIn) ? (parseInt(this.form.inboundPassengersIn) - lastYearData.inboundPassengersIn) / lastYearData.inboundPassengersIn * 100 : ''; + this.form.inFlightsMomIn = this.$calcMom(this.form.inboundFlightsIn,yesterdayData.inboundFlightsIn); + this.form.inFlightsYoyIn =this.$calcYoy(this.form.inboundFlightsIn,lastYearData.inboundFlightsIn); + this.form.inPassengersMomIn = this.$calcMom(this.form.inboundPassengersIn,yesterdayData.inboundPassengersIn); + this.form.inPassengersYoyIn =this.$calcYoy(this.form.inboundPassengersIn,lastYearData.inboundPassengersIn); //国际-出 - this.form.outFlightsMomIn = !checkNotEmpty(this.form.outboundFlightsIn) ? '' : yesterdayData.outboundFlightsIn === 0 ? 100 : checkNotEmpty(yesterdayData.outboundFlightsIn) ? (parseInt(this.form.outboundFlightsIn) - yesterdayData.outboundFlightsIn) / yesterdayData.outboundFlightsIn * 100 : ''; - this.form.outFlightsYoyIn = !checkNotEmpty(this.form.outboundFlightsIn) ? '' : lastYearData.outboundFlightsIn === 0 ? 100 : checkNotEmpty(lastYearData.outboundFlightsIn) ? (parseInt(this.form.outboundFlightsIn) - lastYearData.outboundFlightsIn) / lastYearData.outboundFlightsIn * 100 : ''; - this.form.outPassengersMomIn = !checkNotEmpty(this.form.outboundPassengersIn) ? '' : yesterdayData.outboundPassengersIn === 0 ? 100 : checkNotEmpty(yesterdayData.outboundPassengersIn) ? (parseInt(this.form.outboundPassengersIn) - yesterdayData.outboundPassengersIn) / yesterdayData.outboundPassengersIn * 100 : ''; - this.form.outPassengersYoyIn = !checkNotEmpty(this.form.outboundPassengersIn) ? '' : lastYearData.outboundPassengersIn === 0 ? 100 : checkNotEmpty(lastYearData.outboundPassengersIn) ? (parseInt(this.form.outboundPassengersIn) - lastYearData.outboundPassengersIn) / lastYearData.outboundPassengersIn * 100 : ''; + this.form.outFlightsMomIn = this.$calcMom(this.form.outboundFlightsIn,yesterdayData.outboundFlightsIn); + this.form.outFlightsYoyIn =this.$calcYoy(this.form.outboundFlightsIn,lastYearData.outboundFlightsIn); + this.form.outPassengersMomIn = this.$calcMom(this.form.outboundPassengersIn,yesterdayData.outboundPassengersIn); + this.form.outPassengersYoyIn =this.$calcYoy(this.form.outboundPassengersIn,lastYearData.outboundPassengersIn); //汇总-入 this.form.inboundFlightsTo = (checkNotEmpty(this.form.inboundFlightsDo) ? parseInt(this.form.inboundFlightsDo) : 0) + (checkNotEmpty(this.form.inboundFlightsIn) ? parseInt(this.form.inboundFlightsIn) : 0);//入青-航班 this.form.inboundPassengersTo = (checkNotEmpty(this.form.inboundPassengersDo) ? parseInt(this.form.inboundPassengersDo) : 0) + (checkNotEmpty(this.form.inboundPassengersIn) ? parseInt(this.form.inboundPassengersIn) : 0);//入青-旅客 - this.form.inFlightsMomTo = !checkNotEmpty(this.form.inboundFlightsTo) ? '' : yesterdayData.inboundFlightsTo === 0 ? 100 : checkNotEmpty(yesterdayData.inboundFlightsTo) ? (parseInt(this.form.inboundFlightsTo) - yesterdayData.inboundFlightsTo) / yesterdayData.inboundFlightsTo * 100 : ''; - this.form.inFlightsYoyTo = !checkNotEmpty(this.form.inboundFlightsTo) ? '' : lastYearData.inboundFlightsTo === 0 ? 100 : checkNotEmpty(lastYearData.inboundFlightsTo) ? (parseInt(this.form.inboundFlightsTo) - lastYearData.inboundFlightsTo) / lastYearData.inboundFlightsTo * 100 : ''; - this.form.inPassengersMomTo = !checkNotEmpty(this.form.inboundPassengersTo) ? '' : yesterdayData.inboundPassengersTo === 0 ? 100 : checkNotEmpty(yesterdayData.inboundPassengersTo) ? (parseInt(this.form.inboundPassengersTo) - yesterdayData.inboundPassengersTo) / yesterdayData.inboundPassengersTo * 100 : ''; - this.form.inPassengersYoyTo = !checkNotEmpty(this.form.inboundPassengersTo) ? '' : lastYearData.inboundPassengersTo === 0 ? 100 : checkNotEmpty(lastYearData.inboundPassengersTo) ? (parseInt(this.form.inboundPassengersTo) - lastYearData.inboundPassengersTo) / lastYearData.inboundPassengersTo * 100 : ''; + this.form.inFlightsMomTo = this.$calcMom(this.form.inboundFlightsTo,yesterdayData.inboundFlightsTo); + this.form.inFlightsYoyTo =this.$calcYoy(this.form.inboundFlightsTo,lastYearData.inboundFlightsTo); + this.form.inPassengersMomTo = this.$calcMom(this.form.inboundPassengersTo,yesterdayData.inboundPassengersTo); + this.form.inPassengersYoyTo =this.$calcYoy(this.form.inboundPassengersTo,lastYearData.inboundPassengersTo); //汇总-出 this.form.outboundFlightsTo = (checkNotEmpty(this.form.outboundFlightsDo) ? parseInt(this.form.outboundFlightsDo) : 0) + (checkNotEmpty(this.form.outboundFlightsIn) ? parseInt(this.form.outboundFlightsIn) : 0);//出青-航班 this.form.outboundPassengersTo = (checkNotEmpty(this.form.outboundPassengersDo) ? parseInt(this.form.outboundPassengersDo) : 0) + (checkNotEmpty(this.form.outboundPassengersIn) ? parseInt(this.form.outboundPassengersIn) : 0);//出青-旅客 - this.form.outFlightsMomTo = !checkNotEmpty(this.form.outboundFlightsTo) ? '' : yesterdayData.outboundFlightsTo === 0 ? 100 : checkNotEmpty(yesterdayData.outboundFlightsTo) ? (parseInt(this.form.outboundFlightsTo) - yesterdayData.outboundFlightsTo) / yesterdayData.outboundFlightsTo * 100 : ''; - this.form.outFlightsYoyTo = !checkNotEmpty(this.form.outboundFlightsTo) ? '' : lastYearData.outboundFlightsTo === 0 ? 100 : checkNotEmpty(lastYearData.outboundFlightsTo) ? (parseInt(this.form.outboundFlightsTo) - lastYearData.outboundFlightsTo) / lastYearData.outboundFlightsTo * 100 : ''; - this.form.outPassengersMomTo = !checkNotEmpty(this.form.outboundPassengersTo) ? '' : yesterdayData.outboundPassengersTo === 0 ? 100 : checkNotEmpty(yesterdayData.outboundPassengersTo) ? (parseInt(this.form.outboundPassengersTo) - yesterdayData.outboundPassengersTo) / yesterdayData.outboundPassengersTo * 100 : ''; - this.form.outPassengersYoyTo = !checkNotEmpty(this.form.outboundPassengersTo) ? '' : lastYearData.outboundPassengersTo === 0 ? 100 : checkNotEmpty(lastYearData.outboundPassengersTo) ? (parseInt(this.form.outboundPassengersTo) - lastYearData.outboundPassengersTo) / lastYearData.outboundPassengersTo * 100 : ''; + this.form.outFlightsMomTo = this.$calcMom(this.form.outboundFlightsTo,yesterdayData.outboundFlightsTo); + this.form.outFlightsYoyTo =this.$calcYoy(this.form.outboundFlightsTo,lastYearData.outboundFlightsTo); + this.form.outPassengersMomTo = this.$calcMom(this.form.outboundPassengersTo,yesterdayData.outboundPassengersTo); + this.form.outPassengersYoyTo =this.$calcYoy(this.form.outboundPassengersTo,lastYearData.outboundPassengersTo); }, //统计时段切换选择 changeStatPeriod(e) { @@ -808,7 +814,7 @@ z-index: 11; .act_btn { - width: 329rpx; + width: 690rpx; height: 90rpx; color: #666666; font-size: 28rpx; diff --git a/pages/airport/airport-runStatus/form.vue b/pages/airport/airport-runStatus/form.vue index a516f74..9098a2e 100644 --- a/pages/airport/airport-runStatus/form.vue +++ b/pages/airport/airport-runStatus/form.vue @@ -52,8 +52,8 @@ - 取消 - 确认 + + {{btnText}} @@ -76,7 +76,8 @@ array: [], //时段选择列表 index: 2, //时段选择,默认0-24 userInfo: {}, - pageType: '' + pageType: '', + btnText: '保存' } }, onLoad(options) { @@ -86,10 +87,12 @@ let now = new Date(); this.form.statDate = getDateStr(now, -1); //默认前一天 this.queryTime(); //统计时段 - } if (options.item) { + } if (options.item) { + this.btnText = '修改并保存'; this.form = JSON.parse(options.item); this.queryTime(); //统计时段 - } if (options.id) { + } if (options.id) { + this.btnText = '修改并保存'; this.$request(getApp().globalData.baseUrl+'/api/biz/railwayRunSituation/find//'+options.id,{},"GET").then(res => { this.form = res.data; this.queryTime(); //统计时段 @@ -423,7 +426,7 @@ z-index: 11; .act_btn { - width: 329rpx; + width: 690rpx; height: 90rpx; color: #666666; font-size: 28rpx; diff --git a/pages/highWay/runData/form.vue b/pages/highWay/runData/form.vue index 707e130..8310bb8 100644 --- a/pages/highWay/runData/form.vue +++ b/pages/highWay/runData/form.vue @@ -9,11 +9,12 @@ 管理单位名称： - + {{form.organizationName?form.organizationName:'请选择'}} - + {{form.organizationName}} @@ -38,54 +39,54 @@ - 收费站入口车辆数汇总： + 收费站驶入车辆数统计： {{form.entranceVehicleCount === 0 ? form.entranceVehicleCount : form.entranceVehicleCount || ''}} + :class="checkNotEmpty(form.entranceVehicleCount) && form.entranceVehicleCount === yoyMom.minusDaysEntranceVehicleSum ? 'danger' : ''"> - 收费站入口车辆数汇总环比(%) + :style="checkNotEmpty(form.entranceVehicleCount) && form.entranceVehicleCount === yoyMom.minusDaysEntranceVehicleSum ?'color: #EB4747':''"> + 驶入车辆数统计环比 - {{form.entranceVehicleCountMom === 0 ? form.entranceVehicleCountMom : form.entranceVehicleCountMom ? form.entranceVehicleCountMom.toFixed(2) : ''}} + :style="checkNotEmpty(form.entranceVehicleCount) && form.entranceVehicleCount === yoyMom.minusDaysEntranceVehicleSum ?'color: #EB4747':''"> + {{form.entranceVehicleCountMom === 0 ? form.entranceVehicleCountMom : checkNotEmpty(form.entranceVehicleCountMom) ? formatDigit(form.entranceVehicleCountMom) : '--'}}% - 收费站入口车辆数汇总同比(%) + 驶入车辆数统计同比 - {{form.entranceVehicleCountYoy === 0 ? form.entranceVehicleCountYoy : form.entranceVehicleCountYoy ? form.entranceVehicleCountYoy.toFixed(2) : ''}} + {{form.entranceVehicleCountYoy === 0 ? form.entranceVehicleCountYoy : checkNotEmpty(form.entranceVehicleCountYoy) ? formatDigit(form.entranceVehicleCountYoy) : '--'}}% - 收费站出口车辆数汇总： + 收费站驶出车辆数统计： {{form.exitVehicleCount === 0 ? form.exitVehicleCount : form.exitVehicleCount || ''}} + :class="checkNotEmpty(form.exitVehicleCount) && form.exitVehicleCount === yoyMom.minusDaysExitVehicleSum ? 'danger' : ''"> - 收费站入口车辆数汇总环比(%) + :style="checkNotEmpty(form.exitVehicleCount) && form.exitVehicleCount === yoyMom.minusDaysExitVehicleSum ?'color: #EB4747':''"> + 驶出车辆数统计环比 - {{form.exitVehicleCountMom === 0 ? form.exitVehicleCountMom : form.exitVehicleCountMom ? form.exitVehicleCountMom.toFixed(2) : ''}} + :style="checkNotEmpty(form.exitVehicleCount) && form.exitVehicleCount === yoyMom.minusDaysExitVehicleSum ?'color: #EB4747':''"> + {{form.exitVehicleCountMom === 0 ? form.exitVehicleCountMom : checkNotEmpty(form.exitVehicleCountMom) ? formatDigit(form.exitVehicleCountMom) : '--'}}% - 收费站出口车辆数汇总同比(%) + 驶出车辆数统计同比 - {{form.exitVehicleCountYoy === 0 ? form.exitVehicleCountYoy : form.exitVehicleCountYoy ? form.exitVehicleCountYoy.toFixed(2) : ''}} + {{form.exitVehicleCountYoy === 0 ? form.exitVehicleCountYoy : checkNotEmpty(form.exitVehicleCountYoy) ? formatDigit(form.exitVehicleCountYoy) : '--'}}% @@ -126,7 +127,7 @@ {{form.highwaySubDataList[stationIndex].highwayName}} - 收费站入口车辆数： + 收费站驶入车辆数： + :class="form.highwaySubDataList.length == 0 ? '' : checkNotEmpty(form.highwaySubDataList[stationIndex].entranceVehicleCount) && (form.highwaySubDataList[stationIndex].entranceVehicleCountMom === 0 || (form.highwaySubDataList[stationIndex].entranceVehicleCount === form.highwaySubDataList[stationIndex].exitVehicleCount)) ? 'danger' : '' "> - 收费站入口车辆数环比(%) + :style="form.highwaySubDataList.length == 0 ? '' : checkNotEmpty(form.highwaySubDataList[stationIndex].entranceVehicleCount) && (form.highwaySubDataList[stationIndex].entranceVehicleCountMom === 0 || (form.highwaySubDataList[stationIndex].entranceVehicleCount === form.highwaySubDataList[stationIndex].exitVehicleCount)) ? 'color: #EB4747' : ''"> + 驶入车辆数环比 - {{form.highwaySubDataList.length == 0 ? '' : form.highwaySubDataList[stationIndex].entranceVehicleCountMom === 0 ? form.highwaySubDataList[stationIndex].entranceVehicleCountMom : form.highwaySubDataList[stationIndex].entranceVehicleCountMom ? form.highwaySubDataList[stationIndex].entranceVehicleCountMom.toFixed(2) : ''}} + :style="form.highwaySubDataList.length == 0 ? '' : checkNotEmpty(form.highwaySubDataList[stationIndex].entranceVehicleCount) && (form.highwaySubDataList[stationIndex].entranceVehicleCountMom === 0 || (form.highwaySubDataList[stationIndex].entranceVehicleCount === form.highwaySubDataList[stationIndex].exitVehicleCount)) ? 'color: #EB4747' : ''"> + {{form.highwaySubDataList.length == 0 ? '--' : form.highwaySubDataList[stationIndex].entranceVehicleCountMom === 0 ? form.highwaySubDataList[stationIndex].entranceVehicleCountMom : form.highwaySubDataList[stationIndex].entranceVehicleCountMom ? formatDigit(form.highwaySubDataList[stationIndex].entranceVehicleCountMom) : '--'}}% - 收费站入口车辆数同比(%) + 驶入车辆数同比 - {{form.highwaySubDataList.length == 0 ? '' : form.highwaySubDataList[stationIndex].entranceVehicleCountYoy === 0 ? form.highwaySubDataList[stationIndex].entranceVehicleCountYoy : form.highwaySubDataList[stationIndex].entranceVehicleCountYoy ? form.highwaySubDataList[stationIndex].entranceVehicleCountYoy.toFixed(2) : ''}} + {{form.highwaySubDataList.length == 0 ? '--' : form.highwaySubDataList[stationIndex].entranceVehicleCountYoy === 0 ? form.highwaySubDataList[stationIndex].entranceVehicleCountYoy : form.highwaySubDataList[stationIndex].entranceVehicleCountYoy ? formatDigit(form.highwaySubDataList[stationIndex].entranceVehicleCountYoy) : '--'}}% - 收费站出口车辆数： + 收费站驶出车辆数： + :class="form.highwaySubDataList.length == 0 ? '' : checkNotEmpty(form.highwaySubDataList[stationIndex].exitVehicleCount) && (form.highwaySubDataList[stationIndex].exitVehicleCountMom === 0 || (form.highwaySubDataList[stationIndex].entranceVehicleCount === form.highwaySubDataList[stationIndex].exitVehicleCount)) ? 'danger' : '' "> - 收费站出口车辆数环比(%) + :style="form.highwaySubDataList.length == 0 ? '' : checkNotEmpty(form.highwaySubDataList[stationIndex].exitVehicleCount) && (form.highwaySubDataList[stationIndex].exitVehicleCountMom === 0 || (form.highwaySubDataList[stationIndex].entranceVehicleCount === form.highwaySubDataList[stationIndex].exitVehicleCount)) ? 'color: #EB4747' : ''"> + 驶出车辆数环比 - {{form.highwaySubDataList.length == 0 ? '' : form.highwaySubDataList[stationIndex].exitVehicleCountMom === 0 ? form.highwaySubDataList[stationIndex].exitVehicleCountMom : form.highwaySubDataList[stationIndex].exitVehicleCountMom ? form.highwaySubDataList[stationIndex].exitVehicleCountMom.toFixed(2) : ''}} + :style="form.highwaySubDataList.length == 0 ? '' : checkNotEmpty(form.highwaySubDataList[stationIndex].exitVehicleCount) && (form.highwaySubDataList[stationIndex].exitVehicleCountMom === 0 || (form.highwaySubDataList[stationIndex].entranceVehicleCount === form.highwaySubDataList[stationIndex].exitVehicleCount)) ? 'color: #EB4747' : ''"> + {{form.highwaySubDataList.length == 0 ? '--' : form.highwaySubDataList[stationIndex].exitVehicleCountMom === 0 ? formatDigit(form.highwaySubDataList[stationIndex].exitVehicleCountMom) : form.highwaySubDataList[stationIndex].exitVehicleCountMom ? formatDigit(form.highwaySubDataList[stationIndex].exitVehicleCountMom) : '--'}}% - 收费站出口车辆数同比(%) + 驶出车辆数同比 - {{form.highwaySubDataList.length == 0 ? '' : form.highwaySubDataList[stationIndex].exitVehicleCountYoy === 0 ? form.highwaySubDataList[stationIndex].exitVehicleCountYoy : form.highwaySubDataList[stationIndex].exitVehicleCountYoy ? form.highwaySubDataList[stationIndex].exitVehicleCountYoy.toFixed(2) : ''}} + {{form.highwaySubDataList.length == 0 ? '--' : form.highwaySubDataList[stationIndex].exitVehicleCountYoy === 0 ? form.highwaySubDataList[stationIndex].exitVehicleCountYoy : form.highwaySubDataList[stationIndex].exitVehicleCountYoy ? formatDigit(form.highwaySubDataList[stationIndex].exitVehicleCountYoy) : '--'}}% @@ -214,15 +215,15 @@ 备注： + placeholderStyle="color: #D4D4D4;font-size:28rpx;" placeholder="请输入备注信息" type="textarea" maxlength="200" + autoHeight> - 取消 - 确认 + + {{btnText}} @@ -254,16 +255,17 @@ userInfo: {}, yoyMom: {}, //同比环比 showStaion: false, //展开收起 - pageType: '', - deptNameList: [],//当前登录人所在单位 + pageType: '', + deptNameList: [], //当前登录人所在单位 + btnText: '保存' } }, onLoad(options) { - this.userInfo = uni.getStorageSync('userInfo'); - let arr = uni.getStorageSync('deptName'); + this.userInfo = uni.getStorageSync('userInfo'); + let arr = uni.getStorageSync('deptName'); this.deptNameList = checkNotEmpty(arr) ? arr : []; if (options.type == 'add') { - this.form.organizationName = this.deptNameList.length > 0 ? this.deptNameList[0] : ''; + this.form.organizationName = this.deptNameList.length > 0 ? this.deptNameList[0].deptName : ''; this.form.organizationNameIndex = this.deptNameList.length > 0 ? 0 : ''; this.pageType = 'add'; let now = new Date(); @@ -272,21 +274,29 @@ this.queryTime(); //统计时段 } if (options.id) { + this.btnText = '修改并保存'; this.queryDetailInfo(options.id); } this.queryPerson(); }, methods: { + checkNotEmpty(data) { + return checkNotEmpty(data); + }, + //只保留两位小数 + formatDigit(data) { + return (data+'').indexOf('.') > -1 && (data+'').substring((data+'').indexOf('.')).length > 2 ? data.toFixed(2) : data; + }, //id查询详情 queryDetailInfo(id) { this.$request(getApp().globalData.baseUrl + '/api/biz/highwayParentDataController/selectById/' + id, {}, 'GET').then(res => { this.form = res.data; this.queryTime(); - this.queryStation(); - if(checkNotEmpty(this.deptNameList)) { - let idx = this.deptNameList.findIndex(item => item = this.form.organizationName); - this.form.organizationNameIndex = idx > -1 ? idx : ''; + this.queryStation(); + if (checkNotEmpty(this.deptNameList)) { + let idx = this.deptNameList.findIndex(item => item.deptName = this.form.organizationName); + this.form.organizationNameIndex = idx > -1 ? idx : ''; } }) }, @@ -296,15 +306,15 @@ this.$request(getApp().globalData.baseUrl + '/api/biz/highwayParentDataController/getYoYAndMoM?statDate=' + this.form.statDate + '&statPeriod=' + this.form.statPeriod + '&_t=' + Date.parse(new Date()), {}, "GET").then( - res => { - this.yoyMom = res.data; - //如果重新更改填报日期，重新计算同比环比 - if (this.highwaySubDataList.length > 0 && this.form.highwaySubDataList.length > 0) { - this.highwaySubDataList.map((item, index) => { - this.checkStationInfo(index); - }) - } - }) + res => { + this.yoyMom = res.data; + //如果重新更改填报日期，重新计算同比环比 + if (this.highwaySubDataList.length > 0 && this.form.highwaySubDataList.length > 0) { + this.highwaySubDataList.map((item, index) => { + this.checkStationInfo(index); + }) + } + }) } }, //报送人 @@ -335,31 +345,49 @@ checkStationInfo(index) { this.highwaySubDataList[index].isFinish = this.form.highwaySubDataList[index].entranceVehicleCount != '' && this.form.highwaySubDataList[index].exitVehicleCount != ''; - //汇总计算 + //统计计算 let entranceVehicleCount = 0, exitVehicleCount = 0; this.form.highwaySubDataList.map(item => { - entranceVehicleCount = entranceVehicleCount + (item.entranceVehicleCount ? parseInt(item + entranceVehicleCount = entranceVehicleCount + (checkNotEmpty(item.entranceVehicleCount) ? parseInt(item .entranceVehicleCount) : 0); - exitVehicleCount = exitVehicleCount + (item.exitVehicleCount ? parseInt(item + exitVehicleCount = exitVehicleCount + (checkNotEmpty(item.exitVehicleCount) ? parseInt(item .exitVehicleCount) : 0); }) this.form.entranceVehicleCount = entranceVehicleCount; this.form.exitVehicleCount = exitVehicleCount; - //收费站入口车辆数汇总 - this.form.entranceVehicleCountMom = this.form.entranceVehicleCount && this.yoyMom - .minusDaysEntranceVehicleSum ? (parseInt(this.form.entranceVehicleCount) - this.yoyMom - .minusDaysEntranceVehicleSum) / this.yoyMom.minusDaysEntranceVehicleSum * 100 : ''; - this.form.entranceVehicleCountYoy = this.form.entranceVehicleCount && this.yoyMom - .minusYearsEntranceVehicleSum ? (parseInt(this.form.entranceVehicleCount) - this.yoyMom - .minusYearsEntranceVehicleSum) / this.yoyMom.minusYearsEntranceVehicleSum * 100 : ''; //同比 - //收费站出口车辆数汇总 - this.form.exitVehicleCountMom = this.form.exitVehicleCount && this.yoyMom.minusDaysExitVehicleSum ? ( - parseInt(this.form.exitVehicleCount) - this.yoyMom.minusDaysExitVehicleSum) / this.yoyMom - .minusDaysExitVehicleSum * 100 : ''; - this.form.exitVehicleCountYoy = this.form.exitVehicleCount && this.yoyMom.minusYearsExitVehicleSum ? ( - parseInt(this.form.exitVehicleCount) - this.yoyMom.minusYearsExitVehicleSum) / this.yoyMom - .minusYearsExitVehicleSum * 100 : ''; //同比 + //环比计算规则 if今天没有值不计算，elseif昨天没有值不计算，elseif昨天===0并且今天===0百分比0，esleif昨天0今天大于0百分比100,else(今天-昨天)/昨天*100 + //收费站驶入车辆数统计 + this.form.entranceVehicleCountMom = !checkNotEmpty(this.form.entranceVehicleCount) ? '' : !checkNotEmpty(this + .form.minusDaysEntranceVehicleSum) ? '' : this.form.minusDaysEntranceVehicleSum === 0 && parseInt(this + .form.entranceVehicleCount) === 0 ? 0 : this.form.minusDaysEntranceVehicleSum === 0 && parseInt(this + .form.entranceVehicleCount) > 0 ? 100 : (parseInt(this + .form.entranceVehicleCount) - this.yoyMom.minusDaysEntranceVehicleSum) / this.yoyMom + .minusDaysEntranceVehicleSum * 100; + this.form.entranceVehicleCountYoy = !checkNotEmpty(this.form + .entranceVehicleCount) ? '' : !checkNotEmpty(this + .form.minusYearsEntranceVehicleSum) ? '' : this.form.minusYearsEntranceVehicleSum === 0 && parseInt( + this.form.entranceVehicleCount) === 0 ? 0 : this.form.minusYearsEntranceVehicleSum === 0 && parseInt( + this.form.entranceVehicleCount) > 0 ? 100 : (parseInt( + this.form.entranceVehicleCount) - this.yoyMom.minusYearsEntranceVehicleSum) / this.yoyMom + .minusYearsEntranceVehicleSum * 100; + + //收费站驶出车辆数统计 + this.form.exitVehicleCountMom = !checkNotEmpty(this.form.exitVehicleCount) ? '' : !checkNotEmpty(this + .form + .minusDaysExitVehicleSum) ? '' : this.form.minusDaysExitVehicleSum === 0 && parseInt(this.form + .exitVehicleCount) === 0 ? 0 : this.form.minusDaysExitVehicleSum === 0 && parseInt(this.form + .exitVehicleCount) > 0 ? 100 : (parseInt(this.form + .exitVehicleCount) - this.yoyMom.minusDaysExitVehicleSum) / this.yoyMom.minusDaysExitVehicleSum * + 100; + this.form.exitVehicleCountYoy = !checkNotEmpty(this.form.exitVehicleCount) ? '' : !checkNotEmpty( + this.form + .minusYearsExitVehicleSum) ? '' : this.form.minusYearsExitVehicleSum === 0 && parseInt(this.form + .exitVehicleCount) === 0 ? 0 : this.form.minusYearsExitVehicleSum === 0 && parseInt(this.form + .exitVehicleCount) > 0 ? 100 : (parseInt(this.form + .exitVehicleCount) - this.yoyMom.minusYearsExitVehicleSum) / this.yoyMom.minusYearsExitVehicleSum * + 100; + //收费站子表计算同比环比 // if(this.form.highwaySubDataList[index].entranceVehicleCount != '' || this.form.highwaySubDataList[index].exitVehicleCount != ''){ let idx = this.yoyMom.minusDaysList.findIndex(item => { @@ -375,11 +403,12 @@ console.log(obj) this.form.highwaySubDataList[index].entranceVehicleCountMom = !checkNotEmpty(this.form .highwaySubDataList[index].entranceVehicleCount) ? '' : !checkNotEmpty(obj - .entranceVehicleCount) || obj.entranceVehicleCount === 0 ? 100 : (parseInt(this.form + .entranceVehicleCount) ? '' : obj.entranceVehicleCount === 0 ? 100 : (parseInt(this.form .highwaySubDataList[index].entranceVehicleCount) - obj.entranceVehicleCount) / obj .entranceVehicleCount * 100; - this.form.highwaySubDataList[index].exitVehicleCountMom = !checkNotEmpty(this.form.highwaySubDataList[ - index].exitVehicleCount) ? '' : !checkNotEmpty(obj.exitVehicleCount) || obj + this.form.highwaySubDataList[index].exitVehicleCountMom = !checkNotEmpty(this.form + .highwaySubDataList[ + index].exitVehicleCount) ? '' : !checkNotEmpty(obj.exitVehicleCount) ? '' : obj .exitVehicleCount === 0 ? 100 : (parseInt(this.form.highwaySubDataList[index].exitVehicleCount) - obj.exitVehicleCount) / obj.exitVehicleCount * 100; } else { @@ -392,12 +421,13 @@ console.log(obj) this.form.highwaySubDataList[index].entranceVehicleCountYoy = !checkNotEmpty(this.form .highwaySubDataList[index].entranceVehicleCount) ? '' : !checkNotEmpty(obj - .entranceVehicleCount) || obj.entranceVehicleCount === 0 ? 100 : (parseInt(this.form + .entranceVehicleCount) ? '' : obj.entranceVehicleCount === 0 ? 100 : (parseInt(this.form .highwaySubDataList[index].entranceVehicleCount) - obj.entranceVehicleCount) / obj .entranceVehicleCount * 100; - this.form.highwaySubDataList[index].exitVehicleCountYoy = !checkNotEmpty(this.form.highwaySubDataList[ - index].exitVehicleCount) ? this.form.highwaySubDataList[index].exitVehicleCount : ! - checkNotEmpty(obj.exitVehicleCount) || obj.exitVehicleCount === 0 ? 100 : (parseInt(this.form + this.form.highwaySubDataList[index].exitVehicleCountYoy = !checkNotEmpty(this.form + .highwaySubDataList[ + index].exitVehicleCount) ? '' : ! + checkNotEmpty(obj.exitVehicleCount) ? '' : obj.exitVehicleCount === 0 ? 100 : (parseInt(this.form .highwaySubDataList[index].exitVehicleCount) - obj.exitVehicleCount) / obj.exitVehicleCount * 100; } else { @@ -408,8 +438,9 @@ }, //收费站列表 queryStation(type) { - this.$request(getApp().globalData.baseUrl + '/api/biz/HighSpeedPermissionsInfo/findList?_t=' + Date.parse( - new Date()), {}, 'GET').then(res => { + this.$request(getApp().globalData.baseUrl + '/api/biz/HighSpeedPermissionsInfo/findList?_t=' + Date + .parse( + new Date()), {}, 'GET').then(res => { this.highwaySubDataList = res.data; if (type == 'add') { this.highwaySubDataList.map(item => { @@ -530,20 +561,6 @@ }) return; } - //环比0持平的备注不能为空 - let checkRemark = true; - if (this.form.highwaySubDataList.length > 0) { - checkRemark = this.form.highwaySubDataList.every(item => { - return item.entranceVehicleCountMom !== 0 && item.exitVehicleCountMom !== 0; - }) - } - if (!checkRemark) { - uni.showToast({ - title: '环比持平预警请填写备注原因', - icon: 'none' - }) - return; - } uni.showModal({ title: '提示', content: this.form.id == undefined ? '您确认提交该条报送数据?' : '您确认将该条数据进行修改?', @@ -559,7 +576,8 @@ title: '提交中...', mask: true }) - this.$request(getApp().globalData.baseUrl + '/api/biz/highwayParentDataController/saveOrUpdate', this.form, + this.$request(getApp().globalData.baseUrl + '/api/biz/highwayParentDataController/saveOrUpdate', this + .form, 'POST').then(res => { uni.hideLoading(); if (res.code == 200) { @@ -804,7 +822,7 @@ z-index: 99; .act_btn { - width: 329rpx; + width: 690rpx; height: 90rpx; color: #666666; font-size: 28rpx; @@ -828,4 +846,4 @@ background-color: #007aff; color: #ffffff; } - + \ No newline at end of file diff --git a/pages/highWay/runStatusData/form.vue b/pages/highWay/runStatusData/form.vue index 142d138..95dd712 100644 --- a/pages/highWay/runStatusData/form.vue +++ b/pages/highWay/runStatusData/form.vue @@ -69,13 +69,19 @@ + 是否有伤亡： + + + + + 伤者人数： - + 亡者人数： 拥堵发生时间： - + {{item.congestionStartTime?formatdate(item.congestionStartTime):'请选择'}} @@ -121,7 +127,7 @@ 拥堵处理结束时间： - + {{item.congestionEndTime?formatdate(item.congestionEndTime):'请选择'}} @@ -196,7 +202,7 @@ 事故发生时间： - + {{item.accidentStartTime?formatdate(item.accidentStartTime):'请选择'}} @@ -206,7 +212,7 @@ 事故处理结束时间： - + {{item.accidentEndTime?formatdate(item.accidentEndTime):'请选择'}} @@ -274,8 +280,8 @@ - 取消 - 确认 + + {{btnText}} @@ -337,7 +343,9 @@ userInfo: {}, tabType: 1, //拥堵事故类型 accidentLevel: [], //事故等级 - pageType: '' + pageType: '', + isHas: 0,//是否有伤亡 + btnText: '保存' } }, onLoad(options) { @@ -351,12 +359,22 @@ this.queryAccidentLevel(); //事故等级 this.queryTime(); //统计时段 } else if (options.id) { + this.btnText = '修改并保存'; this.queryDetailInfo(options.id); } }, - methods: { + methods: { + //切换是否有伤亡 + changeIsHas(e) { + this.form.isHas = e.detail.value; + if(e.detail.value === 0) { + //无伤亡清空 + this.form.injuredCount = 0; + this.form.deceasedCount = 0; + } + }, formatdate(date) { - return date.length < 12 ? date + '00:00:00' : date; + return date.length < 12 ? date + '00:00' : date; }, //id查询详情 queryDetailInfo(id) { @@ -374,7 +392,7 @@ queryHighway() { this.$request(getApp().globalData.baseUrl + '/api/biz/roadInfo/all?page=0&pageSize=0&_t=' + Date.parse( new Date()), {}, 'GET').then(res => { - this.highwayDataList = res.data; + this.highwayDataList = res.data.list; this.form.highwayAccidentDetailDTOS.map(item => { let idx = this.highwayDataList.findIndex(item2 => item2.stdName == item.highwayName); item.highwayNameIndex = idx > -1 ? idx : ''; @@ -807,7 +825,7 @@ z-index: 11; .act_btn { - width: 329rpx; + width: 690rpx; height: 90rpx; color: #666666; font-size: 28rpx; diff --git a/pages/login/login.vue b/pages/login/login.vue index 6cf8b63..270e74c 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -95,7 +95,7 @@ getDeptName() { this.$request(getApp().globalData.baseUrl + '/api/user/getDeptName', {}, 'GET').then(res => { if(res.code == 200) { - // uni.setStorageSync('deptName', res.data); + uni.setStorageSync('deptName', res.data); } }).catch(() => { }) diff --git a/pages/railway/railwayRunData/form.vue b/pages/railway/railwayRunData/form.vue index aed5029..e45390c 100644 --- a/pages/railway/railwayRunData/form.vue +++ b/pages/railway/railwayRunData/form.vue @@ -66,17 +66,17 @@ - 终到车次环比(%) + 终到车次环比 - {{form.inRailwayYomDo ? form.inRailwayYomDo.toFixed(2) : ''}} + {{form.inRailwayYomDo ? formatDigit(form.inRailwayYomDo) : '--'}}% - 终到车次同比(%) + 终到车次同比 - {{form.inRailwayMomDo ? form.inRailwayMomDo.toFixed(2) : ''}} + {{form.inRailwayMomDo ? formatDigit(form.inRailwayMomDo) : '--'}}% @@ -93,18 +93,18 @@ :class="form.inPepole && form.inPepole == yoyMom.yesterdayData.inPepole ? 'danger' : '' "> 人数环比(%) + :style="form.inPepole && form.inPepole == yoyMom.yesterdayData.inPepole ? 'color: #EB4747' : ''">人数环比 - {{form.inPepoleYoyDo ? form.inPepoleYoyDo.toFixed(2) : ''}} + {{form.inPepoleYoyDo ? formatDigit(form.inPepoleYoyDo) : '--'}}% - 人数同比(%) + 人数同比 - {{form.inPepoleMomDo ? form.inPepoleMomDo.toFixed(2) : ''}} + {{form.inPepoleMomDo ? formatDigit(form.inPepoleMomDo) : '--'}}% @@ -144,17 +144,17 @@ - 始发车次环比(%) + 始发车次环比 - {{form.outRailwayYomDo ? form.outRailwayYomDo.toFixed(2) : ''}} + {{form.outRailwayYomDo ? formatDigit(form.outRailwayYomDo) : '--'}}% - 始发车次同比(%) + 始发车次同比 - {{form.outRailwayMomDo ? form.outRailwayMomDo.toFixed(2) : ''}} + {{form.outRailwayMomDo ? formatDigit(form.outRailwayMomDo) : '--'}}% @@ -170,18 +170,18 @@ 人数环比(%) + :style="form.outPepole && form.outPepole == yoyMom.yesterdayData.outPeople ? 'color: #EB4747' : ''">人数环比 - {{form.outPepoleYoyDo ? form.outPepoleYoyDo.toFixed(2) : ''}} + {{form.outPepoleYoyDo ? formatDigit(form.outPepoleYoyDo) : '--'}}% - 人数同比(%) + 人数同比 - {{form.outPepoleMomDo ? form.outPepoleMomDo.toFixed(2) : ''}} + {{form.outPepoleMomDo ? formatDigit(form.outPepoleMomDo) : '--'}}% @@ -197,8 +197,8 @@ - 取消 - 确认 + + {{btnText}} @@ -239,7 +239,8 @@ array: [], //时段选择列表 index: 2, //时段选择,默认0-24 userInfo: {}, - pageType: '' + pageType: '', + btnText: '保存' } }, onLoad(options) { @@ -251,6 +252,7 @@ this.form.statDate = getDateStr(now, -1); //默认前一天 this.queryTime(); //统计时段 } else if (options.id) { + this.btnText = '修改并保存'; this.$request(getApp().globalData.baseUrl + '/api/biz/railwayRunData/find/' + options.id, {}, "GET").then( res => { this.form = res.data; @@ -259,6 +261,10 @@ } }, methods: { + //只保留两位小数 + formatDigit(data) { + return (data+'').indexOf('.') > -1 && (data+'').substring((data+'').indexOf('.')).length > 2 ? data.toFixed(2) : data; + }, //环比同比 queryYoyMom() { if (this.form.statDate == '' || this.form.statPeriod == '') { @@ -712,7 +718,7 @@ z-index: 11; .act_btn { - width: 329rpx; + width: 690rpx; height: 90rpx; color: #666666; font-size: 28rpx; diff --git a/pages/railway/runStatus/form.vue b/pages/railway/runStatus/form.vue index 0ddf0eb..a3360aa 100644 --- a/pages/railway/runStatus/form.vue +++ b/pages/railway/runStatus/form.vue @@ -9,11 +9,12 @@ 车站名称： - + {{form.carName?form.carName:'请选择'}} + {{form.carName}} @@ -62,8 +63,8 @@ - 取消 - 确认 + + {{btnText}} @@ -88,7 +89,8 @@ array: [], //时段选择列表 index: 2, //时段选择,默认0-24 userInfo: {}, - pageType: '' + pageType: '', + btnText: '保存' } }, onLoad(options) { @@ -99,7 +101,8 @@ this.form.statDate = getDateStr(now, -1); //默认前一天 this.queryTime(); //统计时段 this.queryStation(); //车展名称列表 - } if (options.id) { + } if (options.id) { + this.btnText = '修改并保存'; this.$request(getApp().globalData.baseUrl+'/api/biz/railwayRunSituation/find//'+options.id,{},"GET").then(res => { this.form = res.data; this.queryTime(); //统计时段 @@ -457,7 +460,7 @@ z-index: 11; .act_btn { - width: 329rpx; + width: 690rpx; height: 90rpx; color: #666666; font-size: 28rpx; diff --git a/pages/water/transportation/form.vue b/pages/water/transportation/form.vue index 7fec28e..a2770e6 100644 --- a/pages/water/transportation/form.vue +++ b/pages/water/transportation/form.vue @@ -52,7 +52,7 @@ 事故发生时间： - + {{item.accidentHappened?formatdate(item.accidentHappened):'请选择'}} @@ -66,7 +66,7 @@ placeholder="请输入" maxlength="200"> - + 事故内容： @@ -95,7 +95,7 @@ 事故处理结束时间： - + {{item.endTime?formatdate(item.endTime):'请选择'}} @@ -109,8 +109,8 @@ - 取消 - 确认 + + {{btnText}} @@ -130,7 +130,7 @@ "dataDetails" : "", "disposalWork" : "", "endTime" : "", - "gradeAccidents" : "", + // "gradeAccidents" : "", "occurrenceLocation" : "", "parentId" : "", "rowKey" : 0 @@ -143,8 +143,9 @@ index: 2, //时段选择,默认0-24 userInfo: {}, tabType: 1, //拥堵事故类型 - accidentLevel: [], //事故等级 - pageType: '' + // accidentLevel: [], //事故等级 + pageType: '', + btnText: '保存' } }, onLoad(options) { @@ -154,22 +155,23 @@ this.form.affiliatedUnit = this.userInfo.organizationName ? this.userInfo.organizationName : ''; let now = new Date(); this.form.statDate = getDateStr(now, -1); //默认前一天 - this.queryAccidentLevel(); //事故等级 + // this.queryAccidentLevel(); //事故等级 this.queryTime(); //统计时段 } else if (options.id) { + this.btnText = '修改并保存'; this.queryDetailInfo(options.id); } }, methods: { formatdate(date) { - return date.length < 12 ? date + '00:00:00' : date; + return date.length < 12 ? date + '00:00' : date; }, //id查询详情 queryDetailInfo(id) { this.$request(getApp().globalData.baseUrl + '/api/biz/watertransportRunSituation/find/' + id, {}, 'GET').then(res => { this.form = res.data; - this.queryAccidentLevel(); //事故等级 + // this.queryAccidentLevel(); //事故等级 this.queryTime(); //统计时段 }) }, @@ -532,7 +534,7 @@ z-index: 11; .act_btn { - width: 329rpx; + width: 690rpx; height: 90rpx; color: #666666; font-size: 28rpx; diff --git a/pages/water/waterWay/form.vue b/pages/water/waterWay/form.vue index 134c4aa..3e67cf0 100644 --- a/pages/water/waterWay/form.vue +++ b/pages/water/waterWay/form.vue @@ -12,6 +12,12 @@ {{form.affiliatedUnit}} --> + + 陆岛名称： + + {{form.bizWaterwayIslandDataSaveOrUpdateDTOList.length > 0 ? form.bizWaterwayIslandDataSaveOrUpdateDTOList[landNameIndex].landName : ''}} + + 统计日期： @@ -33,113 +39,110 @@ - - - - - 序号-{{index+1}} - + + + + + - + {{item.stationId || ''}} + + + + + + {{item.stationId || ''}} + + + + + + 水路(陆岛)： - + + {{form.bizWaterwayIslandDataSaveOrUpdateDTOList.length >= 0 ? form.bizWaterwayIslandDataSaveOrUpdateDTOList[landNameIndex].landName : ''}} 航次： - - + 航次环比(%) + :style="form.bizWaterwayIslandDataSaveOrUpdateDTOList[landNameIndex].voyage && form.bizWaterwayIslandDataSaveOrUpdateDTOList[landNameIndex].voyage == form.bizWaterwayIslandDataSaveOrUpdateDTOList[landNameIndex].yesterdayVoyage ? 'color: #EB4747' : ''"> + 航次环比 - {{item.voyageRingRatio === 0 ? item.voyageRingRatio : item.voyageRingRatio ? item.voyageRingRatio.toFixed(2) : ''}} + :style="form.bizWaterwayIslandDataSaveOrUpdateDTOList[landNameIndex].voyage && item.voyage == form.bizWaterwayIslandDataSaveOrUpdateDTOList[landNameIndex].yesterdayVoyage ? 'color: #EB4747' : ''"> + {{form.bizWaterwayIslandDataSaveOrUpdateDTOList.length == 0 ? '' : form.bizWaterwayIslandDataSaveOrUpdateDTOList[landNameIndex].voyageRingRatio === 0 ? form.bizWaterwayIslandDataSaveOrUpdateDTOList[landNameIndex].voyageRingRatio : form.bizWaterwayIslandDataSaveOrUpdateDTOList[landNameIndex].voyageRingRatio ? formatDigit(form.bizWaterwayIslandDataSaveOrUpdateDTOList[landNameIndex].voyageRingRatio) : '--'}}% - 航次同比(%) + 航次同比 - {{item.voyageYearOnYear === 0 ? item.voyageYearOnYear : item.voyageYearOnYear ? item.voyageYearOnYear.toFixed(2) : ''}} + {{form.bizWaterwayIslandDataSaveOrUpdateDTOList.length == 0 ? '' : form.bizWaterwayIslandDataSaveOrUpdateDTOList[landNameIndex].voyageYearOnYear === 0 ? form.bizWaterwayIslandDataSaveOrUpdateDTOList[landNameIndex].voyageYearOnYear : form.bizWaterwayIslandDataSaveOrUpdateDTOList[landNameIndex].voyageYearOnYear ? formatDigit(form.bizWaterwayIslandDataSaveOrUpdateDTOList[landNameIndex].voyageYearOnYear) : '--'}}% 人数： - + :class="form.bizWaterwayIslandDataSaveOrUpdateDTOList[landNameIndex].numberOfPeople && form.bizWaterwayIslandDataSaveOrUpdateDTOList[landNameIndex].numberOfPeople == form.bizWaterwayIslandDataSaveOrUpdateDTOList[landNameIndex].yesterdayNumberOfPeople ? 'danger' : '' "> 人数环比(%) + :style="form.bizWaterwayIslandDataSaveOrUpdateDTOList[landNameIndex].numberOfPeople && form.bizWaterwayIslandDataSaveOrUpdateDTOList[landNameIndex].numberOfPeople == form.bizWaterwayIslandDataSaveOrUpdateDTOList[landNameIndex].yesterdayNumberOfPeople ? 'color: #EB4747' : ''"> + 人数环比 - {{item.peopleRingRatio === 0 ? item.peopleRingRatio : item.peopleRingRatio ? item.peopleRingRatio.toFixed(2) : ''}} + :style="form.bizWaterwayIslandDataSaveOrUpdateDTOList[landNameIndex].numberOfPeople && form.bizWaterwayIslandDataSaveOrUpdateDTOList[landNameIndex].numberOfPeople == form.bizWaterwayIslandDataSaveOrUpdateDTOList[landNameIndex].yesterdayNumberOfPeople ? 'color: #EB4747' : ''"> + {{form.bizWaterwayIslandDataSaveOrUpdateDTOList.length == 0 ? '' : form.bizWaterwayIslandDataSaveOrUpdateDTOList[landNameIndex].peopleRingRatio === 0 ? form.bizWaterwayIslandDataSaveOrUpdateDTOList[landNameIndex].peopleRingRatio : form.bizWaterwayIslandDataSaveOrUpdateDTOList[landNameIndex].peopleRingRatio ? formatDigit(form.bizWaterwayIslandDataSaveOrUpdateDTOList[landNameIndex].peopleRingRatio) : '--'}}% - 人数同比(%) + 人数同比 - {{item.peopleYearOnYear === 0 ? item.peopleYearOnYear : item.peopleYearOnYear ? item.peopleYearOnYear.toFixed(2) : ''}} + {{form.bizWaterwayIslandDataSaveOrUpdateDTOList.length == 0 ? '' : form.bizWaterwayIslandDataSaveOrUpdateDTOList[landNameIndex].peopleYearOnYear === 0 ? form.bizWaterwayIslandDataSaveOrUpdateDTOList[landNameIndex].peopleYearOnYear : form.bizWaterwayIslandDataSaveOrUpdateDTOList[landNameIndex].peopleYearOnYear ? formatDigit(form.bizWaterwayIslandDataSaveOrUpdateDTOList[landNameIndex].peopleYearOnYear) : '--'}}% - - 昨日航次： - - {{item.yesterdayVoyage}} - - - - 去年航次： - - {{item.lastYearVoyage}} - - - - 昨日人数： - - {{item.yesterdayNumberOfPeople}} - - - - 去年人数： - - {{item.lastYearNumberOfPeople}} - - - + - 增行 + - 取消 - 确认 + + {{btnText}} @@ -152,27 +155,18 @@ data() { return { form: { - "bizWaterwayIslandDataSaveOrUpdateDTOList": [{ - "landNameIndex":"", - "landName": "", - "lastYearNumberOfPeople": 0, - "lastYearVoyage": 0, - "numberOfPeople": 0, - "peopleRingRatio": 0.0, - "peopleYearOnYear": 0.0, - "voyage": 0, - "voyageRingRatio": 0.0, - "voyageYearOnYear": 0.0, - "yesterdayNumberOfPeople": 0, - "yesterdayVoyage": 0 - }], - "reportDate": "" + "bizWaterwayIslandDataSaveOrUpdateDTOList": [], + "reportDate": "", + "statPeriod": "" }, //登录form array: [], //时段选择列表 index: 2, //时段选择,默认0-24 userInfo: {}, - landList: ['灵山岛', '斋堂岛', '青黄线', '竹岔', '田横'], //事故等级 - pageType: '' + landList: ['灵山岛', '斋堂岛', '青黄线', '竹岔', '田横'], + landNameIndex: 0, + showLand: false, + pageType: '', + btnText: '保存' } }, onLoad(options) { @@ -181,37 +175,84 @@ this.pageType = 'add'; let now = new Date(); this.form.reportDate = getDateStr(now, -1); //默认前一天 - this.queryTime(); //统计时段 - this.queryLandList();//陆岛权限列表 + this.queryTime(); //统计时段 + this.queryLandList(); //陆岛权限列表 } else if (options.item) { + this.btnText = '修改并保存'; this.form = JSON.parse(options.item); this.form.bizWaterwayIslandDataSaveOrUpdateDTOList = this.form.bizWaterwayIslandDataVOList; - this.form.bizWaterwayIslandDataSaveOrUpdateDTOList.map(item => { - let idx = this.landList.findIndex(item2 => item2 == item.landName); - item.landNameIndex = idx > -1 ? idx : ''; - }) + this.queryLandList(); //陆岛权限列表 this.queryTime(); } else if (options.id) { + this.btnText = '修改并保存'; this.queryDetailInfo(options.id); } }, methods: { - formatdate(date) { - return date.length < 12 ? date + ' 00:00:00' : date; - }, - //陆岛列表 - queryLandList() { - this.$request(getApp().globalData.baseUrl + '/api/biz/bizWaterwayIslandAuthority/list', {}, 'GET').then(res => { - let arr = []; - res.data.map(item => { - arr.push(item.stationId); - }) - this.landList = arr; - this.form.bizWaterwayIslandDataSaveOrUpdateDTOList.map(item => { - let idx = this.landList.findIndex(item2 => item2 == item.landName); - item.landNameIndex = idx > -1 ? idx : ''; - }) - }) + formatDigit(data) { + return (data+'').indexOf('.') > -1 && (data+'').substring((data+'').indexOf('.')).length > 2 ? data.toFixed(2) : data; + }, + //切换当前编辑陆岛索引 + changeLandNameIndex(index) { + if (this.form.bizWaterwayIslandDataSaveOrUpdateDTOList[this.landNameIndex].voyage != '' && this.form + .bizWaterwayIslandDataSaveOrUpdateDTOList[this.landNameIndex].numberOfPeople != '') { + this.landList[this.landNameIndex].isFinish = true; + } else { + this.landList[this.landNameIndex].isFinish = false; + } + this.landNameIndex = index; + console.log('landNameIndex', index) + }, + //陆岛列表 + queryLandList() { + this.$request(getApp().globalData.baseUrl + '/api/biz/bizWaterwayIslandAuthority/list', {}, 'GET').then(res => { + this.landList = res.data; + if (this.pageType == 'add') { + this.landList.map(item => { + item.isFinish = false; + this.form.bizWaterwayIslandDataSaveOrUpdateDTOList.push({ + "landName": item.stationId, + "lastYearNumberOfPeople": '', + "lastYearVoyage": '', + "numberOfPeople": '', + "peopleRingRatio": '', + "peopleYearOnYear": '', + "voyage": '', + "voyageRingRatio": '', + "voyageYearOnYear": '', + "yesterdayNumberOfPeople": '', + "yesterdayVoyage": '', + }) + }) + } else { + let arr = JSON.parse(JSON.stringify(this.form.bizWaterwayIslandDataSaveOrUpdateDTOList)); + this.form.bizWaterwayIslandDataSaveOrUpdateDTOList = []; + this.landList.map(item => { + let idx = arr.findIndex(item2 => item2.landName == item.stationId); + console.log(idx) + if (idx > -1) { + item.isFinish = checkNotEmpty(arr[idx].numberOfPeople) && checkNotEmpty(arr[idx].voyage) ? true : + false; + this.form.bizWaterwayIslandDataSaveOrUpdateDTOList.push(arr[idx]); + } else { + item.isFinish = false; + this.form.bizWaterwayIslandDataSaveOrUpdateDTOList.push({ + "landName": item.stationId, + "lastYearNumberOfPeople": '', + "lastYearVoyage": '', + "numberOfPeople": '', + "peopleRingRatio": '', + "peopleYearOnYear": '', + "voyage": '', + "voyageRingRatio": '', + "voyageYearOnYear": '', + "yesterdayNumberOfPeople": '', + "yesterdayVoyage": '', + }) + } + }) + } + }) }, //陆岛切换 changeLandName(e, index) { @@ -223,45 +264,67 @@ title: '水运(陆岛)不能重复选择', icon: 'none' }); - }else{ - this.form.bizWaterwayIslandDataSaveOrUpdateDTOList[index].landNameIndex = e.detail.value; - this.form.bizWaterwayIslandDataSaveOrUpdateDTOList[index].landName = this.landList[e.detail.value]; - this.calcYoyMom(index); + } else { + this.form.bizWaterwayIslandDataSaveOrUpdateDTOList[index].landNameIndex = e.detail.value; + this.form.bizWaterwayIslandDataSaveOrUpdateDTOList[index].landName = this.landList[e.detail.value]; + this.calcYoyMom(index); } }, //环比同比计算 - calcYoyMom(index) { + calcYoyMom(landNameIndex) { if (this.form.reportDate == '' || this.form.statPeriod == '' || this.form - .bizWaterwayIslandDataSaveOrUpdateDTOList[index].landName == '') { + .bizWaterwayIslandDataSaveOrUpdateDTOList[landNameIndex].landName == '') { return; } + this.form.bizWaterwayIslandDataSaveOrUpdateDTOList[landNameIndex].isFinish = checkNotEmpty(this.form + .bizWaterwayIslandDataSaveOrUpdateDTOList[landNameIndex].voyage) && checkNotEmpty(this.form + .bizWaterwayIslandDataSaveOrUpdateDTOList[landNameIndex].numberOfPeople) ? true : false; this.$request(getApp().globalData.baseUrl + '/api/biz/waterwayIslandData/getYoyMom?statDate=' + this.form .reportDate + '&statPeriod=' + this.form.statPeriod + '&landName=' + this.form - .bizWaterwayIslandDataSaveOrUpdateDTOList[index].landName + '&_t=' + Date.parse(new Date()), {}, + .bizWaterwayIslandDataSaveOrUpdateDTOList[landNameIndex].landName + '&_t=' + Date.parse(new Date()), {}, 'GET') - .then(res => { - let yesterdayData = res.data.yesterdayData; - let lastYearData = res.data.lastYearData; - this.form.bizWaterwayIslandDataSaveOrUpdateDTOList[index].yesterdayVoyage = checkNotEmpty(yesterdayData.voyage) ? yesterdayData.voyage : 0; - this.form.bizWaterwayIslandDataSaveOrUpdateDTOList[index].lastYearVoyage = checkNotEmpty(lastYearData.voyage) ? lastYearData.voyage : 0; - this.form.bizWaterwayIslandDataSaveOrUpdateDTOList[index].yesterdayNumberOfPeople = checkNotEmpty(yesterdayData.numberOfPeople) ? yesterdayData.numberOfPeople : 0; - this.form.bizWaterwayIslandDataSaveOrUpdateDTOList[index].lastYearNumberOfPeople = checkNotEmpty(lastYearData.numberOfPeople) ? lastYearData.numberOfPeople : 0; - //环比-同比 - let obj = this.form.bizWaterwayIslandDataSaveOrUpdateDTOList[index]; - 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]) + .then(res => { + let yesterdayData = res.data.yesterdayData; + let lastYearData = res.data.lastYearData; + this.form.bizWaterwayIslandDataSaveOrUpdateDTOList[landNameIndex].yesterdayVoyage = checkNotEmpty( + yesterdayData.voyage) ? yesterdayData.voyage : 0; + this.form.bizWaterwayIslandDataSaveOrUpdateDTOList[landNameIndex].lastYearVoyage = checkNotEmpty( + lastYearData.voyage) ? lastYearData.voyage : 0; + this.form.bizWaterwayIslandDataSaveOrUpdateDTOList[landNameIndex].yesterdayNumberOfPeople = checkNotEmpty( + yesterdayData.numberOfPeople) ? yesterdayData.numberOfPeople : 0; + this.form.bizWaterwayIslandDataSaveOrUpdateDTOList[landNameIndex].lastYearNumberOfPeople = checkNotEmpty( + lastYearData.numberOfPeople) ? lastYearData.numberOfPeople : 0; + //环比-同比 + //环比计算规则 if今天没有值不计算，elseif昨天没有值不计算，elseif昨天===0并且今天===0百分比0，esleif昨天0今天大于0百分比100,else(今天-昨天)/昨天*100 + let obj = this.form.bizWaterwayIslandDataSaveOrUpdateDTOList[landNameIndex]; + this.form.bizWaterwayIslandDataSaveOrUpdateDTOList[landNameIndex].voyageRingRatio = !checkNotEmpty(obj + .voyage) ? '' : !checkNotEmpty(yesterdayData.voyage) ? '' : yesterdayData.voyage === 0 && parseInt(obj + .voyage) === 0 ? 0 : yesterdayData.voyage === 0 && parseInt(obj.voyage) > 0 ? 100 : (parseInt(obj + .voyage) - yesterdayData.voyage) / yesterdayData.voyage * 100; + this.form.bizWaterwayIslandDataSaveOrUpdateDTOList[landNameIndex].voyageYearOnYear = !checkNotEmpty(obj + .voyage) ? '' : !checkNotEmpty(lastYearData.voyage) ? '' : lastYearData.voyage === 0 && parseInt(obj + .voyage) === 0 ? 0 : lastYearData.voyage === 0 && parseInt(obj.voyage) > 0 ? 100 : (parseInt(obj + .voyage) - lastYearData.voyage) / lastYearData.voyage * 100; + this.form.bizWaterwayIslandDataSaveOrUpdateDTOList[landNameIndex].peopleRingRatio = !checkNotEmpty(obj + .numberOfPeople) ? '' : !checkNotEmpty(yesterdayData.numberOfPeople) ? '' : yesterdayData + .numberOfPeople === 0 && parseInt(obj.numberOfPeople) === 0 ? 0 : yesterdayData.numberOfPeople === 0 && + parseInt(obj.numberOfPeople) > 0 ? 100 : (parseInt(obj.numberOfPeople) - yesterdayData.numberOfPeople) / + yesterdayData.numberOfPeople * 100; + this.form.bizWaterwayIslandDataSaveOrUpdateDTOList[landNameIndex].peopleYearOnYear = !checkNotEmpty(obj + .numberOfPeople) ? '' : !checkNotEmpty(lastYearData.numberOfPeople) ? '' : lastYearData + .numberOfPeople === 0 && parseInt(obj.numberOfPeople) === 0 ? 0 : lastYearData.numberOfPeople === 0 && + parseInt(obj.numberOfPeople) > 0 ? 100 : (parseInt(obj.numberOfPeople) - lastYearData.numberOfPeople) / + lastYearData.numberOfPeople * 100; + console.log('环比同比', this.form.bizWaterwayIslandDataSaveOrUpdateDTOList[landNameIndex]) }) }, //id查询详情 queryDetailInfo(id) { this.$request(getApp().globalData.baseUrl + '/api/biz/waterwayIslandData/getById/' + id, {}, 'GET').then(res => { - this.form = res.data; + this.form = res.data; this.form.bizWaterwayIslandDataSaveOrUpdateDTOList = this.form.bizWaterwayIslandDataVOList; - this.queryTime(); //统计时段 + this.queryTime(); //统计时段 this.queryLandList(); }) }, @@ -316,7 +379,7 @@ }, //增行 addRow() { - this.form.bizWaterwayIslandDataSaveOrUpdateDTOList.push({ + this.form.bizWaterwayIslandDataSaveOrUpdateDTOList.push({ "landNameIndex": "", "landName": "", "lastYearNumberOfPeople": 0, @@ -385,10 +448,10 @@ icon: 'none', success: () => { if (this.form.id == undefined) { - setTimeout(() => { - uni.redirectTo({ - url: '/pages/water/waterWay/list' - }) + setTimeout(() => { + uni.redirectTo({ + url: '/pages/water/waterWay/list' + }) }, 300) } else { uni.navigateBack(); @@ -567,12 +630,14 @@ margin-top: 40rpx; .station_item { + width: 175rpx; height: 60rpx; color: #666666; line-height: 60rpx; font-size: 26rpx; font-family: PingFang SC-Regular, PingFang SC; font-weight: 400; + text-align: center; border-radius: 20rpx; border: 1rpx solid #C1C1C1; padding: 0 20rpx; @@ -591,11 +656,17 @@ right: 0; width: 34rpx; height: 23rpx; + color: #fff; + line-height: 23rpx; background: #1ECE5F; border-radius: 0rpx 20rpx 0rpx 5rpx; text-align: center; } } + + &.choosed { + border-color: #2D8CF0 !important; + } } } @@ -611,7 +682,7 @@ z-index: 11; .act_btn { - width: 329rpx; + width: 690rpx; height: 90rpx; color: #666666; font-size: 28rpx; @@ -687,4 +758,4 @@ background-color: #007aff; color: #ffffff; } - + \ No newline at end of file