From b8a7d477f894fcffc32c2d5fb1f3ff5bf6409fc4 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期五, 07 七月 2023 14:25:41 +0800
Subject: [PATCH] 验质增加字段
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 65 +++++++++-----------------------
1 files changed, 19 insertions(+), 46 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 f6abe3b..214e8f2 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
@@ -4,8 +4,8 @@
: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="">
@@ -92,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="{ backgroundImage: `url(${onlineurl}/appimg/image/banner/skin.png)`, backgroundSize: 'cover', backgroundRepeat: 'no-repeat' }">
- 鐨�</view>
- <view class="num">{{ item.skin }}</view>
- </view>
- <view class="item">
- <view class="concrete"
- :style="{ backgroundImage: `url(${onlineurl}/appimg/image/banner/hair.png)`, backgroundSize: 'cover', backgroundRepeat: 'no-repeat' }">
- 姣�</view>
- <view class="num">{{ item.hair }}</view>
- </view>
- <view class="item">
- <view class="concrete"
- :style="{ backgroundImage: `url(${onlineurl}/appimg/image/banner/clean.png)`, backgroundSize: 'cover', backgroundRepeat: 'no-repeat' }">
- 鍑�</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"
@@ -153,6 +119,7 @@
@click="UnloadingAgainHandle"
:loading="UnloadingAgainLoading"
loadingText="纭"
+ :disabled="isweigh||realTimeWeigh == 0"
v-if='canUnload'></u-button>
</view>
<!-- 鏀剧┖寮圭獥 -->
@@ -172,6 +139,7 @@
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;
@@ -187,9 +155,11 @@
this.weighData.overTmWaixiao = 1
}
this.changeweighHouseCode(params.weighHouseCode);
+ this.changeWeigh(0)
},
components: {
- combinedTitle
+ combinedTitle,
+ weighItem
},
data() {
return {
@@ -272,15 +242,17 @@
}
},
// 鐩戝惉閲嶉噺鍙樺寲
- 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']),
@@ -315,17 +287,18 @@
},
currentHair() {
return this.temporaryWeighObj.hair ? this.temporaryWeighObj.hair : this.showWeigh.skin ? (this.showWeigh
- .skin || 0) : (this.showWeigh.hair || 0)
+ .skin || '') : (this.showWeigh.hair || '')
},
currentSkin() {
- return this.temporaryWeighObj.skin || 0
+ 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