From 46acd5c32a3eb1bc64df27c85c5e656d737f81b0 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期一, 11 九月 2023 16:37:21 +0800
Subject: [PATCH] 增加皮重异常提示 修改隐私协议
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 252 ++++++++++++++++++++++++++++++++++----------------
1 files changed, 172 insertions(+), 80 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 744ec99..f86efe3 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
@@ -101,6 +101,50 @@
</view>
<view v-else
style="width: 100%;height: 40rpx;"></view>
+ <view class="history-utils">
+ <view class="history-utils_item">
+ <text>骞冲潎鐨噸:{{avgSkin}}</text>
+ <text style="color: #ff6363;font-weight: bold;font-size: 26rpx;"
+ class="error-tip"
+ v-if="errorTipShow">* 寮傚父</text>
+ </view>
+ <view class="history-utils_item btn">
+ <u-button plain
+ type="primary"
+ :text="historyShow?'闅愯棌鍘嗗彶绉伴噸':'鏄剧ず鍘嗗彶绉伴噸'"
+ @click="historyShow=!historyShow"></u-button>
+ </view>
+ </view>
+ <Transition name="slide-fade">
+ <view class="history-skin"
+ v-show="historyShow">
+ <view class="table-title">
+ <view class="table-title_item time">
+ 绉伴噸鏃堕棿
+ </view>
+ <view class="table-title_item coal-name">
+ 鐓ょ鍚嶇О
+ </view>
+ <view class="table-title_item skin">
+ 鐨噸閲嶉噺
+ </view>
+ </view>
+ <view class="history-skin_item"
+ v-for="item in tmTaskCoalList">
+ <view class="item createTime">
+ {{item.createTime||"" }}
+ </view>
+ <view class="item">
+ {{item.coalName||"" }}
+ </view>
+ <view class="item skin">
+ <view class="">
+ {{item.skin||"" }}
+ </view>
+ </view>
+ </view>
+ </view>
+ </Transition>
<view class="bottom-block">
<view class="block-main">
<view class="main-information"
@@ -142,22 +186,28 @@
</view>
<view class="main-information">
<view class="prefix">鐨噸:</view>
- <view class="suffix">{{ temporaryWeighObj.skin == 0 ? weighList.skin : temporaryWeighObj.skin }}
+ <view class="suffix">
+ {{ temporaryWeighObj.skin == 0 ? weighList.skin : temporaryWeighObj.skin||"" }}
</view>
</view>
<view class="main-information">
<view class="prefix">姣涢噸:</view>
- <view class="suffix">{{ temporaryWeighObj.hair == 0 ? weighList.hair : temporaryWeighObj.hair }}
+ <view class="suffix">
+ {{ temporaryWeighObj.hair == 0 ? weighList.hair : temporaryWeighObj.hair||"" }}
</view>
</view>
<view class="main-information">
<view class="prefix">鍑�閲�:</view>
- <view class="suffix">{{ temporaryWeighObj.clean == 0 ? weighList.clean : temporaryWeighObj.clean }}
+ <view class="suffix">
+ {{ temporaryWeighObj.clean == 0 ? weighList.clean : temporaryWeighObj.clean ||"" }}
</view>
</view>
<view class="main-information">
<view class="prefix">璁㈠崟浣欓噺:</view>
- <view class="suffix">{{ weighList.orderSurplus || 0 }}</view>
+ <view class="suffix">{{ weighList.orderSurplus ||"" }}</view>
+ <text style="color: #ff6363;font-weight: bold;font-size: 26rpx;"
+ class="error-tip"
+ v-show="isweigh">* 璁㈠崟浣欓噺涓嶈冻</text>
</view>
</view>
</view>
@@ -176,7 +226,7 @@
:loading="isConfirmWeighLoading"
loadingText="纭"
@click="confirmWeigh"
- v-show="!historyBtn"></u-button>
+ throttleTime="800"></u-button>
<u-button type="primary"
text="杩斿洖鍔犲噺鍚�"
:disabled="addAndSubtractCoalDisabled"
@@ -184,29 +234,6 @@
class="jiajian"
v-if="outBuy"></u-button>
</view>
- <view style="width: 200rpx;margin: auto;position: relative;"
- v-if="!historyBtn"><u-button type="primary"
- text="鏄剧ず鍘嗗彶鐨噸"
- @click.stop="displayHistory"></u-button></view>
- <Transition name="slide-fade">
- <view class="history-skin"
- v-if="historyShow">
- <view class="history-skin_item"
- v-for="item in tmTaskCoalList">
- <view class="createTime">
- 鏃ユ湡:{{item.createTime.slice(0,10)}}
- </view>
- <view class="skin">
- <view class="">
- 鐨噸:
- </view>
- <view class="">
- {{item.skin}}
- </view>
- </view>
- </view>
- </view>
- </Transition>
<!-- 鏀剧┖寮圭獥 -->
<view class="evacuationModal">
<u-modal :show="evacuationModalShow"
@@ -247,6 +274,7 @@
import { webSocketUrl } from '@/api/request.js';
import { mapState, mapMutations } from 'vuex';
import combinedTitle from '@/components/combined-title/combined-title.vue';
+ import BigNumber from "bignumber.js"
export default {
onLoad(params) {
this.takeCoalId = params.takeCoalId;
@@ -258,10 +286,14 @@
this.primarySkin = params.primarySkin;
this.primaryHair = params.primaryHair;
this.primaryClean = params.primaryClean;
- if (params.overTmWaixiao) {
+ if (params.overTmWaixiao !== 'null') {
this.weighData.overTmWaixiao = 1
}
this.changeweighHouseCode(params.weighHouseCode);
+ this.init();
+ this.changeWeigh('')
+ this.realTimeWeigh = 0
+ console.log(this.abnormalModalShow);
},
components: {
combinedTitle
@@ -320,11 +352,15 @@
outBuy: true,
// 鐨噸寮傚父鐩稿叧
abnormalContent: '',
- avgSkin: null, // 骞冲潎鐨噸
+ avgSkin: '', // 骞冲潎鐨噸
+ isAbnormalAvgSkin: true, //骞冲潎鐨噸鏄惁寮傚父
tmTaskCoalList: [],
abnormalModalShow: false,
historyBtn: false,
- historyShow: false
+ historyShow: false,
+ // 鏄惁鍦ㄧО鐨噸锛岀偣鍑荤‘瀹氱О閲嶅垽鏂槸鍚﹀紓甯�
+ isSkinWeigh: false,
+ errorTipShow: false
};
},
watch: {
@@ -340,13 +376,15 @@
.orderType ==
'杞嚭') {
if (this.weighList.skin == 0) {
+ this.isSkinWeigh = true
this.temporaryWeighObj.skin = newV;
- this.getAverageSkin()
- if (this.avgSkin < newV) {
- this.abnormalModalShow = true
- this.historyBtn = true
+ let xx = new BigNumber(this.avgSkin)
+ let yy = new BigNumber(newV)
+ if (xx.minus(yy).toNumber() <= -0.2 || xx.minus(yy).toNumber() >= 0.2) {
+ this.errorTipShow = true
}
} else {
+ this.isSkinWeigh = false;
this.temporaryWeighObj.hair = newV;
this.temporaryWeighObj.clean = (this.temporaryWeighObj.hair - this.weighList.skin).toFixed(
2);
@@ -357,13 +395,15 @@
} else if (this.weighList.orderType == '澶栬喘' || this.weighList.orderType == '鍐呰喘' || this.weighList
.orderType == '杞叆') {
if (this.weighList.hair == 0) {
+ this.isSkinWeigh = false;
this.temporaryWeighObj.hair = newV;
} else {
+ this.isSkinWeigh = true;
this.temporaryWeighObj.skin = newV;
- this.getAverageSkin()
- if (this.avgSkin < newV) {
- this.abnormalModalShow = true
- this.historyBtn = true
+ let xx = new BigNumber(this.avgSkin)
+ let yy = new BigNumber(newV)
+ if (xx.minus(yy).toNumber() <= -0.2 || xx.minus(yy).toNumber() >= 0.2) {
+ this.errorTipShow = true
}
this.temporaryWeighObj.clean = (this.weighList.hair - this.temporaryWeighObj.skin).toFixed(
2);
@@ -374,14 +414,6 @@
}
}
}
- },
- onShow() {
- this.init();
- this.changeisLogin(true)
- this.realTimeWeigh = 0
- },
- onHide() {
-
},
computed: {
...mapState(['globalweigh', 'globalinfraredStatus']),
@@ -413,7 +445,7 @@
}
},
methods: {
- ...mapMutations(['changeweighHouseCode', 'changeisLogin']),
+ ...mapMutations(['changeweighHouseCode', 'changeisLogin', 'changeWeigh']),
init() {
uni.showLoading({
title: "鍔犺浇涓�"
@@ -447,7 +479,9 @@
uni.hideLoading()
this.$u.toast('鍔犺浇澶辫触')
}
- });
+ }).then(() => {
+ this.getAverageSkin()
+ })
},
/**
* @纭绉伴噸绛夊緟鍚庣鎻愪緵瀹炴椂绉伴噸鎺ュ彛锛岃幏鍙栫毊閲嶏紝姣涢噸
@@ -456,16 +490,25 @@
if (this.isConfirmWeighLoading == false) {
this.isConfirmWeighLoading = true;
if (this.weighData.weigh != 0) {
- if (this.weighList.orderType == '澶栭攢') {
- if (this.weighList.skin ? (this.weighList.skin < this.realTimeWeigh ? true : false) : true) {
+ // 濡傛灉姝ｅ湪绉扮毊
+ if (this.isSkinWeigh) {
+ // 濡傛灉绗竴娆＄О閲�
+ if (this.isAbnormalAvgSkin) {
+ this.abnormalModalShow = false
this.saveWeigh();
} else {
- this.$u.toast('姣涢噸涓嶈兘灏忎簬鐨噸');
- this.isConfirmWeighLoading = false;
+ let xx = new BigNumber(this.avgSkin)
+ let yy = new BigNumber(this.globalweigh)
+ if (xx.minus(yy).toNumber() <= -0.2 || xx.minus(yy).toNumber() >= 0.2) {
+ this.abnormalModalShow = true
+ } else {
+ this.saveWeigh();
+ }
}
} else {
this.saveWeigh();
}
+
} else {
this.$u.toast('鏈兘鑾峰彇鍦扮閲嶉噺');
this.isConfirmWeighLoading = false;
@@ -488,6 +531,7 @@
}, 1000);
} else {
this.$u.toast('绉伴噸澶辫触锛岃绋嶅悗閲嶈瘯');
+ this.isConfirmWeighLoading = false
}
})
.catch(err => {
@@ -502,7 +546,8 @@
sceneId: this.weighData.sceneId,
carNo: this.weighData.carNo,
tmId: this.weighData.tmId,
- filedId: this.weighData.filedId
+ filedId: this.weighData.filedId,
+ equipmentCode: this.weighData.equipmentCode
}, 'json').then(res => {
if (res.code == 0) {
this.$u.toast('鎿嶄綔鎴愬姛锛屽嵆灏嗚繑鍥炰笂涓�椤�');
@@ -559,11 +604,15 @@
uni.showLoading({
title: "鍔犺浇涓�"
})
- this.$reqGet('getAvgSkin').then(res => {
+ this.$reqGet('getAvgSkin', { xsUserId1: this.weighList.xsUserId1 }).then(res => {
if (res.code === 0) {
uni.hideLoading()
this.avgSkin = res.data.avgSkin
this.tmTaskCoalList = res.data.tmTaskCoalList
+ /**
+ * @description true鐨勮瘽鏄涓�娆＄О, false灏变笉鏄�,娌℃湁鍘嗗彶锛屽钩鍧囩毊閲嶄负0鏄涓�娆′篃鏄甯� */
+ this.isAbnormalAvgSkin = (Array.isArray(this.tmTaskCoalList) && this
+ .tmTaskCoalList.length === 0 || !this.tmTaskCoalList) && this.avgSkin == 0
} else {
uni.hideLoading()
this.$u.toast('鍔犺浇澶辫触')
@@ -572,28 +621,16 @@
},
abnormalCancel() {
this.abnormalModalShow = false
+ this.isConfirmWeighLoading = false;
},
+ // 鎻愪氦寮傚父鍘熷洜
abnormalConfirm() {
- uni.showLoading({
- title: "鎻愪氦涓�"
- })
- this.$reqPost('tmAbnormalTextAdd', { tmId: this.weighData.tmId, abnormalText: this.abnormalContent },
- 'params').then(
- res => {
- if (res.code == 0) {
- uni.hideLoading()
- this.$u.toast('鎻愪氦鎴愬姛')
- this.abnormalModalShow = false
- } else {
- uni.hideLoading()
- this.$u.toast('鎻愪氦澶辫触')
- this.abnormalModalShow = true
- }
- })
+ this.weighData.abnormalText = this.abnormalContent
+ this.skinAbnormal()
+ this.saveWeigh()
},
- displayHistory() {
- this.historyShow = true
-
+ skinAbnormal() {
+ this.$reqPost('skinAbnormal', { sceneId: this.weighData.sceneId }, 'params')
}
}
};
@@ -616,6 +653,31 @@
.slot-content {
width: 96%;
border: 1rpx solid rgb(220, 223, 230);
+ }
+
+ .table-title {
+ width: 96%;
+ @include flex;
+ position: absolute;
+ top: 8rpx;
+ color: #9e9399;
+
+ &_item {
+ width: 33.3%;
+ text-align: center;
+ }
+
+ .time {
+ padding-left: 20rpx;
+ }
+
+ .coal-name {
+ padding-left: 70rpx;
+ }
+
+ .skin {
+ padding-left: 10rpx;
+ }
}
.one {
@@ -801,6 +863,7 @@
@include flex;
justify-content: flex-start;
overflow: hidden;
+ position: relative;
.prefix {
min-width: vww(60);
@@ -811,12 +874,17 @@
margin-left: vww(12);
text-align: left;
}
+
+ .error-tip {
+ position: absolute;
+ right: 200rpx;
+ }
}
}
}
.three {
- margin: 0 auto vww(20);
+ margin: 0 auto vww(30);
flex: 0.7;
display: flex;
color: #939393;
@@ -842,23 +910,48 @@
transition: all 0.3s ease-out;
}
+ .history-utils {
+ width: 96%;
+ margin: vww(10) auto;
+ @include flex;
+ justify-content: space-around;
+
+ &_item {
+ width: 50%;
+
+ .error-tip {
+ display: inline-block;
+ margin-left: 34rpx;
+ }
+ }
+
+ .btn {
+ width: 180rpx;
+ }
+ }
+
.history-skin {
width: 96%;
height: vww(300);
- margin: vww(50) auto;
+ margin: auto;
margin-top: vww(10);
background: #ffffff;
box-shadow: 0rpx 0rpx 14rpx 0rpx rgba(73, 120, 240, 0.14), 0rpx 7rpx 45rpx 0rpx rgba(73, 120, 240, 0.12);
border-radius: 20rpx;
overflow: scroll;
color: #000;
-
+ position: relative;
.history-skin_item {
- width: 80%;
+ width: 96%;
height: vww(30);
@include flex;
- margin: vww(10) auto;
+ margin: vww(40) auto;
+
+ .item {
+ width: 33.3%;
+ text-align: center;
+ }
.createTime {
color: rgb(60, 156, 255);
@@ -866,7 +959,6 @@
.skin {
color: #f81414;
- @include flex;
width: 180rpx;
height: vww(30);
}
--
Gitblit v1.9.1