From 84d3ca7935f6cd913699cc5506cdc42a94fed640 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Mon, 21 Jul 2025 09:28:05 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.196.74.78:10010/r/drone/drone-web-manage into dev

---
 src/views/wel/index.vue |  658 ++---------------------------------------------------------
 1 files changed, 24 insertions(+), 634 deletions(-)

diff --git a/src/views/wel/index.vue b/src/views/wel/index.vue
index ec47397..ae808f9 100644
--- a/src/views/wel/index.vue
+++ b/src/views/wel/index.vue
@@ -7,76 +7,20 @@
         <!-- 综合统计分析 -->
         <div class="comprehensiveCon">
           <div class="comprehensive">
-            <div class="title">
-              <div class="name">
-                <span> 综合统计分析</span>
-                <img @click="refresh" src="/src/assets/images/workbench/st1.png" alt="" />
-                <div class="time-card">
-                  <div class="card-item" :class="item === checked ? 'active' : ''" v-for="(item, index) in timeListEnum"
-                    :key="index" @click="timeClick(item, index)">
-                    {{ timeListStr[index] }}
-                  </div>
-                </div>
-              </div>
-              <div class="arrow" @click="jumpshebei">
-                <img src="/src/assets/images/workbench/st2.png" alt="" />
-              </div>
-            </div>
+           
             <div class="center">
               <div class="centerLeft">
                 <!-- 工单统计 -->
-                <div class="workOrder">
-                  <div class="card-group">
-                    <div class="main-card">
-                      <div class="card-title">
-                        <img :src="overviewImg1" alt="" />
-                        <div class="cardtotal">
-                          <p>工单统计占比</p>
-                        </div>
-                      </div>
-
-                      <div class="status-grid">
-                        <div class="status-item" v-for="(item, index) in eventTypeList" :key="index">
-                          <div class="statusCon">
-                            <div class="status-label">{{ item.name }}</div>
-                            <div class="status-value">{{ item.value }}<span>个</span></div>
-                            <div class="ratio">
-                              占比
-                              <span :style="{ color: item.color }">{{ ((item.rate * 100) / 100).toFixed(2) }}%</span>
-                            </div>
-                          </div>
-                          <img :src="item.img" alt="" />
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                  <div class="charts">
-                    <div class="chart" ref="echartsRef"></div>
-                  </div>
-                </div>
+                <proportionStatic></proportionStatic>
                 <!-- 飞行统计 -->
-                <div class="flyOrder">
-                  <div class="fytitle">
-                    <img :src="fy1" alt="" />
-                    <span>飞行统计</span>
-                  </div>
-                  <div class="flycenter">
-                    <div class="centerBox">
-                      <div class="centerItem" v-for="(itemfly, index) in flyTypeList" :key="index">
-                        <div class="flyimg"><img :src="itemfly.img" alt="" />{{ itemfly.name }}</div>
-                        <div class="flydata">
-                          <span>{{ itemfly.value }}</span>{{ unitMap[itemfly.name] }}
-                        </div>
-                      </div>
-                    </div>
-                    <div class="lineChart">
-                      <div class="lineBox" ref="chartRef"></div>
-                    </div>
-                  </div>
-                </div>
+                <flightStatistics></flightStatistics>
+              
               </div>
               <div class="centerRight">
-                <flyratio :dateSelect="dateSelect"></flyratio>
+                <!-- 机巢工单数量排名(件) -->
+                <flyratio></flyratio>
+                <!-- 任务成果 -->
+  <taskOutcome></taskOutcome>
               </div>
             </div>
           </div>
@@ -92,6 +36,9 @@
 </template>
 
 <script setup>
+import taskOutcome from './components/taskOutcome.vue'
+import flightStatistics from './components/flightStatistics.vue'
+import proportionStatic from './components/proportionStatic.vue'
 import flyratio from './components/flyratio.vue'
 import Bocklog from './components/backlog.vue'
 import CalenBox from './components/calendarBox.vue'
