From a3b9cfa7c666dcc1f88588c6dd74220f58bd694c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E7=BE=A4?= <zhangqun@MacBook-Pro.local>
Date: Wed, 20 Sep 2023 13:24:38 +0800
Subject: [PATCH] =?UTF-8?q?=E9=93=81=E8=B7=AF=E8=BF=90=E8=BE=93=E5=90=8C?=
 =?UTF-8?q?=E7=8E=AF=E6=AF=94=E6=8E=A5=E5=8F=A3bug=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/railway/railwayRunData/form.vue | 139 ++++++--------------------
 1 file changed, 29 insertions(+), 110 deletions(-)

diff --git a/pages/railway/railwayRunData/form.vue b/pages/railway/railwayRunData/form.vue
index ff2f1c3..b775610 100644
--- a/pages/railway/railwayRunData/form.vue
+++ b/pages/railway/railwayRunData/form.vue
@@ -64,34 +64,34 @@
 						</uni-easyinput>
 					</view>
 				</view>
-				<view class="form_item">
-					<view class="form_item_label">过路车次：</view>
-					<view class="form_item_input form_input">
-						<uni-easyinput @blur="calcYoyMom" @clear="calcYoyMom" v-model="form.inboundPassengersDo" type="number"
-							placeholderStyle="color: #D4D4D4;font-size:28rpx;" placeholder="请输入" maxlength="20">
-						</uni-easyinput>
-					</view>
-				</view>
 				<!-- 同比环比 -->
 				<view class="form_item_rate"
-					:class="form.inboundRailwayDo === 0 ? 'danger' : '' ">
+					:class="form.inRailwayYomDo === 0 ? 'danger' : '' ">
 					<view class="rate_item">
 						<view class="rate_item_label"
-							:style="form.inboundRailwayDo === 0 ? 'color: #EB4747' : ''">
+							:style="form.inRailwayYomDo === 0 ? 'color: #EB4747' : ''">
 							终到车次环比</view>
 						<view class="rate_item_input"
-							:style="form.inboundRailwayDo === 0 ? 'color: #EB4747' : ''">
-							{{form.inRailwayYomDo === 0 ? form.inRailwayYomDo : form.inRailwayYomDo ? formatDigit(form.inRailwayYomDo) : '--'}}%
+							:style="form.inRailwayYomDo === 0 ? 'color: #EB4747' : ''">
+							{{formatDigit(form.inRailwayYomDo)}}%
 						</view>
 					</view>
 					<view class="line"></view>
 					<view class="rate_item">
 						<view class="rate_item_label">终到车次同比</view>
 						<view class="rate_item_input">
-							{{form.inRailwayMomDo === 0 ? form.inRailwayMomDo : form.inRailwayMomDo ? formatDigit(form.inRailwayMomDo) : '--'}}%
+							{{formatDigit(form.inRailwayMomDo)}}%
 						</view>
 					</view>
 				</view>
+				<view class="form_item">
+					<view class="form_item_label">过路车次：</view>
+					<view class="form_item_input form_input">
+						<uni-easyinput @blur="calcYoyMom" @clear="calcYoyMom" v-model="form.inboundPassengersDo" type="number"
+							placeholderStyle="color: #D4D4D4;font-size:28rpx;" placeholder="请输入" maxlength="20">
+						</uni-easyinput>
+					</view>
+				</view>
 				<view class="form_item">
 					<view class="form_item_label">人数(人)：</view>
 					<view class="form_item_input form_input">
@@ -109,14 +109,14 @@
 						</view>
 						<view class="rate_item_input"
 							:style="form.inPepoleYoyDo === 0 ? 'color: #EB4747' : ''">
-							{{form.inPepoleMomDo === 0 ? form.inPepoleMomDo ? form.inPepoleMomDo : formatDigit(form.inPepoleYoyDo) : '--'}}%
+							{{formatDigit(form.inPepoleYoyDo)}}%
 						</view>
 					</view>
 					<view class="line"></view>
 					<view class="rate_item">
 						<view class="rate_item_label">人数同比</view>
 						<view class="rate_item_input">
-							{{form.inPepoleMomDo === 0 ? form.inPepoleMomDo ? form.inPepoleMomDo : formatDigit(form.inPepoleMomDo) : '--'}}%
+							{{formatDigit(form.inPepoleMomDo)}}%
 						</view>
 					</view>
 				</view>
