From 7eb710fb7fe4e0730da61d8931c2f32927f2c34c 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 11:21:38 +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

---
 .../src/main/resources/static/js/board/month.js      | 12 ++++++++++--
 .../src/main/resources/static/js/echartsCommon.js    |  5 ++---
 2 files changed, 12 insertions(+), 5 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 d9d6c14..e06cbac 100644
--- a/ruoyi-admin/src/main/resources/static/js/board/month.js
+++ b/ruoyi-admin/src/main/resources/static/js/board/month.js
@@ -89,20 +89,28 @@ $(() => {
     })
     autoUpdate(url + "/selectBaseQilist", 40000, data => {
         console.log(data)
-        lineChart(null, document.getElementById("quality"))
+        lineChart({
+            xName: data[0].list.map(val => val.name),
+            yData: data[0].list.map(val => val.rate),
+            yDataName: data[0].code,
+        }, document.getElementById("quality"),'%')
     })
     autoUpdate(url + "/selectDtNenglist", INTERVAL, data => {
         let month = ["1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"]
         let value = []
+        let target = []
         for (let i = 1; i <= 12; i++) {
             if(data[0][`month${i}`]){
                 value.push(data[0][`month${i}`])
+                target.push(data[0][`target`])
             }
         }
         lineChart({
             xName: month.splice(0,value.length),
             yData: value,
-            yDataName: "单台能耗(元/台)"
+            yDataName: "单台能耗(元/台)",
+            yDataTwo: target,
+            yDataTwoName: "目标"
         }, document.getElementById("energyConsumption"), '')
     })
 
diff --git a/ruoyi-admin/src/main/resources/static/js/echartsCommon.js b/ruoyi-admin/src/main/resources/static/js/echartsCommon.js
index 5890590..9661971 100644
--- a/ruoyi-admin/src/main/resources/static/js/echartsCommon.js
+++ b/ruoyi-admin/src/main/resources/static/js/echartsCommon.js
@@ -1021,7 +1021,6 @@ const lineChart = function (data, id,unit='') {
                 },
                 axisLabel: {
                     show: true,
-                    formatter:`{c}${unit}`,
                     textStyle: {
                         color: '#ffffff',
                     },
@@ -1047,7 +1046,7 @@ const lineChart = function (data, id,unit='') {
                 label: {
                     //图形上的文本标签
                     normal: {
-                        formatter: '{c}%',
+                        formatter: `{c}${unit}`,
                         show: true,
                         position: "top",
                         textStyle: {
@@ -1078,7 +1077,7 @@ const lineChart = function (data, id,unit='') {
                 label: {
                     //图形上的文本标签
                     normal: {
-                        formatter: '{c}%',
+                        formatter: `{c}${unit}`,
                         show: true,
                         position: "top",
                         textStyle: {