From 5a8575299f1cc6b4bf0601025d17273e92c2d8cf Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期三, 08 十一月 2023 17:23:42 +0800
Subject: [PATCH] 日计划增加磅单类型

---
 pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 1074 ++++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 769 insertions(+), 305 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 7363ee3..ba460ac 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,369 +1,833 @@
 <template>
 	<view class="weighingDevice">
-		<view class="one">
+		<view class="one"
+			: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>{{ realTimeWeigh }}</text> -->
+					<text>{{ globalweigh }}</text>
 				</view>
 				<view class="top_right">
 					<view class="">
 						绉伴噸:
-						<u--text :type="realTimeWeigh == 0 ? 'error' : 'success'" :text="realTimeWeigh == 0 ? '寮傚父' : '姝e父'" size="34"></u--text>
+						<u--text :type="realTimeWeigh == 0 ? 'error' : 'success'"
+							:text="realTimeWeigh == 0 ? '寮傚父' : '姝e父'"
+							size="34"></u--text>
 					</view>
 					<view class="">
 						绾㈠:
-						<u--text :type="infraredStatus ? 'error' : 'success'" :text="infraredStatus ? '寮傚父' : '姝e父'" size="34"></u--text>
+						<u--text :type="globalinfraredStatus ? 'error' : 'success'"
+							:text="globalinfraredStatus ? '寮傚父' : '姝e父'"
+							size="34"></u--text>
 					</view>
-					<!-- <view class="">
-						闆疯揪:
-						<u--text type="success" text="姝e父" size="34"></u--text>
-					</view> -->
 				</view>
 			</view>
 			<view class="bottom"><text>TIP:褰撳墠鐘舵�佷负姝e父鏃跺彲浠ョО閲�</text></view>
 		</view>
-		<view class="two">
-			<p>璁㈠崟缂栧彿锛歿{ weighList.code || '' }}</p>
-			<p>璁㈠崟绫诲瀷锛歿{ weighList.orderTye || '' }}</p>
-			<p>璁㈠崟浣欓噺锛歿{ weighList.orderSurplus || 0 }}</p>
-			<p>鐨噸锛歿{ temporaryWeighObj.skin == 0 ? weighList.skin : temporaryWeighObj.skin }}</p>
-			<p>姣涢噸锛歿{ temporaryWeighObj.hair == 0 ? weighList.hair : temporaryWeighObj.hair }}</p>
-			<p>鍑�閲嶏細{{ temporaryWeighObj.clean == 0 ? weighList.clean : temporaryWeighObj.clean }}</p>
-			<p>鐓ょ鍚嶇О锛歿{ weighList.coalName || '' }}</p>
-			<p>鍗曚綅鍚嶇О锛歿{ weighList.deptName || '' }}</p>
-			<p>鐭垮満鍚嶇О锛歿{ weighList.filedName || '' }}</p>
+		<view class="bottom-block">
+			<view class="block-main">
+				<view class="main-information"
+					v-if="weighList.orderType=='杞叆'||weighList.orderType=='杞嚭'">
+					<view class="prefix">
+						鍙戣揣鍦板熀鍦�:
+					</view>
+					<view class="suffix">
+						{{ weighList.filedName || '' }}
+					</view>
+				</view>
+				<view class="main-information"
+					v-if="weighList.orderType=='杞叆'||weighList.orderType=='杞嚭'">
+					<view class="prefix">
+						鏀惰揣鍦板熀鍦�:
+					</view>
+					<view class="suffix">
+						{{ weighList.toFiledName || '' }}
+					</view>
+				</view>
+				<view class="main-information"
+					v-if="weighList.orderType!=='杞叆'||weighList.orderType!=='杞嚭'">
+					<view class="prefix">瀹㈡埛:</view>
+					<view class="suffix">{{ weighList.customerName|| '' }}</view>
+				</view>
+				<view class="main-information"
+					v-if="weighList.orderType!=='杞叆'||weighList.orderType!=='杞嚭'">
+					<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="suffix">{{ weighList.filedName || '' }}</view>
+				</view>
+				<!-- <view class="main-information">
+					<view class="prefix">鐗╂枡鍚嶇О:</view>
+					<view class="suffix">{{ weighList.coalName || '' }}</view>
+				</view> -->
+				<view class="main-information">
+					<view class="prefix">璁㈠崟绫诲瀷:</view>
+					<view class="suffix">{{ weighList.orderType || '' }}</view>
+				</view>
+				<view class="main-information"  v-if="isweight">
+					<view class="prefix">鐨噸:</view>
+					<view class="suffix">
+						{{currentSkin}}
+					</view>
+				</view>
+				<view class="main-information"  v-if="isweight">
+					<view class="prefix">姣涢噸:</view>
+					<view class="suffix">
+						{{currentHair}}
+					</view>
+				</view>
+				<view class="main-information" v-if="isweight">
+					<view class="prefix">鍑�閲�:</view>
+					<view class="suffix">
+						{{ currentClean}}
+					</view>
+				</view>
+				<view class="main-information" v-else>
+					<view class="prefix">鍑�閲�:</view>
+					<view class="suffix">
+						{{ isWeightclean}}
+					</view>
+				</view>
+				<!-- <view class="main-information">
+					<view class="prefix">璁㈠崟浣欓噺:</view>
+					<view class="suffix">{{ weighList.orderSurplus || 0 }}</view>
+				</view> -->
+			</view>
 		</view>
