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 | 98 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 80 insertions(+), 18 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 db2e681..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
@@ -60,31 +60,37 @@
<view class="suffix">{{ weighList.filedName || '' }}</view>
</view>
<!-- <view class="main-information">
- <view class="prefix">鐓ょ鍚嶇О:</view>
+ <view class="prefix">鐗╂枡鍚嶇О:</view>
<view class="suffix">{{ weighList.coalName || '' }}</view>
</view> -->
<view class="main-information">
<view class="prefix">璁㈠崟绫诲瀷:</view>
<view class="suffix">{{ weighList.orderType || '' }}</view>
</view>
- <view class="main-information">
+ <!-- <view class="main-information" v-if="isweight">
<view class="prefix">鐨噸:</view>
<view class="suffix">
{{currentSkin}}
</view>
</view>
- <view class="main-information">
+ <view class="main-information" v-if="isweight">
<view class="prefix">姣涢噸:</view>
<view class="suffix">
{{currentHair}}
</view>
</view>
- <view class="main-information">
+ <view class="main-information" v-if="isweight">
<view class="prefix">鍑�閲�:</view>
<view class="suffix">
{{ currentClean}}
</view>
</view>
+ <view class="main-information" v-else>
+ <view class="prefix">鍑�閲�:</view>
+ <view class="suffix">
+ {{ isWeightclean}}
+ </view>
+ </view> -->
<!-- <view class="main-information">
<view class="prefix">璁㈠崟浣欓噺:</view>
<view class="suffix">{{ weighList.orderSurplus || 0 }}</view>
@@ -92,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"
@@ -136,13 +142,14 @@
</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';
import weighItem from '@/components/weighItem.vue'
export default {
onLoad(params) {
+
+ this.isWeighing = params.isWeighing; // 褰撳墠鏄笉鏄洖纾呯殑
this.takeCoalId = params.takeCoalId;
this.weighData.sceneId = params.sceneId;
this.weighData.gateCameraId = params.gateCameraId;
@@ -164,6 +171,8 @@
},
data() {
return {
+ isWeighing:'',
+ timer:null,
weighData: {
//纭绉伴噸鎺ュ彛鍙傛暟
deptId: '',
@@ -192,7 +201,8 @@
temporaryWeighObj: {
skin: null,
hair: null,
- clean: null
+ clean: null,
+ isWeightclean:null,
},
infraredStatus: false, // 绾㈠鐘舵�侊紝
// 鏀剧┖鎺у埗
@@ -228,16 +238,16 @@
globalweigh: {
handler: function(newV) {
this.weighData.weigh = this.realTimeWeigh = newV;
- if (this.weighList.orderType == '澶栭攢' || this.weighList.orderType == '鍐呴攢' || this.weighList
- .orderType == '杞嚭') {
+ if ((this.weighList.orderType == '澶栭攢' || this.weighList.orderType == '鍐呴攢' || this.weighList
+ .orderType == '杞嚭')) {
if (!this.showWeigh.skin) {
this.temporaryWeighObj.skin = newV;
} else {
this.temporaryWeighObj.hair = newV;
this.isweigh = Number(this.currentClean) < 0;
}
- } else if (this.weighList.orderType == '澶栬喘' || this.weighList.orderType == '鍐呰喘' || this.weighList
- .orderType == '杞叆') {
+ } else if ( (this.isweight) && (this.weighList.orderType == '澶栬喘' || this.weighList.orderType == '鍐呰喘' || this.weighList
+ .orderType == '杞叆')) {
if (!this.showWeigh.hair) {
this.temporaryWeighObj.hair = newV;
} else {
@@ -246,7 +256,17 @@
.showWeigh
.skin > 0;
}
- }
+ }else if((this.weighList.orderType == '澶栬喘' || this.weighList.orderType == '鍐呰喘' || this.weighList
+ .orderType == '杞叆') && (!this.isweight)){
+ if (!this.showWeigh.skin) {
+ this.temporaryWeighObj.skin = newV;
+ this.temporaryWeighObj.isWeightclean = newV;
+ } else {
+ this.temporaryWeighObj.isWeightclean = newV;
+
+ this.isweigh = Number(this.currentClean) < 0;
+ }
+ }
},
deep: true
}
@@ -266,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');
@@ -321,10 +360,26 @@
.currentHair - this.currentSkin).toFixed(2) : ''
}
+ },
+ isWeightclean(){
+ console.log(this.temporaryWeighObj,'his.temporaryWeighObj')
+ return this.temporaryWeighObj.skin || ''
+ },
+ isweight(){
+ if(this.isWeighing){
+ if(this.isWeighing == '涓嶅洖纾�'){
+ return false
+ }else{
+ return true
+ }
+
+ }else{
+ return true
+ }
}
},
methods: {
- ...mapMutations(['changeweighHouseCode', 'changeisLogin', 'changeWeigh']),
+ ...mapMutations(['changeweighHouseCode', 'changeisLogin', 'changeWeigh','changereconnectNum','changesocketTask']),
init() {
uni.showLoading({
title: '鍔犺浇涓�'
@@ -384,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 : '绉伴噸澶辫触');
});
},
// 鍔犲噺鐓�
@@ -477,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;
@@ -719,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);
@@ -730,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