From ed9a83cffaeee73b71153c080cb7f5c899c81752 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Tue, 26 Jul 2022 18:46:48 +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/week.js    | 6 ++++--
 ruoyi-admin/src/main/resources/static/js/echartsCommon.js | 6 ++++++
 ruoyi-admin/src/main/resources/templates/broad/week.html  | 1 +
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/static/js/board/week.js b/ruoyi-admin/src/main/resources/static/js/board/week.js
index 86fb932..4088241 100644
--- a/ruoyi-admin/src/main/resources/static/js/board/week.js
+++ b/ruoyi-admin/src/main/resources/static/js/board/week.js
@@ -103,6 +103,8 @@ $(() => {
             yDataOne.push(val.find(val => val.name == '计划')?.qty || 0)
             yDataTwo.push(val.find(val => val.name == '产量')?.qty || 0)
         })
+
+        total(yDataTwo.reduce((val1,val2) => val1 + val2 , 0),'#total')
         multipleVerticalBarChartTwo({
             xName: data.map(val => val.code),
             yDataOne: yDataOne,
@@ -136,7 +138,7 @@ const curWeek = () => {
 
 const moduleTitle = () => {
     const html = `
-    <span style="position: absolute;top: 0.9%;left: 50%;color: #fff;font-size: 1.3vw;transform: translateX(-50%);letter-spacing: 0.3vw">周看板</span>
+    <span style="position: absolute;top: 0.9%;left: 50%;color: #fff;font-size: 1.3vw;transform: translateX(-50%);letter-spacing: 0.3vw">第${curWeek()}周 生产数据分析平台</span>
     <span style="position: absolute;top: 10%;left: 5.5%;color: #CFD2D0;font-size: 1.0vw">第${curWeek()}周 产量统计 </span>
     <span style="position: absolute;top: 10%;left: 32%;color: #CFD2D0;font-size: 1.0vw">周订单执行情况</span>
     <span style="position: absolute;top: 10%;left: 73.5%;color: #CFD2D0;font-size: 1.0vw">班组 6s 排行榜</span>
@@ -166,7 +168,7 @@ const Tips = (val1 = 0, val2 = 0, val3 = 0, el) => {
 
 const total = (val1 = 0, el) => {
     const html = `
-    <span style="position: absolute;top: 10%;left: 85.7%;color: #fff;font-size: 1vw;">合计：${val1}</span>
+    <span style="position: absolute;top: 10%;left: 17.7%;color: #fff;font-size: 1vw;">合计：${val1} 台</span>
     `
     $(el).html(html)
 }
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/static/js/echartsCommon.js b/ruoyi-admin/src/main/resources/static/js/echartsCommon.js
index d510bf9..fb27811 100644
--- a/ruoyi-admin/src/main/resources/static/js/echartsCommon.js
+++ b/ruoyi-admin/src/main/resources/static/js/echartsCommon.js
@@ -2219,6 +2219,7 @@ const multipleBrokenLineAreaDiagramTwo = (data, ids) => {
                     },
                 },
                 axisLabel: {
+                    formatter:'{value}%',
                     show: true,
                     color: '#fff',
                     interval: 0.5,
@@ -2274,6 +2275,7 @@ const multipleBrokenLineAreaDiagramTwo = (data, ids) => {
                     normal: {
                         show: true,
                         position: "top",
+                        formatter:'{c}%',
                         textStyle: {
                             color: "#a8aab0",
                             fontStyle: "normal",
@@ -2324,6 +2326,7 @@ const multipleBrokenLineAreaDiagramTwo = (data, ids) => {
                 label: {
                     //图形上的文本标签
                     normal: {
+                        formatter:'{c}%',
                         show: true,
                         position: "top",
                         textStyle: {
@@ -2376,6 +2379,7 @@ const multipleBrokenLineAreaDiagramTwo = (data, ids) => {
                 label: {
                     //图形上的文本标签
                     normal: {
+                        formatter:'{c}%',
                         show: true,
                         position: "top",
                         textStyle: {
@@ -2428,6 +2432,7 @@ const multipleBrokenLineAreaDiagramTwo = (data, ids) => {
                 label: {
                     //图形上的文本标签
                     normal: {
+                        formatter:'{c}%',
                         show: true,
                         position: "top",
                         textStyle: {
@@ -2480,6 +2485,7 @@ const multipleBrokenLineAreaDiagramTwo = (data, ids) => {
                 label: {
                     //图形上的文本标签
                     normal: {
+                        formatter:'{c}%',
                         show: true,
                         position: "top",
                         textStyle: {
diff --git a/ruoyi-admin/src/main/resources/templates/broad/week.html b/ruoyi-admin/src/main/resources/templates/broad/week.html
index d0d799c..620d8d8 100644
--- a/ruoyi-admin/src/main/resources/templates/broad/week.html
+++ b/ruoyi-admin/src/main/resources/templates/broad/week.html
@@ -47,6 +47,7 @@
 
 <!--设备功率-->
 <div class="topLeft" id="topLeft"></div>
+
 </body>
 <script src="../../static/js/board/week.js" th:src="@{/js/board/week.js}"></script>
 <script>