From 5a8575299f1cc6b4bf0601025d17273e92c2d8cf Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期三, 08 十一月 2023 17:23:42 +0800
Subject: [PATCH] 日计划增加磅单类型
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 157 ++++++++++++++++++++++++++++++++++++---------------
1 files changed, 110 insertions(+), 47 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 214e8f2..ba460ac 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
@@ -29,7 +29,7 @@
<view class="main-information"
v-if="weighList.orderType=='杞叆'||weighList.orderType=='杞嚭'">
<view class="prefix">
- 鍙戣揣鍦扮叅鍦�:
+ 鍙戣揣鍦板熀鍦�:
</view>
<view class="suffix">
{{ weighList.filedName || '' }}
@@ -38,7 +38,7 @@
<view class="main-information"
v-if="weighList.orderType=='杞叆'||weighList.orderType=='杞嚭'">
<view class="prefix">
- 鏀惰揣鍦扮叅鍦�:
+ 鏀惰揣鍦板熀鍦�:
</view>
<view class="suffix">
{{ weighList.toFiledName || '' }}
@@ -51,60 +51,59 @@
</view>
<view class="main-information"
v-if="weighList.orderType!=='杞叆'||weighList.orderType!=='杞嚭'">
- <view class="prefix">鐭垮満:</view>
+ <view class="prefix">浠撳簱:</view>
<view class="suffix">{{ weighList.deptName || '' }}</view>
</view>
<view class="main-information"
v-if="weighList.orderType!=='杞叆'||weighList.orderType!=='杞嚭'">
- <view class="prefix">鐓ゅ満:</view>
+ <view class="prefix">鍩哄湴:</view>
<view class="suffix">{{ weighList.filedName || '' }}</view>
</view>
- <view class="main-information">
- <view class="prefix">鐓ょ鍚嶇О:</view>
+ <!-- <view class="main-information">
+ <view class="prefix">鐗╂枡鍚嶇О:</view>
<view class="suffix">{{ weighList.coalName || '' }}</view>
- </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">
+ <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>
- </view>
+ </view> -->
</view>
</view>
<!-- 绉伴噸鍘嗗彶-->
<weigh-item :list="weighHistory"></weigh-item>
<view class="three">
- <!-- 鏀剧┖ -->
- <u-button type="primary"
- text="鏀剧┖"
- plain
- @click="evacuation"
- throttleTime="500"
- :disabled="!isEvacuation"></u-button>
- <!-- 澶栭攢璁㈠崟绉扮毊鏃讹紝杩斿洖鍔犲噺鍚ㄦ寜閽疆鐏般�傜О姣涙椂鍙敤.澶栬喘璁㈠崟锛屼笉鍑虹幇杩斿洖鍔犲噺鍚ㄧ殑鎸夐挳 -->
+ <!-- .澶栬喘璁㈠崟锛屼笉鍑虹幇杩斿洖鍔犲噺鍚ㄧ殑鎸夐挳 -->
<u-button type="primary"
text="纭畾绉伴噸"
- :disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh "
+ :disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh ||globalWarning"
:loading="isConfirmWeighLoading"
loadingText="纭"
@click="confirmWeigh"></u-button>
@@ -121,6 +120,14 @@
loadingText="纭"
:disabled="isweigh||realTimeWeigh == 0"
v-if='canUnload'></u-button>
+ <!-- 鏀剧┖ -->
+ <u-button type="primary"
+ text="鏀剧┖"
+ plain
+ @click="evacuation"
+ throttleTime="500"
+ :disabled="!isEvacuation"></u-button>
+
</view>
<!-- 鏀剧┖寮圭獥 -->
<view class="evacuationModal">
@@ -142,6 +149,8 @@
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;
@@ -163,6 +172,7 @@
},
data() {
return {
+ isWeighing:'',
weighData: {
//纭绉伴噸鎺ュ彛鍙傛暟
deptId: '',
@@ -191,7 +201,8 @@
temporaryWeighObj: {
skin: null,
hair: null,
- clean: null
+ clean: null,
+ isWeightclean:null,
},
infraredStatus: false, // 绾㈠鐘舵�侊紝
// 鏀剧┖鎺у埗
@@ -221,33 +232,55 @@
},
watch: {
realTimeWeigh(newV, oldV) {
- 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) > this.weighList.orderSurplus || Number(this
- .currentClean) < 0;
- }
- } else if (this.weighList.orderType == '澶栬喘' || this.weighList.orderType == '鍐呰喘' || this.weighList
- .orderType == '杞叆') {
- if (!this.showWeigh.hair) {
- this.temporaryWeighObj.hair = newV;
- } else {
- this.temporaryWeighObj.skin = newV;
- this.isweigh = Number(this.currentClean) < 0 || this.showWeigh.skin < newV && this.showWeigh
- .skin > 0;
- }
- }
+
},
// 鐩戝惉閲嶉噺鍙樺寲
globalweigh: {
handler: function(newV) {
this.weighData.weigh = this.realTimeWeigh = newV;
- console.log(this.realTimeWeigh, '鐪熷疄閲嶉噺鏀瑰彉浜�');
+ 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.isweight) && (this.weighList.orderType == '澶栬喘' || this.weighList.orderType == '鍐呰喘' || this.weighList
+ .orderType == '杞叆')) {
+ if (!this.showWeigh.hair) {
+ this.temporaryWeighObj.hair = newV;
+ } else {
+ this.temporaryWeighObj.skin = newV;
+ this.isweigh = Number(this.currentClean) < 0 || this.showWeigh.skin < newV && this
+ .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
+ }
+ },
+ onPullDownRefresh() {
+ if (!this.globalisconnect && !this.globalisUploadimg && this.globalisLogin) {
+ if (!this.is_open_socket) {
+ this.$store.dispatch('websocketInit')
+ this.changeisconnect(false);
+ console.log('绉伴噸鐨剋s');
+ uni.stopPullDownRefresh();
+ } else {
+ uni.stopPullDownRefresh();
+ }
}
},
onShow() {
@@ -255,7 +288,9 @@
// this.realTimeWeigh = 0
},
computed: {
- ...mapState(['globalweigh', 'globalinfraredStatus']),
+ ...mapState(['globalweigh', 'globalinfraredStatus', 'globalWarning', 'globalisconnect', 'globalisUploadimg',
+ 'globalisLogin', 'is_open_socket'
+ ]),
token() {
return uni.getStorageSync('token');
},
@@ -286,15 +321,42 @@
return this.weighList.tmTaskCoalItems ? this.weighList.tmTaskCoalItems : []
},
currentHair() {
+ if (this.weighList.orderType == '澶栭攢' || this.weighList.orderType == '鍐呴攢' || this.weighList.orderType ==
+ '杞嚭') {
+ return this.temporaryWeighObj.hair ? this.temporaryWeighObj.hair : ''
+ }
return this.temporaryWeighObj.hair ? this.temporaryWeighObj.hair : this.showWeigh.skin ? (this.showWeigh
.skin || '') : (this.showWeigh.hair || '')
},
currentSkin() {
- return this.temporaryWeighObj.skin || ''
+ return this.temporaryWeighObj.skin ? this.temporaryWeighObj.skin : (this.showWeigh.skin || '')
},
currentClean() {
if (!this.currentSkin) return ''
- return (this.currentHair - this.currentSkin).toFixed(2)
+ if (this.weighList.orderType == '澶栬喘' || this.weighList.orderType == '鍐呰喘' || this.weighList
+ .orderType == '杞叆') {
+ return (this.currentHair - this.currentSkin).toFixed(2)
+ } else {
+ return !this.showWeigh.skin ? this.currentSkin : (this.currentHair - this.currentSkin) > 0 ? (this
+ .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: {
@@ -737,15 +799,16 @@
.three {
margin: 0 auto vww(5);
+ margin-bottom: vww(60);
width: 96%;
display: grid;
- grid-template-columns: repeat(auto-fit, minmax(140px, 1fr));
+ grid-template-columns: repeat(auto-fit, minmax(140rpx, 1fr));
justify-content: center;
gap: vww(10);
color: #939393;
.u-button {
- width: vww(90);
+ width: vww(70);
}
}
--
Gitblit v1.9.1