@@ -100,14 +47,9 @@
 import { mapGetters } from 'vuex'
 import { getJobEventByStatus, getJobEventTotal, getFly, getFlyTime } from '@/api/home/index'
 import overviewImg1 from '@/assets/images/workbench/tc1.png'
-import overviewImg2 from '@/assets/images/workbench/tc2.svg'
-import overviewImg3 from '@/assets/images/workbench/tc3.svg'
-import overviewImg4 from '@/assets/images/workbench/tc4.svg'
-import overviewImg5 from '@/assets/images/workbench/tc5.svg'
+
 import fy1 from '@/assets/images/workbench/fy1.png'
-import flyImg1 from '@/assets/images/workbench/fy2.svg'
-import flyImg2 from '@/assets/images/workbench/fy3.svg'
-import flyImg3 from '@/assets/images/workbench/fy4.svg'
+
 import statistics from './components/statistics.vue'
 import { ElMessage } from 'element-plus'
 let checked = ref('CURRENT_YEAR')
@@ -124,377 +66,31 @@
   checked.value = item
   params.value.date_enum = item
   dateSelect.value = item
-  getTypeData()
-  getFlyList()
-  getFlyTimeList()
+
+
+ 
 }
 const refresh = () => {
   params.value.date_enum = 'CURRENT_YEAR'
   checked.value = 'CURRENT_YEAR'
   dateSelect.value = 'CURRENT_YEAR'
-  getTypeData()
-  getFlyList()
-  getFlyTimeList()
+
+
 }
 // 跳转
 const jumpshebei = () => {
   ElMessage.warning('加急开发中...')
 }
 
-const eventTypeList = ref([
-  { name: '待审核', value: 0, img: overviewImg2, color: '#FF472F', status: '2', rate: 0 },
-  { name: '待处理', value: 0, img: overviewImg3, color: '#FF7411', status: '0', rate: 0 },
-  { name: '处理中', value: 0, img: overviewImg4, color: '#FFC300', status: '3', rate: 0 },
-  { name: '已完成', value: 0, img: overviewImg5, color: '#0291A1', status: '4', rate: 0 },
-])
-const keyMapping = {
-  飞行时长: 'total_flight_time',
-  飞行里程: 'total_flight_distance',
-  任务成果: 'event_num',
-}
-const unitMap = {
-  飞行时长: '时',
-  飞行里程: '千米',
-  任务成果: '个',
-}
-const flyTypeList = ref([
-  { name: '飞行时长', value: 0, img: flyImg1 },
-  { name: '飞行里程', value: 0, img: flyImg2 },
-  { name: '任务成果', value: 0, img: flyImg3 },
-])
-
 const eventTotal = ref(0)
 const data = ref([])
