From 0c3e40c399a00fe6405f7b9a79eb1c93b7cc660e Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期二, 11 七月 2023 16:23:33 +0800
Subject: [PATCH] 更改字眼，增加非稳定态下不可称重，增加验质字段
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 113 ++++++++++++++++++++++----------------------------------
1 files changed, 45 insertions(+), 68 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 52436c5..b775edd 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="">
@@ -52,18 +51,18 @@
</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="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>
@@ -71,19 +70,19 @@
<view class="main-information">
<view class="prefix">鐨噸:</view>
<view class="suffix">
- {{temporaryWeighObj.skin||''}}
+ {{currentSkin}}
</view>
</view>
<view class="main-information">
<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="prefix">鍑�閲�:</view>
<view class="suffix">
- {{ temporaryWeighObj.clean||''}}
+ {{ currentClean}}
</view>
</view>
<view class="main-information">
@@ -93,41 +92,7 @@
</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"></weigh-item>
<view class="three">
<!-- 鏀剧┖ -->
<u-button type="primary"
@@ -139,7 +104,7 @@
<!-- 澶栭攢璁㈠崟绉扮毊鏃讹紝杩斿洖鍔犲噺鍚ㄦ寜閽疆鐏般�傜О姣涙椂鍙敤.澶栬喘璁㈠崟锛屼笉鍑虹幇杩斿洖鍔犲噺鍚ㄧ殑鎸夐挳 -->
<u-button type="primary"
text="纭畾绉伴噸"
- :disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh "
+ :disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh ||globalWarning"
:loading="isConfirmWeighLoading"
loadingText="纭"
@click="confirmWeigh"></u-button>
@@ -154,6 +119,7 @@
@click="UnloadingAgainHandle"
:loading="UnloadingAgainLoading"
loadingText="纭"
+ :disabled="isweigh||realTimeWeigh == 0"
v-if='canUnload'></u-button>
</view>
<!-- 鏀剧┖寮圭獥 -->
@@ -170,9 +136,10 @@
<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.takeCoalId = params.takeCoalId;
@@ -188,9 +155,11 @@
this.weighData.overTmWaixiao = 1
}
this.changeweighHouseCode(params.weighHouseCode);
+ this.changeWeigh(0)
},
components: {
- combinedTitle
+ combinedTitle,
+ weighItem
},
data() {
return {
@@ -246,7 +215,8 @@
outBuy: true,
// 缁х画鍗歌揣鎸夐挳
canUnload: false,
- UnloadingAgainLoading: false
+ UnloadingAgainLoading: false,
+ onlineurl,
};
},
watch: {
@@ -257,9 +227,8 @@
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;
+ this.isweigh = Number(this.currentClean) > this.weighList.orderSurplus || Number(this
+ .currentClean) < 0;
}
} else if (this.weighList.orderType == '澶栬喘' || this.weighList.orderType == '鍐呰喘' || this.weighList
.orderType == '杞叆') {
@@ -267,28 +236,26 @@
this.temporaryWeighObj.hair = newV;
} else {
this.temporaryWeighObj.skin = newV;
- this.temporaryWeighObj.clean = (this.showWeigh.skin - newV).toFixed(2);
- this.isweigh = this.temporaryWeighObj.clean < 0 || this.showWeigh.skin < newV && this.showWeigh
+ this.isweigh = Number(this.currentClean) < 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;
+ console.log(this.realTimeWeigh, '鐪熷疄閲嶉噺鏀瑰彉浜�');
+ },
+ deep: true
}
},
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']),
token() {
return uni.getStorageSync('token');
},
@@ -309,19 +276,29 @@
.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() {
+ return this.temporaryWeighObj.hair ? this.temporaryWeighObj.hair : this.showWeigh.skin ? (this.showWeigh
+ .skin || '') : (this.showWeigh.hair || '')
+ },
+ currentSkin() {
+ return this.temporaryWeighObj.skin || ''
+ },
+ currentClean() {
+ if (!this.currentSkin) return ''
+ return (this.currentHair - this.currentSkin).toFixed(2)
}
},
methods: {
- ...mapMutations(['changeweighHouseCode', 'changeisLogin']),
+ ...mapMutations(['changeweighHouseCode', 'changeisLogin', 'changeWeigh']),
init() {
uni.showLoading({
title: '鍔犺浇涓�'
--
Gitblit v1.9.1