From 6ded2ee6a9d9097d45f8f79a7e6429cf55ed7cc3 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 07 三月 2025 16:59:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/statistics/platformStatic.vue | 48 +++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 43 insertions(+), 5 deletions(-)
diff --git a/admin/src/views/statistics/platformStatic.vue b/admin/src/views/statistics/platformStatic.vue
index 4af9ec1..8d495d2 100644
--- a/admin/src/views/statistics/platformStatic.vue
+++ b/admin/src/views/statistics/platformStatic.vue
@@ -1,5 +1,5 @@
<template>
- <div class="main_app">
+ <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 #fastdate>
<el-radio-group v-model="filters.fastdate" size="small" @input="changeRadio">
@@ -16,6 +16,12 @@
<el-table-column prop="workCountTime" label="宸ヤ綔鏃堕暱" min-width="100" show-overflow-tooltip />
<el-table-column prop="useRata" label="鏈堝彴浣跨敤鐜�" min-width="100" show-overflow-tooltip />
</el-table>
+ <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>
<!-- <pagination @size-change="handleSizeChange" @current-change="getList" :pagination="pagination" /> -->
</div>
</template>
@@ -42,6 +48,8 @@
fastdate: 0,
selDate: []
},
+ totalStopCount:0,
+ totalWorkTime:0,
list: [],
total: 0,
queryFormConfig: {
@@ -76,9 +84,33 @@
},
created() {
this.changeRadio('0')
- this.getList()
+ this.getGroupList()
},
methods: {
+ getSummaries(param) {
+ const { columns, data } = param;
+ const sums = [];
+ columns.forEach((column, index) => {
+ if (index === 0) {
+ sums[index] = '鍚堣';
+ } else {
+ 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);
+ if (!isNaN(value)) {
+ return prev + curr;
+ } else {
+ return prev;
+ }
+ }, 0);
+ } else {
+ sums[index] = '0';
+ }
+ }
+ });
+ 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)
@@ -103,6 +135,8 @@
})
},
getList(page) {
+ this.totalStopCount = 0
+ this.totalWorkTime = 0
const { pagination, filters } = this
this.loading = true
platformWorkReportPage({
@@ -113,6 +147,8 @@
this.loading = false
this.list = res || []
this.list.forEach(item => {
+ this.totalStopCount = this.totalStopCount + (item.stopCount || 0)
+ this.totalWorkTime = this.totalWorkTime + (item.workCountTime || 0)
item.useRata = item.useRata + '%'
item.workCountTime = item.workCountTime + '鏃�'
// item.workTime = dayjs.duration(item.workTime, 'seconds').format('H鏃秏鍒唖绉�')
@@ -123,13 +159,15 @@
},
clear() {
this.filters = {
- fastdate: 0,
- selDate: []
+ selDate: [],
+ fastdate: ''
}
- this.changeRadio('0')
+ this.getList()
+ // this.changeRadio('0')
},
handleSizeChange(capacity) {
this.pagination.pageSize = capacity
+ this.getList()
}
}
}
--
Gitblit v1.9.3