From 34fe52caba63e6a6337cb9c3e6bd0d4707fd6a99 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 06 三月 2026 10:17:05 +0800
Subject: [PATCH] 解决冲突
---
admin/src/views/business/carStatistics.vue | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/admin/src/views/business/carStatistics.vue b/admin/src/views/business/carStatistics.vue
index 701b34b..99bab1c 100644
--- a/admin/src/views/business/carStatistics.vue
+++ b/admin/src/views/business/carStatistics.vue
@@ -87,7 +87,7 @@
<el-table
style="width: 100%; margin-top: 15px;"
:data="list"
- header-row-style="background-color: #F7F7F7;"
+ :header-row-style="{ backgroundColor: '#F7F7F7' }"
border
>
<el-table-column :prop="item" :label="item" align="center" :fixed="index === 0 ? true : index === column.length - 1 ? 'right' : false" v-for="(item, index) in column" :key="index"></el-table-column>
@@ -102,7 +102,7 @@
<el-table
style="width: 100%; margin-top: 15px;"
:data="info.yearSortList"
- header-row-style="background-color: #F7F7F7;"
+ :header-row-style="{ backgroundColor: '#F7F7F7' }"
border
>
<el-table-column prop="name" label="杞﹁締鍒嗙被" align="center"></el-table-column>
@@ -168,6 +168,11 @@
getReportLists() {
getReportList({ dateStr: this.date1, isGroupBy: this.isGroupBy, type: 0 })
.then(res => {
+ if (res.length === 0) {
+ this.column = []
+ this.list = []
+ return
+ }
if (!res || res.length === 0) {
this.column = []
@@ -194,8 +199,8 @@
// }, {});
// });
- console.log(this.column)
- console.log(this.list)
+ // console.log(this.column)
+ // console.log(this.list)
// if (res.length === 0) {
// this.column = []
@@ -526,7 +531,7 @@
.main_table {
display: flex;
- align-items: start;
+ align-items: flex-start;
justify-content: space-between;
margin-top: 10px;
.main_table_list {
--
Gitblit v1.9.3