From 3fef62b03c16aa69c109c355150cdb698b777feb Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期五, 28 六月 2024 17:39:20 +0800
Subject: [PATCH] Merge branch 'develop/steels' into feature/steels/yangan
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 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 eeaff51..e356895 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
@@ -142,7 +142,6 @@
</template>
<script>
- let socket = null;
import { webSocketUrl, onlineurl } from '@/api/request.js';
import { mapState, mapMutations } from 'vuex';
import combinedTitle from '@/components/combined-title/combined-title.vue';
@@ -173,6 +172,7 @@
data() {
return {
isWeighing:'',
+ timer:null,
weighData: {
//纭绉伴噸鎺ュ彛鍙傛暟
deptId: '',
@@ -286,10 +286,29 @@
onShow() {
this.init();
// this.realTimeWeigh = 0
+ if (this.timer) {
+ clearTimeout(this.timer)
+ }
+ this.timer = setTimeout(() => {
+ if (!this.globalweigh) {
+ console.log('绉伴噸鏃惰嚜鍔ㄩ噸杩�');
+ this.socketTask.close();
+ this.changesocketTask(null);
+ this.changereconnectNum({ connectNum: 1, isWeigh: true })
+ this.$store.dispatch('websocketInit');
+ }
+ }, 3000)
},
+ onHide() {
+ clearTimeout(this.timer)
+ },
+ onUnload() {
+ clearTimeout(this.timer)
+ },
+
computed: {
...mapState(['globalweigh', 'globalinfraredStatus', 'globalWarning', 'globalisconnect', 'globalisUploadimg',
- 'globalisLogin', 'is_open_socket'
+ 'globalisLogin', 'socketTask','is_open_socket'
]),
token() {
return uni.getStorageSync('token');
@@ -360,7 +379,7 @@
}
},
methods: {
- ...mapMutations(['changeweighHouseCode', 'changeisLogin', 'changeWeigh']),
+ ...mapMutations(['changeweighHouseCode', 'changeisLogin', 'changeWeigh','changereconnectNum','changesocketTask']),
init() {
uni.showLoading({
title: '鍔犺浇涓�'
@@ -420,12 +439,13 @@
this.isConfirmWeighLoading = false;
}, 1000);
} else {
- this.$u.toast('绉伴噸澶辫触锛岃绋嶅悗閲嶈瘯');
+ this.$u.toast('绉伴噸澶辫触锛岃绋嶅悗閲嶈瘯' + (res.msg ? res.msg : ''));
}
})
.catch(err => {
this.isConfirmWeighLoading = false;
console.log(err);
+ this.$u.toast(err.msg ? err.msg : '绉伴噸澶辫触');
});
},
// 鍔犲噺鐓�
--
Gitblit v1.9.1