From eb49564ab17c6695d8928d5a63a57c58b3cfd79c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 11 十二月 2024 18:21:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pda/pages/index/center.vue | 45 +++++++++++++++++++++++----------------------
1 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/pda/pages/index/center.vue b/pda/pages/index/center.vue
index 54774e0..0bd09a4 100644
--- a/pda/pages/index/center.vue
+++ b/pda/pages/index/center.vue
@@ -48,7 +48,7 @@
</view>
<view class="line">
<text class="label">鎬昏繍杈撻噺</text>
- <text class="value">{{ item.totalNum }}涓囨敮</text>
+ <text class="value">{{ item.totalNum || item.ioQty}}涓囨敮</text>
</view>
<view class="line" v-if="item.carrierName">
<text class="label">杩愯緭鍏徃</text>
@@ -113,7 +113,7 @@
</view>
<view class="line">
<text class="label">鎬昏繍杈撻噺</text>
- <text class="value">{{ item.totalNum }}涓囨敮</text>
+ <text class="value">{{ item.totalNum || item.ioQty }}涓囨敮</text>
</view>
<view class="line" v-if="item.carrierName">
<text class="label">杩愯緭鍏徃</text>
@@ -184,7 +184,7 @@
<view class="transform_list">
<view class="line" @click="transformPlatClick(item)" v-for="item in TransferList"
:key="item.id">
- <view class="name">{{ item.name }}</view>
+ <view class="name">{{ item.name || item.platformName}}</view>
<view class="status" :class="{ green: item.workStatus == 1 }">({{ item.workStatus == 0 ? "绌洪棽" : "浣滀笟涓�" }})
</view>
<image v-if="transformPlatId == item.id" src="@/static/ic_select@2x.png" class="checked" />
@@ -259,12 +259,15 @@
},
methods: {
getTransferList() {
- getPlatformWorkData({
- platformId: this.activePlatform.id
+ getPlatformGroupList({
+ queryData: 1,
+ queryType: 1
}).then(res => {
- console.log('res.data', res.data);
- if(res.data && res.data.platformJobList){
- this.TransferList = res.data.platformJobList
+ const platformGroupList = res.data || []
+ if (platformGroupList.length > 0) {
+ const { activePlatformGroup } = this
+ const temp = platformGroupList.find(i => i.id === activePlatformGroup.id)
+ this.TransferList = temp.platformList || []
}
})
},
@@ -281,24 +284,21 @@
this.getPlatformTask()
this.timer = setInterval(() => {
this.getPlatformTask()
- }, 60 * 1000)
+ }, 120 * 1000)
}
}
})
},
- getPlatformTask() {
- uni.showLoading({title:"鍔犺浇涓�..."})
+ getPlatformTask() {
getPlatformWorkData({
platformId: this.activePlatform.id
- }).then(res => {
- uni.hideLoading()
+ }).then(res => {
this.platformTaskInfo = res.data
this.circulInitTaskList()
setInterval(() => {
this.circulInitTaskList()
}, 1000)
}, () => {
- uni.hideLoading()
})
},
circulInitTaskList() {
@@ -525,19 +525,20 @@
flex-wrap: wrap;
.item {
- width: 210rpx;
- height: 80rpx;
- display: flex;
- justify-content: center;
- align-items: center;
+ width: 220rpx;
+ height: 80rpx;
+ line-height: 80rpx;
+ text-align: center;
background: #ffffff;
border-radius: 8rpx;
border: 1rpx solid #999999;
font-size: 30rpx;
color: #222222;
- margin-bottom: 20rpx;
- margin-right: 30rpx;
-
+ margin-bottom: 15rpx;
+ margin-right: 15rpx;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
&:nth-of-type(3n) {
margin-right: 0;
}
--
Gitblit v1.9.3