From 9ae3baca4c8730fcc5f7c8daf3b6368cec554ae6 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 25 十二月 2024 18:39:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/statistics/platformRecord.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/admin/src/views/statistics/platformRecord.vue b/admin/src/views/statistics/platformRecord.vue
index f9f3291..729cf99 100644
--- a/admin/src/views/statistics/platformRecord.vue
+++ b/admin/src/views/statistics/platformRecord.vue
@@ -9,8 +9,7 @@
<el-table-column prop="param1" label="浣滀笟寮�濮�" min-width="100" show-overflow-tooltip />
<el-table-column prop="param2" label="浣滀笟缁撴潫" min-width="100" show-overflow-tooltip />
<el-table-column prop="workTime" label="浣滀笟鏃堕暱" min-width="100" show-overflow-tooltip />
- <el-table-column prop="name"
- label="杩愯緭鍗曞彿/鍚堝悓鍙�" min-width="100" show-overflow-tooltip>
+ <el-table-column prop="name" label="杩愯緭鍗曞彿/鍚堝悓鍙�" min-width="100" show-overflow-tooltip>
<template v-slot="scope">
<span>{{ scope.row.billCode || scope.row.contractNum }}</span>
</template>
@@ -117,11 +116,11 @@
item.inTypeTemp = item.inType == 0 ? '鏁存墭鐩�' : '浠剁儫'
item.taskOrigin = 'WMS鑾峰彇'
// item.workTime = dayjs.duration(item.param3, 'seconds').format('H鏃秏鍒唖绉�')
- if(item.param3 > 3600){
+ if (item.param3 > 3600) {
item.workTime = Math.ceil(item.param3 / 3600) + '鏃�' + Math.ceil(Math.ceil(item.param3 % 3600) / 60) + '鍒�' + item.param3 % 60 + '绉�'
- }else if(item.param3 > 60){
+ } else if (item.param3 > 60) {
item.workTime = Math.ceil(item.param3 / 60) + '鍒�' + item.param3 % 60 + '绉�'
- }else{
+ } else {
item.workTime = item.param3 + '绉�'
}
})
@@ -138,6 +137,7 @@
},
handleSizeChange(capacity) {
this.pagination.pageSize = capacity
+ this.getList()
}
}
}
--
Gitblit v1.9.3