From 0c045df28935e21879b8c0b58b58311c011294c5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 09 五月 2025 16:42:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/carStatistics.vue | 60 ++++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 46 insertions(+), 14 deletions(-)
diff --git a/admin/src/views/business/carStatistics.vue b/admin/src/views/business/carStatistics.vue
index 473fc94..d179507 100644
--- a/admin/src/views/business/carStatistics.vue
+++ b/admin/src/views/business/carStatistics.vue
@@ -52,7 +52,7 @@
:clearable="false"
@change="getRataLists()"
:value-format="dateType === 'month' ? 'yyyy-MM' : 'yyyy'"
- style="margin-left: 20px; width: 130px;"
+ style="margin-left: 10px; width: 120px;"
placeholder="璇烽�夋嫨">
</el-date-picker>
</div>
@@ -77,20 +77,23 @@
:clearable="false"
@change="getReportLists()"
:value-format="radio === 'month' ? 'yyyy-MM' : 'yyyy'"
- style="margin-left: 20px; width: 130px;"
+ style="margin-left: 10px; width: 120px;"
placeholder="璇烽�夋嫨">
</el-date-picker>
</div>
<el-button type="primary" style="margin-left: 20px;" icon="el-icon-upload2" @click="daochu">瀵煎嚭</el-button>
</div>
- <div class="list_head">
- <div class="list_head_item" v-for="(item, index) in column" :key="index">{{item}}</div>
- </div>
- <div class="table_box">
- <div class="list_content" v-for="(item, index) in list" :key="index">
- <div class="list_head_item" v-for="(child, i) in item" :key="i">{{child}}</div>
+ <template v-if="column.length > 0">
+ <div class="list_head">
+ <div class="list_head_item" v-for="(item, index) in column" :key="index">{{item}}</div>
</div>
- </div>
+ <div class="table_box">
+ <div class="list_content" v-for="(item, index) in list" :key="index">
+ <div class="list_head_item" v-for="(child, i) in item" :key="i">{{child}}</div>
+ </div>
+ </div>
+ </template>
+ <div class="list_wu" v-else>鏆傛棤鏁版嵁</div>
</div>
<div class="main_table_list1">
<div class="title">
@@ -166,7 +169,11 @@
getReportLists() {
getReportList({ dateStr: this.date1, isGroupBy: this.isGroupBy, type: 0 })
.then(res => {
- if (res.length === 0) return
+ if (res.length === 0) {
+ this.column = []
+ this.list = []
+ return
+ }
this.column = res[0]
this.list = res.slice(1, res.length);
@@ -223,7 +230,10 @@
let option = {
tooltip: {
- trigger: 'item'
+ trigger: 'axis',
+ axisPointer: {
+ type: 'line'
+ }
},
legend: {
show: false,
@@ -259,6 +269,12 @@
type: 'value',
axisLine: {
show: true
+ },
+ axisLabel: {
+ formatter: function (value) {
+ // 鍥涜垗浜斿叆鍒版渶杩戠殑鏁存暟
+ return Math.round(value);
+ }
}
},
series: [
@@ -347,7 +363,7 @@
labelLine: {
normal: {
length: 30,
- length2: 100,
+ length2: 70,
}
},
label: {
@@ -499,6 +515,14 @@
color: #222222;
}
}
+ .list_wu {
+ width: 100%;
+ height: 100px;
+ line-height: 100px;
+ text-align: center;
+ font-size: 16px;
+ color: #222222;
+ }
.list_head {
width: 100%;
height: 50px;
@@ -545,7 +569,7 @@
}
.main_table_list1 {
margin-left: 10px;
- width: 520px;
+ width: 420px;
padding: 20px;
box-sizing: border-box;
flex-shrink: 0;
@@ -553,6 +577,14 @@
.title {
font-weight: 500;
font-size: 18px;
+ color: #222222;
+ }
+ .list_wu {
+ width: 100%;
+ height: 100px;
+ line-height: 100px;
+ text-align: center;
+ font-size: 16px;
color: #222222;
}
.list_head {
@@ -637,7 +669,7 @@
}
.dept_wrap {
- width: 520px;
+ width: 420px;
flex-shrink: 0;
height: 100%;
background-color: #ffffff;
--
Gitblit v1.9.3