From 0b41a5c59028a61bff22f60e74cb1d6d53a40e61 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 13 五月 2025 14:01:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/largescreendisplay/statistics.vue | 37 +++++++++++++++++++------------------
1 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/UI-Project/src/views/largescreendisplay/statistics.vue b/UI-Project/src/views/largescreendisplay/statistics.vue
index 2fcea07..8dcf943 100644
--- a/UI-Project/src/views/largescreendisplay/statistics.vue
+++ b/UI-Project/src/views/largescreendisplay/statistics.vue
@@ -1,29 +1,30 @@
<template>
<div>
<div style="display: flex;width: 1770px;">
- <el-date-picker v-model="timeRange" type="datetimerange" range-separator="鑷�"
- :start-placeholder="$t('reportmanage.starttime')" style="margin-left: 15px;" value-format="YYYY-MM-DD hh:mm:ss"
- :end-placeholder="$t('reportmanage.endtime')">
+ <el-date-picker v-model="timeRange" type="daterange" range-separator="鑷�"
+ :start-placeholder="$t('reportmanage.starttime')" :end-placeholder="$t('reportmanage.endtime')"
+ value-format="YYYY-MM-DD" style="margin-left: 15px;">
</el-date-picker>
- <el-button type="primary" style="margin-left: 10px;margin-bottom: 10px;"
- @click="sethistorical()">{{ $t('reportmanage.inquire') }}</el-button>
+ <el-button type="primary" style="margin-left: 10px;margin-bottom: 10px;" @click="sethistorical()">{{
+ $t('reportmanage.inquire') }}</el-button>
</div>
<el-table ref="table" style="margin-top: 20px;height: 580px;width: 1770px;" :data="tableDatax"
:header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }">
<el-table-column prop="date" align="center" :label="$t('large.date')" min-width="70" />
- <el-table-column prop="countOutOne" align="center" :label="$t('large.countOutOne')" min-width="40" />
- <el-table-column prop="totalAreaOutOne" align="center" :label="$t('large.totalAreaOutOne')" min-width="40" />
- <el-table-column prop="countOutTwo" align="center" :label="$t('large.countOutTwo')" min-width="50" />
- <el-table-column prop="totalAreaOutTwo" align="center" :label="$t('large.totalAreaOutTwo')" min-width="50" />
- <el-table-column prop="countIn" align="center" :label="$t('large.countIn')" min-width="50" />
- <el-table-column prop="totalAreaIn" align="center" :label="$t('large.totalAreaIn')" min-width="50" />
- <el-table-column prop="countOut" align="center" :label="$t('large.countOut')" min-width="40" />
- <el-table-column prop="totalAreaOut" align="center" :label="$t('large.totalAreaOut')" min-width="40" />
- <el-table-column prop="hollowCountOutOne" align="center" :label="$t('large.hollowCountOutOne')" min-width="40" />
- <el-table-column prop="hollowTotalAreaOutOne" align="center" :label="$t('large.hollowTotalAreaOutOne')" min-width="40" />
- <el-table-column prop="hollowCountOutTwo" align="center" :label="$t('large.hollowCountOutTwo')" min-width="40" />
- <el-table-column prop="hollowTotalAreaOutTwo" align="center" :label="$t('large.hollowTotalAreaOutTwo')"
- min-width="40"/>
+ <el-table-column prop="countOutOne" align="center" :label="$t('large.countOutOne')" min-width="40" />
+ <el-table-column prop="totalAreaOutOne" align="center" :label="$t('large.totalAreaOutOne')" min-width="40" />
+ <el-table-column prop="countOutTwo" align="center" :label="$t('large.countOutTwo')" min-width="50" />
+ <el-table-column prop="totalAreaOutTwo" align="center" :label="$t('large.totalAreaOutTwo')" min-width="50" />
+ <el-table-column prop="countIn" align="center" :label="$t('large.countIn')" min-width="50" />
+ <el-table-column prop="totalAreaIn" align="center" :label="$t('large.totalAreaIn')" min-width="50" />
+ <el-table-column prop="countOut" align="center" :label="$t('large.countOut')" min-width="40" />
+ <el-table-column prop="totalAreaOut" align="center" :label="$t('large.totalAreaOut')" min-width="40" />
+ <el-table-column prop="hollowCountOutOne" align="center" :label="$t('large.hollowCountOutOne')" min-width="40" />
+ <el-table-column prop="hollowTotalAreaOutOne" align="center" :label="$t('large.hollowTotalAreaOutOne')"
+ min-width="40" />
+ <el-table-column prop="hollowCountOutTwo" align="center" :label="$t('large.hollowCountOutTwo')" min-width="40" />
+ <el-table-column prop="hollowTotalAreaOutTwo" align="center" :label="$t('large.hollowTotalAreaOutTwo')"
+ min-width="40" />
</el-table>
<div style="margin-top: 20px;margin-left: 40%;">
<el-pagination v-model:current-page="currentPage2" :page-size="pageSize" :size="large" :disabled="disabled"
--
Gitblit v1.8.0