From 2ea83048e7f11eb9a453da7371f9b3719a323fad Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期五, 15 九月 2023 09:52:40 +0800
Subject: [PATCH] 煤炭增加操作指引,增加打印入门证出门证

---
 pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue |   23 +++++++++--------------
 1 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue b/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
index 2a19181..c30c17c 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
@@ -293,7 +293,6 @@
 			this.init();
 			this.changeWeigh('')
 			this.realTimeWeigh = 0
-			console.log(this.abnormalModalShow);
 		},
 		components: {
 			combinedTitle
@@ -364,9 +363,6 @@
 			};
 		},
 		watch: {
-			realTimeWeigh(newV, oldV) {
-
-			},
 			// 鐩戝惉閲嶉噺鍙樺寲
 			globalweigh: {
 				deep: true,
@@ -380,9 +376,7 @@
 							this.temporaryWeighObj.skin = newV;
 							let xx = new BigNumber(this.avgSkin)
 							let yy = new BigNumber(newV)
-							if (xx.minus(yy).toNumber() <= -0.2 || xx.minus(yy).toNumber() >= 0.2) {
-								this.errorTipShow = true
-							}
+							this.errorTipShow = xx.minus(yy).toNumber() <= -0.2 || xx.minus(yy).toNumber() >= 0.2
 						} else {
 							this.isSkinWeigh = false;
 							this.temporaryWeighObj.hair = newV;
@@ -402,9 +396,7 @@
 							this.temporaryWeighObj.skin = newV;
 							let xx = new BigNumber(this.avgSkin)
 							let yy = new BigNumber(newV)
-							if (xx.minus(yy).toNumber() <= -0.2 || xx.minus(yy).toNumber() >= 0.2) {
-								this.errorTipShow = true
-							}
+							this.errorTipShow = xx.minus(yy).toNumber() <= -0.2 || xx.minus(yy).toNumber() >= 0.2
 							this.temporaryWeighObj.clean = (this.weighList.hair - this.temporaryWeighObj.skin).toFixed(
 								2);
 							this.isweigh = this.temporaryWeighObj.clean > this.weighList.orderSurplus || this
@@ -418,7 +410,9 @@
 		computed: {
 			...mapState(['globalweigh', 'globalinfraredStatus']),
 			coalContactClean() {
-				return (Number(this.weighData.coalContactHair) - Number(this.weighData.coalContactSkin)).toFixed(2);
+				let xx = BigNumber(this.weighData.coalContactHair)
+				let yy = BigNumber(this.weighData.coalContactSkin)
+				return xx.minus(yy).toNumber().toFixed(2)
 			},
 			token() {
 				return uni.getStorageSync('token');
@@ -492,7 +486,7 @@
 					if (this.weighData.weigh != 0) {
 						// 濡傛灉姝e湪绉扮毊
 						if (this.isSkinWeigh) {
-							// 濡傛灉绗竴娆$О閲�
+							// 濡傛灉骞冲潎鐨噸涓�0
 							if (this.isAbnormalAvgSkin) {
 								this.abnormalModalShow = false
 								this.saveWeigh();
@@ -611,8 +605,9 @@
 						this.tmTaskCoalList = res.data.tmTaskCoalList
 						/**
 						 * @description true鐨勮瘽鏄涓�娆$О, false灏变笉鏄�,娌℃湁鍘嗗彶锛屽钩鍧囩毊閲嶄负0鏄涓�娆′篃鏄甯� */
-						this.isAbnormalAvgSkin = (Array.isArray(this.tmTaskCoalList) && this
-							.tmTaskCoalList.length === 0 || !this.tmTaskCoalList) && this.avgSkin == 0
+						// this.isAbnormalAvgSkin = (Array.isArray(this.tmTaskCoalList) && this
+						// 	.tmTaskCoalList.length === 0 || !this.tmTaskCoalList) && this.avgSkin == 0
+						this.isAbnormalAvgSkin = this.avgSkin == 0
 					} else {
 						uni.hideLoading()
 						this.$u.toast('鍔犺浇澶辫触')

--
Gitblit v1.9.1