From ba15721b62c8b2aec01a91fb7eb12a86f55423b3 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Wed, 23 Jul 2025 11:42:16 +0800
Subject: [PATCH] feat:个人工作台调整

---
 src/views/wel/components/flyratio.vue         |    6 +-
 src/views/wel/components/proportionStatic.vue |   30 ++++-----
 src/views/wel/components/flightStatistics.vue |   94 ++++++++++++++++++++++++++-----
 src/views/wel/components/taskOutcome.vue      |    4 
 4 files changed, 97 insertions(+), 37 deletions(-)

diff --git a/src/views/wel/components/flightStatistics.vue b/src/views/wel/components/flightStatistics.vue
index 3d324ac..f58ee99 100644
--- a/src/views/wel/components/flightStatistics.vue
+++ b/src/views/wel/components/flightStatistics.vue
@@ -238,20 +238,84 @@
       },
     ],
     series: [
-      {
-        name: '飞行时长',
-        type: 'bar',
-        barWidth: '8px',
-        itemStyle: {
-          color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-            { offset: 0, color: '#91C1FF' },
-            { offset: 1, color: '#2970FF' },
-          ]),
-          borderRadius: 4,
+    
+  // {//柱底圆片
+  //           name: "",
+  //           type: "pictorialBar",
+  //           symbolSize: [8, 10],//调整截面形状
+  //           symbolOffset: [0, 5],
+  //           z: 12,
+  //           itemStyle: {
+  //                   "normal": {
+  //                     color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+  //                               offset: 0,
+  //                              "color": "#91C1FF"
+  //                           },
+  //                           {
+  //                               offset: 1,
+  //                               "color": "#2970FF"
+  //                           }
+  //                       ],false)
+  //                   }
+  //               },
+  //           data: flight_time,
+  //       }, 
+        
+        //柱体
+        {
+            name: '飞行时长',
+            type: 'bar',
+             barWidth: '8px',
+            itemStyle: {
+                // shadowOffsetX: 200,
+                // shadowOffsetY: 200,
+                    "normal": {
+                        "color": {
+                            "x": 0,
+                            "y": 0,
+                            "x2": 0,
+                            "y2": 1,
+                            "type": "linear",
+                            "global": false,
+                            "colorStops": [{//第一节下面
+                                "offset": 0,
+                                "color": "#91C1FF"
+                            }, {
+                                "offset": 1,
+                                "color": "#2970FF"
+                            }]
+                        }
+                    }
+                },
+           data: flight_time,
+        }, 
+        
+        //柱顶圆片
+        {
+           name: '飞行时长',
+            type: "pictorialBar",
+            symbolSize: [8, 8],//调整截面形状
+            symbolOffset: [0, -3],
+            z: 12,
+            symbolPosition: "end",
+                "itemStyle": {
+                    "normal": {
+                         color: new echarts.graphic.LinearGradient(0,0,0,1,
+                            [{
+                                    offset: 0,
+                                    color: "#9DC9FD"
+                                },
+                                {
+                                    offset: 1,
+                                    color: "#3279FA"
+                                }
+                            ],
+                            false
+                        ),
+                    }
+                },
+            data: flight_time,
         },
-        data: flight_time,
-      },
-
       {
         name: '飞行里程',
         type: 'line',
@@ -289,7 +353,7 @@
   padding: 4px 14px 0 15px;
   background: #ffffff !important;
   margin-top: 5px;
-    height: pxToVh(400);
+    height: pxToVh(471);
 
   .fytitle {
     display: flex;
@@ -388,7 +452,7 @@
     }
 
     .lineChart {
-     height: pxToVh(233) ;
+     height: pxToVh(314) ;
       width: 100%;
 
       .lineBox {
diff --git a/src/views/wel/components/flyratio.vue b/src/views/wel/components/flyratio.vue
index 1edbfea..1488c6a 100644
--- a/src/views/wel/components/flyratio.vue
+++ b/src/views/wel/components/flyratio.vue
@@ -200,7 +200,7 @@
 .machineNest {
   width: 93%;
   margin-left: 10px;
-  height: pxToVh(355);
+  height: pxToVh(282);
     border-radius: 8px 8px 8px 8px;
   padding: 4px 14px 0 15px;
   background: #ffffff !important;
@@ -303,8 +303,8 @@
   }
   .nestCenter {
     width: 100%;
-    // height: 600px;
-    height: pxToVh(266);
+ 
+    height: pxToVh(226);
     .chart {
       width: 100%;
       height: 100%;
diff --git a/src/views/wel/components/proportionStatic.vue b/src/views/wel/components/proportionStatic.vue
index ac04e28..2c1142a 100644
--- a/src/views/wel/components/proportionStatic.vue
+++ b/src/views/wel/components/proportionStatic.vue
@@ -187,12 +187,12 @@
   border-radius: 8px 8px 8px 8px;
   padding: 4px 14px 0 15px;
   background: #ffffff !important;
-//   height: 315px;
-    height: pxToVh(355);
+
+  height: pxToVh(282);
   margin-bottom: 10px;
   .card-title {
     display: flex;
-    margin-bottom: 10px;
+    margin-bottom: 4px;
     align-items: center;
     justify-content: space-between;
     .cardtotal {
@@ -240,19 +240,12 @@
       .status-grid {
         display: grid;
         grid-template-columns: repeat(2, 1fr);
-        // row-gap: 19px;
-        // gap: 10px;
-   
-        // padding-bottom: 5px;
-
         .status-item {
           display: flex;
           text-align: center;
           justify-content: space-between;
-        //   height: 97px;
-          height: pxToVh(107);
-          //   max-width: 158px;
-          margin-bottom: 19px;
+          height: pxToVh(97);
+          margin-bottom: 10px;
           margin-right: 14px;
           width: 144px;
           background: #f6f8fe;
@@ -265,10 +258,11 @@
           }
 
           .statusCon {
+            box-sizing: border-box;
             display: flex;
             flex-direction: column;
-            // align-items: center;
-            padding: 5px 4px 9px 10px;
+          justify-content: space-between;
+            padding: 10px 4px 39px 10px;
             text-align: left;
 
             .status-label {
@@ -276,6 +270,7 @@
               font-size: 14px;
               text-align: left;
               color: #383838;
+              margin: 0;
             }
 
             .ratio {
@@ -284,15 +279,16 @@
               color: #363636;
               white-space: nowrap;
               text-align: left;
+              margin-top: 10px;
             }
 
             .status-value {
               font-family: 'Source Han Sans CN';
               font-weight: bold;
-              font-size: 30px;
+              font-size: 28px;
+              height: 28px;
               color: #363636;
-              // margin: 5px 0;
-              // font-style: italic;
+            margin-top: -6px;
               display: inline-block;
               transform: skewX(-5deg);
 
diff --git a/src/views/wel/components/taskOutcome.vue b/src/views/wel/components/taskOutcome.vue
index e8186e6..96bb8f8 100644
--- a/src/views/wel/components/taskOutcome.vue
+++ b/src/views/wel/components/taskOutcome.vue
@@ -221,7 +221,7 @@
   background: #ffffff !important;
   margin-top: 10px;
   margin-left: 10px;
-  height: pxToVh(400);
+  height: pxToVh(471);
   .card-title {
     display: flex;
     margin-bottom: 10px;
@@ -307,7 +307,7 @@
 .chart {
   width: 98%;
   // height: 265px;
-  height: pxToVh(285);
+  height: pxToVh(355);
   padding-left: 10px;
   margin-top: 27px;
 }

--
Gitblit v1.9.3