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 @@
-
- 过路车次：
-
-
-
-
-
+ :class="form.inRailwayYomDo === 0 ? 'danger' : '' ">
+ :style="form.inRailwayYomDo === 0 ? 'color: #EB4747' : ''">
终到车次环比
- {{form.inRailwayYomDo === 0 ? form.inRailwayYomDo : form.inRailwayYomDo ? formatDigit(form.inRailwayYomDo) : '--'}}%
+ :style="form.inRailwayYomDo === 0 ? 'color: #EB4747' : ''">
+ {{formatDigit(form.inRailwayYomDo)}}%
终到车次同比
- {{form.inRailwayMomDo === 0 ? form.inRailwayMomDo : form.inRailwayMomDo ? formatDigit(form.inRailwayMomDo) : '--'}}%
+ {{formatDigit(form.inRailwayMomDo)}}%
+
+ 过路车次：
+
+
+
+
+
人数(人)：
@@ -109,14 +109,14 @@
- {{form.inPepoleMomDo === 0 ? form.inPepoleMomDo ? form.inPepoleMomDo : formatDigit(form.inPepoleYoyDo) : '--'}}%
+ {{formatDigit(form.inPepoleYoyDo)}}%
人数同比
- {{form.inPepoleMomDo === 0 ? form.inPepoleMomDo ? form.inPepoleMomDo : formatDigit(form.inPepoleMomDo) : '--'}}%
+ {{formatDigit(form.inPepoleMomDo)}}%
@@ -144,14 +144,6 @@
-
- 过路车次：
-
-
-
-
-
@@ -160,17 +152,25 @@
始发车次环比
- {{form.outRailwayMomDo === 0 ? form.outRailwayMomDo : form.outRailwayMomDo ? formatDigit(form.outRailwayYomDo) : '--'}}%
+ {{formatDigit(form.outRailwayYomDo)}}%
始发车次同比
- {{form.outRailwayMomDo === 0 ? form.outRailwayMomDo : form.outRailwayMomDo ? formatDigit(form.outRailwayMomDo) : '--'}}%
+ {{formatDigit(form.outRailwayMomDo)}}%
+
+ 过路车次：
+
+
+
+
+
人数(人)：
@@ -187,14 +187,14 @@
- {{form.outPepoleMomDo === 0 ? form.outPepoleMomDo : form.outPepoleMomDo ? formatDigit(form.outPepoleYoyDo) : '--'}}%
+ {{formatDigit(form.outPepoleYoyDo)}}%
人数同比
- {{form.outPepoleMomDo === 0 ? form.outPepoleMomDo : form.outPepoleMomDo ? formatDigit(form.outPepoleMomDo) : '--'}}%
+ {{formatDigit(form.outPepoleMomDo)}}%
@@ -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() {