From 21fb37c7162d5b47a14d6438870377c85fcc0b52 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期六, 07 十月 2023 10:23:21 +0800
Subject: [PATCH] 修改装卸员页面 调整websocket逻辑
---
pages/loadUnload-page/loadUnload-detail/loadUnload-detail.vue | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/pages/loadUnload-page/loadUnload-detail/loadUnload-detail.vue b/pages/loadUnload-page/loadUnload-detail/loadUnload-detail.vue
index 8c89119..3d278b5 100644
--- a/pages/loadUnload-page/loadUnload-detail/loadUnload-detail.vue
+++ b/pages/loadUnload-page/loadUnload-detail/loadUnload-detail.vue
@@ -53,7 +53,7 @@
@click.stop="loadOrder(item.id)"
:loading="loading"
loadingText="纭"
- v-if='item.isPretendDischar===0'></u-button>
+ v-if='!item.ableDischar'></u-button>
</view>
</view>
</view>
@@ -77,7 +77,7 @@
loading: false,
id: "",
coalStatus: ['棰嗗彇', '棰勭害', '绛惧埌', '鍏ュ満', '绉扮毊', '绉版瘺', '绂诲満', '鍏ョ鎴�', '鍑虹鎴�', '鍏ョ叅浠�', '鍑虹叅浠�', '鏀剧┖', '浣滃簾', '鍏ュ満鐢宠',
- '杩涘叆鍦洪櫌', '寮傚父瀹℃牳涓�'
+ '杩涘叆鍦洪櫌', '寮傚父瀹℃牳涓�', '杩斿洖鍔犲噺鍚�', '瓒呮椂', '鎵撳嵃涓�', '鎵撳嵃涓�'
], // 鐘舵��
}
},
@@ -86,6 +86,10 @@
this.init()
},
methods: {
+ onPullDownRefresh() {
+ this.init()
+ uni.stopPullDownRefresh();
+ },
init() {
uni.showLoading({
title: "鍔犺浇涓�"
@@ -93,7 +97,14 @@
this.$reqGet('getAccordingCoalNameAll', { coalName: this.name }).then(res => {
uni.hideLoading()
if (res.code === 0) {
- this.detailData = res.data
+ const errorStatusArr = [0, 1, 2, 3, 6, 11, 12, 13];
+ this.detailData = res.data.map(v => {
+ return {
+ ...v,
+ ableDischar: v.skin === v.hair || v.hair === 0 && v.skin === 0 || v
+ .isPretendDischar !== 0 || errorStatusArr.indexOf(v.status) !== -1
+ }
+ })
} else {
this.$u.toast('鍔犺浇澶辫触')
}
@@ -110,7 +121,9 @@
this.loading = false;
if (res.code === 0) {
this.$u.toast('瑁呭嵏鎴愬姛')
- this.init()
+ setTimeout(() => {
+ this.init()
+ }, 1000)
} else {
this.$u.toast(res.msg ? res.msg : '瑁呭嵏澶辫触')
}
--
Gitblit v1.9.1