From 8aa3edd56c279100c9053576f3e90fa55459fe77 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 16 Jan 2023 16:15:55 +0800
Subject: [PATCH] 修改

---
 src/views/supervisoryConsole/data.vue |   39 +++++++++++++++++++++++----------------
 1 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/src/views/supervisoryConsole/data.vue b/src/views/supervisoryConsole/data.vue
index a33fb03..5a7aecb 100644
--- a/src/views/supervisoryConsole/data.vue
+++ b/src/views/supervisoryConsole/data.vue
@@ -332,6 +332,12 @@
           itemStyle: { color: "#29c194" },
         },
         {
+          value: that.yj,
+          legendname: "预警",
+          name: "预警",
+          itemStyle: { color: "#F34A4A" },
+        },
+        {
           value: that.gz,
           legendname: "故障",
           name: "故障",
@@ -346,12 +352,11 @@
       ];
 
       var sum = 0;
-
       m2R2Data.forEach((item) => {
         sum += item.value;
       });
 
-      sum +=that.yj;
+      // sum +=that.yj;
 
       var option = {
         title: [
@@ -374,20 +379,21 @@
         ],
         tooltip: {
           trigger: "item",
-          formatter: function (parms) {
-            var str =
-              parms.marker +
-              "" +
-              parms.data.legendname +
-              "</br>" +
-              "数量:" +
-              parms.data.value +
-              "</br>" +
-              "占比:" +
-              parms.percent +
-              "%";
-            return str;
-          },
+          // formatter: function (parms) {
+          //   var str =
+          //     parms.marker +
+          //     "" +
+          //     parms.data.legendname +
+          //     "</br>" +
+          //     "数量:" +
+          //     parms.data.value +
+          //     "</br>" +
+          //     "占比:" +
+          //     parms.percent +
+          //     "%";
+          //   return str;
+          // },
+          formatter: "{b}: {c} ({d}%)",
         },
         series: [
           {
@@ -706,6 +712,7 @@
       }
       .pie-total-container {
         display: flex;
+        border: 1px solid transparent;
         padding: 20px 0;
       }
       .info-active {

--
Gitblit v1.9.3