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 | 46 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 36 insertions(+), 10 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 ba460ac..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
@@ -67,7 +67,7 @@
<view class="prefix">璁㈠崟绫诲瀷:</view>
<view class="suffix">{{ weighList.orderType || '' }}</view>
</view>
- <view class="main-information" v-if="isweight">
+ <!-- <view class="main-information" v-if="isweight">
<view class="prefix">鐨噸:</view>
<view class="suffix">
{{currentSkin}}
@@ -90,7 +90,7 @@
<view class="suffix">
{{ isWeightclean}}
</view>
- </view>
+ </view> -->
<!-- <view class="main-information">
<view class="prefix">璁㈠崟浣欓噺:</view>
<view class="suffix">{{ weighList.orderSurplus || 0 }}</view>
@@ -98,7 +98,7 @@
</view>
</view>
<!-- 绉伴噸鍘嗗彶-->
- <weigh-item :list="weighHistory"></weigh-item>
+ <weigh-item :list="weighHistory" class="weighingDecive-item"></weigh-item>
<view class="three">
<!-- .澶栬喘璁㈠崟锛屼笉鍑虹幇杩斿洖鍔犲噺鍚ㄧ殑鎸夐挳 -->
<u-button type="primary"
@@ -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 : '绉伴噸澶辫触');
});
},
// 鍔犲噺鐓�
@@ -513,6 +533,12 @@
<style lang="scss"
scoped>
+ .weighingDecive-item{
+ min-height: 200rpx!important;
+ .weigh-history {
+ min-height: 200rpx!important;
+ }
+ }
@mixin flex {
display: flex;
justify-content: space-between;
@@ -755,7 +781,7 @@
.bottom-block {
width: calc(100% - 60rpx);
box-sizing: border-box;
- height: 630rpx;
+ height: 420rpx;
margin: 0 vww(15) vww(15) vww(15);
background: #ffffff;
box-shadow: 0rpx 0rpx 14rpx 0rpx rgba(73, 120, 240, 0.14), 0rpx 7rpx 45rpx 0rpx rgba(73, 120, 240, 0.12);
@@ -766,8 +792,8 @@
.block-main {
width: 94%;
- height: 565rpx;
- margin-top: vww(10);
+ height: 420rpx;
+ margin-top: vww(5);
@include flex;
justify-content: space-around;
align-items: flex-start;
--
Gitblit v1.9.1