修改同环比计算公式

common/util.js

@@ -103,13 +103,15 @@ 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;
+	console.log('cur ===>',!checkNotEmpty(cur),'data ===>',!checkNotEmpty(data))
+	console.log('checkNotEmpty ===>',!checkNotEmpty(cur) || !checkNotEmpty(data) ? '12' : '1212')
+	return !checkNotEmpty(cur) || !checkNotEmpty(data) ? null : data === 0 && parseInt(cur) === 0 ? null : 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;
+	return !checkNotEmpty(cur) || !checkNotEmpty(data) ? null : data === 0 && parseInt(cur) === 0 ? null : data === 0 && parseInt(cur) > 0 ? 100 : (parseInt(cur) - data) / data * 100;
 }
 
 // 是否是闰年

pages/highWay/runData/form.vue

@@ -449,8 +449,8 @@
 					this.form.highwaySubDataList[index].exitVehicleCountMom = this.$calcMom(this.form.highwaySubDataList[index].exitVehicleCount,obj.exitVehicleCount);
 					
 				} else {
-					this.form.highwaySubDataList[index].entranceVehicleCountMom = '';
+					this.form.highwaySubDataList[index].entranceVehicleCountMom = null;
-					this.form.highwaySubDataList[index].exitVehicleCountMom = '';
+					this.form.highwaySubDataList[index].exitVehicleCountMom = null;
 				}
 				if (idx2 > -1) {
 					//同比
@@ -462,8 +462,8 @@
 					this.form.highwaySubDataList[index].exitVehicleCountYoy = this.$calcYoy(this.form
 							.highwaySubDataList[index].exitVehicleCount, obj.exitVehicleCount);
 				} else {
-					this.form.highwaySubDataList[index].entranceVehicleCountYoy = '';
+					this.form.highwaySubDataList[index].entranceVehicleCountYoy = null;
-					this.form.highwaySubDataList[index].exitVehicleCountYoy = '';
+					this.form.highwaySubDataList[index].exitVehicleCountYoy = null;
 				}
 				// }
 			},