-//  工单统计
-const getTypeData = () => {
-  getJobEventByStatus(params.value).then(res => {
-    const resList = res?.data?.data || []
 
-    resList.forEach(item => {
-      eventTypeList.value.forEach(item1 => {
-        if (item1.name === item.name) {
-          item1.value = item.num
-          item1.rate = item.rate
-        }
-      })
-    })
-    initChart(resList)
-  })
-}
-// 飞行统计
-const getFlyList = () => {
-  getFly(params.value).then(res => {
-    flyTypeList.value = flyTypeList.value.map(item => ({
-      ...item,
-      value: res.data.data[keyMapping[item.name]] || 0,
-    }))
-  })
-}
-const getFlyTimeList = () => {
-  getFlyTime(params.value).then(res => {
-    const resList = res?.data?.data || []
-    lineCharts(resList)
-  })
-}
-// 图表
-const echartsRef = ref(null)
-let { chart } = useEchartsResize(echartsRef)
-const chartRef = ref(null)
-let { chart: lineChart } = useEchartsResize(chartRef)
-const initChart = val => {
-  const totalNum = val.reduce((sum, item) => sum + item.num, 0)
-  const data = {
-    total: {
-      title: '总计',
-      figure: totalNum.toString(), // 动态计算总数
-    },
-    data: val.map(item => ({
-      value: item.num,
-      name: item.name,
-      rate: item.rate,
-    })),
-  }
-  const containerWidth = chart.value.clientWidth
-  const isSmallScreen = containerWidth < 768 // 移动端判断
-  const echartsOption = {
-    color: ['#FF472F', '#FF7411', '#FFC300', '#0291A1'],
-    tooltip: {
-      trigger: 'item',
-      padding: 0,
-      borderWidth: 0,
-      formatter: params => {
-        return `<div style="background-color: rgba($color: #FFFFFF, $alpha: 0.95);
-          box-shadow: 0 0.4rem 0.9rem 0 rgba($color: #000000, $alpha: 0.1);
-          padding:0 1.2rem;
-          display: flex;
-          align-items: center;
-          border-radius: 0.4rem;
-          font-size: 1.2rem;" class="tooltip-area">
-          <p>${params.marker}${params.name}</p>
-          <h4 style="margin-left: 1rem;">${params.data.rate || params.percent}%</h4>
-        </div>`
-      },
-    },
-    legend: {
-      show: false,
-    },
-    title: {
-      text: data.total.title,
-      textStyle: {
-        color: 'rgba(28, 31, 35, 0.80)',
-        fontSize: '1.2rem',
-        fontWeight: 'bold',
-      },
-      subtext: data.total.figure,
-      subtextStyle: {
-        color: '#1C1F23',
-        fontSize: '2rem',
-        fontWeight: '600',
-      },
-      top: '40%',
-      left: '48%',
-      textAlign: 'center', // 文本对齐
-    },
-    series: [
-      {
-        name: '',
-        type: 'pie',
-        radius: ['43%', '63%'],
-        avoidLabelOverlap: true,
-        left: '-2%',
-        label: {
-          formatter: params => {
-            // 使用 b 样式标记包裹百分比数值
-            return `{a|${params.name}}: {b|${params.data.rate}%}`
-          },
-          fontSize: isSmallScreen ? '0.8rem' : '1.2rem',
-          position: isSmallScreen ? 'outer' : 'outer',
-          alignTo: 'labelLine',
-          overflow: 'truncate',
-          overflow: 'none', // 禁用省略号
-          bleedMargin: 30, // 防止标签被截断
-          rich: {
-            a: {
-              color: 'rgba(28, 31, 35, 0.80)',
-              fontSize: isSmallScreen ? '1rem' : '1.2rem',
-            },
-            b: {
-              color: '#1C1F23',
-              fontSize: isSmallScreen ? '1rem' : '1.3rem',
-              fontWeight: 'bold',
-            },
-          },
-        },
-        labelLine: {
-          show: true,
-          length: 3, // 调整引导线长度
-          length2: 5,
-          lineStyle: {
-            cap: 'round',
-          },
-          minTurnAngle: 45, // 防止小角度重叠
-        },
-        data: data.data,
-      },
-    ],
-  }
-
-  chart.value.setOption(echartsOption)
-}
-
-// 折线/柱状图
-const lineCharts = bardata => {
-  const categories = bardata?.map(item => item.name) // x轴类别
-  const flight_distance = []
-  const flight_time = []
-  const event_num = []
-  // /遍历数据填充各系列
-  bardata?.forEach(period => {
-    let hasDuration = false,
-      hasDistance = false,
-      hasResult = false
-
-    period.data?.forEach(item => {
-      switch (item.name) {
-        case '飞行时长':
-          flight_time.push(parseFloat(item.value) || 0)
-          hasDuration = true
-          break
-        case '飞行里程':
-          // 转换为万公 (假设原始单位是米)
-          // flight_distance.push((parseFloat(item.value) / 10 || 0));
-          flight_distance.push(parseFloat(item.value) || 0)
-          hasDistance = true
-          break
-        case '任务成果':
-          event_num.push(Number(item.value) || 0)
-          hasResult = true
-          break
-      }
-    })
-
-    // 处理可能缺失的数据项
-    if (!hasDuration) flight_time.push(0)
-    if (!hasDistance) flight_distance.push(0)
-    if (!hasResult) event_num.push(0)
-  })
-  var option = {
-    tooltip: {
-      trigger: 'item',
-      axisPointer: {
-        type: 'shadow',
-      },
-    },
-    grid: {
-      left: '2%',
-      right: '4%',
-      bottom: '14%',
-      top: '16%',
-      containLabel: true,
-    },
-    legend: {
-      data: ['飞行时长', '飞行里程', '任务成果'],
-      left: 'center',
-      top: '5%',
-      color: '#383838', // 直接配置颜色
-      itemWidth: 15,
-      itemHeight: 10,
-      itemGap: 25,
-      fontSize: '1.2rem'
-    },
-    xAxis: {
-      type: 'category',
-      data: categories,
-      axisLine: {
-        lineStyle: {
-          color: '#cdd5e2',
-        },
-      },
-      axisLabel: {
-        interval: 0,
-        color: '#383838',
-      },
-    },
-    yAxis: [
-      {
-        type: 'log',
-        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: {
-            color: '#cdd5e2',
-          },
-        },
-        splitLine: {
-          show: true,
-          lineStyle: {
-            type: 'dashed',
-            color: '#cdd5e2',
-            width: 1,
-            opacity: 0.5,
-          },
-        },
-        axisLabel: {
-          color: '#383838', // 直接配置颜色
-        },
-      },
-    ],
-    series: [
-      {
-        name: '飞行时长',
-        type: 'bar',
-        barWidth: '8px',
-        itemStyle: {
-          color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-            { offset: 0, color: '#29acff' },
-            { offset: 1, color: '#4bdfff' },
-          ]),
-          borderRadius: 6,
-        },
-        data: flight_time,
-      },
-      {
-        name: '飞行里程',
-        type: 'bar',
-        barWidth: '8px',
-        itemStyle: {
-          color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-            { offset: 0, color: '#01c871' },
-            { offset: 1, color: '#55f49c' },
-          ]),
-          borderRadius: 6,
-        },
-        data: flight_distance,
-      },
-
-      {
-        name: '任务成果',
-        type: 'line',
-        yAxisIndex: 1,
-        smooth: true,
-        // itemStyle: {
-        //   color: '#ffa43a', // 默认状态颜色
-        //   borderColor: 'rgba(255, 234, 0, 0.5)',
-        //   borderWidth: 5,
-        // },
-        // emphasis: {
-        //   // 悬停状态
-        //   itemStyle: {
-        //     color: '#ff8c00', // 悬停时颜色变深
-        //     borderWidth: 6,
-        //   },
-        // },
-        lineStyle: {
-          color: 'rgba(52, 146, 242, 1)',
-        },
-        data: event_num,
-      },
-    ],
-  }
-  lineChart.value.setOption(option)
-}
 onMounted(() => {
   getJobEventTotal().then(res => {
     eventTotal.value = res?.data?.data || 0
   })
+ 
 
-  getTypeData()
-  lineCharts()
-  getFlyList()
-  getFlyTimeList()
 })
 </script>
 
