From 5bd778d9a1899422ba1e9b67fbe578d759c86685 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期四, 21 十二月 2023 10:19:16 +0800
Subject: [PATCH] 点击称重完成，修改提示信息
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 261 ++++++++++++++++++++++++++++++---------------------
1 files changed, 154 insertions(+), 107 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 896b7fd..2a9f265 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
@@ -1,12 +1,11 @@
<template>
<view class="weighingDevice">
<view class="one"
- style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/weighbanner.png') no-repeat;
- background-size: cover;">
+ :style="{ backgroundImage: `url(${onlineurl}/appimg/image/banner/weighbanner.png)`, backgroundSize: 'cover', backgroundRepeat: 'no-repeat' }">
<view class="top">
<view class="top_left">
- <text>{{ realTimeWeigh }}</text>
- <!-- <text>{{ globalweigh }}</text> -->
+ <!-- <text>{{ realTimeWeigh }}</text> -->
+ <text>{{ globalweigh }}</text>
</view>
<view class="top_right">
<view class="">
@@ -30,7 +29,7 @@
<view class="main-information"
v-if="weighList.orderType=='杞叆'||weighList.orderType=='杞嚭'">
<view class="prefix">
- 鍙戣揣鍦扮叅鍦�:
+ 鍙戣揣鍦板熀鍦�:
</view>
<view class="suffix">
{{ weighList.filedName || '' }}
@@ -39,7 +38,7 @@
<view class="main-information"
v-if="weighList.orderType=='杞叆'||weighList.orderType=='杞嚭'">
<view class="prefix">
- 鏀惰揣鍦扮叅鍦�:
+ 鏀惰揣鍦板熀鍦�:
</view>
<view class="suffix">
{{ weighList.toFiledName || '' }}
@@ -52,94 +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">
- {{temporaryWeighObj.skin||''}}
+ {{currentSkin}}
</view>
</view>
- <view class="main-information">
+ <view class="main-information" v-if="isweight">
<view class="prefix">姣涢噸:</view>
<view class="suffix">
- {{temporaryWeighObj.hair?temporaryWeighObj.hair:showWeigh.skin?(showWeigh.skin||''):(showWeigh.hair||'')}}
+ {{currentHair}}
</view>
</view>
- <view class="main-information">
+ <view class="main-information" v-if="isweight">
<view class="prefix">鍑�閲�:</view>
<view class="suffix">
- {{ temporaryWeighObj.clean||''}}
+ {{ 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>
<!-- 绉伴噸鍘嗗彶-->
- <transition name="weighHistory">
- <view class="weigh-history"
- v-if="weighHistory.length!==0">
- <view class="block-main">
- <view class="weigh-item"
- v-for='item in weighHistory'
- :key="item.id">
- <view class="weigh-time">
- <u-tag :text="item.createTime.slice(-8,-3)"
- plain></u-tag>
- </view>
- <view class="item-block">
- <view class="item">
- <view class="concrete"
- style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/skin.png') no-repeat;background-size: cover;">
- 鐨�</view>
- <view class="num">{{ item.skin }}</view>
- </view>
- <view class="item">
- <view class="concrete"
- style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/hair.png') no-repeat;background-size: cover;">
- 姣�</view>
- <view class="num">{{ item.hair }}</view>
- </view>
- <view class="item">
- <view class="concrete"
- style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/clean.png') no-repeat;background-size: cover;">
- 鍑�</view>
- <view class="num">{{ item.clean }}</view>
- </view>
- </view>
- </view>
- </view>
- </view>
- </transition>
+ <weigh-item :list="weighHistory" class="weighingDecive-item"></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>
@@ -154,7 +118,16 @@
@click="UnloadingAgainHandle"
:loading="UnloadingAgainLoading"
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">
@@ -170,11 +143,14 @@
<script>
let socket = null;
- import { webSocketUrl } from '@/api/request.js';
+ 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;
@@ -188,12 +164,15 @@
this.weighData.overTmWaixiao = 1
}
this.changeweighHouseCode(params.weighHouseCode);
+ this.changeWeigh(0)
},
components: {
- combinedTitle
+ combinedTitle,
+ weighItem
},
data() {
return {
+ isWeighing:'',
weighData: {
//纭绉伴噸鎺ュ彛鍙傛暟
deptId: '',
@@ -222,7 +201,8 @@
temporaryWeighObj: {
skin: null,
hair: null,
- clean: null
+ clean: null,
+ isWeightclean:null,
},
infraredStatus: false, // 绾㈠鐘舵�侊紝
// 鏀剧┖鎺у埗
@@ -246,49 +226,71 @@
outBuy: true,
// 缁х画鍗歌揣鎸夐挳
canUnload: false,
- UnloadingAgainLoading: false
+ UnloadingAgainLoading: false,
+ onlineurl,
};
},
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.temporaryWeighObj.clean = (this.temporaryWeighObj.hair - this.showWeigh.skin).toFixed(2);
- this.isweigh = this.temporaryWeighObj.clean > this.weighList.orderSurplus || this.temporaryWeighObj
- .clean < 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.temporaryWeighObj.clean = (this.showWeigh.skin - newV).toFixed(2);
- this.isweigh = this.temporaryWeighObj.clean > this.weighList.orderSurplus || this.temporaryWeighObj
- .clean < 0 || this.showWeigh.skin < newV && this.showWeigh.skin > 0;
- }
- }
+
},
// 鐩戝惉閲嶉噺鍙樺寲
- globalweigh(newV) {
- this.weighData.weigh = this.realTimeWeigh = newV;
- console.log(this.realTimeWeigh, '鐪熷疄閲嶉噺鏀瑰彉浜�');
+ globalweigh: {
+ handler: function(newV) {
+ this.weighData.weigh = this.realTimeWeigh = newV;
+ 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() {
this.init();
- this.changeisLogin(true)
- this.realTimeWeigh = 0
+ // this.realTimeWeigh = 0
},
computed: {
- ...mapState(['globalweigh', 'globalinfraredStatus']),
- // coalContactClean() {
- // return (Number(this.weighData.coalContactHair) - Number(this.weighData.coalContactSkin)).toFixed(2);
- // },
+ ...mapState(['globalweigh', 'globalinfraredStatus', 'globalWarning', 'globalisconnect', 'globalisUploadimg',
+ 'globalisLogin', 'is_open_socket'
+ ]),
token() {
return uni.getStorageSync('token');
},
@@ -309,19 +311,56 @@
.temporaryWeighObj.hair;
}
},
- sideline() {
- return this.weighList.orderType == '鍐呰喘' || this.weighList.orderType == '杞叆';
- },
+
showWeigh() {
return this.weighList.tmTaskCoalItems ? (this.weighList.tmTaskCoalItems[0] ? this
.weighList.tmTaskCoalItems[0] : {}) : {}
},
+ // 绉伴噸鍘嗗彶
weighHistory() {
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 ? this.temporaryWeighObj.skin : (this.showWeigh.skin || '')
+ },
+ currentClean() {
+ if (!this.currentSkin) return ''
+ 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: {
- ...mapMutations(['changeweighHouseCode', 'changeisLogin']),
+ ...mapMutations(['changeweighHouseCode', 'changeisLogin', 'changeWeigh']),
init() {
uni.showLoading({
title: '鍔犺浇涓�'
@@ -381,12 +420,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 : '绉伴噸澶辫触');
});
},
// 鍔犲噺鐓�
@@ -474,6 +514,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;
@@ -716,7 +762,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);
@@ -727,8 +773,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;
@@ -760,15 +806,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