From d4bffaa2419bc3e3d6b1af4a6314065c67a8cbc0 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期一, 03 七月 2023 16:57:13 +0800
Subject: [PATCH] ws增加报错关闭重连功能
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 112 +++++++++++++++++++++-----------------------------------
1 files changed, 42 insertions(+), 70 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 11cfd62..4510c28 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,12 +1,11 @@
<template>
<view class="weighingDevice">
<view class="one"
- style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/weighbanner.png') no-repeat;
- background-size: cover;">
+ :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>{{ globalweigh }}</text> -->
+ <!-- <text>{{ realTimeWeigh }}</text> -->
+ <text>{{ globalweigh }}</text>
</view>
<view class="top_right">
<view class="">
@@ -71,19 +70,19 @@
<view class="main-information">
<view class="prefix">鐨噸:</view>
<view class="suffix">
- {{temporaryWeighObj.skin?temporaryWeighObj.skin:showWeigh.skin?showWeigh.skin:''}}
+ {{currentSkin}}
</view>
</view>
<view class="main-information">
<view class="prefix">姣涢噸:</view>
<view class="suffix">
- {{temporaryWeighObj.hair?temporaryWeighObj.hair:showWeigh.hair?showWeigh.hair:''}}
+ {{currentHair}}
</view>
</view>
<view class="main-information">
<view class="prefix">鍑�閲�:</view>
<view class="suffix">
- {{ temporaryWeighObj.clean?temporaryWeighObj.clean:showWeigh.clean?showWeigh.clean:'' }}
+ {{ currentClean}}
</view>
</view>
<view class="main-information">
@@ -93,41 +92,7 @@
</view>
</view>
<!-- 绉伴噸鍘嗗彶-->
- <transition name="weighHistory">
- <view class="weigh-history"
- v-if="weighHistory.length!==0">
- <view class="block-main">
- <view class="weigh-item"
- v-for='item in weighHistory'
- :key="item.id">
- <view class="weigh-time">
- <u-tag :text="item.createTime.slice(-8,-3)"
- plain></u-tag>
- </view>
- <view class="item-block">
- <view class="item">
- <view class="concrete"
- style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/skin.png') no-repeat;background-size: cover;">
- 鐨�</view>
- <view class="num">{{ item.skin }}</view>
- </view>
- <view class="item">
- <view class="concrete"
- style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/hair.png') no-repeat;background-size: cover;">
- 姣�</view>
- <view class="num">{{ item.hair }}</view>
- </view>
- <view class="item">
- <view class="concrete"
- style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/clean.png') no-repeat;background-size: cover;">
- 鍑�</view>
- <view class="num">{{ item.clean }}</view>
- </view>
- </view>
- </view>
- </view>
- </view>
- </transition>
+ <weigh-item :list="weighHistory"></weigh-item>
<view class="three">
<!-- 鏀剧┖ -->
<u-button type="primary"
@@ -154,6 +119,7 @@
@click="UnloadingAgainHandle"
:loading="UnloadingAgainLoading"
loadingText="纭"
+ :disabled="isweigh||realTimeWeigh == 0"
v-if='canUnload'></u-button>
</view>
<!-- 鏀剧┖寮圭獥 -->
@@ -170,9 +136,10 @@
<script>
let socket = null;
- import { webSocketUrl } from '@/api/request.js';
+ 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.takeCoalId = params.takeCoalId;
@@ -188,9 +155,11 @@
this.weighData.overTmWaixiao = 1
}
this.changeweighHouseCode(params.weighHouseCode);
+ this.changeWeigh(0)
},
components: {
- combinedTitle
+ combinedTitle,
+ weighItem
},
data() {
return {
@@ -246,49 +215,48 @@
outBuy: true,
// 缁х画鍗歌揣鎸夐挳
canUnload: false,
- UnloadingAgainLoading: false
+ UnloadingAgainLoading: false,
+ onlineurl,
};
},
watch: {
realTimeWeigh(newV, oldV) {
if (this.weighList.orderType == '澶栭攢' || this.weighList.orderType == '鍐呴攢' || this.weighList.orderType ==
'杞嚭') {
- if (this.showWeigh.skin == 0) {
+ if (!this.showWeigh.skin) {
this.temporaryWeighObj.skin = newV;
} else {
this.temporaryWeighObj.hair = newV;
- this.temporaryWeighObj.clean = (this.temporaryWeighObj.hair - this.showWeigh.skin).toFixed(2);
- this.isweigh = this.temporaryWeighObj.clean > this.weighList.orderSurplus || this.temporaryWeighObj
- .clean < 0;
+ this.isweigh = Number(this.currentClean) > this.weighList.orderSurplus || Number(this
+ .currentClean) < 0;
}
} else if (this.weighList.orderType == '澶栬喘' || this.weighList.orderType == '鍐呰喘' || this.weighList
.orderType == '杞叆') {
- if (this.showWeigh.hair == 0) {
+ if (!this.showWeigh.hair) {
this.temporaryWeighObj.hair = newV;
} else {
this.temporaryWeighObj.skin = newV;
- this.temporaryWeighObj.clean = (this.showWeigh.hair - this.temporaryWeighObj.skin).toFixed(2);
- this.isweigh = this.temporaryWeighObj.clean > this.weighList.orderSurplus || this.temporaryWeighObj
- .clean < 0 || this.showWeigh.skin < newV;
+ this.isweigh = Number(this.currentClean) < 0 || this.showWeigh.skin < newV && this.showWeigh
+ .skin > 0;
}
}
},
// 鐩戝惉閲嶉噺鍙樺寲
- globalweigh(newV) {
- this.weighData.weigh = this.realTimeWeigh = newV;
- console.log(this.realTimeWeigh, '鐪熷疄閲嶉噺鏀瑰彉浜�');
+ globalweigh: {
+ handler: function(newV) {
+ this.weighData.weigh = this.realTimeWeigh = newV;
+ console.log(this.realTimeWeigh, '鐪熷疄閲嶉噺鏀瑰彉浜�');
+ },
+ deep: true
}
},
onShow() {
this.init();
this.changeisLogin(true)
- this.realTimeWeigh = 0
+ // this.realTimeWeigh = 0
},
computed: {
...mapState(['globalweigh', 'globalinfraredStatus']),
- // coalContactClean() {
- // return (Number(this.weighData.coalContactHair) - Number(this.weighData.coalContactSkin)).toFixed(2);
- // },
token() {
return uni.getStorageSync('token');
},
@@ -309,23 +277,29 @@
.temporaryWeighObj.hair;
}
},
- sideline() {
- return this.weighList.orderType == '鍐呰喘' || this.weighList.orderType == '杞叆';
- },
+
showWeigh() {
return this.weighList.tmTaskCoalItems ? (this.weighList.tmTaskCoalItems[0] ? this
.weighList.tmTaskCoalItems[0] : {}) : {}
},
- nextShowWeigh() {
- return this.weighList.tmTaskCoalItems ? (this.weighList.tmTaskCoalItems[1] ? this
- .weighList.tmTaskCoalItems[1] : {}) : {}
- },
+ // 绉伴噸鍘嗗彶
weighHistory() {
return this.weighList.tmTaskCoalItems ? this.weighList.tmTaskCoalItems : []
+ },
+ currentHair() {
+ return this.temporaryWeighObj.hair ? this.temporaryWeighObj.hair : this.showWeigh.skin ? (this.showWeigh
+ .skin || '') : (this.showWeigh.hair || '')
+ },
+ currentSkin() {
+ return this.temporaryWeighObj.skin || ''
+ },
+ currentClean() {
+ if (!this.currentSkin) return ''
+ return (this.currentHair - this.currentSkin).toFixed(2)
}
},
methods: {
- ...mapMutations(['changeweighHouseCode', 'changeisLogin']),
+ ...mapMutations(['changeweighHouseCode', 'changeisLogin', 'changeWeigh']),
init() {
uni.showLoading({
title: '鍔犺浇涓�'
@@ -341,8 +315,6 @@
this.weighData.carNo = res.data.carNo;
this.weighData.tmCode = res.data.code;
this.weighData.filedId = res.data.filedId;
- this.weighData.coalContactHair = res.data.hairTwo ? res.data.hairTwo : 0;
- this.weighData.coalContactSkin = res.data.skinTwo ? res.data.skinTwo : 0;
this.outBuy = (this.weighList.orderType.indexOf('閿�') !== -1) && this.showWeigh.skin > 0;
// 缁х画鍗歌揣鍙湁澶栬喘绫诲瀷绗簩娆′細鏈�
this.canUnload = this.weighList.orderType === '澶栬喘' && this.showWeigh.hair > 0;
--
Gitblit v1.9.1