From 3dd852a77ff1fcb8c4c0ceb3a8df727c15ae643e Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期三, 16 八月 2023 15:39:13 +0800
Subject: [PATCH] 称重异常判断逻辑修改
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 91 +++++++-------
pages/driver-page/driver-index/bill-of-lading-details/punchTheClock/punchTheClock.vue | 221 ++++++++++++++++++------------------
2 files changed, 158 insertions(+), 154 deletions(-)
diff --git a/pages/driver-page/driver-index/bill-of-lading-details/punchTheClock/punchTheClock.vue b/pages/driver-page/driver-index/bill-of-lading-details/punchTheClock/punchTheClock.vue
index ac4ef2e..e3521ea 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/punchTheClock/punchTheClock.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/punchTheClock/punchTheClock.vue
@@ -3,7 +3,8 @@
<view class="punchTheClock">
<!-- 鎵撳崱鎸夐挳 -->
<view class="punchTheClock_container">
- <view class="punchTheClock_btn" @click="arrive">
+ <view class="punchTheClock_btn"
+ @click="arrive">
<view>
<p>{{ coalStatus == 2 ? '宸茬鍒�' : '绛惧埌/鎵撳崱' }}</p>
<p>{{ nowTime }}</p>
@@ -18,123 +19,127 @@
</template>
<script>
-import { todayDate } from '@/utils/util.js';
-export default {
- onLoad(params) {
- this.punchTheClockObj.tmcoa = params.tmId.toString();
- this.coalStatus = params.coalStatus;
- },
- data() {
- return {
- nowTime: '',
- coalStatus: 0,
- punchTheClockObj: {
- tmcoa: null,
- latA: null,
- latB: null
- }
- };
- },
- onShow() {
- this.getSetting(); //鑾峰彇鎺堟潈
- this.getFuzzyLocation(); //鑾峰彇浣嶇疆
- this.todayDate(); //褰撳墠鏃堕棿
- },
- methods: {
- getSetting() {
- // 鑾峰彇鏉冮檺淇℃伅
- wx.getSetting({
- success(res) {
- if (!res.authSetting['scope.userFuzzyLocation']) {
- wx.authorize({
- scope: 'scope.userFuzzyLocation',
- success(res) {
- uni.showToast({
- title: '鎺堟潈鎴愬姛锛�'
- });
- }
- });
- }
- },
- fail() {
- console.log('鑾峰彇澶辫触');
+ import { todayDate } from '@/utils/util.js';
+ export default {
+ onLoad(params) {
+ this.punchTheClockObj.tmcoa = params.tmId.toString();
+ this.coalStatus = params.coalStatus;
+ },
+ data() {
+ return {
+ nowTime: '',
+ coalStatus: 0,
+ punchTheClockObj: {
+ tmcoa: null,
+ latA: null,
+ latB: null
}
- });
+ };
},
- getFuzzyLocation() {
- let that = this;
- wx.getFuzzyLocation({
- type: 'wgs84',
- success(res) {
- console.log(res, '鑾峰彇浣嶇疆', that);
- that.punchTheClockObj.latB = res.latitude;
- that.punchTheClockObj.latA = res.longitude;
- }
- });
+ onLoad() {
+ this.getSetting(); //鑾峰彇鎺堟潈
+ this.getFuzzyLocation(); //鑾峰彇浣嶇疆
+ this.todayDate(); //褰撳墠鏃堕棿
},
- todayDate() {
- setInterval(() => {
- this.nowTime = todayDate('hms');
- }, 1000);
- },
- // 绛惧埌
- arrive() {
- if (this.punchTheClockObj.latA && this.punchTheClockObj.latB) {
- console.log(this.punchTheClockObj);
- this.$reqPost('arrive', this.punchTheClockObj, 'params').then(res => {
- console.log(res, '绛惧埌');
- if (res.code == 0) {
- this.$u.toast('绛惧埌鎴愬姛');
- setTimeout(() => {
- uni.navigateBack(
- {
- delta: 1
- },
- 500
- );
- });
- } else {
- this.$u.toast(res.msg ? res.msg : '绛惧埌澶辫触');
+ methods: {
+ getSetting() {
+ // 鑾峰彇鏉冮檺淇℃伅
+ wx.getSetting({
+ success(res) {
+ if (!res.authSetting['scope.userFuzzyLocation']) {
+ wx.authorize({
+ scope: 'scope.userFuzzyLocation',
+ success(res) {
+ uni.showToast({
+ title: '鎺堟潈鎴愬姛锛�'
+ });
+ }
+ });
+ }
+ },
+ fail() {
+ console.log('鑾峰彇澶辫触');
}
});
- } else {
- this.$u.toast('鏆傝幏鍙栦笉鍒板埌褰撳墠浣嶇疆');
+ },
+ getFuzzyLocation() {
+ let that = this;
+ wx.getFuzzyLocation({
+ type: 'wgs84',
+ success(res) {
+ console.log(res, '鑾峰彇浣嶇疆', that);
+ that.punchTheClockObj.latB = res.latitude;
+ that.punchTheClockObj.latA = res.longitude;
+ }
+ });
+ },
+ todayDate() {
+ setInterval(() => {
+ this.nowTime = todayDate('hms');
+ }, 1000);
+ },
+ // 绛惧埌
+ arrive() {
+ if (this.punchTheClockObj.latA && this.punchTheClockObj.latB) {
+ console.log(this.punchTheClockObj);
+ this.$reqPost('arrive', this.punchTheClockObj, 'params').then(res => {
+ console.log(res, '绛惧埌');
+ if (res.code == 0) {
+ this.$u.toast('绛惧埌鎴愬姛');
+ setTimeout(() => {
+ uni.navigateBack({
+ delta: 1
+ },
+ 500
+ );
+ });
+ } else {
+ this.$u.toast(res.msg ? res.msg : '绛惧埌澶辫触');
+ }
+ });
+ } else {
+ this.$u.toast('鏆傝幏鍙栦笉鍒板埌褰撳墠浣嶇疆');
+ }
}
}
- }
-};
+ };
</script>
-<style lang="scss" scoped>
-.punchTheClock {
- height: 100vh;
- display: flex;
- justify-content: center;
- align-items: center;
- .punchTheClock_container {
- .punchTheClock_btn {
- width: vww(240);
- height: vww(240);
- color: #ffffff;
- font-size: vww(20);
- border-radius: 50%;
- background-color: #36d4e5;
- display: flex;
- justify-content: center;
- align-items: center;
- p {
- text-align: center;
+<style lang="scss"
+ scoped>
+ .punchTheClock {
+ height: 100vh;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+
+ .punchTheClock_container {
+ .punchTheClock_btn {
+ width: vww(240);
+ height: vww(240);
+ color: #ffffff;
+ font-size: vww(20);
+ border-radius: 50%;
+ background-color: #36d4e5;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+
+ p {
+ text-align: center;
+ }
}
- }
- .punchTheClock_text {
- display: flex;
- justify-content: center;
- margin-top: vww(20);
- color: #b8b8b8;
- .text {
- margin-left: vww(5);
+
+ .punchTheClock_text {
+ display: flex;
+ justify-content: center;
+ margin-top: vww(20);
+ color: #b8b8b8;
+
+ .text {
+ margin-left: vww(5);
+ }
}
}
}
-}
-</style>
+</style>
\ No newline at end of file
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 86c51bc..90bfe6c 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
@@ -219,7 +219,8 @@
:disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh || !isInputOrigin"
:loading="isConfirmWeighLoading"
loadingText="纭"
- @click="confirmWeigh"></u-button>
+ @click="confirmWeigh"
+ throttleTime="800"></u-button>
<u-button type="primary"
text="杩斿洖鍔犲噺鍚�"
:disabled="addAndSubtractCoalDisabled"
@@ -345,6 +346,7 @@
// 鐨噸寮傚父鐩稿叧
abnormalContent: '',
avgSkin: '', // 骞冲潎鐨噸
+ isAbnormalAvgSkin: true, //骞冲潎鐨噸鏄惁寮傚父
tmTaskCoalList: [],
abnormalModalShow: false,
historyBtn: false,
@@ -470,28 +472,25 @@
if (this.isConfirmWeighLoading == false) {
this.isConfirmWeighLoading = true;
if (this.weighData.weigh != 0) {
+ // 濡傛灉姝ｅ湪绉扮毊
if (this.isSkinWeigh) {
- let xx = new BigNumber(this.avgSkin)
- let yy = new BigNumber(this.globalweigh)
- if (xx.minus(yy).toNumber() > 0.2) {
- this.abnormalModalShow = true
- } else {
+ // 濡傛灉绗竴娆＄О閲�
+ if (this.isAbnormalAvgSkin) {
this.abnormalModalShow = false
this.saveWeigh();
+ } else {
+ 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();
}
- // if (this.weighList.orderType == '澶栭攢') {
- // if (this.weighList.skin ? (this.weighList.skin < this.realTimeWeigh ? true : false) : true) {
- // this.saveWeigh();
- // } else {
- // this.$u.toast('姣涢噸涓嶈兘灏忎簬鐨噸');
- // this.isConfirmWeighLoading = false;
- // }
- // } else {
- // this.saveWeigh();
- // }
+
} else {
this.$u.toast('鏈兘鑾峰彇鍦扮閲嶉噺');
this.isConfirmWeighLoading = false;
@@ -514,6 +513,7 @@
}, 1000);
} else {
this.$u.toast('绉伴噸澶辫触锛岃绋嶅悗閲嶈瘯');
+ this.isConfirmWeighLoading = false
}
})
.catch(err => {
@@ -590,13 +590,10 @@
uni.hideLoading()
this.avgSkin = res.data.avgSkin
this.tmTaskCoalList = res.data.tmTaskCoalList
- // let xx = new BigNumber(this.avgSkin)
- // let yy = new BigNumber(weigh)
- // console.log(weigh, this.avgSkin, yy.minus(xx).toNumber());
- // if (xx.minus(yy).toNumber() <= 0.2) {
- // this.abnormalModalShow = true
- // this.historyBtn = true
- // }
+ /**
+ * @description true鐨勮瘽鏄笉寮傚父 false灏辨槸寮傚父 娌℃湁鍘嗗彶锛屽钩鍧囩毊閲嶄负0鏄涓�娆℃甯� */
+ this.isAbnormalAvgSkin = (Array.isArray(this.tmTaskCoalList.length === 0) && this
+ .tmTaskCoalList.length === 0 || !this.tmTaskCoalList) && this.avgSkin == 0
} else {
uni.hideLoading()
this.$u.toast('鍔犺浇澶辫触')
@@ -609,30 +606,32 @@
},
// 鎻愪氦寮傚父鍘熷洜
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
- this.isConfirmWeighLoading = false
- setTimeout(() => {
- uni.navigateBack({
- delta: 1
- });
- }, 1000);
+ this.weighData.abnormalText = this.abnormalContent
+ this.saveWeigh()
+ // 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
+ // this.isConfirmWeighLoading = false
+ // setTimeout(() => {
+ // uni.navigateBack({
+ // delta: 1
+ // });
+ // }, 1000);
- } else {
- uni.hideLoading()
- this.$u.toast('鎻愪氦澶辫触')
- this.abnormalModalShow = true
- this.isConfirmWeighLoading = false
- }
- })
+ // } else {
+ // uni.hideLoading()
+ // this.$u.toast('鎻愪氦澶辫触')
+ // this.abnormalModalShow = true
+ // this.isConfirmWeighLoading = false
+ // }
+ // })
},
}
};
--
Gitblit v1.9.1