diff --git a/App.vue b/App.vue index e6fdbd1..8f34007 100644 --- a/App.vue +++ b/App.vue @@ -55,7 +55,8 @@ }, globalData: { // baseUrl: 'http://27.223.104.50:8001',//接口前缀 - baseUrl: 'http://jtxx.qdjtcx.cn:8001',//接口前缀 + baseUrl: 'https://jtxx.qdjtcx.cn:8001',//接口前缀 + // baseUrl: 'http://10.50.3.103:8086',//接口前缀 mobile: '66007587' }, methods: { diff --git a/common/util.js b/common/util.js index 3e79f7b..78853e6 100644 --- a/common/util.js +++ b/common/util.js @@ -102,12 +102,12 @@ function getDay(d, num) { // 计算环比 function calcMom(cur, data) { - console.log(cur,"环比==========",data); + // console.log(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) { - // console.log(cur,"同比==========",data); + console.log(cur,"同比==========",data); return !checkNotEmpty(cur) || !checkNotEmpty(data) ? '' : data === 0 && parseInt(cur) === 0 ? 0 : data === 0 && parseInt(cur) > 0 ? 100 : (parseInt(cur) - data) / data * 100; } diff --git a/pages/bus/busDataInfo/form-copy.vue b/pages/bus/busDataInfo/form-copy.vue deleted file mode 100644 index 2e95c02..0000000 --- a/pages/bus/busDataInfo/form-copy.vue +++ /dev/null @@ -1,617 +0,0 @@ - - - - - diff --git a/pages/bus/busDataInfo/form.vue b/pages/bus/busDataInfo/form.vue index deb2a1e..85fe8bb 100644 --- a/pages/bus/busDataInfo/form.vue +++ b/pages/bus/busDataInfo/form.vue @@ -12,113 +12,115 @@ {{form.affiliatedUnit}} --> - + 统计日期： - + {{form.reportDate?form.reportDate:'请选择时段'}} + :style="form.statDate?'color:#333;':''">{{form.statDate?form.statDate:'请选择时段'}} + {{form.statDate?form.statDate:''}} 统计时段： - + {{index>-1?array[index].dictLabel:'请选择时段'}} + {{index>-1?array[index].dictLabel:''}} 投入车辆统计： - {{form.entranceVehicleCount === 0 ? form.entranceVehicleCount : form.entranceVehicleCount || ''}} + {{form.vehicleCount === 0 ? form.vehicleCount : form.vehicleCount || ''}} + :class="checkNotEmpty(form.vehicleCount) && form.vehicleCount === yoySum.minusDaySummaryData.vehicleCount ? 'danger' : ''"> + :style="checkNotEmpty(form.vehicleCount) && form.vehicleCount === yoySum.minusDaySummaryData.vehicleCount ?'color: #EB4747':''"> 投入车辆统计环比 - {{formatDigit(form.entranceVehicleCountMom)}}% + :style="checkNotEmpty(form.vehicleCount) && form.vehicleCount === yoySum.minusDaySummaryData.vehicleCount ?'color: #EB4747':''"> + {{formatDigit(form.vehicleCountMom)}}% 投入车辆统计同比 - {{formatDigit(form.entranceVehicleCountYoy)}}% + {{formatDigit(form.vehicleCountYoy)}}% 人数统计： - {{form.exitVehicleCount === 0 ? form.exitVehicleCount : form.exitVehicleCount || ''}} + {{form.passengerCount === 0 ? form.passengerCount : form.passengerCount || ''}} + :class="checkNotEmpty(form.passengerCount) && form.passengerCount === yoySum.minusDaySummaryData.passengerCount ? 'danger' : ''"> + :style="checkNotEmpty(form.passengerCount) && form.passengerCount === yoySum.minusDaySummaryData.passengerCount ?'color: #EB4747':''"> 人数统计环比 - {{formatDigit(form.exitVehicleCountMom)}}% + :style="checkNotEmpty(form.passengerCount) && form.passengerCount === yoySum.minusDaySummaryData.passengerCount ?'color: #EB4747':''"> + {{formatDigit(form.passengerCountMom)}}% 人数统计同比 - {{formatDigit(form.exitVehicleCountYoy)}}% + {{formatDigit(form.passengerCountYoy)}}% 班次统计： - {{form.exitVehicleCount === 0 ? form.exitVehicleCount : form.exitVehicleCount || ''}} + {{form.operatingCount === 0 ? form.operatingCount : form.operatingCount || ''}} + :class="checkNotEmpty(form.operatingCount) && form.operatingCount === yoySum.minusDaySummaryData.operatingCount ? 'danger' : ''"> + :style="checkNotEmpty(form.operatingCount) && form.operatingCount === yoySum.minusDaySummaryData.operatingCount ?'color: #EB4747':''"> 班次统计环比 - {{formatDigit(form.exitVehicleCountMom)}}% + :style="checkNotEmpty(form.operatingCount) && form.operatingCount === yoySum.minusDaySummaryData.operatingCount ?'color: #EB4747':''"> + {{formatDigit(form.operatingCountMom)}}% 班次统计同比 - {{formatDigit(form.exitVehicleCountYoy)}}% + {{formatDigit(form.operatingCountYoy)}}% - + -1 && (data+'').substring((data+'').indexOf('.')).length > 2 ? data.toFixed(2) : data; + return !checkNotEmpty(data) ? '--' : (data+'').indexOf('.') > -1 && (data+'').substring((data+'').indexOf('.')).length > 2 ? data.toFixed(2) : data; }, getDetail(id){ this.$request(getApp().globalData.baseUrl + '/api/biz/busdata/getById/' + id,{},"GET").then(res =>{ @@ -340,6 +346,26 @@ this.getPermiss(); }) }, + getDetail2(statDate,statPeriod){ + this.$request(getApp().globalData.baseUrl + '/api/biz/busdata/getDataByTime?statDate=' + statDate + '&statPeriod=' + statPeriod,{},"GET").then(res =>{ + console.log('查询详情===>',res) + res.data.statDate = statDate; + res.data.statPeriod = statPeriod; + this.form = res.data; + //查询汇总同环比 + this.$request(getApp().globalData.baseUrl + '/api/biz/busdata/getSummaryDataYoYAndMoM?statDate=' + statDate + '&statPeriod=' + statPeriod + '&_t=' + Date.parse(new Date()), {}, + 'GET') + .then(res2 => { + res2.data.minusDaySummaryData = res2.data.minusDaySummaryData ? res2.data.minusDaySummaryData : {}; + res2.data.minusYearSummaryData = res2.data.minusYearSummaryData ? res2.data.minusYearSummaryData : {}; + this.yoySum = res2.data; + }) + if(this.pageType != 'add') { + this.queryTime(); //统计时段 + } + this.getPermiss(); + }) + }, //切换当前编辑陆岛索引 changeLandNameIndex(index) { if (this.form.bizBusDataDetailVOList[this.landNameIndex].vehicleInput != '' && this.form @@ -360,22 +386,12 @@ this.landList.map(item => { item.isFinish = false; this.form.bizBusDataDetailVOList.push({ - // "landName": item.stationName, - // "lastYearpassengerCount": '', - // "lastYearvehicleInput": '', - // "passengerCount": '', - // "passengerCountMom": '', - // "passengerCountYoy": '', - // "vehicleInput": '', - // "vehicleInputRingRatio": '', - // "vehicleInputYearOnYear": '', - // "yestPassengerCount": '', - // "yesterdayvehicleInput": '', busUnit:item.stationName, // busIndex:'', vehicleInput:'', vehicleInputMom:'', vehicleInputYoy:'', + operatingShifts: '', operatingShiftsMom:'', operatingShiftsYoy:'', passengerCount:'', @@ -391,11 +407,6 @@ }) }) } else { - // this.landList = [ - // {stationName: "即墨交通局"}, - // {stationName: "胶州交通局"}, - // {stationName: "青岛公交"}, - // ] let arr = JSON.parse(JSON.stringify(this.form.bizBusDataDetailVOList)); this.form.bizBusDataDetailVOList = []; this.landList.map(item => { @@ -415,8 +426,11 @@ "passengerCountMom": '', "passengerCountYoy": '', "vehicleInput": '', - "vehicleInputRingRatio": '', - "vehicleInputYearOnYear": '', + "vehicleInputMom": '', + "vehicleInputYoy": '', + "operatingShifts": '', + "operatingShiftsMom" : '', + "operatingShiftsYoy" : '', "yestPassengerCount": '', "yesterdayvehicleInput": '', "yestOperatingShifts":'', @@ -425,6 +439,9 @@ } }) } + this.form.bizBusDataDetailVOList.map((item,index) => { + this.calcYoyMom(index); + }); }) }, //陆岛切换 @@ -446,7 +463,7 @@ //环比同比计算 calcYoyMom(landNameIndex) { console.log('landNameIndex ===>',landNameIndex) - if (this.form.reportDate == '' || this.form.statPeriod == '' || this.form + if (this.form.statDate == '' || this.form.statPeriod == '' || this.form .bizBusDataDetailVOList[landNameIndex].landName == '') { return; } @@ -459,8 +476,24 @@ .bizBusDataDetailVOList[landNameIndex].vehicleInput) && checkNotEmpty(this.form .bizBusDataDetailVOList[landNameIndex].passengerCount) && checkNotEmpty(this.form .bizBusDataDetailVOList[landNameIndex].operatingShifts) ? true : false; + //汇总同环比 + let _vehicleInputTotal = 0, _peopleTotal = 0, _operationTotal = 0; + this.form.bizBusDataDetailVOList.map(item => { + _vehicleInputTotal = _vehicleInputTotal + (checkNotEmpty(item.vehicleInput) ? parseInt(item.vehicleInput) : 0); + _peopleTotal = _peopleTotal + (checkNotEmpty(item.passengerCount) ? parseInt(item.passengerCount) : 0); + _operationTotal = _operationTotal + (checkNotEmpty(item.operatingShifts) ? parseInt(item.operatingShifts) : 0); + }) + this.form.vehicleCount = _vehicleInputTotal; + this.form.vehicleCountMom = this.$calcMom(this.form.vehicleCount,this.yoySum.minusDaySummaryData.vehicleCount); + this.form.vehicleCountYoy = this.$calcYoy(this.form.vehicleCount,this.yoySum.minusYearSummaryData.vehicleCount); + this.form.passengerCount = _peopleTotal; + this.form.passengerCountMom = this.$calcMom(this.form.passengerCount,this.yoySum.minusDaySummaryData.passengerCount); + this.form.passengerCountYoy = this.$calcYoy(this.form.passengerCount,this.yoySum.minusYearSummaryData.passengerCount); + this.form.operatingCount = _operationTotal; + this.form.operatingCountMom = this.$calcMom(this.form.operatingCount,this.yoySum.minusDaySummaryData.operatingCount); + this.form.operatingCountYoy = this.$calcYoy(this.form.operatingCount,this.yoySum.minusYearSummaryData.operatingCount); this.$request(getApp().globalData.baseUrl + '/api/biz/busdata/getYoyMom?statDate=' + this.form - .reportDate + '&statPeriod=' + this.form.statPeriod + '&busUnit=' + this.form + .statDate + '&statPeriod=' + this.form.statPeriod + '&busUnit=' + this.form .bizBusDataDetailVOList[landNameIndex].busUnit + '&_t=' + Date.parse(new Date()), {}, 'GET') .then(res => { @@ -533,10 +566,14 @@ this.index = e.detail.value; this.form.statPeriod = this.array[e.detail.value].dictValue; console.log('change 时段', this.form) - //重新计算同比环比 - this.form.bizBusDataDetailVOList.map((item, index) => { - this.calcYoyMom(index); - }) + + if(this.pageType == 'add') { + this.getDetail2(this.form.statDate, this.form.statPeriod); + }else{ + this.form.bizBusDataDetailVOList.map((item,index) => { + this.calcYoyMom(index); + }) + } }, //取消 doCancel() { @@ -544,15 +581,18 @@ }, //选择统计日期 bindDateChange(e) { - this.form.reportDate = e.detail.value; - //重新计算同比环比 - this.form.bizBusDataDetailVOList.map((item, index) => { - this.calcYoyMom(index); - }) + this.form.statDate = e.detail.value; + if(this.pageType == 'add') { + this.getDetail2(this.form.statDate, this.form.statPeriod); + }else{ + this.form.bizBusDataDetailVOList.map((item,index) => { + this.calcYoyMom(index); + }) + } }, //时段 queryTime() { - this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=airport_time' + '&_t=' + Date + this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=bus_time' + '&_t=' + Date .parse( new Date()), {}, 'GET').then(res => { this.array = res.data; @@ -572,6 +612,7 @@ let idx = this.array.findIndex(item => item.dictValue == '03'); this.index = idx > -1 ? idx : ''; } + this.getDetail2(this.form.statDate, this.form.statPeriod); } else { let idx = this.array.findIndex(item => item.dictValue == this.form.statPeriod); this.index = idx > -1 ? idx : ''; @@ -602,7 +643,7 @@ //确认提交 doSubmit() { console.log(this.form) - if (this.form.reportDate == '' || this.form.statPeriod == '') { + if (this.form.statDate == '' || this.form.statPeriod == '') { uni.showToast({ title: '报送日期和时段不能为空', icon: 'none' @@ -630,7 +671,7 @@ console.log(this.form) uni.showModal({ title: '提示', - content: this.form.id == undefined ? '您确认提交该条报送数据?' : '您确认将该条数据进行修改?', + content: this.pageType == 'add' ? '您确认提交该条报送数据?' : '您确认将该条数据进行修改?', success: (res) => { if (res.confirm) { this.submitForm(); diff --git a/pages/bus/busDataInfo/list.vue b/pages/bus/busDataInfo/list.vue index 0e68dcb..1fbb561 100644 --- a/pages/bus/busDataInfo/list.vue +++ b/pages/bus/busDataInfo/list.vue @@ -6,7 +6,7 @@ 报送时间 - {{item.reportDate || ''}}{{item.statPeriodValue || ''}} + {{item.statDate || ''}}{{renderTime(item.statPeriod)}} @@ -110,12 +110,12 @@ _t:Date.parse(new Date()), ...this.query } - this.$request(getApp().globalData.baseUrl + '/api/biz/busdata/list',params,"GET").then(res =>{ + this.$request(getApp().globalData.baseUrl + '/api/biz/highwayParentDataController/getTimeList',params,"GET").then(res =>{ console.log(res) if(res.code == 200){ - res.data.list.map(item =>{ - item.show = false; - }) + // res.data.list.map(item =>{ + // item.show = false; + // }) this.listData = this.listData.concat(res.data.list); if(res.data.list.length == 0 || res.data.list.length < this.pageSize){ this.hasMore = false; @@ -138,9 +138,14 @@ handleSearch(){ this.$refs.popup.open('bottom') }, + //时段文本转换 + renderTime(reportPhase) { + let idx = this.timeArray.findIndex(item => item.dictValue == reportPhase); + return idx > -1 ? this.timeArray[idx].dictLabel : ''; + }, //时段 queryTime() { - this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=airport_time' + '&_t=' + Date.parse( + this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=bus_time' + '&_t=' + Date.parse( new Date()), {}, 'GET').then(res => { this.timeArray = res.data; }) diff --git a/pages/railway/railwayRunData/form.vue b/pages/railway/railwayRunData/form.vue index 15f3e8c..df42359 100644 --- a/pages/railway/railwayRunData/form.vue +++ b/pages/railway/railwayRunData/form.vue @@ -21,79 +21,81 @@ 统计日期： - + {{form.statDate?form.statDate:'请选择'}} - + + {{form.statDate?form.statDate:''}} 统计时段： - + {{index>-1?array[index].dictLabel:'请选择'}} - + + {{index>-1?array[index].dictLabel:''}} 进青终到车次统计： - {{form.entranceVehicleCount === 0 ? form.entranceVehicleCount : form.entranceVehicleCount || ''}} + {{form.inboundRailwayDo === 0 ? form.inboundRailwayDo : form.inboundRailwayDo || ''}} + :class="checkNotEmpty(form.inboundRailwayDo) && form.inboundRailwayDo === yoySum.minusDaySummaryData.inboundRailwayDo ? 'danger' : ''"> + :style="checkNotEmpty(form.inboundRailwayDo) && form.inboundRailwayDo === yoySum.minusDaySummaryData.inboundRailwayDo ?'color: #EB4747':''"> 终到车次统计环比 - {{formatDigit(form.entranceVehicleCountMom)}}% + :style="checkNotEmpty(form.inboundRailwayDo) && form.inboundRailwayDo === yoySum.minusDaySummaryData.inboundRailwayDo ?'color: #EB4747':''"> + {{formatDigit(form.inRailwayYomDo)}}% 终到车次统计同比 - {{formatDigit(form.entranceVehicleCountYoy)}}% + {{formatDigit(form.inRailwayMomDo)}}% 进青过路车次统计： - {{form.entranceVehicleCount === 0 ? form.entranceVehicleCount : form.entranceVehicleCount || ''}} + {{form.inboundPassengersDo === 0 ? form.inboundPassengersDo : form.inboundPassengersDo || ''}} 进青人数统计： - {{form.exitVehicleCount === 0 ? form.exitVehicleCount : form.exitVehicleCount || ''}} + {{form.inPepole === 0 ? form.inPepole : form.inPepole || ''}} + :class="checkNotEmpty(form.inPepole) && form.inPepole === yoySum.minusDaySummaryData.inPepole ? 'danger' : ''"> + :style="checkNotEmpty(form.inPepole) && form.inPepole === yoySum.minusDaySummaryData.inPepole ?'color: #EB4747':''"> 人数统计环比 - {{formatDigit(form.exitVehicleCountMom)}}% + :style="checkNotEmpty(form.inPepole) && form.inPepole === yoySum.minusDaySummaryData.inPepole ?'color: #EB4747':''"> + {{formatDigit(form.inPepoleYoyDo)}}% 人数统计同比 - {{formatDigit(form.exitVehicleCountYoy)}}% + {{formatDigit(form.inPepoleMomDo)}}% @@ -101,58 +103,58 @@ 出青始发车次统计： - {{form.entranceVehicleCount === 0 ? form.entranceVehicleCount : form.entranceVehicleCount || ''}} + {{form.outboundRailwayDo === 0 ? form.outboundRailwayDo : form.outboundRailwayDo || ''}} + :class="checkNotEmpty(form.outboundRailwayDo) && form.outboundRailwayDo === yoySum.minusDaySummaryData.outboundRailwayDo ? 'danger' : ''"> + :style="checkNotEmpty(form.outboundRailwayDo) && form.outboundRailwayDo === yoySum.minusDaySummaryData.outboundRailwayDo ?'color: #EB4747':''"> 始发车次统计环比 - {{formatDigit(form.entranceVehicleCountMom)}}% + :style="checkNotEmpty(form.outboundRailwayDo) && form.outboundRailwayDo === yoySum.minusDaySummaryData.outboundRailwayDo ?'color: #EB4747':''"> + {{formatDigit(form.outRailwayYomDo)}}% 始发车次统计同比 - {{formatDigit(form.entranceVehicleCountYoy)}}% + {{formatDigit(form.outRailwayMomDo)}}% 出青过路车次统计： - {{form.entranceVehicleCount === 0 ? form.entranceVehicleCount : form.entranceVehicleCount || ''}} + {{form.outboundPassengersDo === 0 ? form.outboundPassengersDo : form.outboundPassengersDo || ''}} 出青人数统计： - {{form.exitVehicleCount === 0 ? form.exitVehicleCount : form.exitVehicleCount || ''}} + {{form.outPepole === 0 ? form.outPepole : form.outPepole || ''}} + :class="checkNotEmpty(form.outPepole) && form.outPepole === yoySum.minusDaySummaryData.outPepole ? 'danger' : ''"> + :style="checkNotEmpty(form.outPepole) && form.outPepole === yoySum.minusDaySummaryData.outPepole ?'color: #EB4747':''"> 人数统计环比 - {{formatDigit(form.exitVehicleCountMom)}}% + :style="checkNotEmpty(form.outPepole) && form.outPepole === yoySum.minusDaySummaryData.outPepole ?'color: #EB4747':''"> + {{formatDigit(form.outPepoleYoyDo)}}% 人数统计同比 - {{formatDigit(form.exitVehicleCountYoy)}}% + {{formatDigit(form.outPepoleMomDo)}}% @@ -198,7 +200,7 @@ 终到车次(辆)： - @@ -226,7 +228,7 @@ 过路车次： - @@ -234,7 +236,7 @@ 人数(人)： - @@ -284,7 +286,7 @@ 始发车次(辆)： - @@ -311,7 +313,7 @@ 过路车次： - @@ -319,7 +321,7 @@ 人数(人)： - @@ -378,7 +380,6 @@ "inRailwayYomDo": '', "inboundPassengersDo": '', "inboundRailwayDo": '', - "isHoliday": "", "outMark": "", "outPepole": '', "outPepoleMomDo": '', @@ -387,8 +388,7 @@ "outRailwayYomDo": '', "outboundPassengersDo": '', "outboundRailwayDo": '', - "railwayName": "", - "bizRailwayDataSaveOrUpdateDTOList": [{ + "bizRailwayRunDataSaveOrUpdateDTOList": [{ "inMark": "", "inPepole": '', "inPepoleMomDo": '', @@ -422,7 +422,11 @@ pageType: '', btnText: '保存', tabType: 1, - mobile: getApp().globalData.mobile + mobile: getApp().globalData.mobile, + yoySum: { + minusDaySummaryData: {}, + minusYearSummaryData: {} + },//汇总统计同环比 } }, onLoad(options) { @@ -432,7 +436,11 @@ let now = new Date(); this.form.statDate = getDateStr(now, -1); //默认前一天 this.queryTime(); //统计时段 - this.queryStation(); + // this.queryStation(); + } else if (options.item) { + this.btnText = '修改并保存'; + let obj = JSON.parse(options.item); + this.queryDetail(obj.statDate, obj.statPeriod); } else if (options.id) { this.btnText = '修改并保存'; this.$request(getApp().globalData.baseUrl + '/api/biz/railwayRunData/find/' + options.id, {}, "GET").then( @@ -455,23 +463,85 @@ //只保留两位小数 formatDigit(data) { return !checkNotEmpty(data) ? '--' : (data+'').indexOf('.') > -1 && (data+'').substring((data+'').indexOf('.')).length > 2 ? data.toFixed(2) : data; + }, + //详情 + queryDetail(statDate,statPeriod) { + this.$request(getApp().globalData.baseUrl + '/api/biz/railwayRunData/getDataByTime?statDate=' + statDate + '&statPeriod=' + statPeriod, {}, "GET").then( + res => { + res.data.statDate = statDate; + res.data.statPeriod = statPeriod; + this.form = res.data; + this.form.bizRailwayRunDataSaveOrUpdateDTOList = this.form.bizRailwayRunDataVOList; + //查询汇总同环比 + this.$request(getApp().globalData.baseUrl + '/api/biz/railwayRunData/getSummaryDataYoYAndMoM?statDate=' + statDate + '&statPeriod=' + statPeriod + '&_t=' + Date.parse(new Date()), {}, + 'GET') + .then(res2 => { + res2.data.minusDaySummaryData = res2.data.minusDaySummaryData ? res2.data.minusDaySummaryData : {}; + res2.data.minusYearSummaryData = res2.data.minusYearSummaryData ? res2.data.minusYearSummaryData : {}; + this.yoySum = res2.data; + }) + if(this.pageType != 'add') { + this.queryTime(); //统计时段 + } + this.queryStation(); + }); }, //环比同比 - queryYoyMom(index, railwayName) { - if (this.form.statDate == '' || this.form.statPeriod == '') { - return; - } - // let _date = getDateStr(new Date(this.form.statDate), -1); - this.$request(getApp().globalData.baseUrl + '/api/biz/railwayRunData/getYoYMoM?statDate=' + this.form - .statDate + '&statPeriod=' + this.form.statPeriod + '&railwayName=' + railwayName + '&_t=' + Date.parse(new Date()), {}, 'GET') - .then(res => { - this.yoyMom = res.data; - this.calcYoyMom(index); //同步更新环比同比 - }) - }, + // queryYoyMom(index, railwayName) { + // if (this.form.statDate == '' || this.form.statPeriod == '') { + // return; + // } + // // let _date = getDateStr(new Date(this.form.statDate), -1); + // this.$request(getApp().globalData.baseUrl + '/api/biz/railwayRunData/getYoYMoM?statDate=' + this.form + // .statDate + '&statPeriod=' + this.form.statPeriod + '&railwayName=' + railwayName + '&_t=' + Date.parse(new Date()), {}, 'GET') + // .then(res => { + // this.yoyMom = res.data; + // this.calcYoyMom(index); //同步更新环比同比 + // }) + // }, //环比同比计算 calcYoyMom(index) { - console.log('同比环比计算') + console.log('同比环比计算'); + // 汇总 + let _inPeole = 0,_inboundPassengersDo = 0,_inboundRailwayDo = 0; + let _outPepole = 0,_outboundPassengersDo = 0,_outboundRailwayDo = 0; + this.form.bizRailwayRunDataVOList.map((item,index) => { + _inPeole = _inPeole + (checkNotEmpty(item.inPepole) ? parseInt(item.inPepole) : 0); + _inboundPassengersDo = _inboundPassengersDo + (checkNotEmpty(item.inboundPassengersDo) ? parseInt(item.inboundPassengersDo) : 0); + _inboundRailwayDo = _inboundRailwayDo + (checkNotEmpty(item.inboundRailwayDo) ? parseInt(item.inboundRailwayDo) : 0); + _outPepole = _outPepole + (checkNotEmpty(item.outPepole) ? parseInt(item.outPepole) : 0); + _outboundPassengersDo = _outboundPassengersDo + (checkNotEmpty(item.outboundPassengersDo) ? parseInt(item.outboundPassengersDo) : 0); + _outboundRailwayDo = _outboundRailwayDo + (checkNotEmpty(item.outboundRailwayDo) ? parseInt(item.outboundRailwayDo) : 0); + }) + this.form.inPepole = _inPeole; + this.form.inPepoleYoyDo = this.$calcMom(this.form.inPepole, this.yoySum.minusDaySummaryData.inPepole); + this.form.inPepoleMomDo = this.$calcYoy(this.form.inPepole, this.yoySum.minusYearSummaryData.inPepole); + this.form.inboundPassengersDo = _inboundPassengersDo; + this.form.inboundRailwayDo = _inboundRailwayDo; + this.form.inRailwayYomDo = this.$calcMom(this.form.inboundRailwayDo, this.yoySum.minusDaySummaryData.inboundRailwayDo); + this.form.inRailwayMomDo = this.$calcYoy(this.form.inboundRailwayDo, this.yoySum.minusYearSummaryData.inboundRailwayDo); + this.form.outPepole = _outPepole; + this.form.outPepoleYoyDo = this.$calcMom(this.form.outPepole, this.yoySum.minusDaySummaryData.outPepole); + this.form.outPepoleMomDo = this.$calcYoy(this.form.outPepole, this.yoySum.minusYearSummaryData.outPepole); + this.form.outboundPassengersDo = _outboundPassengersDo; + this.form.outboundRailwayDo = _outboundRailwayDo; + this.form.outRailwayYomDo = this.$calcMom(this.form.outboundRailwayDo, this.yoySum.minusDaySummaryData.outboundRailwayDo); + this.form.outRailwayMomDo = this.$calcYoy(this.form.outboundRailwayDo, this.yoySum.minusYearSummaryData.outboundRailwayDo); + let railwayName = this.form.bizRailwayDataSaveOrUpdateDTOList[index].railwayName; + this.$request(getApp().globalData.baseUrl + '/api/biz/railwayRunData/getYoYMoM?statDate=' + this.form + .statDate + '&statPeriod=' + this.form.statPeriod + '&railwayName=' + railwayName + '&_t=' + Date.parse(new Date()), {}, 'GET') + .then(res => { + let yoyMom = res.data; + let obj = this.form.bizRailwayDataSaveOrUpdateDTOList[index]; + this.form.bizRailwayDataSaveOrUpdateDTOList[index].inRailwayYomDo = this.$calcMom(obj.inboundRailwayDo,yoyMom.yesterdayData.inboundRailwayDo); + this.form.bizRailwayDataSaveOrUpdateDTOList[index].inPepoleYoyDo = this.$calcMom(obj.inPepole,yoyMom.yesterdayData.inPepole); + this.form.bizRailwayDataSaveOrUpdateDTOList[index].outRailwayYomDo = this.$calcMom(obj.outboundRailwayDo,yoyMom.yesterdayData.outboundRailwayDo); + this.form.bizRailwayDataSaveOrUpdateDTOList[index].outPepoleYoyDo = this.$calcMom(obj.outPepole,yoyMom.yesterdayData.outPepole); + this.form.bizRailwayDataSaveOrUpdateDTOList[index].inRailwayMomDo = this.$calcYoy(obj.inboundRailwayDo,yoyMom.lastYearData.inboundRailwayDo); + this.form.bizRailwayDataSaveOrUpdateDTOList[index].inPepoleMomDo = this.$calcYoy(obj.inPepole,yoyMom.lastYearData.inPepole); + this.form.bizRailwayDataSaveOrUpdateDTOList[index].outRailwayMomDo = this.$calcYoy(obj.outboundRailwayDo,yoyMom.lastYearData.outboundRailwayDo); + this.form.bizRailwayDataSaveOrUpdateDTOList[index].outPepoleMomDo = this.$calcYoy(obj.outPepole,yoyMom.lastYearData.outPepole); + }) // this.form.inRailwayYomDo = this.$calcMom(this.form.inboundRailwayDo,this.yoyMom.yesterdayData.inboundRailwayDo); // this.form.inPepoleYoyDo = this.$calcMom(this.form.inPepole,this.yoyMom.yesterdayData.inPepole); // this.form.outRailwayYomDo = this.$calcMom(this.form.outboundRailwayDo,this.yoyMom.yesterdayData.outboundRailwayDo); @@ -489,7 +559,7 @@ // this.queryYoyMom(); }, //车站权限列表 - queryStation() { + queryStation(type) { this.$request(getApp().globalData.baseUrl + '/api/biz/railwayRunData/getCurrentSite?_t=' + Date.parse( new Date()), {}, 'GET').then(res => { let arr = []; @@ -497,7 +567,7 @@ arr.push({railwayName: item, isFinish: false}) }) this.stationList = arr; - if (this.pageType == 'add') { + if (type == 'add') { this.form.railwayName = arr[0].railwayName; this.railwayNameIndex = 0; this.form.bizRailwayDataSaveOrUpdateDTOList = []; @@ -558,24 +628,30 @@ } }) } - // this.queryYoyMom(); + this.form.bizRailwayDataSaveOrUpdateDTOList.map((item,index) => { + this.calcYoyMom(index); + }); }) }, //车站选择 - changeRailway(e) { - this.railwayNameIndex = e.detail.value; - this.form.railwayName = this.stationList[e.detail.value].railwayName; - this.queryYoyMom(); + // changeRailway(e) { + // this.railwayNameIndex = e.detail.value; + // this.form.railwayName = this.stationList[e.detail.value].railwayName; + // this.queryYoyMom(); - }, + // }, //统计时段切换选择 changeStatPeriod(e) { this.index = e.detail.value; this.form.statPeriod = this.array[e.detail.value].dictValue; - console.log('change 时段', this.form); - this.form.bizRailwayDataSaveOrUpdateDTOList.map((item,index) => { - this.queryYoyMom(index,item.railwayName); - }) + console.log('change 时段', this.form); + if(this.pageType == 'add') { + this.queryDetail(this.form.statDate, this.form.statPeriod); + }else{ + this.form.bizRailwayDataSaveOrUpdateDTOList.map((item,index) => { + this.calcYoyMom(index); + }) + } }, //取消 doCancel() { @@ -584,11 +660,17 @@ //选择统计日期 bindDateChange(e) { this.form.statDate = e.detail.value; - this.queryYoyMom(); + if(this.pageType == 'add') { + this.queryDetail(this.form.statDate, this.form.statPeriod); + }else{ + this.form.bizRailwayDataSaveOrUpdateDTOList.map((item,index) => { + this.calcYoyMom(index); + }) + } }, //时段 queryTime() { - this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=airport_time' + '&_t=' + Date + this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=railway_time' + '&_t=' + Date .parse( new Date()), {}, 'GET').then(res => { this.array = res.data; @@ -606,7 +688,8 @@ this.form.statPeriod = '03'; //默认0-24 let idx = this.array.findIndex(item => item.dictValue == '03'); this.index = idx > -1 ? idx : ''; - } + } + this.queryDetail(this.form.statDate, this.form.statPeriod); } else { let idx = this.array.findIndex(item => item.dictValue == this.form.statPeriod); this.index = idx > -1 ? idx : ''; @@ -661,7 +744,7 @@ } uni.showModal({ title: '提示', - content: this.form.id == undefined ? '您确认提交该条报送数据?' : '您确认将该条数据进行修改?', + content: this.pageType == 'add' ? '您确认提交该条报送数据?' : '您确认将该条数据进行修改?', success: (res) => { if (res.confirm) { this.submitForm(); diff --git a/pages/railway/railwayRunData/list.vue b/pages/railway/railwayRunData/list.vue index 76bffbf..699dbe4 100644 --- a/pages/railway/railwayRunData/list.vue +++ b/pages/railway/railwayRunData/list.vue @@ -1,10 +1,10 @@