~fyy/unattended-app.git

			@@ -8,16 +8,16 @@
			<view class="top_right">
			<view class="">
			称重:
			<u--text type="success" text="正常" size="34"></u--text>
			<u--text :type="realTimeWeigh == 0 ? 'error' : 'success'" :text="realTimeWeigh == 0 ? '异常' : '正常'" size="34"></u--text>
			</view>
			<view class="">
			红外:
			<u--text type="success" text="正常" size="34"></u--text>
			<u--text :type="infraredStatus ? 'error' : 'success'" :text="infraredStatus ? '异常' : '正常'" size="34"></u--text>
			</view>
			<view class="">
			<!-- <view class="">
			雷达:
			<u--text type="success" text="正常" size="34"></u--text>
			</view>
			</view> -->
			</view>
			</view>
			<view class="bottom"><text>TIP:当前状态正常可以称重</text></view>
			@@ -26,16 +26,23 @@
			<p>订单编号：{{ weighList.code \|\| '' }}</p>
			<p>订单类型：{{ weighList.orderTye \|\| '' }}</p>
			<p>订单余量：{{ weighList.orderSurplus \|\| 0 }}</p>
			<p>皮重：{{ weighList.skin \|\| 0 }}</p>
			<p>毛重：{{ weighList.hair \|\| 0 }}</p>
			<p>净重：{{ weighList.skin == 0 && weighList.hair == 0 ? weighList.clean : weighList.skin != 0 ? realTimeWeigh - weighList.skin : weighList.hair - realTimeWeigh }}</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>
			<view class="three">
			<!-- 外销订单成皮时，返回加减吨按钮置灰。称毛时可用.外购订单，不出现返回加减吨的按钮 -->
			<u-button type="primary" text="确定称重" :loading="isConfirmWeighLoading" loadingText="加载中" @click="confirmWeigh"></u-button>
			<u-button
			type="primary"
			text="确定称重"
			:disabled="realTimeWeigh == 0 \|\| infraredStatus"
			:loading="isConfirmWeighLoading"
			loadingText="加载中"
			@click="confirmWeigh"
			></u-button>
			<u-button type="primary" text="返回加减吨" :disabled="addAndSubtractCoalDisabled" v-if="weighList.orderTye == '外销'" @click="addAndSubtractCoal"></u-button>
			</view>
			<view class="four">如您需要调整装载货品吨数，请点击返回加减吨</view>
			@@ -71,7 +78,7 @@
			isConfirmWeighLoading: false, //确定称重按钮
			realTimeWeigh: '',
			weighList: {},
			webSocket: null // webSocket实例
			webSocket: null, // webSocket实例
			// lockReconnect: false, // 重连锁，避免多次重连
			// maxReconnect: 6, // 最大重连次数， -1 标识无限重连
			// reconnectTime: 0, // 重连尝试次数
			@@ -82,7 +89,33 @@
			// pongTimeoutObj: null, // 接收心跳响应的定时器
			// pingMessage: JSON.stringify({ type: 'ping' }) // 心跳请求信息
			// }
			// 临时称重对象
			temporaryWeighObj: {
			skin: 0,
			hair: 0,
			clean: 0
			},
			infraredStatus: false // 红外状态
			};
			},
			watch: {
			realTimeWeigh(newV, oldV) {
			if (this.weighList.orderTye == '外销') {
			if (this.weighList.skin == 0) {
			this.temporaryWeighObj.skin = this.realTimeWeigh;
			} else {
			this.temporaryWeighObj.hair = this.realTimeWeigh;
			this.temporaryWeighObj.clean = this.temporaryWeighObj.hair - this.weighList.skin;
			}
			} else if (this.weighList.orderTye == '外购') {
			if (this.weighList.hair == 0) {
			this.temporaryWeighObj.hair = this.realTimeWeigh;
			} else {
			this.temporaryWeighObj.skin = this.realTimeWeigh;
			this.temporaryWeighObj = this.weighList.hair - this.temporaryWeighObj.skin;
			}
			}
			}
			},
			onShow() {
			this.init();
			@@ -92,6 +125,7 @@
			token() {
			return uni.getStorageSync('token');
			},
			// 加减煤按钮禁用与否
			addAndSubtractCoalDisabled() {
			if (this.weighList.orderTye == '外销') {
			if (this.weighList.skin == 0) {
			@@ -177,7 +211,6 @@
			* 初始化 weoSocket
			*/
			initWebSocket() {
			// let wsUrl = `wss://192.168.0.120:9997/wrzs/ws/info?access_token=${this.token}`;
			let wsUrl = `${webSocketUrl}?access_token=${uni.getStorageSync('token')}`;
			socket = uni.connectSocket({
			url: wsUrl,
			@@ -191,13 +224,18 @@
			socket.onOpen(() => {
			console.log('onOpen');
			});
			// 获取服务器传来的数据，做相应处理
			socket.onMessage(res => {
			// 获取服务器传来的数据，做相应处理
			console.log('socketWeigh', res);
			let nowWeigh = JSON.parse(res.data.slice(7)).weigh;
			let nowWeighHouseCode = JSON.parse(res.data.slice(7)).eqCode;
			if (nowWeighHouseCode == this.weighHouseCode) {
			this.weighData.weigh = this.realTimeWeigh = nowWeigh;
			let nowWeighObj = JSON.parse(res.data.slice(7));
			if (nowWeighObj.eqCode == this.weighHouseCode) {
			if (nowWeighObj.eqInfraredStatus) {
			this.infraredStatus = true;
			this.weighData.weigh = this.realTimeWeigh = nowWeighObj.weigh;
			} else {
			this.infraredStatus = false;
			this.weighData.weigh = this.realTimeWeigh = nowWeighObj.weigh;
			}
			}
			});
			socket.onClose(() => {
			@@ -221,7 +259,7 @@
			flex-direction: column;
			.one {
			flex: 2;
			border: vww(1) solid #dddddd;
			border: vww(2) solid #dddddd;
			margin: vww(20) vww(20) 0 vww(20);
			border-radius: vww(15);
			.top {
			@@ -250,7 +288,7 @@
			}
			.two {
			flex: 4;
			border: vww(1) solid #dddddd;
			border: vww(2) solid #dddddd;
			margin: vww(20);
			border-radius: vww(10);
			padding: vww(20);