修改界面

3 years ago · dfc5964017
parent 2cd1b00491
commit dfc5964017
11 changed files with 105 additions and 6 deletions
--- 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%;
--- a/ruoyi-admin/src/main/resources/static/img/board/month/backgroundImg.jpg
+++ b/ruoyi-admin/src/main/resources/static/img/board/month/backgroundImg.jpg
--- a/ruoyi-admin/src/main/resources/static/img/board/month/bg2.jpg
+++ b/ruoyi-admin/src/main/resources/static/img/board/month/bg2.jpg
--- a/ruoyi-admin/src/main/resources/static/img/board/month/bgFour.gif
+++ b/ruoyi-admin/src/main/resources/static/img/board/month/bgFour.gif
--- a/ruoyi-admin/src/main/resources/static/img/board/month/bgOne.gif
+++ b/ruoyi-admin/src/main/resources/static/img/board/month/bgOne.gif
--- a/ruoyi-admin/src/main/resources/static/img/board/month/bgThree.gif
+++ b/ruoyi-admin/src/main/resources/static/img/board/month/bgThree.gif
--- a/ruoyi-admin/src/main/resources/static/img/board/month/bgTwo.gif
+++ b/ruoyi-admin/src/main/resources/static/img/board/month/bgTwo.gif
--- a/ruoyi-admin/src/main/resources/static/img/board/month/day.png
+++ b/ruoyi-admin/src/main/resources/static/img/board/month/day.png
--- a/ruoyi-admin/src/main/resources/static/img/board/month/time.png
+++ b/ruoyi-admin/src/main/resources/static/img/board/month/time.png
--- 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 = `
-    <span style="position: absolute;top: 54.2%;left: 10.7%;color: #fff;font-size: 1vw;">${new Date().getFullYear()}年 合计：${val1} 台</span>
+    <span style="position: absolute;top: 60%;left: 11%;color: #fff;font-size: 1vw;">${new Date().getFullYear()}年 合计：${val1} 台</span>
    `
    $(el).html(html)
 }
--- a/ruoyi-admin/src/main/resources/templates/broad/month.html
+++ b/ruoyi-admin/src/main/resources/templates/broad/month.html
@ -29,8 +29,18 @@

 </head>
 <body style="display:flex;">
+<div class="cardOne" id="cardOne"></div>
+<div class="cardTwo" id="cardTwo"></div>
+<!--<div class="cardThree" id="cardThree"></div>-->
+<!--<div class="cardFour" id="cardFour"></div>-->
+<div class="cardFive" id="cardFive"></div>
+<div class="cardSix" id="cardSix"></div>
+<!--<div class="cardSeven" id="cardSeven"></div>-->
+<!--<div class="cardEight" id="cardEight"></div>-->
 <div id="Tips"></div>
 <div id="total"></div>
+<day class="time" id="time"></day>
+<day class="day" id="day"></day>

 <!--用户满意度-->
 <div class="satisfaction" id="satisfaction"></div>