diff --git a/pages.json b/pages.json index 5d0d8e9..4ee3361 100644 --- a/pages.json +++ b/pages.json @@ -19,27 +19,27 @@ } }, { - "path": "pages/highway/runData/list", + "path": "pages/highWay/runData/list", "style": { "navigationBarTitleText": "高速运行数据", "enablePullDownRefresh": true } }, { - "path": "pages/highway/runData/form", + "path": "pages/highWay/runData/form", "style": { "navigationBarTitleText": "高速运行数据报送" } }, { - "path": "pages/highway/runStatusData/list", + "path": "pages/highWay/runStatusData/list", "style": { "navigationBarTitleText": "高速运行情况", "enablePullDownRefresh": true } }, { - "path": "pages/highway/runStatusData/form", + "path": "pages/highWay/runStatusData/form", "style": { "navigationBarTitleText": "高速运行情况报送" } diff --git a/pages/railway/railwayRunData/form.vue b/pages/railway/railwayRunData/form.vue index b79331a..5878135 100644 --- a/pages/railway/railwayRunData/form.vue +++ b/pages/railway/railwayRunData/form.vue @@ -179,6 +179,12 @@ {{item.railwayName || ''}} + + + + + {{showRailway?'收起':'展开'}} + @@ -194,41 +200,41 @@ 车站名称： - {{form.bizRailwayDataSaveOrUpdateDTOList[railwayNameIndex].railwayName}} + {{form.bizRailwayRunDataSaveOrUpdateDTOList[railwayNameIndex].railwayName}} 终到车次(辆)： - + :class="form.bizRailwayRunDataSaveOrUpdateDTOList[railwayNameIndex].inRailwayYomDo === 0 ? 'danger' : '' "> + :style="form.bizRailwayRunDataSaveOrUpdateDTOList[railwayNameIndex].inRailwayYomDo === 0 ? 'color: #EB4747' : ''"> 终到车次环比 - {{formatDigit(form.bizRailwayDataSaveOrUpdateDTOList[railwayNameIndex].inRailwayYomDo)}}% + :style="form.bizRailwayRunDataSaveOrUpdateDTOList[railwayNameIndex].inRailwayYomDo === 0 ? 'color: #EB4747' : ''"> + {{form.bizRailwayRunDataSaveOrUpdateDTOList.length > 0 ? formatDigit(form.bizRailwayRunDataSaveOrUpdateDTOList[railwayNameIndex].inRailwayYomDo) : '--'}}% 终到车次同比 - {{formatDigit(form.bizRailwayDataSaveOrUpdateDTOList[railwayNameIndex].inRailwayMomDo)}}% + {{formatDigit(form.bizRailwayRunDataSaveOrUpdateDTOList[railwayNameIndex].inRailwayMomDo)}}% 过路车次： - @@ -236,35 +242,35 @@ 人数(人)： - + :class="form.bizRailwayRunDataSaveOrUpdateDTOList[railwayNameIndex].inPepoleYoyDo === 0 ? 'danger' : '' "> 人数环比 + :style="form.bizRailwayRunDataSaveOrUpdateDTOList[railwayNameIndex].inPepoleYoyDo === 0 ? 'color: #EB4747' : ''">人数环比 - {{formatDigit(form.bizRailwayDataSaveOrUpdateDTOList[railwayNameIndex].inPepoleYoyDo)}}% + :style="form.bizRailwayRunDataSaveOrUpdateDTOList[railwayNameIndex].inPepoleYoyDo === 0 ? 'color: #EB4747' : ''"> + {{formatDigit(form.bizRailwayRunDataSaveOrUpdateDTOList[railwayNameIndex].inPepoleYoyDo)}}% 人数同比 - {{formatDigit(form.bizRailwayDataSaveOrUpdateDTOList[railwayNameIndex].inPepoleMomDo)}}% + {{formatDigit(form.bizRailwayRunDataSaveOrUpdateDTOList[railwayNameIndex].inPepoleMomDo)}}% 备注： - @@ -280,40 +286,40 @@ 车站名称： - {{form.bizRailwayDataSaveOrUpdateDTOList[railwayNameIndex].railwayName}} + {{form.bizRailwayRunDataSaveOrUpdateDTOList[railwayNameIndex].railwayName}} 始发车次(辆)： - - + + :style="form.bizRailwayRunDataSaveOrUpdateDTOList[railwayNameIndex].outRailwayYomDo === 0 ? 'color: #EB4747' : ''"> 始发车次环比 - {{formatDigit(form.bizRailwayDataSaveOrUpdateDTOList[railwayNameIndex].outRailwayYomDo)}}% + :style="form.bizRailwayRunDataSaveOrUpdateDTOList[railwayNameIndex].outRailwayYomDo === 0 ? 'color: #EB4747' : ''"> + {{formatDigit(form.bizRailwayRunDataSaveOrUpdateDTOList[railwayNameIndex].outRailwayYomDo)}}% 始发车次同比 - {{formatDigit(form.bizRailwayDataSaveOrUpdateDTOList[railwayNameIndex].outRailwayMomDo)}}% + {{formatDigit(form.bizRailwayRunDataSaveOrUpdateDTOList[railwayNameIndex].outRailwayMomDo)}}% 过路车次： - @@ -321,34 +327,34 @@ 人数(人)： - - + 人数环比 + :style="form.bizRailwayRunDataSaveOrUpdateDTOList[railwayNameIndex].outPepoleYoyDo === 0 ? 'color: #EB4747' : ''">人数环比 - {{formatDigit(form.bizRailwayDataSaveOrUpdateDTOList[railwayNameIndex].outPepoleYoyDo)}}% + :style="form.bizRailwayRunDataSaveOrUpdateDTOList[railwayNameIndex].outPepoleYoyDo === 0 ? 'color: #EB4747' : ''"> + {{formatDigit(form.bizRailwayRunDataSaveOrUpdateDTOList[railwayNameIndex].outPepoleYoyDo)}}% 人数同比 - {{formatDigit(form.bizRailwayDataSaveOrUpdateDTOList[railwayNameIndex].outPepoleMomDo)}}% + {{formatDigit(form.bizRailwayRunDataSaveOrUpdateDTOList[railwayNameIndex].outPepoleMomDo)}}% 备注： - @@ -408,6 +414,7 @@ "outboundRailwayDo": '', "railwayName": "", }], + "statDate": "", "statPeriod": "" }, //登录form @@ -506,7 +513,7 @@ // 汇总 let _inPeole = 0,_inboundPassengersDo = 0,_inboundRailwayDo = 0; let _outPepole = 0,_outboundPassengersDo = 0,_outboundRailwayDo = 0; - this.form.bizRailwayRunDataVOList.map((item,index) => { + this.form.bizRailwayRunDataSaveOrUpdateDTOList.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); @@ -527,22 +534,24 @@ 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.form.outRailwayMomDo = this.$calcYoy(this.form.outboundRailwayDo, this.yoySum.minusYearSummaryData.outboundRailwayDo); + console.log('bizRailwayRunDataSaveOrUpdateDTOList ===>',this.form.bizRailwayRunDataSaveOrUpdateDTOList) + let railwayName = this.form.bizRailwayRunDataSaveOrUpdateDTOList[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); + let obj = this.form.bizRailwayRunDataSaveOrUpdateDTOList[index]; + this.form.bizRailwayRunDataSaveOrUpdateDTOList[index].inRailwayYomDo = this.$calcMom(obj.inboundRailwayDo,yoyMom.yesterdayData.inboundRailwayDo); + this.form.bizRailwayRunDataSaveOrUpdateDTOList[index].inPepoleYoyDo = this.$calcMom(obj.inPepole,yoyMom.yesterdayData.inPepole); + this.form.bizRailwayRunDataSaveOrUpdateDTOList[index].outRailwayYomDo = this.$calcMom(obj.outboundRailwayDo,yoyMom.yesterdayData.outboundRailwayDo); + this.form.bizRailwayRunDataSaveOrUpdateDTOList[index].outPepoleYoyDo = this.$calcMom(obj.outPepole,yoyMom.yesterdayData.outPepole); + this.form.bizRailwayRunDataSaveOrUpdateDTOList[index].inRailwayMomDo = this.$calcYoy(obj.inboundRailwayDo,yoyMom.lastYearData.inboundRailwayDo); + this.form.bizRailwayRunDataSaveOrUpdateDTOList[index].inPepoleMomDo = this.$calcYoy(obj.inPepole,yoyMom.lastYearData.inPepole); + this.form.bizRailwayRunDataSaveOrUpdateDTOList[index].outRailwayMomDo = this.$calcYoy(obj.outboundRailwayDo,yoyMom.lastYearData.outboundRailwayDo); + this.form.bizRailwayRunDataSaveOrUpdateDTOList[index].outPepoleMomDo = this.$calcYoy(obj.outPepole,yoyMom.lastYearData.outPepole); }) + this.$forceUpdate(); // 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); @@ -554,8 +563,10 @@ }, //切换当前编辑陆岛索引 changeRailwayNameIndexIndex(index) { - let arr = this.form.bizRailwayDataSaveOrUpdateDTOList; - this.stationList[this.railwayNameIndex].isFinish = checkNotEmpty(arr[index].inboundRailwayDo) && checkNotEmpty(arr[index].inboundPassengersDo) && checkNotEmpty(arr[index].inPepole) && checkNotEmpty(arr[index].outboundRailwayDo) && checkNotEmpty(arr[index].outboundPassengersDo) && checkNotEmpty(arr[index].outPepole) ? true : false; + let arr = this.form.bizRailwayRunDataSaveOrUpdateDTOList; + console.log('arr ===>',arr,index) + this.stationList[this.railwayNameIndex].isFinish = checkNotEmpty(arr[this.railwayNameIndex].inboundRailwayDo) && checkNotEmpty(arr[this.railwayNameIndex].inboundPassengersDo) && checkNotEmpty(arr[this.railwayNameIndex].inPepole) && checkNotEmpty(arr[this.railwayNameIndex].outboundRailwayDo) && checkNotEmpty(arr[this.railwayNameIndex].outboundPassengersDo) && checkNotEmpty(arr[this.railwayNameIndex].outPepole) ? true : false; + console.log('isFinish===>',this.stationList[this.railwayNameIndex].isFinish) this.railwayNameIndex = index; // this.queryYoyMom(); }, @@ -571,10 +582,10 @@ if (type == 'add') { this.form.railwayName = arr[0].railwayName; this.railwayNameIndex = 0; - this.form.bizRailwayDataSaveOrUpdateDTOList = []; + this.form.bizRailwayRunDataSaveOrUpdateDTOList = []; this.stationList.map(item => { item.isFinish = false; - this.form.bizRailwayDataSaveOrUpdateDTOList.push({ + this.form.bizRailwayRunDataSaveOrUpdateDTOList.push({ "inMark": "", "inPepole": '', "inPepoleMomDo": '', @@ -597,17 +608,17 @@ }) }else{ console.log('init station ==', this.form) - let arr = JSON.parse(JSON.stringify(this.form.bizRailwayDataSaveOrUpdateDTOList)); - this.form.bizRailwayDataSaveOrUpdateDTOList = []; + let arr = JSON.parse(JSON.stringify(this.form.bizRailwayRunDataSaveOrUpdateDTOList)); + this.form.bizRailwayRunDataSaveOrUpdateDTOList = []; this.stationList.map(item => { let idx = arr.findIndex(item2 => item2.railwayName == item.railwayName); if (idx > -1) { item.isFinish = checkNotEmpty(arr[idx].inboundRailwayDo) && checkNotEmpty(arr[idx].inboundPassengersDo) && checkNotEmpty(arr[idx].inPepole) && checkNotEmpty(arr[idx].outboundRailwayDo) && checkNotEmpty(arr[idx].outboundPassengersDo) && checkNotEmpty(arr[idx].outPepole) ? true : false; - this.form.bizRailwayDataSaveOrUpdateDTOList.push(arr[idx]); + this.form.bizRailwayRunDataSaveOrUpdateDTOList.push(arr[idx]); } else { item.isFinish = false; - this.form.bizRailwayDataSaveOrUpdateDTOList.push({ + this.form.bizRailwayRunDataSaveOrUpdateDTOList.push({ "inMark": "", "inPepole": '', "inPepoleMomDo": '', @@ -630,7 +641,7 @@ } }) } - this.form.bizRailwayDataSaveOrUpdateDTOList.map((item,index) => { + this.form.bizRailwayRunDataSaveOrUpdateDTOList.map((item,index) => { this.calcYoyMom(index); }); }) @@ -650,7 +661,7 @@ if(this.pageType == 'add') { this.queryDetail(this.form.statDate, this.form.statPeriod); }else{ - this.form.bizRailwayDataSaveOrUpdateDTOList.map((item,index) => { + this.form.bizRailwayRunDataSaveOrUpdateDTOList.map((item,index) => { this.calcYoyMom(index); }) } @@ -665,7 +676,7 @@ if(this.pageType == 'add') { this.queryDetail(this.form.statDate, this.form.statPeriod); }else{ - this.form.bizRailwayDataSaveOrUpdateDTOList.map((item,index) => { + this.form.bizRailwayRunDataSaveOrUpdateDTOList.map((item,index) => { this.calcYoyMom(index); }) } @@ -732,8 +743,9 @@ // return; // } let checkList = true; - if (this.form.bizRailwayDataSaveOrUpdateDTOList.length > 0) { - checkList = this.form.bizRailwayDataSaveOrUpdateDTOList.every(item => { + console.log('bizRailwayRunDataSaveOrUpdateDTOList ===>',this.form.bizRailwayRunDataSaveOrUpdateDTOList) + if (this.form.bizRailwayRunDataSaveOrUpdateDTOList.length > 0) { + checkList = this.form.bizRailwayRunDataSaveOrUpdateDTOList.every(item => { return checkNotEmpty(item.inboundRailwayDo) && checkNotEmpty(item.inboundPassengersDo) && checkNotEmpty(item.inPepole) && checkNotEmpty(item.outboundRailwayDo) && checkNotEmpty(item.outboundPassengersDo) && checkNotEmpty(item.outPepole) }) } @@ -946,7 +958,14 @@ } } } - + + .station_act { + color: #2D8CF0; + font-size: 24rpx; + text-align: center; + margin-bottom: 30rpx; + } + //收费站 .station_box { display: flex;