From a60928ce8f08b4cb15b8baebe04d173a06f5564c Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Mon, 21 Jul 2025 13:55:02 +0800
Subject: [PATCH] Merge branch 'refs/heads/master' into dev
---
src/views/wel/components/flightStatistics.vue | 81 +++++++++++++++++++---------------------
1 files changed, 38 insertions(+), 43 deletions(-)
diff --git a/src/views/wel/components/flightStatistics.vue b/src/views/wel/components/flightStatistics.vue
index 16768fd..c6fe262 100644
--- a/src/views/wel/components/flightStatistics.vue
+++ b/src/views/wel/components/flightStatistics.vue
@@ -67,21 +67,16 @@
const unitMap = {
飞行时长: '小时',
飞行里程: '公里',
- // 任务成果: '个',
+
};
const flyTypeList = ref([
{ name: '飞行时长', value: 0, img: flyImg1, key: 'hour_count' },
{ name: '飞行里程', value: 0, img: flyImg2, key: 'flight_mileage' },
- // { name: '任务成果', value: 0, img: flyImg3 },
+
]);
// 飞行统计
const getFlyList = () => {
- // getFly(params.value).then(res => {
- // flyTypeList.value = flyTypeList.value.map(item => ({
- // ...item,
- // value: res.data.data[keyMapping[item.name]] || 0,
- // }));
- // });
+
tongjiNestApi(flyparams.value).then(res => {
flyTypeList.value = flyTypeList.value.map(item => ({
@@ -94,18 +89,19 @@
const getFlyTimeList = () => {
getFlyTime(params.value).then(res => {
const resList = res?.data?.data || [];
+ console.log('飞行',resList);
+
lineCharts(resList);
});
};
const refresh = () => {
- params.value.date_enum = 'CURRENT_YEAR';
- checked.value = 'CURRENT_YEAR';
- dateSelect.value = 'CURRENT_YEAR';
+
getFlyList();
getFlyTimeList();
+
+
};
let timeClick = (item, index) => {
-
checked.value = item;
params.value.date_enum = item;
dateSelect.value = item;
@@ -187,41 +183,40 @@
},
yAxis: [
{
- type: 'log',
- name: '单位:小时',
+ type: 'value',
+ name: '单位:小时',
+ nameTextStyle: {
+ color: '#383838',
+ fontSize: '1.2rem',
+ },
+ axisLine: {
+ show: false,
+ lineStyle: {
+ color: '#cdd5e2',
+ },
+ },
+ splitLine: {
+ show: true,
+ lineStyle: {
+ type: 'dashed',
+ color: '#cdd5e2',
+ width: 1,
+ opacity: 0.5,
+ },
+ },
+ axisLabel: {
+ color: '#666666',
+ }
+ },
+ {
+ type: 'value',
+ name: '单位:公里',
nameTextStyle: {
color: '#383838',
fontSize: '1.2rem',
},
- min: 1,
- logBase: 3,
- axisLine: {
- show: false,
- lineStyle: {
- color: '#cdd5e2',
- },
- },
- splitLine: {
- show: true,
- lineStyle: {
- type: 'dashed',
- color: '#cdd5e2',
- width: 1,
- opacity: 0.5,
- },
- },
- axisLabel: {
- color: '#666666', // 直接配置颜色
- },
- },
- {
- type: 'log',
- name: '单位:公里',
- nameTextStyle: {
- color: '#383838',
- },
- min: 1,
- logBase: 3,
+
+
axisLine: {
show: false,
lineStyle: {
--
Gitblit v1.9.3