From 2e2b132e112c07f87e0abec73f36c6d613363e70 Mon Sep 17 00:00:00 2001
From: 付延余 <f-yanyu@outlook.com>
Date: 星期三, 22 三月 2023 19:26:52 +0800
Subject: [PATCH] 称重页面，皮重/毛重/净重动态显示判断，红外条件添加
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 69 ++++++++++++++++++++++++++--------
pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue | 1
2 files changed, 54 insertions(+), 16 deletions(-)
diff --git a/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue b/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
index fd0fc70..d03e6e0 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
@@ -164,6 +164,7 @@
display: flex;
flex-direction: column;
.bangDanMessage {
+ padding:vww(10);
border: vww(2) solid #dddddd;
border-radius: vww(20);
margin: vww(20);
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 8dee72c..f52f718 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
@@ -8,16 +8,16 @@
<view class="top_right">
<view class="">
绉伴噸:
- <u--text type="success" text="姝ｅ父" size="34"></u--text>
+ <u--text :type="realTimeWeigh == 0 ? 'error' : 'success'" :text="realTimeWeigh == 0 ? '寮傚父' : '姝ｅ父'" size="34"></u--text>
</view>
<view class="">
绾㈠:
- <u--text type="success" text="姝ｅ父" size="34"></u--text>
+ <u--text :type="infraredStatus ? 'error' : 'success'" :text="infraredStatus ? '寮傚父' : '姝ｅ父'" size="34"></u--text>
</view>
- <view class="">
+ <!-- <view class="">
闆疯揪:
<u--text type="success" text="姝ｅ父" size="34"></u--text>
- </view>
+ </view> -->
</view>
</view>
<view class="bottom"><text>TIP:褰撳墠鐘舵�佹甯稿彲浠ョО閲�</text></view>
@@ -26,16 +26,23 @@
<p>璁㈠崟缂栧彿锛歿{ weighList.code || '' }}</p>
<p>璁㈠崟绫诲瀷锛歿{ weighList.orderTye || '' }}</p>
<p>璁㈠崟浣欓噺锛歿{ weighList.orderSurplus || 0 }}</p>
- <p>鐨噸锛歿{ weighList.skin || 0 }}</p>
- <p>姣涢噸锛歿{ weighList.hair || 0 }}</p>
- <p>鍑�閲嶏細{{ weighList.skin == 0 && weighList.hair == 0 ? weighList.clean : weighList.skin != 0 ? realTimeWeigh - weighList.skin : weighList.hair - realTimeWeigh }}</p>
+ <p>鐨噸锛歿{ temporaryWeighObj.skin == 0 ? weighList.skin : temporaryWeighObj.skin }}</p>
+ <p>姣涢噸锛歿{ temporaryWeighObj.hair == 0 ? weighList.hair : temporaryWeighObj.hair }}</p>
+ <p>鍑�閲嶏細{{ temporaryWeighObj.clean == 0 ? weighList.clean : temporaryWeighObj.clean }}</p>
<p>鐓ょ鍚嶇О锛歿{ weighList.coalName || '' }}</p>
<p>鍗曚綅鍚嶇О锛歿{ weighList.deptName || '' }}</p>
<p>鐭垮満鍚嶇О锛歿{ weighList.filedName || '' }}</p>
</view>
<view class="three">
<!-- 澶栭攢璁㈠崟鎴愮毊鏃讹紝杩斿洖鍔犲噺鍚ㄦ寜閽疆鐏般�傜О姣涙椂鍙敤.澶栬喘璁㈠崟锛屼笉鍑虹幇杩斿洖鍔犲噺鍚ㄧ殑鎸夐挳 -->
- <u-button type="primary" text="纭畾绉伴噸" :loading="isConfirmWeighLoading" loadingText="鍔犺浇涓�" @click="confirmWeigh"></u-button>
+ <u-button
+ type="primary"
+ text="纭畾绉伴噸"
+ :disabled="realTimeWeigh == 0 || infraredStatus"
+ :loading="isConfirmWeighLoading"
+ loadingText="鍔犺浇涓�"
+ @click="confirmWeigh"
+ ></u-button>
<u-button type="primary" text="杩斿洖鍔犲噺鍚�" :disabled="addAndSubtractCoalDisabled" v-if="weighList.orderTye == '澶栭攢'" @click="addAndSubtractCoal"></u-button>
</view>
<view class="four">濡傛偍闇�瑕佽皟鏁磋杞借揣鍝佸惃鏁帮紝璇风偣鍑昏繑鍥炲姞鍑忓惃</view>
@@ -71,7 +78,7 @@
isConfirmWeighLoading: false, //纭畾绉伴噸鎸夐挳
realTimeWeigh: '',
weighList: {},
- webSocket: null // webSocket瀹炰緥
+ webSocket: null, // webSocket瀹炰緥
// lockReconnect: false, // 閲嶈繛閿侊紝閬垮厤澶氭閲嶈繛
// maxReconnect: 6, // 鏈�澶ч噸杩炴鏁帮紝 -1 鏍囪瘑鏃犻檺閲嶈繛
// reconnectTime: 0, // 閲嶈繛灏濊瘯娆℃暟
@@ -82,7 +89,33 @@
// pongTimeoutObj: null, // 鎺ユ敹蹇冭烦鍝嶅簲鐨勫畾鏃跺櫒
// pingMessage: JSON.stringify({ type: 'ping' }) // 蹇冭烦璇锋眰淇℃伅
// }
+ // 涓存椂绉伴噸瀵硅薄
+ temporaryWeighObj:{
+ skin:0,
+ hair:0,
+ clean:0
+ },
+ infraredStatus:false// 绾㈠鐘舵��
};
+ },
+ watch:{
+ realTimeWeigh(newV,oldV){
+ if(this.weighList.orderTye == '澶栭攢'){
+ if(this.weighList.skin == 0){
+ this.temporaryWeighObj.skin = this.realTimeWeigh
+ } else {
+ this.temporaryWeighObj.hair = this.realTimeWeigh
+ this.temporaryWeighObj.clean = this.temporaryWeighObj.hair - this.weighList.skin
+ }
+ } else if(this.weighList.orderTye == '澶栬喘'){
+ if(this.weighList.hair == 0){
+ this.temporaryWeighObj.hair = this.realTimeWeigh
+ } else {
+ this.temporaryWeighObj.skin = this.realTimeWeigh
+ this.temporaryWeighObj = this.weighList.hair - this.temporaryWeighObj.skin
+ }
+ }
+ }
},
onShow() {
this.init();
@@ -92,6 +125,7 @@
token() {
return uni.getStorageSync('token');
},
+ // 鍔犲噺鐓ゆ寜閽鐢ㄤ笌鍚�
addAndSubtractCoalDisabled() {
if (this.weighList.orderTye == '澶栭攢') {
if (this.weighList.skin == 0) {
@@ -100,7 +134,7 @@
return false;
}
}
- }
+ },
},
methods: {
init() {
@@ -177,7 +211,6 @@
* 鍒濆鍖� weoSocket
*/
initWebSocket() {
- // let wsUrl = `wss://192.168.0.120:9997/wrzs/ws/info?access_token=${this.token}`;
let wsUrl = `${webSocketUrl}?access_token=${uni.getStorageSync('token')}`;
socket = uni.connectSocket({
url: wsUrl,
@@ -191,13 +224,17 @@
socket.onOpen(() => {
console.log('onOpen');
});
+ // 鑾峰彇鏈嶅姟鍣ㄤ紶鏉ョ殑鏁版嵁锛屽仛鐩稿簲澶勭悊
socket.onMessage(res => {
- // 鑾峰彇鏈嶅姟鍣ㄤ紶鏉ョ殑鏁版嵁锛屽仛鐩稿簲澶勭悊
console.log('socketWeigh', res);
- let nowWeigh = JSON.parse(res.data.slice(7)).weigh;
- let nowWeighHouseCode = JSON.parse(res.data.slice(7)).eqCode;
- if (nowWeighHouseCode == this.weighHouseCode) {
- this.weighData.weigh = this.realTimeWeigh = nowWeigh;
+ let nowWeighObj = JSON.parse(res.data.slice(7))
+ if (nowWeighObj.eqCode == this.weighHouseCode) {
+ if(nowWeighObj.'鏆傚畾'){
+ this.infraredStatus = true
+ }else{
+ this.infraredStatus = false
+ this.weighData.weigh = this.realTimeWeigh = nowWeighObj.weigh;
+ }
}
});
socket.onClose(() => {
--
Gitblit v1.9.1