diff --git a/ruoyi-admin/src/main/resources/static/css/board/month.css b/ruoyi-admin/src/main/resources/static/css/board/month.css
index 1963309..29ba8b8 100644
--- a/ruoyi-admin/src/main/resources/static/css/board/month.css
+++ b/ruoyi-admin/src/main/resources/static/css/board/month.css
@@ -9,7 +9,96 @@ body {
color: rgba(255, 255, 255, .95);
font: normal 100% Arial, sans-serif;
}
-
+.cardOne{
+ background: url(../../img/board/month/bgTwo.gif);
+ background-size: 100% 100%;
+ position: absolute;
+ top: 14%;
+ left: 1.4%;
+ width: 23.7%;
+ height: 40.5%;
+}
+.cardTwo{
+ background: url(../../img/board/month/bgTwo.gif);
+ background-size: 100% 100%;
+ position: absolute;
+ top: 14%;
+ left: 26%;
+ width: 23.6%;
+ height: 40.5%;
+}
+.cardThree{
+ background: url(../../img/board/month/bgFour.gif);
+ background-size: 100% 100%;
+ position: absolute;
+ top:1%;
+ left:1%;
+ width:1%;
+ height:1%;
+}
+.cardFour{
+ background: url(../../img/board/month/bgFour.gif);
+ background-size: 100% 100%;
+ position: absolute;
+ top:1%;
+ left:1%;
+ width:1%;
+ height:1%;
+}
+.cardFive{
+ background: url(../../img/board/month/bgTwo.gif);
+ background-size: 100% 100%;
+ position: absolute;
+ top: 56.8%;
+ left: 1.4%;
+ width: 23.7%;
+ height: 40.5%;
+}
+.cardSix{
+ background: url(../../img/board/month/bgTwo.gif);
+ background-size: 100% 100%;
+ position: absolute;
+ top: 56.8%;
+ left: 26%;
+ width: 23.7%;
+ height: 40.4%;
+}
+.cardSeven{
+ background: url(../../img/board/month/bgFour.gif);
+ background-size: 100% 100%;
+ position: absolute;
+ top:1%;
+ left:1%;
+ width:1%;
+ height:1%;
+}
+.cardEight{
+ background: url(../../img/board/month/bgFour.gif);
+ background-size: 100% 100%;
+ position: absolute;
+ top:1%;
+ left:1%;
+ width:1%;
+ height:1%;
+}
+.day{
+ background: url(../../img/board/month/time.png);
+ background-size: 100% 100%;
+ position: absolute;
+ top: 1.4%;
+ left: 80.5%;
+ width: 8%;
+ height: 4%;
+}
+.time{
+ background: url(../../img/board/month/day.png);
+ background-size: 100% 100%;
+ position: absolute;
+ top: 1.4%;
+ left: 89%;
+ width: 8%;
+ height: 4%;
+}
.satisfaction{
position: absolute;
width: 23%;
diff --git a/ruoyi-admin/src/main/resources/static/img/board/month/backgroundImg.jpg b/ruoyi-admin/src/main/resources/static/img/board/month/backgroundImg.jpg
index 47b6361..2a69419 100644
Binary files a/ruoyi-admin/src/main/resources/static/img/board/month/backgroundImg.jpg and b/ruoyi-admin/src/main/resources/static/img/board/month/backgroundImg.jpg differ
diff --git a/ruoyi-admin/src/main/resources/static/img/board/month/bg2.jpg b/ruoyi-admin/src/main/resources/static/img/board/month/bg2.jpg
new file mode 100644
index 0000000..47b6361
Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/img/board/month/bg2.jpg differ
diff --git a/ruoyi-admin/src/main/resources/static/img/board/month/bgFour.gif b/ruoyi-admin/src/main/resources/static/img/board/month/bgFour.gif
new file mode 100644
index 0000000..ade870d
Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/img/board/month/bgFour.gif differ
diff --git a/ruoyi-admin/src/main/resources/static/img/board/month/bgOne.gif b/ruoyi-admin/src/main/resources/static/img/board/month/bgOne.gif
new file mode 100644
index 0000000..1bda966
Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/img/board/month/bgOne.gif differ
diff --git a/ruoyi-admin/src/main/resources/static/img/board/month/bgThree.gif b/ruoyi-admin/src/main/resources/static/img/board/month/bgThree.gif
new file mode 100644
index 0000000..094336d
Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/img/board/month/bgThree.gif differ
diff --git a/ruoyi-admin/src/main/resources/static/img/board/month/bgTwo.gif b/ruoyi-admin/src/main/resources/static/img/board/month/bgTwo.gif
new file mode 100644
index 0000000..c5b9f33
Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/img/board/month/bgTwo.gif differ
diff --git a/ruoyi-admin/src/main/resources/static/img/board/month/day.png b/ruoyi-admin/src/main/resources/static/img/board/month/day.png
new file mode 100644
index 0000000..8b67ed0
Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/img/board/month/day.png differ
diff --git a/ruoyi-admin/src/main/resources/static/img/board/month/time.png b/ruoyi-admin/src/main/resources/static/img/board/month/time.png
new file mode 100644
index 0000000..c5a877c
Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/img/board/month/time.png differ
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 02134a3..4ed3f3d 100644
--- a/ruoyi-admin/src/main/resources/static/js/board/month.js
+++ b/ruoyi-admin/src/main/resources/static/js/board/month.js
@@ -111,10 +111,10 @@ $(() => {
}
lineChart({
xName: month.splice(0, value.length),
- yData: value,
- yDataName: "单台能耗(元/台)",
- yDataTwo: target,
- yDataTwoName: "目标"
+ yData: target,
+ yDataName: "目标",
+ yDataTwo: value,
+ yDataTwoName: "单台能耗(元/台)",
}, document.getElementById("energyConsumption"), '')
})
@@ -158,7 +158,7 @@ const moduleTitle = () => {
const total = (val1 = 0, el) => {
const html = `
- ${new Date().getFullYear()}年 合计：${val1} 台
+ ${new Date().getFullYear()}年 合计：${val1} 台
`
$(el).html(html)
}
diff --git a/ruoyi-admin/src/main/resources/templates/broad/month.html b/ruoyi-admin/src/main/resources/templates/broad/month.html
index 3cae805..3e43e2c 100644
--- a/ruoyi-admin/src/main/resources/templates/broad/month.html
+++ b/ruoyi-admin/src/main/resources/templates/broad/month.html
@@ -29,8 +29,18 @@
+
+
+
+
+
+
+
+
+
+