From e8ad0c2b79f54ff88445ce4a37032c4910f66cff Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期五, 13 九月 2024 17:06:54 +0800
Subject: [PATCH] feat:预约列表增加传参
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 59 +++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 43 insertions(+), 16 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 e3ae15d..f6d97fb 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,7 +1,7 @@
<template>
<view class="weighingDevice">
<view class="one"
- style="background: url('https://mx.jzeg.cn:9096/appimg/image/banner/weighbanner.png') no-repeat;
+ style="background: url('https://mr1.res.jzeg.cn:9096/appimg/image/banner/weighbanner.png') no-repeat;
background-size: cover;">
<view class="top">
<view class="top_left">
@@ -31,19 +31,19 @@
<view class="weigh-item">
<view class="item">
<view class="concrete"
- style="background: url('https://mx.jzeg.cn:9096/appimg/image/banner/skin.png') no-repeat;background-size: cover;">
+ style="background: url('https://mr1.res.jzeg.cn:9096/appimg/image/banner/skin.png') no-repeat;background-size: cover;">
鐨�</view>
<view class="num">{{ weighList.skinTwo }}</view>
</view>
<view class="item">
<view class="concrete"
- style="background: url('https://mx.jzeg.cn:9096/appimg/image/banner/hair.png') no-repeat;background-size: cover;">
+ style="background: url('https://mr1.res.jzeg.cn:9096/appimg/image/banner/hair.png') no-repeat;background-size: cover;">
姣�</view>
<view class="num">{{ weighList.hairTwo }}</view>
</view>
<view class="item">
<view class="concrete"
- style="background: url('https://mx.jzeg.cn:9096/appimg/image/banner/clean.png') no-repeat;background-size: cover;">
+ style="background: url('https://mr1.res.jzeg.cn:9096/appimg/image/banner/clean.png') no-repeat;background-size: cover;">
鍑�</view>
<view class="num">{{ weighList.cleanTwo }}</view>
</view>
@@ -189,8 +189,8 @@
</view>
<view v-show="isExceedOrigin"
style="color: #ff6363;width: auto;margin: 0 auto;">
- <text v-if="weighList.orderType == '澶栬喘'">瓒呭嚭鍘熷彂姣涢噸,纾呮埧浜哄憳纭涓�,璇峰嬁绂诲紑姝ら〉闈�</text>
- <text v-else>瓒呭嚭鏈�澶ф瘺閲�,纾呮埧浜哄憳纭涓�,璇峰嬁绂诲紑姝ら〉闈�</text>
+ <text v-if="weighList.orderType == '澶栬喘'">瓒呭嚭鍘熷彂{{avgFalse ? '鐨噸' :'姣涢噸'}} ,纾呮埧浜哄憳纭涓�,璇峰嬁绂诲紑姝ら〉闈�</text>
+ <text v-else>瓒呭嚭鏈�澶� {{avgFalse ? '鐨噸' :'姣涢噸'}},纾呮埧浜哄憳纭涓�,璇峰嬁绂诲紑姝ら〉闈�</text>
</view>
<view v-show="afterEvacuationStatus"
style="color: #ff6363;width: auto;margin: 0 auto;">
@@ -242,6 +242,7 @@
<script>
import { webSocketUrl } from '@/api/request.js';
import { mapState, mapMutations } from 'vuex';
+ import { BaseUrl } from '@/api/publicInterface.js'
import combinedTitle from '@/components/combined-title/combined-title.vue';
import BigNumber from "bignumber.js"
export default {
@@ -252,6 +253,7 @@
this.weighData.equipmentCode = params.gateCameraCode;
this.weighData.sceneInOut = params.sceneInOut;
this.weighHouseCode = params.weighHouseCode;
+ this.deptId = params.deptId;
this.primarySkin = params.primarySkin;
this.primaryHair = params.primaryHair;
this.primaryClean = params.primaryClean;
@@ -261,6 +263,7 @@
this.changeweighHouseCode(params.weighHouseCode);
this.init();
this.changeWeigh('')
+ this.getDept();
this.realTimeWeigh = 0
},
onShow() {
@@ -288,6 +291,7 @@
},
data() {
return {
+ avgFalse:false, // 鏄惁鐨噸寮傚父
weighData: {
//纭绉伴噸鎺ュ彛鍙傛暟
deptId: '',
@@ -310,12 +314,14 @@
weighHouseCode: '',
isConfirmWeighLoading: false, //纭畾绉伴噸鎸夐挳
realTimeWeigh: 0,
+ deptId:'',
+ weightReal:0, // 绉伴噸娴姩鏁版嵁
weighList: {},
// 涓存椂绉伴噸瀵硅薄
temporaryWeighObj: {
- skin: 0,
- hair: 0,
- clean: 0
+ skin: 0, //鐨�
+ hair: 0, //姣�
+ clean: 0 //鍑�閲�
},
infraredStatus: false, // 绾㈠鐘舵�侊紝
// 鏀剧┖鎺у埗
@@ -364,7 +370,7 @@
},
]
},
- mergeState: true, //鍚堝崱鐘舵��
+ mergeState: true, //鍚堝崱鐘舵��
// mergeStateShow: false, //鍚堝崱寮圭獥
checkboxValue1: [],
isExceedOrigin: false, //鏄惁瓒呭嚭姣涢噸
@@ -391,7 +397,7 @@
this.temporaryWeighObj.skin = newV;
let xx = new BigNumber(this.avgSkin)
let yy = new BigNumber(newV)
- this.errorTipShow = (xx.minus(yy).toNumber() <= -0.2 || xx.minus(yy).toNumber() >= 0.2) &&
+ this.errorTipShow = (xx.minus(yy).toNumber() < -this.weightReal || xx.minus(yy).toNumber() > this.weightReal) &&
this.avgSkin !== 0
} else {
this.isSkinWeigh = false;
@@ -415,7 +421,7 @@
this.temporaryWeighObj.skin = newV;
let xx = new BigNumber(this.avgSkin)
let yy = new BigNumber(newV)
- this.errorTipShow = (xx.minus(yy).toNumber() <= -0.2 || xx.minus(yy).toNumber() >= 0.2) &&
+ this.errorTipShow = (xx.minus(yy).toNumber() < -this.weightReal || xx.minus(yy).toNumber() > this.weightReal) &&
this.avgSkin !== 0;
let x = new BigNumber(this.weighList.hair)
let y = new BigNumber(this.temporaryWeighObj.skin)
@@ -515,7 +521,7 @@
} 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) {
+ if (xx.minus(yy).toNumber() < -this.weightReal || xx.minus(yy).toNumber() > this.weightReal) {
this.abnormalModalShow = true
this.skinAbnormal()
} else {
@@ -546,7 +552,13 @@
this.isConfirmWeighLoading = false;
}, 1000);
} else if (res.code === 3) {
- this.isExceedOrigin = true
+ if(/鐨噸/.test(res.msg)){
+ this.avgFalse = true;
+ this.isExceedOrigin = true;
+ }else{
+ this.avgFalse = false;
+ this.isExceedOrigin = true;
+ }
} else {
this.$u.toast(res.msg ? res.msg : '绉伴噸澶辫触锛岃绋嶅悗閲嶈瘯');
this.isConfirmWeighLoading = false
@@ -639,7 +651,8 @@
this.$reqGet('getAvgSkin', { xsUserId1: this.weighList.xsUserId1 }).then(res => {
if (res.code === 0) {
uni.hideLoading()
- this.avgSkin = res.data.avgSkin
+ this.avgSkin = res.data.avgSkin;
+ this.weighData.avgSkin = res.data.avgSkin;
this.tmTaskCoalList = res.data.tmTaskCoalList
/**
* @description true鐨勮瘽鏄涓�娆＄О, false灏变笉鏄�,娌℃湁鍘嗗彶锛屽钩鍧囩毊閲嶄负0鏄涓�娆′篃鏄甯� */
@@ -676,7 +689,21 @@
delta: 1
})
}, 800)
+ },
+ getDept(){
+ uni.request({
+ url: `${BaseUrl}/admin/dept/${this.deptId}`,
+ method: 'GET',
+ header: {
+ 'content-type': 'application/x-www-form-urlencoded'
+ },
+ success: (res) => {
+ console.log(res.data.data,'res.datra')
+ res.data.data.skinSafeValue ? this.weightReal = res.data.data.skinSafeValue : this.weightReal = '';
+ }
+ })
}
+
}
};
</script>
@@ -1050,4 +1077,4 @@
justify-content: space-between;
}
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.1