From 7406be32979e90a730b5a2ac8d392892f71835d2 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期一, 10 四月 2023 14:53:17 +0800
Subject: [PATCH] 修复称重不显示问题，优化信息提示
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 40 ++++++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 16 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 391fe04..7363ee3 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
@@ -47,7 +47,7 @@
></u-button>
<u-button type="primary" text="杩斿洖鍔犲噺鍚�" :disabled="addAndSubtractCoalDisabled" @click="addAndSubtractCoal" class="jiajian"></u-button>
</view>
- <view class="four" v-if="weighList.orderTye == '澶栭攢'">濡傛偍闇�瑕佽皟鏁磋杞借揣鍝佸惃鏁帮紝璇风偣鍑昏繑鍥炲姞鍑忓惃</view>
+ <view class="four" v-if="weighList.orderTye !== '澶栬喘'">濡傛偍闇�瑕佽皟鏁磋杞借揣鍝佸惃鏁帮紝璇风偣鍑昏繑鍥炲姞鍑忓惃</view>
<!-- 鏀剧┖寮圭獥 -->
<view class="evacuationModal">
<u-modal
@@ -112,25 +112,29 @@
infraredStatus: false, // 绾㈠鐘舵�侊紝
// 鏀剧┖鎺у埗
evacuationModalShow: false,
- evacuationTitle: '绗簩娆℃斁绌虹‘璁�',
+ evacuationTitle: '鏀剧┖纭',
evacuationContent: '鏄惁纭鏀剧┖'
};
},
watch: {
realTimeWeigh(newV, oldV) {
- if (this.weighList.orderTye == '澶栭攢') {
+ if (this.weighList.orderTye == '澶栭攢' || this.weighList.orderTye == '鍐呴攢') {
if (this.weighList.skin == 0) {
- this.temporaryWeighObj.skin = this.realTimeWeigh;
+ // this.temporaryWeighObj.skin = this.realTimeWeigh;
+ this.temporaryWeighObj.skin = newV;
} else {
- this.temporaryWeighObj.hair = this.realTimeWeigh;
+ // this.temporaryWeighObj.hair = this.realTimeWeigh;
+ this.temporaryWeighObj.hair = newV;
this.temporaryWeighObj.clean = (this.temporaryWeighObj.hair - this.weighList.skin).toFixed(2);
}
- } else if (this.weighList.orderTye == '澶栬喘') {
+ } else if (this.weighList.orderTye == '澶栬喘' || this.weighList.orderTye == '杞嚭') {
if (this.weighList.hair == 0) {
- this.temporaryWeighObj.hair = this.realTimeWeigh;
+ // this.temporaryWeighObj.hair = this.realTimeWeigh;
+ this.temporaryWeighObj.hair = newV;
} else {
- this.temporaryWeighObj.skin = this.realTimeWeigh;
- this.temporaryWeighObj = this.weighList.hair - this.temporaryWeighObj.skin;
+ // this.temporaryWeighObj.skin = this.realTimeWeigh;
+ this.temporaryWeighObj.skin = newV;
+ this.temporaryWeighObj.clean = (this.weighList.hair - this.temporaryWeighObj.skin).toFixed(2);
}
}
}
@@ -145,14 +149,15 @@
},
// 鍔犲噺鐓ゆ寜閽鐢ㄤ笌鍚�
addAndSubtractCoalDisabled() {
- if (this.weighList.orderTye == '澶栭攢') {
- if (this.weighList.skin == 0) {
+ if (this.weighList.orderTye == '澶栭攢' || this.weighList.orderTye == '鍐呴攢' || this.weighList.orderTye == '杞嚭') {
+ if (this.weighList.hair == 0) {
return true;
- } else if (this.weighList.skin != 0) {
+ } else if (this.weighList.hair != 0) {
return false;
}
}
},
+ // 鏄惁鏀剧┖鎸夐挳绂佺敤
isEvacuation() {
if (this.weighList.hair == this.weighList.skin || this.temporaryWeighObj.skin == this.temporaryWeighObj.hair) {
return false;
@@ -237,7 +242,7 @@
*/
initWebSocket() {
let wsUrl = `${webSocketUrl}?access_token=${uni.getStorageSync('token')}`;
- socket = uni.connectSocket({
+ let socket = uni.connectSocket({
url: wsUrl,
header: {
CLIENT_TOC: 'Y'
@@ -253,7 +258,9 @@
socket.onMessage(res => {
console.log('socketWeigh', res);
let nowWeighObj = JSON.parse(res.data.slice(7));
- if (nowWeighObj.eqCode == this.weighHouseCode) {
+ console.log(nowWeighObj);
+ // 涓�寮�濮嬫槸weighHouseCode
+ if (nowWeighObj.eqCode == this.weighData.equipmentCode) {
if (nowWeighObj.eqInfraredStatus) {
this.infraredStatus = true;
this.weighData.weigh = this.realTimeWeigh = nowWeighObj.weigh;
@@ -264,12 +271,13 @@
}
});
socket.onClose(() => {
+ uni.closeSocket();
console.log('webSocketClose');
- this.$u.toast('纾呮埧鎺ュ彛缁堢');
+ this.$u.toast('纾呮埧宸插叧闂�');
});
socket.onError(err => {
console.log('socket鎶ラ敊', err);
- this.$u.toast('纾呮埧鎺ュ彛鏆傛椂涓嶈兘浣跨敤锛岃閲嶆柊杩涘叆璇ラ〉闈紝閲嶈瘯锛侊紒');
+ this.$u.toast('纾呮埧鏆傛椂涓嶈兘浣跨敤锛岃閲嶆柊杩涘叆璇ラ〉闈紝閲嶈瘯锛侊紒');
});
},
// 鏀剧┖
--
Gitblit v1.9.1