+		<!--  绉伴噸鍘嗗彶-->
+		<weigh-item :list="weighHistory"></weigh-item>
 		<view class="three">
-			<!-- 鏀剧┖ -->
-			<u-button type="primary" text="鏀剧┖" plain @click="evacuation" throttleTime="500" :disabled="isEvacuation"></u-button>
-			<!-- 澶栭攢璁㈠崟绉扮毊鏃讹紝杩斿洖鍔犲噺鍚ㄦ寜閽疆鐏般�傜О姣涙椂鍙敤.澶栬喘璁㈠崟锛屼笉鍑虹幇杩斿洖鍔犲噺鍚ㄧ殑鎸夐挳 -->
-			<u-button
-				type="primary"
+			<!-- .澶栬喘璁㈠崟锛屼笉鍑虹幇杩斿洖鍔犲噺鍚ㄧ殑鎸夐挳 -->
+			<u-button type="primary"
 				text="纭畾绉伴噸"
-				:disabled="realTimeWeigh == 0 || infraredStatus"
+				:disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh ||globalWarning"
 				:loading="isConfirmWeighLoading"
-				loadingText="鍔犺浇涓�"
-				@click="confirmWeigh"
-			></u-button>
-			<u-button type="primary" text="杩斿洖鍔犲噺鍚�" :disabled="addAndSubtractCoalDisabled" @click="addAndSubtractCoal" class="jiajian"></u-button>
+				loadingText="纭"
+				@click="confirmWeigh"></u-button>
+			<u-button type="primary"
+				text="杩斿洖鍔犲噺鍚�"
+				:disabled="addAndSubtractCoalDisabled"
+				@click="addAndSubtractCoal"
+				class="jiajian"
+				v-if="outBuy"></u-button>
+			<u-button type="primary"
+				text="缁х画鍗歌揣"
+				@click="UnloadingAgainHandle"
+				:loading="UnloadingAgainLoading"
+				loadingText="纭"
+				:disabled="isweigh||realTimeWeigh == 0"
+				v-if='canUnload'></u-button>
+			<!-- 鏀剧┖ -->
+			<u-button type="primary"
+				text="鏀剧┖"
+				plain
+				@click="evacuation"
+				throttleTime="500"
+				:disabled="!isEvacuation"></u-button>
+
 		</view>
-		<view class="four" v-if="weighList.orderTye !== '澶栬喘'">濡傛偍闇�瑕佽皟鏁磋杞借揣鍝佸惃鏁帮紝璇风偣鍑昏繑鍥炲姞鍑忓惃</view>
 		<!-- 鏀剧┖寮圭獥 -->
 		<view class="evacuationModal">
-			<u-modal
-				:show="evacuationModalShow"
+			<u-modal :show="evacuationModalShow"
 				:title="evacuationTitle"
 				:content="evacuationContent"
 				:showCancelButton="true"
 				@confirm="evacuationConfirm"
-				@cancel="evacuationCancel"
-			></u-modal>
+				@cancel="evacuationCancel"></u-modal>
 		</view>
 	</view>
 </template>
 
 <script>
