From 14101bd42ce17dfb9d951d0738abe9d303fb3fe5 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期一, 11 十二月 2023 10:41:39 +0800
Subject: [PATCH] 机器开机率、人员技能比饼图优化

---
 src/views/cockpitPage/components/PerSonnelProductivity.vue |   54 ++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 38 insertions(+), 16 deletions(-)

diff --git a/src/views/cockpitPage/components/PerSonnelProductivity.vue b/src/views/cockpitPage/components/PerSonnelProductivity.vue
index f9ef786..407ad78 100644
--- a/src/views/cockpitPage/components/PerSonnelProductivity.vue
+++ b/src/views/cockpitPage/components/PerSonnelProductivity.vue
@@ -62,6 +62,7 @@
       myChart = echarts.init(chartDom);
       let option;
       let lineColor = "#35ddc74d";
+      let spirit = "/cockpitPage/order-bg.png";
       if (data) {
         option = {
           color: ["#00FFFF", "#dcb018"],
@@ -69,6 +70,14 @@
             trigger: "axis",
             axisPointer: {
               type: "none",
+            },
+            textStyle: {
+              color: "#00FFFF",
+            },
+            borderColor: "#00FFFF",
+            backgroundColor: "#238d8d6b",
+            valueFormatter: function (value) {
+              return value + "%";
             },
           },
           grid: {
@@ -115,7 +124,7 @@
                 fontSize: 12,
                 textStyle: {
                   color: function (params, index) {
-                    let colorList = ["#dcb018", "#00FFFF"];
+                    let colorList = ["#fec718", "#00FFFF"];
                     if (index % 2 == 0) {
                       return colorList[0];
                     } else {
@@ -136,7 +145,7 @@
           xAxis: [
             {
               type: "value",
-              name: "鍗曚綅锛氫欢",
+              // name: "鍗曚綅锛氫欢",
               // min: data.yAxis[0].min?data.yAxis.min:0,
               minInterval: 1, //鍧愭爣杞存槸鏁存暟
               max: Math.ceil(eval(`Math.max(${data.datay})`) / 5) * 5, //鏁版嵁鏈�澶у�煎姞3
@@ -174,9 +183,14 @@
           ],
           series: [
             {
-              type: "bar",
+              type: "pictorialBar",
               name: "",
-              barWidth: "15",
+              symbol: spirit,
+              symbolRepeat: true,
+              symbolMargin: "25%",
+              symbolClip: true,
+              symbolSize: [4, 11],
+              barCategoryGap: "40%",
               label: {
                 show: true,
                 position: "right",
@@ -192,7 +206,7 @@
                     color: "#00FFFF",
                   },
                   b: {
-                    color: "#dcb018",
+                    color: "#fccd1d",
                   },
                 },
               },
@@ -201,7 +215,7 @@
                   //鏌卞舰鍥惧渾瑙掞紝鍒濆鍖栨晥鏋�
                   barBorderRadius: [4, 4, 0, 0],
                   color: function (params) {
-                    let colorList = ["#dcb018", "#00FFFF"];
+                    let colorList = ["#fccd1d", "#00FFFF"];
                     if (params.dataIndex % 2 == 0) {
                       return colorList[0];
                     } else {
@@ -236,7 +250,6 @@
     },
     getChartRight(chartName, data) {
       let chartDom = this.$refs[chartName];
-      // let myRightChart = echarts.init(chartDom);
       if (
         myRightChart != null &&
         myRightChart != "" &&
@@ -246,22 +259,32 @@
       }
       myRightChart = echarts.init(chartDom);
       let img = "/cockpitPage/dotted-circle.png";
+      let height = myRightChart.getHeight() / 1;
+      let width = height + 5;
       let option;
       if (data) {
         option = {
           color: ["#dcb018", "#735b09", "#ebd68e", "#c7b36e"],
           tooltip: {
             trigger: "item",
+            textStyle: {
+              color: "#00FFFF",
+            },
+            borderColor: "#00FFFF",
+            backgroundColor: "#238d8d6b",
+            valueFormatter: function (value) {
+              return value + "%";
+            },
           },
           graphic: {
             elements: [
               {
                 type: "image",
-                z: 3,
+                // z: 3,
                 style: {
                   image: img,
-                  width: 240,
-                  height: 240,
+                  width: width,
+                  height: height,
                 },
                 left: "center",
                 top: "center",
@@ -271,11 +294,10 @@
           },
           series: [
             {
-              name: "Access From",
+              name: "浜哄憳鎶�鑳芥瘮",
               type: "pie",
               radius: ["52%", "62%"],
               avoidLabelOverlap: false,
-
               label: {
                 normal: {
                   position: "outer",
@@ -286,8 +308,8 @@
                   borderRadius: 4,
                   formatter: function (params) {
                     let label =
-                      params.name.length > 5
-                        ? `${params.name.slice(0, 4)}...`
+                      params.name.length > 4
+                        ? `${params.name.slice(0, 3)}...`
                         : params.name;
                     return `{a|${label}} {b|${params.value + "%"}}`;
                   },
@@ -350,7 +372,7 @@
 
     .chart-left {
       width: calc(60% - 20px);
-      height: 100%;
+      height: calc(100% - 20px);
       margin-right: 20px;
       float: left;
       border: 1px solid #00ffff;
@@ -360,7 +382,7 @@
     .chart-right {
       width: 40%;
       float: left;
-      height: 100%;
+      height: calc(100% - 20px);
       position: relative;
       .chart-bg {
         width: 100%;

--
Gitblit v1.8.0