From 2ca94de8ede18ac07ccfd8dec7b6f6a707adde9b Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Mon, 01 Sep 2025 11:20:24 +0800
Subject: [PATCH] Merge branch 'refs/heads/feature/v5.0/5.0.5' into patch_management
---
src/views/wel/components/taskOutcome.vue | 54 +++++++++++++++++++++++-------------------------------
1 files changed, 23 insertions(+), 31 deletions(-)
diff --git a/src/views/wel/components/taskOutcome.vue b/src/views/wel/components/taskOutcome.vue
index fc8fd50..773c115 100644
--- a/src/views/wel/components/taskOutcome.vue
+++ b/src/views/wel/components/taskOutcome.vue
@@ -40,9 +40,7 @@
const totalNum = ref(0)
const dateSelect = ref('CURRENT_YEAR');
const refresh = () => {
- params.value.dateEnum = 'CURRENT_YEAR';
- checked.value = 'CURRENT_YEAR';
- dateSelect.value = 'CURRENT_YEAR';
+
getBarChartData(params.value);
};
let timeClick = (item, index) => {
@@ -51,7 +49,18 @@
dateSelect.value = item;
getBarChartData(params.value);
};
+const seriesObj = {};
const echartsOption = {
+ title: {
+ text: seriesObj ? '' :'暂无数据',
+ left: 'center',
+ top: 'center',
+ textStyle: {
+ color: '#999',
+ fontSize: '1.6rem',
+ fontWeight: 'normal'
+ }
+ },
tooltip: {
trigger: 'axis',
axisPointer: {
@@ -61,7 +70,7 @@
legend: {
itemWidth: 14,
itemHeight: 8,
- data: ['照片总数', '视频总数', 'AI识别', '全景', '三维', '正射'], // 确保包含所有系列名称
+ data: ['照片总数', '视频总数', 'AI识别', '全景', '三维', '正射'],
top: '-1%',
textStyle: {
color: '#383838',
@@ -69,7 +78,7 @@
},
},
grid: {
- // top: '5%',
+ top: '9%',
left: 0,
right: 0,
bottom: 0,
@@ -130,7 +139,7 @@
{ name: '三维', value: 0, type: '3', color: '#04C598' },
{ name: '正射', value: 0, type: '4', color: '#3673E8' },
]);
-const seriesObj = {};
+
eventTypeList.value.forEach(item => {
seriesObj[item.name] = {
type: 'bar',
@@ -150,50 +159,34 @@
const getBarChartData = value => {
gettaskOutcomApi(value).then(res => {
const list = res?.data?.data || [];
- console.log('list',list);
+
- // 清空现有的eventTypeList值
eventTypeList.value.forEach(item => {
item.value = 0;
});
-
- // 创建一个类型映射以便快速查找
const typeMap = new Map();
eventTypeList.value.forEach(item => {
typeMap.set(item.type, item);
});
-
- // 处理图表数据 - 确保每个月份都有所有类型的数据
echartsOption.xAxis.data = list.map(item => item.name);
-
- // 清空系列数据
+
Object.keys(seriesObj).forEach(key => {
seriesObj[key].data = [];
- });
-
+ });
// 遍历所有月份
list.forEach(month => {
totalNum.value = month.total
-
-
- // 创建一个临时映射存储当月的数据
const monthData = new Map();
month.data.forEach(item => {
monthData.set(item.name, item.value);
- });
-
- // 为每个类型添加数据（如果有则用实际值，没有则为0）
+ });
eventTypeList.value.forEach(typeItem => {
const value = monthData.get(typeItem.type) || 0;
-
- // 添加到图表系列
if (seriesObj[typeItem.name]) {
seriesObj[typeItem.name].data.push(value);
}
});
});
-
- // 更新eventTypeList的值（取最后一个月份的数据）
if (list.length > 0) {
const lastMonth = list[list.length - 1];
const lastMonthData = new Map();
@@ -226,10 +219,10 @@
background: #ffffff !important;
margin-top: 10px;
margin-left: 10px;
- height: pxToVh(400);
+ height: pxToVh(473);
.card-title {
display: flex;
- margin-bottom: 10px;
+ // margin-bottom: 10px;
align-items: center;
justify-content: space-between;
.cardtotal {
@@ -311,9 +304,8 @@
}
.chart {
width: 98%;
- // height: 265px;
- height: pxToVh(285);
+ height: pxToVh(380);
padding-left: 10px;
- margin-top: 27px;
+ margin-top: 10px;
}
</style>
--
Gitblit v1.9.3