From d36eb757af8867278125c6999fcaa5bdb902151c Mon Sep 17 00:00:00 2001
From: 付延余 <f-yanyu@outlook.com>
Date: 星期二, 21 三月 2023 17:38:45 +0800
Subject: [PATCH] 司机称重页面,签到页面

---
 pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue |   42 +++++++++++++++++++++++++++++++++++-------
 1 files changed, 35 insertions(+), 7 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 11f6dac..d27cf67 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
@@ -2,7 +2,9 @@
 	<view class="weighingDevice">
 		<view class="one">
 			<view class="top">
-				<view class="top_left"><text>41.5</text></view>
+				<view class="top_left">
+					<text>{{ realTimeWeigh }}</text>
+				</view>
 				<view class="top_right">
 					<view class="">
 						绉伴噸:
@@ -42,12 +44,28 @@
 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.weighCode = params.weighCode;
 	},
 	data() {
 		return {
+			weighData: {
+				//纭绉伴噸鎺ュ彛鍙傛暟
+				deptId: '',
+				tmId: '',
+				sceneId: '',
+				carNo: '',
+				gateCameraId: '',
+				equipmentCode: '',
+				weigh: '',
+				tmCode: ''
+			},
 			takeCoalId: null,
+			weighCode: '',
+			realTimeWeigh: '',
 			weighList: {},
 			webSocket: null // webSocket瀹炰緥
 			// lockReconnect: false, // 閲嶈繛閿侊紝閬垮厤澶氭閲嶈繛
@@ -78,6 +96,10 @@
 				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;
 				}
 			});
 		},
@@ -85,16 +107,17 @@
 		 * @纭绉伴噸绛夊緟鍚庣鎻愪緵瀹炴椂绉伴噸鎺ュ彛锛岃幏鍙栫毊閲嶏紝姣涢噸
 		 */
 		confirmWeigh() {
-			// this.$reqPost('saveWeigh',{id:this.takeCoalId,skin:'',hair:''}).then(res=>{
-			// 	console.log(res,"纭绉伴噸");
-			// })
+			console.log('纭绉伴噸', this.weighData);
+			this.$reqPost('saveWeigh',this.weighData,'json').then(res=>{
+				console.log(res,"纭绉伴噸");
+			})
 		},
 		/**
 		 * 鍒濆鍖� weoSocket
 		 */
 		initWebSocket() {
 			// let wsUrl = `wss://192.168.0.120:9997/wrzs/ws/info?access_token=${this.token}`;
-			let wsUrl = `${webSocketUrl}?access_token=c954c7f5-f34b-453e-8c9d-e291747b401f`;
+			let wsUrl = `${webSocketUrl}?access_token=${uni.getStorageSync('token')}`;
 			socket = uni.connectSocket({
 				url: wsUrl,
 				header: {
@@ -108,7 +131,12 @@
 				console.log('onOpen');
 			});
 			socket.onMessage(res => {
-				console.log(res, '鏈嶅姟鍣ㄨ繑鍥炵殑鏁版嵁');
+				console.log('socketWeigh', res);
+				let nowWeigh = JSON.parse(res.data.slice(7)).weigh;
+				// if (nowWeigh.eqCode == this.weighCode) {
+				// 	this.weighData.weigh = this.realTimeWeigh = nowWeigh;
+				// }
+				this.weighData.weigh = this.realTimeWeigh = nowWeigh;
 			}); // 鑾峰彇鏈嶅姟鍣ㄤ紶鏉ョ殑鏁版嵁锛屽仛鐩稿簲澶勭悊
 			socket.onClose(() => {
 				console.log('close');

--
Gitblit v1.9.1