From bdad06349901c13f8ce2c9381a3ace2b7f80c652 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 11 三月 2025 14:33:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/statistics/platformStatic.vue | 69 +++++++++++++++++++++-------------
1 files changed, 42 insertions(+), 27 deletions(-)
diff --git a/admin/src/views/statistics/platformStatic.vue b/admin/src/views/statistics/platformStatic.vue
index 8d495d2..0125d09 100644
--- a/admin/src/views/statistics/platformStatic.vue
+++ b/admin/src/views/statistics/platformStatic.vue
@@ -1,6 +1,14 @@
<template>
<div class="main_app" style="overflow: auto;height: calc(100% - 100px);">
<QueryForm v-model="filters" :query-form-config="queryFormConfig" @handleQuery="getList(1)" @clear="clear">
+ <template #selDate>
+ <div>
+ <el-date-picker v-model="filters.queryDateStart" type="date" value-format="yyyy-MM-dd" class="w200" :clearable="false"
+ @change="getList(1)" />
+ <el-date-picker v-model="filters.queryDateEnd" type="date" value-format="yyyy-MM-dd" class="w200" :clearable="false"
+ @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>
@@ -19,8 +27,9 @@
<div v-if="this.list" style="width: 100%;display: flex;height: 50px;padding-top: 20px;font-size: 18px;color: red">
<div style="flex: 1;min-width: 100px"></div>
<div style="flex: 1;min-width: 100px;">鍚堣锛�</div>
- <div style="flex: 1;min-width: 100px;"> <span style="font-weight: bold; ">{{totalStopCount}}</span>娆� </div>
- <div style="flex: 2;min-width: 100px;"> <span style="font-weight: bold;">{{totalWorkTime.toFixed(2)}}</span>鏃�</div>
+ <div style="flex: 1;min-width: 100px;"> <span style="font-weight: bold; ">{{ totalStopCount }}</span>娆� </div>
+ <div style="flex: 2;min-width: 100px;"> <span style="font-weight: bold;">{{ totalWorkTime.toFixed(2) }}</span>鏃�
+ </div>
</div>
<!-- <pagination @size-change="handleSizeChange" @current-change="getList" :pagination="pagination" /> -->
</div>
@@ -46,10 +55,11 @@
},
filters: {
fastdate: 0,
- selDate: []
+ queryDateStart: '',
+ queryDateEnd: ''
},
- totalStopCount:0,
- totalWorkTime:0,
+ totalStopCount: 0,
+ totalWorkTime: 0,
list: [],
total: 0,
queryFormConfig: {
@@ -68,15 +78,14 @@
},
{
type: 'slot',
+ filed: 'selDate',
+ label: '鏃ユ湡'
+ },
+ {
+ type: 'slot',
filed: 'fastdate',
label: ''
},
- {
- filed: 'selDate',
- type: 'daterange',
- clearable: false,
- label: '鏃ユ湡'
- }
],
online: true
}
@@ -88,32 +97,34 @@
},
methods: {
getSummaries(param) {
- const { columns, data } = param;
- const sums = [];
+ const { columns, data } = param
+ const sums = []
columns.forEach((column, index) => {
if (index === 0) {
- sums[index] = '鍚堣';
+ sums[index] = '鍚堣'
} else {
- const values = data.map(item => parseInt(item[column.property]));
+ const values = data.map(item => parseInt(item[column.property]))
if (!values.every(value => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {
- const value = parseInt(curr);
+ const value = parseInt(curr)
if (!isNaN(value)) {
- return prev + curr;
+ return prev + curr
} else {
- return prev;
+ return prev
}
- }, 0);
+ }, 0)
} else {
- sums[index] = '0';
+ sums[index] = '0'
}
}
- });
- return sums;
+ })
+ return sums
},
changeRadio(day) {
const arr = [dayjs().subtract(day, 'day').format('YYYY-MM-DD'), dayjs().format('YYYY-MM-DD')]
- this.$set(this.filters, 'selDate', arr)
+ this.filters.queryDateStart = arr[0]
+ this.filters.queryDateEnd = arr[1]
+ this.filters.fastdate = day
this.getList()
},
handleSub() {
@@ -138,11 +149,15 @@
this.totalStopCount = 0
this.totalWorkTime = 0
const { pagination, filters } = this
+ if (filters.queryDateStart > filters.queryDateEnd) {
+ this.filters.queryDateStart = this.filters.queryDateEnd
+ return this.$message.error('寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂�')
+ }
this.loading = true
platformWorkReportPage({
...filters,
- queryDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null,
- queryDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null,
+ // queryDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null,
+ // queryDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null,
}).then(res => {
this.loading = false
this.list = res || []
@@ -162,8 +177,8 @@
selDate: [],
fastdate: ''
}
- this.getList()
- // this.changeRadio('0')
+ // this.getList()
+ this.changeRadio('0')
},
handleSizeChange(capacity) {
this.pagination.pageSize = capacity
--
Gitblit v1.9.3