@@ -144,14 +144,6 @@
 						</uni-easyinput>
 					</view>
 				</view>
-				<view class="form_item">
-					<view class="form_item_label">过路车次：</view>
-					<view class="form_item_input form_input">
-						<uni-easyinput @blur="calcYoyMom" @clear="calcYoyMom" v-model="form.outboundPassengersDo" type="number"
-							placeholderStyle="color: #D4D4D4;font-size:28rpx;" placeholder="请输入" maxlength="20">
-						</uni-easyinput>
-					</view>
-				</view>
 				<!-- 同比环比 -->
 				<view class="form_item_rate" :class="form.outRailwayYomDo === 0 ? 'danger' : '' ">
 					<view class="rate_item">
@@ -160,17 +152,25 @@
 							始发车次环比</view>
 						<view class="rate_item_input"
 							:style="form.outRailwayYomDo === 0 ? 'color: #EB4747' : ''">
-							{{form.outRailwayMomDo === 0 ? form.outRailwayMomDo : form.outRailwayMomDo ? formatDigit(form.outRailwayYomDo) : '--'}}%
+							{{formatDigit(form.outRailwayYomDo)}}%
 						</view>
 					</view>
 					<view class="line"></view>
 					<view class="rate_item">
 						<view class="rate_item_label">始发车次同比</view>
 						<view class="rate_item_input">
-							{{form.outRailwayMomDo === 0 ? form.outRailwayMomDo : form.outRailwayMomDo ? formatDigit(form.outRailwayMomDo) : '--'}}%
+							{{formatDigit(form.outRailwayMomDo)}}%
 						</view>
 					</view>
 				</view>
+				<view class="form_item">
+					<view class="form_item_label">过路车次：</view>
+					<view class="form_item_input form_input">
+						<uni-easyinput @blur="calcYoyMom" @clear="calcYoyMom" v-model="form.outboundPassengersDo" type="number"
+							placeholderStyle="color: #D4D4D4;font-size:28rpx;" placeholder="请输入" maxlength="20">
+						</uni-easyinput>
+					</view>
+				</view>
 				<view class="form_item">
 					<view class="form_item_label">人数(人)：</view>
 					<view class="form_item_input form_input">
@@ -187,14 +187,14 @@
 						</view>
 						<view class="rate_item_input"
 							:style="form.outPepoleYoyDo === 0 ? 'color: #EB4747' : ''">
-							{{form.outPepoleMomDo === 0 ? form.outPepoleMomDo : form.outPepoleMomDo ? formatDigit(form.outPepoleYoyDo) : '--'}}%
+							{{formatDigit(form.outPepoleYoyDo)}}%
 						</view>
 					</view>
 					<view class="line"></view>
 					<view class="rate_item">
 						<view class="rate_item_label">人数同比</view>
 						<view class="rate_item_input">
-							{{form.outPepoleMomDo === 0 ? form.outPepoleMomDo : form.outPepoleMomDo ? formatDigit(form.outPepoleMomDo) : '--'}}%
+							{{formatDigit(form.outPepoleMomDo)}}%
 						</view>
 					</view>
 				</view>
