From 744ee613000495a4115fb3136623d0de1920ad1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Fri, 29 Jul 2022 17:48:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-admin/src/main/resources/static/js/board/month.js   | 8 ++++----
 ruoyi-admin/src/main/resources/static/js/echartsCommon.js | 3 +--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/static/js/board/month.js b/ruoyi-admin/src/main/resources/static/js/board/month.js
index ec1a456..8a595f6 100644
--- a/ruoyi-admin/src/main/resources/static/js/board/month.js
+++ b/ruoyi-admin/src/main/resources/static/js/board/month.js
@@ -19,10 +19,10 @@ $(() => {
     autoUpdate(url + "/selectMonthNumberQaS", INTERVAL, data => {
         multipleVerticalBarChartTwo({
             xName: data.map(val => `${val.monthName}月`),
-            yDataOne: data.map(val => val.bhNumber),
-            yDataOneName: '闭环数',
-            yDataTwo: data.map(val => val.qaNumber),
-            yDataTwoName: "隐患数",
+            yDataOne:  data.map(val => val.qaNumber),
+            yDataOneName: "隐患数",
+            yDataTwo: data.map(val => val.bhNumber),
+            yDataTwoName: '闭环数',
         }, document.getElementById("safe"), '','',4)
     })
     autoUpdate(url + "/selectMonthQANumber", INTERVAL, data => {
diff --git a/ruoyi-admin/src/main/resources/static/js/echartsCommon.js b/ruoyi-admin/src/main/resources/static/js/echartsCommon.js
index 431867e..6e9bccb 100644
--- a/ruoyi-admin/src/main/resources/static/js/echartsCommon.js
+++ b/ruoyi-admin/src/main/resources/static/js/echartsCommon.js
@@ -1522,13 +1522,12 @@ const pieChartTwo = function (data, id, unit = '次') {
             {
                 name: "访问来源",
                 type: "pie",
-                radius: "50%",
+                radius: "70%",
                 center: ["50%", "50%"],
                 colorBy: 'data',
                 // color: ["rgb(131,249,103)", "#FBFE27", "#FE5050", "#1DB7E5"], //'#FBFE27','rgb(11,228,96)','#FE5050'
                 data: data,
                 roseType: "radius",
-                overflow:'break',
                 label: {
                     normal: {
                         formatter: `{b|{b}} \n {c|{c}${unit}}`,