From 1b4f1c9db703b1bfd0e3f8cc7f01153a7399088d Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期一, 10 四月 2023 15:53:47 +0800
Subject: [PATCH] 修改称重控制，修复刷新失败
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 84 +++++++++++++++++++++++++++---------------
1 files changed, 54 insertions(+), 30 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 f8b71d7..f99e4e9 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
@@ -34,7 +34,8 @@
<p>鐭垮満鍚嶇О锛歿{ weighList.filedName || '' }}</p>
</view>
<view class="three">
- <u-button type="primary" text="鏀剧┖" plain @click="evacuation" throttleTime="500"></u-button>
+ <!-- 鏀剧┖ -->
+ <u-button type="primary" text="鏀剧┖" plain @click="evacuation" throttleTime="500" :disabled="isEvacuation"></u-button>
<!-- 澶栭攢璁㈠崟绉扮毊鏃讹紝杩斿洖鍔犲噺鍚ㄦ寜閽疆鐏般�傜О姣涙椂鍙敤.澶栬喘璁㈠崟锛屼笉鍑虹幇杩斿洖鍔犲噺鍚ㄧ殑鎸夐挳 -->
<u-button
type="primary"
@@ -44,9 +45,10 @@
loadingText="鍔犺浇涓�"
@click="confirmWeigh"
></u-button>
- <u-button type="primary" text="杩斿洖鍔犲噺鍚�" :disabled="addAndSubtractCoalDisabled" v-if="weighList.orderTye == '澶栭攢'" @click="addAndSubtractCoal"></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
:show="evacuationModalShow"
@@ -65,6 +67,7 @@
import { webSocketUrl } from '@/api/request.js';
export default {
onLoad(params) {
+ console.log(params, '绗簩娆℃斁绌哄弬鏁�');
this.takeCoalId = params.takeCoalId;
this.weighData.sceneId = params.sceneId;
this.weighData.gateCameraId = params.gateCameraId;
@@ -109,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);
}
}
}
@@ -142,28 +149,24 @@
},
// 鍔犲噺鐓ゆ寜閽鐢ㄤ笌鍚�
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;
+ } else {
+ return true;
}
}
},
methods: {
- // 鏀剧┖
- evacuation() {
- this.evacuationModalShow = true;
- },
- // 鏀剧┖寮圭獥纭
- evacuationConfirm() {
- this.evacuationModalShow = false;
- },
- // 鏀剧┖寮圭獥鍙栨秷
- evacuationCancel() {
- this.evacuationModalShow = false;
- },
init() {
// 鑾峰彇绉伴噸淇℃伅
this.$reqGet('weighList', { id: this.takeCoalId }).then(res => {
@@ -188,7 +191,7 @@
if (this.weighList.skin ? (this.weighList.skin < this.realTimeWeigh ? true : false) : true) {
this.saveWeigh();
} else {
- this.$u.toast('姣涢噸涓峲鑳藉皬浜庣毊閲�');
+ this.$u.toast('姣涢噸涓嶈兘灏忎簬鐨噸');
this.isConfirmWeighLoading = false;
}
} else {
@@ -239,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'
@@ -255,6 +258,8 @@
socket.onMessage(res => {
console.log('socketWeigh', res);
let nowWeighObj = JSON.parse(res.data.slice(7));
+ console.log(nowWeighObj);
+ // 涓�寮�濮嬫槸weighHouseCode
if (nowWeighObj.eqCode == this.weighHouseCode) {
if (nowWeighObj.eqInfraredStatus) {
this.infraredStatus = true;
@@ -266,13 +271,29 @@
}
});
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('纾呮埧鏆傛椂涓嶈兘浣跨敤锛岃閲嶆柊杩涘叆璇ラ〉闈紝閲嶈瘯锛侊紒');
});
+ },
+ // 鏀剧┖
+ evacuation() {
+ this.evacuationModalShow = true;
+ },
+ // 鏀剧┖寮圭獥纭
+ evacuationConfirm() {
+ this.$reqPost('getTwoEvacuation', this.weighData, 'json').then(res => {
+ console.log(res, '绗簩娆℃斁绌�');
+ this.evacuationModalShow = false;
+ });
+ },
+ // 鏀剧┖寮圭獥鍙栨秷
+ evacuationCancel() {
+ this.evacuationModalShow = false;
}
}
};
@@ -335,6 +356,9 @@
&:nth-of-type(2) {
margin-left: vww(10);
}
+ &:nth-of-type(3) {
+ margin-left: vww(10);
+ }
}
}
.four {
--
Gitblit v1.9.1