From 7298d5354963a88643a543b51b90192dc9fc934c Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 11 九月 2025 18:43:14 +0800
Subject: [PATCH] 最新版本541200007
---
admin/src/views/statistics/platformRecord.vue | 85 +++++++++++++++++++++++++++++++++---------
1 files changed, 67 insertions(+), 18 deletions(-)
diff --git a/admin/src/views/statistics/platformRecord.vue b/admin/src/views/statistics/platformRecord.vue
index 9d26059..3901acd 100644
--- a/admin/src/views/statistics/platformRecord.vue
+++ b/admin/src/views/statistics/platformRecord.vue
@@ -1,19 +1,36 @@
<template>
<div class="main_app">
- <QueryForm v-model="filters" :query-form-config="queryFormConfig" @handleQuery="getList(1)" @clear="clear" />
- <el-table v-loading="loading" :data="list" stripe>
+ <QueryForm v-model="filters" :query-form-config="queryFormConfig" @handleQuery="getList(1)" @clear="clear">
+ <template #selDate>
+ <div>
+ <el-date-picker v-model="filters.beginWorkDateStart" type="date" value-format="yyyy-MM-dd" class="w200"
+ @change="getList(1)" />
+ <el-date-picker v-model="filters.beginWorkDateEnd" type="date" value-format="yyyy-MM-dd" class="w200"
+ @change="getList(1)" />
+ </div>
+ </template>
+ <template #fastdate>
+ <el-radio-group v-model="filters.fastdate" size="small" @input="changeRadio">
+ <el-radio-button label="0">褰撳ぉ</el-radio-button>
+ <el-radio-button label="6">杩�7澶�</el-radio-button>
+ <el-radio-button label="29">杩�30澶�</el-radio-button>
+ </el-radio-group>
+ </template>
+ </QueryForm>
+ <el-table :height="tableHeightNew" v-loading="loading" :data="list" stripe>
<el-table-column prop="platformName" label="鏈堝彴鍚嶇О" min-width="100" show-overflow-tooltip />
<el-table-column prop="platformGroupName" label="鏈堝彴缁�" min-width="100" show-overflow-tooltip />
<el-table-column prop="carCodeFront" label="杞﹀墠鐗岀収鍙�" min-width="100" show-overflow-tooltip />
<el-table-column prop="carCodeBack" label="杞﹀悗鐗岀収鍙�" min-width="100" show-overflow-tooltip />
- <el-table-column prop="startDate" label="浣滀笟寮�濮�" min-width="100" show-overflow-tooltip />
- <el-table-column prop="doneDate" 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="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>
<template v-slot="scope">
<span>{{ scope.row.billCode || scope.row.contractNum }}</span>
</template>
</el-table-column>
+ <el-table-column prop="totalNum" label="鎬讳綔涓氶噺(涓囨敮)" min-width="100" show-overflow-tooltip />
</el-table>
<div class="mt20">
<Pagination @size-change="handleSizeChange" @current-change="getList" :pagination="pagination" />
@@ -26,9 +43,11 @@
import QueryForm from '@/components/common/QueryForm'
import dayjs from 'dayjs'
import duration from 'dayjs/plugin/duration'
+import { platformLogPage, getPlatformGroupList } from '@/api'
+import BaseComputHeight from '@/components/base/BaseComputHeight'
dayjs.extend(duration)
-import { platformJobPage, getPlatformGroupList } from '@/api'
export default {
+ extends: BaseComputHeight,
components: {
Pagination,
QueryForm
@@ -41,7 +60,11 @@
page: 1,
total: 0
},
- filters: {},
+ filters: {
+ fastdate: 0,
+ beginWorkDateStart: '',
+ beginWorkDateEnd: ''
+ },
list: [],
total: 0,
queryFormConfig: {
@@ -64,20 +87,33 @@
label: '杞︾墝鍙�'
},
{
+ type: 'slot',
filed: 'selDate',
- type: 'daterange',
label: '鏃ユ湡'
- }
+ },
+ {
+ type: 'slot',
+ filed: 'fastdate',
+ label: ''
+ },
],
online: true
}
}
},
created() {
- this.getList()
+ // this.getList()
this.getGroupList()
+ this.changeRadio('0')
},
methods: {
+ changeRadio(day) {
+ const arr = [dayjs().subtract(day, 'day').format('YYYY-MM-DD'), dayjs().format('YYYY-MM-DD')]
+ this.filters.beginWorkDateStart = arr[0]
+ this.filters.beginWorkDateEnd = arr[1]
+ this.filters.fastdate = day
+ this.getList()
+ },
handleSub() {
this.$refs.ruleForm.validate((valid) => {
if (valid) {
@@ -99,14 +135,15 @@
getList(page) {
const { pagination, filters } = this
this.loading = true
- platformJobPage({
+
+ platformLogPage({
model: {
...filters,
- queryStatus: '5,6,9,10',
- beginWorkDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null,
- beginWorkDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null,
+ queryStatus: '6,7,8',
+ // beginWorkDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null,
+ // beginWorkDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null,
},
- sorts: [{ direction: 'DESC', property: 'START_DATE' }],
+ sorts: [{ direction: 'DESC', property: 'param1' }],
capacity: pagination.pageSize,
page: page || pagination.page,
}).then(res => {
@@ -115,7 +152,14 @@
this.list.forEach(item => {
item.inTypeTemp = item.inType == 0 ? '鏁存墭鐩�' : '浠剁儫'
item.taskOrigin = 'WMS鑾峰彇'
- item.workTime = dayjs.duration(item.workTime, 'seconds').format('H鏃秏鍒唖绉�')
+ // item.workTime = dayjs.duration(item.param3, 'seconds').format('H鏃秏鍒唖绉�')
+ 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) {
+ item.workTime = Math.ceil(item.param3 / 60) + '鍒�' + item.param3 % 60 + '绉�'
+ } else {
+ item.workTime = item.param3 + '绉�'
+ }
})
this.pagination.total = res.total || 0
}, () => {
@@ -130,9 +174,14 @@
},
handleSizeChange(capacity) {
this.pagination.pageSize = capacity
+ this.getList(1)
}
}
}
</script>
-<style></style>
+<style scoped>
+::v-deep .el-table {
+ margin-bottom: 60px;
+}
+</style>
--
Gitblit v1.9.3