@@ -285,7 +285,7 @@
 			},
 			//只保留两位小数
 			formatDigit(data) {
-				return (data+'').indexOf('.') > -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;
 			},
 			//环比同比
 			queryYoyMom() {
@@ -303,7 +303,7 @@
 			//环比同比计算
 			calcYoyMom() {
 				console.log('同比环比计算')
-				this.form.inRailwayYomDo = this.$calcMom(this.form.inRailwayYomDo,this.yoyMom.yesterdayData.inboundRailwayDo);
+				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);
 				this.form.outPepoleYoyDo = this.$calcMom(this.form.outPepole,this.yoyMom.yesterdayData.outPepole);
@@ -311,87 +311,6 @@
 				this.form.inPepoleMomDo = this.$calcYoy(this.form.inPepole,this.yoyMom.lastYearData.inPepole);
 				this.form.outRailwayMomDo = this.$calcYoy(this.form.outboundRailwayDo,this.yoyMom.lastYearData.outboundRailwayDo);
 				this.form.outPepoleMomDo = this.$calcYoy(this.form.outPepole,this.yoyMom.lastYearData.outPepole);
-				return;
-				if (this.yoyMom.yesterdayData) {
-					//环比
-					if (checkNotEmpty(this.form.inboundRailwayDo)) {
-						this.form.inRailwayYomDo = !checkNotEmpty(this.yoyMom.yesterdayData.inboundRailwayDo) || this
-							.yoyMom.yesterdayData.inboundRailwayDo === 0 ? 100 : (
-								parseInt(this.form.inboundRailwayDo) - this.yoyMom.yesterdayData.inboundRailwayDo) / this
-							.yoyMom.yesterdayData.inboundRailwayDo * 100;
-					}else{
-						this.form.inRailwayYomDo = '';
-					}
-					if (this.form.inPepole) {
-						this.form.inPepoleYoyDo = !checkNotEmpty(this.yoyMom.yesterdayData.inPepole) || this.yoyMom
-							.yesterdayData.inPepole === 0 ? 100 : (parseInt(this
-								.form.inPepole) - this.yoyMom.yesterdayData.inPepole) / this.yoyMom.yesterdayData
-							.inPepole *
-							100;
-					}else{
-						this.form.inPepoleYoyDo = '';
-					}
-					if (checkNotEmpty(this.form.outboundRailwayDo)) {
-						this.form.outRailwayYomDo = !checkNotEmpty(this.yoyMom.yesterdayData.outboundRailwayDo) || this
-							.yoyMom.yesterdayData.outboundRailwayDo === 0 ? 100 : (parseInt(this.form.outboundRailwayDo) -
-								this.yoyMom.yesterdayData
-								.outboundRailwayDo) / this.yoyMom.yesterdayData.outboundRailwayDo * 100;
-					}else{
-						this.form.outRailwayYomDo = '';
-					}
-					if (checkNotEmpty(this.form.outPepole)) {
-						this.form.outPepoleYoyDo = !checkNotEmpty(this.yoyMom.yesterdayData.outPepole) || this.yoyMom
-							.yesterdayData.outPepole === 0 ? 100 : (parseInt(this
-								.form.outPepole) - this.yoyMom.yesterdayData.outPepole) / this.yoyMom.yesterdayData
-							.outPepole *
-							100;
-					}else{
-						this.form.outPepoleYoyDo = '';
-					}
-				}
-				if (this.yoyMom.lastYearData) {
-					//同比
-					if (checkNotEmpty(this.form.inboundRailwayDo)) {
-						this.form.inRailwayMomDo = !checkNotEmpty(this.yoyMom.lastYearData.inboundRailwayDo) || this.yoyMom
-							.lastYearData.inboundRailwayDo === 0 ? 100 : (
-								parseInt(this.form.inboundRailwayDo) - this.yoyMom.lastYearData.inboundRailwayDo) / this
-							.yoyMom
-							.lastYearData.inboundRailwayDo * 100;
-					}else{
-						this.form.inRailwayMomDo = '';
-					}
-
-					if (checkNotEmpty(this.form.inPepole)) {
-						this.form.inPepoleMomDo = !checkNotEmpty(this.yoyMom.lastYearData.inPepole) || this.yoyMom
-							.lastYearData
-							.inPepole === 0 ? 100 : (parseInt(this.form
-								.inPepole) - this.yoyMom.lastYearData.inPepole) / this.yoyMom.lastYearData.inPepole * 100;
-					}else{
-						this.form.inPepoleMomDo = '';
-					}
-
-					if (checkNotEmpty(this.form.outboundRailwayDo)) {
-						this.form.outRailwayMomDo = !checkNotEmpty(this.yoyMom.lastYearData.outboundRailwayDo) || this
-							.yoyMom
-							.lastYearData.outboundRailwayDo === 0 ? 100 :
-							(parseInt(this.form.outboundRailwayDo) - this.yoyMom.lastYearData.outboundRailwayDo) / this
-							.yoyMom
-							.lastYearData.outboundRailwayDo * 100;
-					}else{
-						this.form.outRailwayMomDo = '';
-					}
-
-					if (checkNotEmpty(this.form.outPepole)) {
-						this.form.outPepoleMomDo = !checkNotEmpty(this.yoyMom.lastYearData.outPepole) || this.yoyMom
-							.lastYearData.outPepole === 0 ? 100 : (parseInt(this
-								.form.outPepole) - this.yoyMom.lastYearData.outPepole) / this.yoyMom.lastYearData
-							.outPepole *
-							100;
-					}else{
-						this.form.outPepoleMomDo = '';
-					}
-
-				}
 			},
 			//车站权限列表
 			queryStation() {