From 237a32aadb51f4c7f51d4734f6e62663f8acde36 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期六, 08 四月 2023 17:02:18 +0800
Subject: [PATCH] 修复多个bug
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 133 +++++++++++++++++++++++++++++++++++--------
1 files changed, 107 insertions(+), 26 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 411d631..391fe04 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
@@ -8,37 +8,57 @@
<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>
+ <view class="bottom"><text>TIP:褰撳墠鐘舵�佷负姝ｅ父鏃跺彲浠ョО閲�</text></view>
</view>
<view class="two">
<p>璁㈠崟缂栧彿锛歿{ weighList.code || '' }}</p>
<p>璁㈠崟绫诲瀷锛歿{ weighList.orderTye || '' }}</p>
- <p>璁㈠崟浣欓噺锛歿{ weighList.orderSurplus }}</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>鐓ょ鍚嶇О锛歿{ weighList.coalName }}</p>
- <p>鍗曚綅鍚嶇О锛歿{ weighList.deptName }}</p>
- <p>鐭垮満鍚嶇О锛歿{ weighList.filedName }}</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>
<view class="three">
- <!-- 澶栭攢璁㈠崟鎴愮毊鏃讹紝杩斿洖鍔犲噺鍚ㄦ寜閽疆鐏般�傜О姣涙椂鍙敤.澶栬喘璁㈠崟锛屼笉鍑虹幇杩斿洖鍔犲噺鍚ㄧ殑鎸夐挳 -->
- <u-button type="primary" text="纭畾绉伴噸" :loading="isConfirmWeighLoading" loadingText="鍔犺浇涓�" @click="confirmWeigh"></u-button>
- <u-button type="primary" text="杩斿洖鍔犲噺鍚�" :disabled="addAndSubtractCoalDisabled" v-if="weighList.orderTye == '澶栭攢'" @click="addAndSubtractCoal"></u-button>
+ <!-- 鏀剧┖ -->
+ <u-button type="primary" text="鏀剧┖" plain @click="evacuation" throttleTime="500" :disabled="isEvacuation"></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" @click="addAndSubtractCoal" class="jiajian"></u-button>
</view>
- <view class="four">濡傛偍闇�瑕佽皟鏁磋杞借揣鍝佸惃鏁帮紝璇风偣鍑昏繑鍥炲姞鍑忓惃</view>
+ <view class="four" v-if="weighList.orderTye == '澶栭攢'">濡傛偍闇�瑕佽皟鏁磋杞借揣鍝佸惃鏁帮紝璇风偣鍑昏繑鍥炲姞鍑忓惃</view>
+ <!-- 鏀剧┖寮圭獥 -->
+ <view class="evacuationModal">
+ <u-modal
+ :show="evacuationModalShow"
+ :title="evacuationTitle"
+ :content="evacuationContent"
+ :showCancelButton="true"
+ @confirm="evacuationConfirm"
+ @cancel="evacuationCancel"
+ ></u-modal>
+ </view>
</view>
</template>
@@ -47,6 +67,7 @@
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;
@@ -71,7 +92,7 @@
isConfirmWeighLoading: false, //纭畾绉伴噸鎸夐挳
realTimeWeigh: '',
weighList: {},
- webSocket: null // webSocket瀹炰緥
+ webSocket: null, // webSocket瀹炰緥
// lockReconnect: false, // 閲嶈繛閿侊紝閬垮厤澶氭閲嶈繛
// maxReconnect: 6, // 鏈�澶ч噸杩炴鏁帮紝 -1 鏍囪瘑鏃犻檺閲嶈繛
// reconnectTime: 0, // 閲嶈繛灏濊瘯娆℃暟
@@ -82,7 +103,37 @@
// 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 == '澶栭攢') {
+ 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).toFixed(2);
+ }
+ } 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 +143,7 @@
token() {
return uni.getStorageSync('token');
},
+ // 鍔犲噺鐓ゆ寜閽鐢ㄤ笌鍚�
addAndSubtractCoalDisabled() {
if (this.weighList.orderTye == '澶栭攢') {
if (this.weighList.skin == 0) {
@@ -99,6 +151,13 @@
} else if (this.weighList.skin != 0) {
return false;
}
+ }
+ },
+ isEvacuation() {
+ if (this.weighList.hair == this.weighList.skin || this.temporaryWeighObj.skin == this.temporaryWeighObj.hair) {
+ return false;
+ } else {
+ return true;
}
}
},
@@ -162,7 +221,7 @@
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('鎿嶄綔鎴愬姛锛屽嵆灏嗚繑鍥炰笂涓�椤�')
+ this.$u.toast('鎿嶄綔鎴愬姛锛屽嵆灏嗚繑鍥炰笂涓�椤�');
setTimeout(() => {
uni.navigateBack({
delta: 1
@@ -177,7 +236,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 +249,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(() => {
@@ -208,6 +271,21 @@
console.log('socket鎶ラ敊', err);
this.$u.toast('纾呮埧鎺ュ彛鏆傛椂涓嶈兘浣跨敤锛岃閲嶆柊杩涘叆璇ラ〉闈紝閲嶈瘯锛侊紒');
});
+ },
+ // 鏀剧┖
+ evacuation() {
+ this.evacuationModalShow = true;
+ },
+ // 鏀剧┖寮圭獥纭
+ evacuationConfirm() {
+ this.$reqPost('getTwoEvacuation', this.weighData, 'json').then(res => {
+ console.log(res, '绗簩娆℃斁绌�');
+ this.evacuationModalShow = false;
+ });
+ },
+ // 鏀剧┖寮圭獥鍙栨秷
+ evacuationCancel() {
+ this.evacuationModalShow = false;
}
}
};
@@ -221,7 +299,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 +328,7 @@
}
.two {
flex: 4;
- border: vww(1) solid #dddddd;
+ border: vww(2) solid #dddddd;
margin: vww(20);
border-radius: vww(10);
padding: vww(20);
@@ -270,6 +348,9 @@
&:nth-of-type(2) {
margin-left: vww(10);
}
+ &:nth-of-type(3) {
+ margin-left: vww(10);
+ }
}
}
.four {
--
Gitblit v1.9.1