-let socket = null;
-import { webSocketUrl } from '@/api/request.js';
-export default {
-	onLoad(params) {
-		console.log(params, '绗簩娆℃斁绌哄弬鏁�');
-		this.takeCoalId = params.takeCoalId;
-		this.weighData.sceneId = params.sceneId;
-		this.weighData.gateCameraId = params.gateCameraId;
-		this.weighData.equipmentCode = params.gateCameraCode;
-		this.weighHouseCode = params.weighHouseCode;
-	},
-	data() {
-		return {
-			weighData: {
-				//纭绉伴噸鎺ュ彛鍙傛暟
-				deptId: '',
-				tmId: '',
-				sceneId: '',
-				carNo: '',
-				gateCameraId: '',
-				equipmentCode: '',
-				weigh: 0,
-				tmCode: ''
+	let socket = null;
+	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.isWeighing = params.isWeighing; // 褰撳墠鏄笉鏄洖纾呯殑
+			this.takeCoalId = params.takeCoalId;
+			this.weighData.sceneId = params.sceneId;
+			this.weighData.gateCameraId = params.gateCameraId;
+			this.weighData.equipmentCode = params.gateCameraCode;
+			this.weighData.sceneInOut = params.sceneInOut;
+			this.weighHouseCode = params.weighHouseCode;
+			this.primarySkin = params.primarySkin;
+			this.primaryHair = params.primaryHair;
+			this.primaryClean = params.primaryClean;
+			if (params.overTmWaixiao) {
+				this.weighData.overTmWaixiao = 1
+			}
+			this.changeweighHouseCode(params.weighHouseCode);
+			this.changeWeigh(0)
+		},
+		components: {
+			combinedTitle,
+			weighItem
+		},
+		data() {
+			return {
+				isWeighing:'',
+				weighData: {
+					//纭绉伴噸鎺ュ彛鍙傛暟
+					deptId: '',
+					tmId: '',
+					sceneId: '',
+					carNo: '',
+					gateCameraId: '',
+					equipmentCode: '',
+					weigh: 0,
+					tmCode: '',
+					sceneInOut: '',
+					// coalContactClean: 0,
+					// coalContactHair: 0,
+					// coalContactSkin: 0
+				},
+				// 鏄惁濉啓鍘熷彂淇℃伅
+				isInputOrigin: false,
+				haveInputOrigin: false,
+
+				takeCoalId: null,
+				weighHouseCode: '',
+				isConfirmWeighLoading: false, //纭畾绉伴噸鎸夐挳
+				realTimeWeigh: 0,
+				weighList: {},
+				// 涓存椂绉伴噸瀵硅薄
+				temporaryWeighObj: {
+					skin: null,
+					hair: null,
+					clean: null,
+					isWeightclean:null,
+				},
+				infraredStatus: false, // 绾㈠鐘舵�侊紝
+				// 鏀剧┖鎺у埗
+				evacuationModalShow: false,
+				evacuationTitle: '鏀剧┖纭',
+				evacuationContent: '鏄惁纭鏀剧┖',
+				// 鑾峰彇鍘熷彂淇℃伅
+				primarySkin: null,
+				primaryHair: null,
+				primaryClean: null,
+				// 鍒ゆ柇绉伴噸鎸夐挳鏄惁鍙敤
+				isweigh: false,
+				// 澶栬喘绫诲瀷绉伴噸濉啓姣涳紝鐨紝
+				firstHairCustomernameShow: false,
+				coalContactHair: '',
+				coalContactSkin: '',
+				// 鑱氱劍鏃舵敼鍙樻牱寮�
+				isfocus1: false,
+				isfocus2: false,
+				// 澶栬喘绫诲瀷
+				outBuy: true,
+				// 缁х画鍗歌揣鎸夐挳
+				canUnload: false,
+				UnloadingAgainLoading: false,
+				onlineurl,
+			};
+		},
+		watch: {
+			realTimeWeigh(newV, oldV) {
+
 			},
-			takeCoalId: null,
-			weighHouseCode: '',
-			isConfirmWeighLoading: false, //纭畾绉伴噸鎸夐挳
-			realTimeWeigh: '',
-			weighList: {},
-			webSocket: null, // webSocket瀹炰緥
-			// lockReconnect: false, // 閲嶈繛閿侊紝閬垮厤澶氭閲嶈繛
-			// maxReconnect: 6, // 鏈�澶ч噸杩炴鏁帮紝 -1 鏍囪瘑鏃犻檺閲嶈繛
-			// reconnectTime: 0, // 閲嶈繛灏濊瘯娆℃暟
-			// heartbeat: {
-			// 	interval: 30 * 1000, // 蹇冭烦闂撮殧鏃堕棿
-			// 	timeout: 10 * 1000, // 鍝嶅簲瓒呮椂鏃堕棿
-			// 	pingTimeoutObj: null, // 寤舵椂鍙戦�佸績璺崇殑瀹氭椂鍣�
-			// 	pongTimeoutObj: null, // 鎺ユ敹蹇冭烦鍝嶅簲鐨勫畾鏃跺櫒
-			// 	pingMessage: JSON.stringify({ type: 'ping' }) // 蹇冭烦璇锋眰淇℃伅
-			// }
-			// 涓存椂绉伴噸瀵硅薄
-			temporaryWeighObj: {
-				skin: 0,
-				hair: 0,
-				clean: 0
-			},
-			infraredStatus: false, // 绾㈠鐘舵�侊紝
-			// 鏀剧┖鎺у埗
-			evacuationModalShow: false,
-			evacuationTitle: '鏀剧┖纭',
-			evacuationContent: '鏄惁纭鏀剧┖'
-		};
-	},
-	watch: {
-		realTimeWeigh(newV, oldV) {
-			if (this.weighList.orderTye == '澶栭攢' || this.weighList.orderTye == '鍐呴攢') {
-				if (this.weighList.skin == 0) {
-					// this.temporaryWeighObj.skin = this.realTimeWeigh;
-					this.temporaryWeighObj.skin = newV;
-				} else {
-					// this.temporaryWeighObj.hair = this.realTimeWeigh;
-					this.temporaryWeighObj.hair = newV;
-					this.temporaryWeighObj.clean = (this.temporaryWeighObj.hair - this.weighList.skin).toFixed(2);
-				}
-			} else if (this.weighList.orderTye == '澶栬喘' || this.weighList.orderTye == '杞嚭') {
-				if (this.weighList.hair == 0) {
-					// this.temporaryWeighObj.hair = this.realTimeWeigh;
-					this.temporaryWeighObj.hair = newV;
-				} else {
-					// this.temporaryWeighObj.skin = this.realTimeWeigh;
-					this.temporaryWeighObj.skin = newV;
-					this.temporaryWeighObj.clean = (this.weighList.hair - this.temporaryWeighObj.skin).toFixed(2);
-				}
-			}
-		}
-	},
-	onShow() {
-		this.init();
-		this.initWebSocket();
-	},
-	computed: {
-		token() {
-			return uni.getStorageSync('token');
-		},
-		// 鍔犲噺鐓ゆ寜閽鐢ㄤ笌鍚�
-		addAndSubtractCoalDisabled() {
-			if (this.weighList.orderTye == '澶栭攢' || this.weighList.orderTye == '鍐呴攢' || this.weighList.orderTye == '杞嚭') {
-				if (this.weighList.hair == 0) {
-					return true;
-				} else if (this.weighList.hair != 0) {
-					return false;
-				}
-			}
-		},
-		// 鏄惁鏀剧┖鎸夐挳绂佺敤
-		isEvacuation() {
-			if (this.weighList.hair == this.weighList.skin || this.temporaryWeighObj.skin == this.temporaryWeighObj.hair) {
-				return false;
-			} else {
-				return true;
-			}
-		}
-	},
-	methods: {
-		init() {
-			// 鑾峰彇绉伴噸淇℃伅
-			this.$reqGet('weighList', { id: this.takeCoalId }).then(res => {
-				console.log(res, '鑾峰彇绉伴噸淇℃伅');
-				if (res.code == 0) {
-					this.weighList = res.data;
-					this.weighData.deptId = res.data.deptId;
-					this.weighData.tmId = res.data.id;
-					this.weighData.carNo = res.data.carNo;
-					this.weighData.tmCode = res.data.code;
-				}
-			});
-		},
-		/**
-		 * @纭绉伴噸绛夊緟鍚庣鎻愪緵瀹炴椂绉伴噸鎺ュ彛锛岃幏鍙栫毊閲嶏紝姣涢噸
-		 */
-		confirmWeigh() {
-			if (this.isConfirmWeighLoading == false) {
-				this.isConfirmWeighLoading = true;
-				if (this.weighData.weigh != 0) {
-					if (this.weighList.orderTye == '澶栭攢') {
-						if (this.weighList.skin ? (this.weighList.skin < this.realTimeWeigh ? true : false) : true) {
-							this.saveWeigh();
+			// 鐩戝惉閲嶉噺鍙樺寲
+			globalweigh: {
+				handler: function(newV) {
+					this.weighData.weigh = this.realTimeWeigh = newV;
+					if  ((this.weighList.orderType == '澶栭攢' || this.weighList.orderType == '鍐呴攢' || this.weighList
+						.orderType == '杞嚭')) {
+						if (!this.showWeigh.skin) {
+							this.temporaryWeighObj.skin = newV;
 						} else {
-							this.$u.toast('姣涢噸涓嶈兘灏忎簬鐨噸');
-							this.isConfirmWeighLoading = false;
+							this.temporaryWeighObj.hair = newV;
+							this.isweigh = Number(this.currentClean) < 0;
+						}
+					} else if ( (this.isweight) && (this.weighList.orderType == '澶栬喘' || this.weighList.orderType == '鍐呰喘' || this.weighList
+						.orderType == '杞叆')) {
+						if (!this.showWeigh.hair) {
+							this.temporaryWeighObj.hair = newV;
+						} else {
+							this.temporaryWeighObj.skin = newV;
+							this.isweigh = Number(this.currentClean) < 0 || this.showWeigh.skin < newV && this
+								.showWeigh
+								.skin > 0;
+						}
+					}else if((this.weighList.orderType == '澶栬喘' || this.weighList.orderType == '鍐呰喘' || this.weighList
+						.orderType == '杞叆') && (!this.isweight)){
+							if (!this.showWeigh.skin) {
+							this.temporaryWeighObj.skin = newV;
+							this.temporaryWeighObj.isWeightclean = newV;
+						} else {
+							this.temporaryWeighObj.isWeightclean = newV;
+
+							this.isweigh = Number(this.currentClean) < 0;
+						}
+						}
+				},
+				deep: true
+			}
+		},
+		onPullDownRefresh() {
+			if (!this.globalisconnect && !this.globalisUploadimg && this.globalisLogin) {
+				if (!this.is_open_socket) {
+					this.$store.dispatch('websocketInit')
+					this.changeisconnect(false);
+					console.log('绉伴噸鐨剋s');
+					uni.stopPullDownRefresh();
+				} else {
+					uni.stopPullDownRefresh();
+				}
+			}
+		},
+		onShow() {
+			this.init();
+			// this.realTimeWeigh = 0
+		},
+		computed: {
+			...mapState(['globalweigh', 'globalinfraredStatus', 'globalWarning', 'globalisconnect', 'globalisUploadimg',
+				'globalisLogin', 'is_open_socket'
+			]),
+			token() {
+				return uni.getStorageSync('token');
+			},
+			// 鍔犲噺鐓ゆ寜閽鐢ㄤ笌鍚�
+			addAndSubtractCoalDisabled() {
+				return this.realTimeWeigh == 0;
+			},
+			// 鏄惁鏀剧┖鎸夐挳绂佺敤
+			isEvacuation() {
+				if (this.weighList.orderType == '澶栭攢' || this.weighList.orderType == '鍐呴攢' || this.weighList.orderType ==
+					'杞嚭') {
+					return (this.weighList.skin === 0 ? this.temporaryWeighObj.skin : this.weighList.skin) == this
+						.temporaryWeighObj.hair;
+				}
+				if (this.weighList.orderType == '澶栬喘' || this.weighList.orderType == '鍐呰喘' || this.weighList.orderType ==
+					'杞叆') {
+					return (this.weighList.hair === 0 ? this.temporaryWeighObj.skin : this.weighList.hair) == this
+						.temporaryWeighObj.hair;
+				}
+			},
+
+			showWeigh() {
+				return this.weighList.tmTaskCoalItems ? (this.weighList.tmTaskCoalItems[0] ? this
+					.weighList.tmTaskCoalItems[0] : {}) : {}
+			},
+			// 绉伴噸鍘嗗彶
+			weighHistory() {
+				return this.weighList.tmTaskCoalItems ? this.weighList.tmTaskCoalItems : []
+			},
+			currentHair() {
+				if (this.weighList.orderType == '澶栭攢' || this.weighList.orderType == '鍐呴攢' || this.weighList.orderType ==
+					'杞嚭') {
+					return this.temporaryWeighObj.hair ? this.temporaryWeighObj.hair : ''
+				}
+				return this.temporaryWeighObj.hair ? this.temporaryWeighObj.hair : this.showWeigh.skin ? (this.showWeigh
+					.skin || '') : (this.showWeigh.hair || '')
+			},
+			currentSkin() {
+				return this.temporaryWeighObj.skin ? this.temporaryWeighObj.skin : (this.showWeigh.skin || '')
+			},
+			currentClean() {
+				if (!this.currentSkin) return ''
+				if (this.weighList.orderType == '澶栬喘' || this.weighList.orderType == '鍐呰喘' || this.weighList
+					.orderType == '杞叆') {
+					return (this.currentHair - this.currentSkin).toFixed(2)
+				} else {
+					return !this.showWeigh.skin ? this.currentSkin : (this.currentHair - this.currentSkin) > 0 ? (this
+						.currentHair - this.currentSkin).toFixed(2) : ''
+				}
+
+			},
+			isWeightclean(){
+				console.log(this.temporaryWeighObj,'his.temporaryWeighObj')
+				return this.temporaryWeighObj.skin || ''
+			},
+			isweight(){
+				if(this.isWeighing){
+					if(this.isWeighing == '涓嶅洖纾�'){
+						return false
+					}else{
+						return true
+					}
+
+				}else{
+					return true
+				}
+			}
+		},
+		methods: {
+			...mapMutations(['changeweighHouseCode', 'changeisLogin', 'changeWeigh']),
+			init() {
+				uni.showLoading({
+					title: '鍔犺浇涓�'
+				})
+				// 鑾峰彇绉伴噸淇℃伅
+				this.$reqGet('weighList', { id: this.takeCoalId }).then(res => {
+					console.log(res, '鑾峰彇绉伴噸淇℃伅');
+					uni.hideLoading()
+					if (res.code == 0) {
+						this.weighList = res.data;
+						this.weighData.deptId = res.data.deptId;
+						this.weighData.tmId = res.data.id;
+						this.weighData.carNo = res.data.carNo;
+						this.weighData.tmCode = res.data.code;
+						this.weighData.filedId = res.data.filedId;
+						this.outBuy = (this.weighList.orderType.indexOf('閿�') !== -1) && this.showWeigh.skin > 0;
+						// 缁х画鍗歌揣鍙湁澶栬喘绫诲瀷绗簩娆′細鏈�
+						this.canUnload = this.weighList.orderType === '澶栬喘' && this.showWeigh.hair > 0;
+					}
+				});
+			},
+			/**
+			 * @纭绉伴噸绛夊緟鍚庣鎻愪緵瀹炴椂绉伴噸鎺ュ彛锛岃幏鍙栫毊閲嶏紝姣涢噸
+			 */
+			confirmWeigh() {
+				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) {
+								this.saveWeigh();
+							} else {
+								this.$u.toast('姣涢噸涓嶈兘灏忎簬鐨噸');
+								this.isConfirmWeighLoading = false;
+							}
+						} else {
+							this.saveWeigh();
 						}
 					} else {
-						this.saveWeigh();
+						this.$u.toast('鏈兘鑾峰彇鍦扮閲嶉噺');
+						this.isConfirmWeighLoading = false;
 					}
-				} else {
-					this.$u.toast('鏈兘鑾峰彇鍦扮閲嶉噺');
-					this.isConfirmWeighLoading = false;
 				}
-			}
-		},
-		// 纭绉伴噸鎺ュ彛
-		saveWeigh() {
-			this.$reqPost('saveWeigh', this.weighData, 'json')
-				.then(res => {
+			},
+			// 纭绉伴噸鎺ュ彛
+			saveWeigh() {
+				// this.weighData.coalContactClean = this.coalContactClean;
+				this.$reqPost('saveWeigh', this.weighData, 'json')
+					.then(res => {
+						console.log(res, '绉伴噸鎺ュ彛');
+						if (res.code == 0) {
+							this.$u.toast('绉伴噸鎴愬姛');
+							setTimeout(() => {
+								uni.navigateBack({
+									delta: 1
+								});
+								this.isConfirmWeighLoading = false;
+							}, 1000);
+						} else {
+							this.$u.toast('绉伴噸澶辫触锛岃绋嶅悗閲嶈瘯');
+						}
+					})
+					.catch(err => {
+						this.isConfirmWeighLoading = false;
+						console.log(err);
+					});
+			},
+			// 鍔犲噺鐓�
+			addAndSubtractCoal() {
+				this.$reqPost('addAndSubtractCoal', {
+					deptId: this.weighData.deptId,
+					sceneId: this.weighData.sceneId,
+					carNo: this.weighData.carNo,
+					tmId: this.weighData.tmId,
+					filedId: this.weighData.filedId,
+					tmId: this.weighData.tmId,
+					gateCameraId: this.weighData.gateCameraId,
+					equipmentCode: this.weighData.equipmentCode,
+					tmCode: this.weighData.tmCode,
+					sceneInOut: this.weighData.sceneInOut,
+					weigh: this.realTimeWeigh
+				}, 'json').then(res => {
 					if (res.code == 0) {
-						this.$u.toast('绉伴噸鎴愬姛');
+						this.$u.toast('鎿嶄綔鎴愬姛锛屽嵆灏嗚繑鍥炰笂涓�椤�');
 						setTimeout(() => {
 							uni.navigateBack({
 								delta: 1
 							});
 							this.isConfirmWeighLoading = false;
 						}, 1000);
+						console.log(res, '鍔犲噺鐓�');
+					} else {
+						this.$u.toast('鎿嶄綔澶辫触锛岃绋嶅�欓噸璇�');
+					}
+				});
+			},
+			// 缁х画鍗歌揣
+			UnloadingAgainHandle() {
+				this.UnloadingAgainLoading = true
+				this.$reqPost('continueWeigh', {
+					deptId: this.weighData.deptId,
+					sceneId: this.weighData.sceneId,
+					carNo: this.weighData.carNo,
+					tmId: this.weighData.tmId,
+					filedId: this.weighData.filedId,
+					tmId: this.weighData.tmId,
+					gateCameraId: this.weighData.gateCameraId,
+					equipmentCode: this.weighData.equipmentCode,
+					tmCode: this.weighData.tmCode,
+					sceneInOut: this.weighData.sceneInOut,
+					weigh: this.realTimeWeigh
+				}, 'json').then(res => {
+					this.UnloadingAgainLoading = false
+					if (res.code == 0) {
+						this.$u.toast('鎿嶄綔鎴愬姛锛屽嵆灏嗚繑鍥炰笂涓�椤�');
+						setTimeout(() => {
+							uni.navigateBack({
+								delta: 1
+							});
+						}, 1000);
+					} else {
+						this.$u.toast('鎿嶄綔澶辫触锛岃绋嶅�欓噸璇�');
 					}
 				})
-				.catch(err => {
-					this.isConfirmWeighLoading = false;
-					console.log(err);
-				});
-		},
-		// 鍔犲噺鐓�
-		addAndSubtractCoal() {
-			this.$reqPost('addAndSubtractCoal', { deptId: this.weighData.deptId, sceneId: this.weighData.sceneId, carNo: this.weighData.carNo }, 'json').then(res => {
-				if (res.code == 0) {
-					this.$u.toast('鎿嶄綔鎴愬姛锛屽嵆灏嗚繑鍥炰笂涓�椤�');
-					setTimeout(() => {
-						uni.navigateBack({
-							delta: 1
-						});
-						this.isConfirmWeighLoading = false;
-					}, 1000);
-					console.log(res, '鍔犲噺鐓�');
-				}
-			});
-		},
-		/**
-		 * 鍒濆鍖� weoSocket
-		 */
-		initWebSocket() {
-			let wsUrl = `${webSocketUrl}?access_token=${uni.getStorageSync('token')}`;
-			let socket = uni.connectSocket({
-				url: wsUrl,
-				header: {
-					CLIENT_TOC: 'Y'
-				},
-				complete: res => {
-					console.log(res, 'socket缁撴灉');
-				}
-			});
-			socket.onOpen(() => {
-				console.log('onOpen');
-			});
-			// 鑾峰彇鏈嶅姟鍣ㄤ紶鏉ョ殑鏁版嵁锛屽仛鐩稿簲澶勭悊
-			socket.onMessage(res => {
-				console.log('socketWeigh', res);
-				let nowWeighObj = JSON.parse(res.data.slice(7));
-				console.log(nowWeighObj);
-				// 涓�寮�濮嬫槸weighHouseCode
-				if (nowWeighObj.eqCode == this.weighData.equipmentCode) {
-					if (nowWeighObj.eqInfraredStatus) {
-						this.infraredStatus = true;
-						this.weighData.weigh = this.realTimeWeigh = nowWeighObj.weigh;
+			},
+			// 鏀剧┖
+			evacuation() {
+				this.evacuationModalShow = true;
+			},
+			// 鏀剧┖寮圭獥纭
+			evacuationConfirm() {
+				this.$reqPost('getTwoEvacuation', this.weighData, 'json').then(res => {
+					console.log(res, '绗簩娆℃斁绌�');
+					if (res.code == 0) {
+						this.$u.toast('鎿嶄綔鎴愬姛');
+						this.evacuationModalShow = false;
 					} else {
-						this.infraredStatus = false;
-						this.weighData.weigh = this.realTimeWeigh = nowWeighObj.weigh;
+						this.$u.toast(res.msg ? res.msg : '鎿嶄綔澶辫触');
+						this.evacuationModalShow = true;
 					}
-				}
-			});
-			socket.onClose(() => {
-				uni.closeSocket();
-				console.log('webSocketClose');
-				this.$u.toast('纾呮埧宸插叧闂�');
-			});
-			socket.onError(err => {
-				console.log('socket鎶ラ敊', err);
-				this.$u.toast('纾呮埧鏆傛椂涓嶈兘浣跨敤锛岃閲嶆柊杩涘叆璇ラ〉闈紝閲嶈瘯锛侊紒');
-			});
-		},
-		// 鏀剧┖
-		evacuation() {
-			this.evacuationModalShow = true;
-		},
-		// 鏀剧┖寮圭獥纭
-		evacuationConfirm() {
-			this.$reqPost('getTwoEvacuation', this.weighData, 'json').then(res => {
-				console.log(res, '绗簩娆℃斁绌�');
+				});
+			},
+			// 鏀剧┖寮圭獥鍙栨秷
+			evacuationCancel() {
 				this.evacuationModalShow = false;
-			});
-		},
-		// 鏀剧┖寮圭獥鍙栨秷
-		evacuationCancel() {
-			this.evacuationModalShow = false;
+			},
 		}
-	}
-};
+	};
 </script>
 
-<style lang="scss" scoped>
-::v-deep.weighingDevice {
-	width: 100%;
-	height: 100vh;
-	display: flex;
-	flex-direction: column;
-	.one {
-		flex: 2;
-		border: vww(2) solid #dddddd;
-		margin: vww(20) vww(20) 0 vww(20);
-		border-radius: vww(15);
-		.top {
-			height: 80%;
-			display: flex;
-			.top_left {
-				flex: 3;
-				font-size: vww(50);
-				display: flex;
-				align-items: center;
-				justify-content: center;
-			}
-			.top_right {
-				display: flex;
+<style lang="scss"
+	scoped>
+	@mixin flex {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+	// 绉伴噸鍘嗗彶
+	.weighHistory-enter-active,
+	.weighHistory-leave-active {
+		transition: opacity 0.5s ease;
+	}
+
+	.weighHistory-enter-from,
+	.weighHistory-leave-to {
+		opacity: 0;
+	}
+
+	.weigh-history {
+		width: 690rpx;
+		height: 100%;
+		min-height: 420rpx;
+		margin: vww(10) auto vww(20);
+		background: #ffffff;
+		box-shadow: 4rpx 6rpx 51rpx 0rpx rgba(73, 120, 240, 0.11);
+		border-radius: 20rpx;
+		position: relative;
+		font-size: 30rpx;
+		font-weight: 300;
+		color: #303030;
+		overflow: hidden;
+
+		.block-main {
+			display: grid;
+			grid-template-columns: auto;
+			grid-template-rows: repeat(auto-fit, minmax(40rpx, 1fr));
+			width: 94%;
+			height: 100%;
+			min-height: 380rpx;
+			margin: vww(18) vww(7) vww(11) vww(17);
+			gap: 10rpx 20rpx;
+
+			.weigh-item {
+				width: 100%;
+				height: vww(80);
+				@include flex;
 				flex-direction: column;
-				justify-content: center;
-				flex: 2;
-				view {
-					display: flex;
+				justify-content: space-around;
+				align-items: flex-start;
+
+				.item-block {
+					width: 100%;
+					height: vww(36);
+					@include flex;
+					justify-content: space-around;
+
+					.item {
+						min-width: vww(50);
+						height: vww(45);
+						font-size: 21rpx;
+						font-weight: 400;
+						color: #ffffff;
+						text-align: center;
+						line-height: vww(30);
+						@include flex;
+
+						.concrete {
+							width: vww(36);
+							height: vww(36);
+						}
+
+						.num {
+							font-size: 40rpx;
+							font-weight: 300;
+							color: #303030;
+						}
+					}
 				}
 			}
 		}
-		.bottom {
-			text-align: center;
-		}
 	}
-	.two {
-		flex: 4;
-		border: vww(2) solid #dddddd;
-		margin: vww(20);
-		border-radius: vww(10);
-		padding: vww(20);
-		p {
-			text-align: center;
-			font-size: vww(20);
-			font-weight: 500;
-			margin-top: vww(5);
-		}
-	}
-	.three {
-		margin: 0 auto vww(20);
-		flex: 0.7;
+
+	::v-deep.weighingDevice {
+		width: 100%;
+		height: 100%;
 		display: flex;
-		color: #939393;
-		.u-button {
-			&:nth-of-type(2) {
-				margin-left: vww(10);
+		flex-direction: column;
+
+		.one {
+			// flex: 3;
+			height: 290rpx;
+			margin: vww(20);
+			border-radius: vww(15);
+
+			.top {
+				height: 75%;
+				display: flex;
+
+				.top_left {
+					flex: 3;
+					font-size: vww(50);
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					font-size: 74rpx;
+					font-weight: 400;
+					color: #ffffff;
+					line-height: 69rpx;
+					text-shadow: 0rpx 3rpx 14rpx rgba(0, 0, 0, 0.33);
+
+					text {
+						font-family: weighting;
+					}
+				}
+
+				.top_right {
+					display: flex;
+					flex-direction: column;
+					justify-content: center;
+					flex: 2;
+					font-size: 31rpx;
+					font-weight: 300;
+					color: #ffffff;
+
+					view {
+						display: flex;
+						align-items: center;
+					}
+				}
 			}
-			&:nth-of-type(3) {
-				margin-left: vww(10);
+
+			.bottom {
+				text-align: center;
+				height: 25%;
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				flex-direction: column;
+				font-size: 28rpx;
+				font-weight: 300;
+				color: #d9e1fe;
 			}
 		}
+
+		.middle-block {
+			width: 690rpx;
+			height: 386rpx;
+			margin: vww(20) vww(15) vww(13);
+			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;
+			@include flex;
+			justify-content: center;
+			overflow: hidden;
+
+			.block-main {
+				width: 650rpx;
+				height: 350rpx;
+				@include flex;
+				flex-direction: column;
+				margin-bottom: vww(20);
+				position: relative;
+
+				.first-line,
+				.second-line {
+					width: 90%;
+					height: vww(44);
+
+					.focusClass {
+						color: #5b95fd;
+					}
+
+					.inputClass {
+						border: 1px solid rgba(73, 95, 252, 0.6) !important;
+						box-shadow: 0rpx 5rpx 13rpx 0rpx rgba(73, 95, 252, 0.6) !important;
+						border-radius: 12rpx !important;
+					}
+
+					.isInputOrigin {
+						background-color: #f4f4fc;
+					}
+
+					.input-container {
+						border: 2px solid #c5c5c5;
+						box-shadow: 0rpx 5rpx 13rpx 0rpx #c5c5c5;
+						border-radius: 12rpx;
+					}
+				}
+
+				.first-line {
+					@include flex;
+					position: relative;
+					top: vww(8);
+				}
+
+				.second-line {
+					@include flex;
+				}
+			}
+
+			.block-sideline {
+				width: 94%;
+				height: vww(100);
+				@include flex flex-direction: column;
+				align-items: flex-start;
+
+				.first-line {
+					width: 100%;
+				}
+
+				.weigh-item {
+					width: 100%;
+					height: vww(36);
+					@include flex justify-content: space-around;
+
+					.item {
+						min-width: vww(50);
+						height: vww(45);
+						font-size: 21rpx;
+						font-weight: 400;
+						color: #ffffff;
+						text-align: center;
+						line-height: vww(30);
+						@include flex;
+
+						.concrete {
+							width: vww(36);
+							height: vww(36);
+						}
+
+						.num {
+							font-size: 40rpx;
+							font-weight: 300;
+							color: #303030;
+						}
+					}
+				}
+			}
+		}
+
+		.bottom-block {
+			width: calc(100% - 60rpx);
+			box-sizing: border-box;
+			height: 630rpx;
+			margin: 0 vww(15) vww(15) vww(15);
+			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;
+			@include flex;
+			justify-content: center;
+			overflow: hidden;
+
+			.block-main {
+				width: 94%;
+				height: 565rpx;
+				margin-top: vww(10);
+				@include flex;
+				justify-content: space-around;
+				align-items: flex-start;
+				flex-direction: column;
+				overflow: hidden;
+
+				.main-information {
+					width: 100%;
+					height: 28rpx;
+					font-size: 28rpx;
+					font-weight: 300;
+					color: #303030;
+					@include flex;
+					justify-content: flex-start;
+					overflow: hidden;
+
+					.prefix {
+						min-width: vww(60);
+					}
+
+					.suffix {
+						flex: 1;
+						margin-left: vww(12);
+						text-align: left;
+					}
+				}
+			}
+		}
+
+		.three {
+			margin: 0 auto vww(5);
+			margin-bottom: vww(60);
+			width: 96%;
+			display: grid;
+			grid-template-columns: repeat(auto-fit, minmax(140rpx, 1fr));
+			justify-content: center;
+			gap: vww(10);
+			color: #939393;
+
+			.u-button {
+				width: vww(70);
+			}
+		}
+
+		.four {
+			width: 100%;
+			margin-top: vww(5);
+			text-align: center;
+		}
 	}
-	.four {
-		margin: vww(10) auto;
-		flex: 0.5;
+
+	.secondary-confirmation__main {
+		display: flex;
+		flex-direction: column;
+		justify-content: space-between;
+		align-items: center;
+
+		.secondary-child {
+			display: flex;
+			justify-content: space-between;
+		}
 	}
-}
-</style>
+</style>
\ No newline at end of file

--
Gitblit v1.9.1