@@ -518,13 +114,13 @@
   height: 100%;
 
   .comprehensiveCon {
-    background: #ffffff !important;
+    // background: #ffffff !important;
     height: pxToVh(776);
     border-radius: 8px 8px 8px 8px;
 
     .comprehensive {
 
-      padding: 14px 14px 0 21px;
+      // padding: 14px 14px 0 21px;
 
       .title {
         display: flex;
@@ -595,220 +191,14 @@
       // 工、单
       .center {
         display: flex;
-
         .centerLeft {
-          width: 60%;
-          border-right: 1px solid #dfdfdf;
+          width: 50%;
 
-          .workOrder {
-            margin-top: 11px;
-            display: flex;
-            justify-content: space-between;
-            border-bottom: 1px solid #dfdfdf;
-
-            .card-group {
-              width: 40%;
-
-              .card-title {
-                display: flex;
-                margin-bottom: 10px;
-                align-items: center;
-
-                img {
-                  width: 36px;
-                  height: 40px;
-                }
-              }
-
-              .cardtotal {
-                display: flex;
-                align-items: center;
-                margin-left: 9px;
-
-                p {
-                  font-weight: bold;
-                  font-size: 14px;
-                  color: #363636;
-                }
-
-                span {
-                  font-weight: 400;
-                  font-size: 14px;
-                  color: #7c8091;
-                }
-
-                .total-number {
-                  font-family: 'Source Han Sans CN';
-
-                  font-weight: bold;
-                  font-size: 32px;
-                  color: #2a54ff;
-                }
-              }
-
-              .status-grid {
-                display: grid;
-                grid-template-columns: repeat(2, 1fr);
-                row-gap: 14px;
-                gap: 10px;
-                padding-bottom: 5px;
-
-                .status-item {
-                  display: flex;
-                  text-align: center;
-                  justify-content: space-between;
-                  height: 97px;
-                  // height: pxToVh(107);
-                  max-width: 158px;
-                  background: #f6f8fe;
-                  border-radius: 8px 8px 8px 8px;
-
-                  img {
-                    width: 26px;
-                    height: 26px;
-                    padding: 9px 10px 9px 2px;
-                  }
-
-                  .statusCon {
-                    display: flex;
-                    flex-direction: column;
-                    // align-items: center;
-                    padding: 5px 4px 9px 10px;
-                    text-align: left;
-
-                    .status-label {
-                      font-weight: 400;
-                      font-size: 14px;
-                      text-align: left;
-                      color: #383838;
-                    }
-
-                    .ratio {
-                      font-weight: 400;
-                      font-size: 12px;
-                      color: #363636;
-                      white-space: nowrap;
-                      text-align: left;
-                    }
-
-                    .status-value {
-                      font-family: 'Source Han Sans CN';
-                      font-weight: bold;
-                      font-size: 30px;
-                      color: #363636;
-                      // margin: 5px 0;
-                      // font-style: italic;
-                      display: inline-block;
-                      transform: skewX(-5deg);
-
-                      span {
-                        font-weight: 400;
-                        font-size: 14px;
-                        color: #7c8091;
-                      }
-                    }
-                  }
-                }
-              }
-            }
-
-            .charts {
-              margin-top: 30px;
-              width: 100%;
-              height: auto;
-
-              .chart {
-                width: 100%;
-                height: 100%;
-              }
-            }
-          }
-
-          // 飞行统计
-          .flyOrder {
-            margin-top: 5px;
-
-            .fytitle {
-              display: flex;
-              align-items: center;
-
-              img {
-                width: 39px;
-                height: 38px;
-              }
-
-              span {
-                font-weight: bold;
-                font-size: 14px;
-                color: #363636;
-              }
-            }
-
-            .flycenter {
-              margin-top: 13px;
-
-              .centerBox {
-                display: flex;
-                justify-content: space-between;
-                margin-bottom: 10px;
-
-                .centerItem {
-                  padding: 7px 7px 0 15px;
-                  // width: 196px;
-                  flex: 1;
-                  // height: 80px;
-                  height: pxToVh(80);
-                  background: #f6f8fe;
-                  box-shadow: 0px 5px 4px 0px #ebf1ff;
-                  border-radius: 8px 8px 8px 8px;
-                  border: 1px solid #ffffff;
-                  margin-right: 16px;
-
-                  img {
-                    width: 15px;
-                    height: 15px;
-                    margin-right: 5px;
-                  }
-
-                  .flyimg {
-                    display: flex;
-                    align-items: center;
-                    font-weight: 400;
-                    font-size: 14px;
-                    color: #7c8091;
-                  }
-
-                  .flydata {
-                    margin-top: 10px;
-                    text-align: right;
-                    font-size: 14px;
-                    color: #7c8091;
-
-                    span {
-                      font-weight: bold;
-                      font-size: 24px;
-                      color: #343434;
-                      margin-right: 6px;
-                    }
-                  }
-                }
-              }
-
-              .lineChart {
-                height: 209px;
-                width: 100%;
-
-                .lineBox {
-                  width: 100%;
-                  height: 100%;
-                }
-              }
-            }
-          }
+      
         }
 
         .centerRight {
-          width: 40%;
+          width: 50%;
         }
       }
     }

--
Gitblit v1.9.3