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 d2aa9e6..da87ba0 100644 --- a/ruoyi-admin/src/main/resources/static/css/board/month.css +++ b/ruoyi-admin/src/main/resources/static/css/board/month.css @@ -14,15 +14,15 @@ body { position: absolute; width: 23%; height: 35%; - top: 15%; - left: 2.5%; + top: 17%; + left: 1.5%; } .outputStatistics{ position: absolute; width: 23%; height: 35%; - top: 60%; - left: 2.5%; + top: 18.5%; + left: 75.3%; } .quality{ position: absolute; @@ -32,56 +32,58 @@ body { left: 26.5%; } .ecosphere{ - background: url(../../img/board/month/one.png) no-repeat; - background-size: 100% 100%; - position: absolute; - width: 23%; - height: 35%; - top: 15%; - left: 75%; + /*background: url(../../img/board/month/one.png) no-repeat;*/ + /*background-size: 100% 100%;*/ + /*position: absolute;*/ + /*width: 23%;*/ + /*height: 35%;*/ + /*top: 15%;*/ + /*left: 75%;*/ } .scene{ background: url(../../img/board/month/two.jpg) no-repeat; background-size: 100% 100%; position: absolute; - width: 23%; - height: 35%; - top: 15%; - left: 50.5%; + width: 22%; + height: 34%; + top: 18%; + left: 51.5%; +} +.Highlight{ + background-repeat: no-repeat; + background-size: 100% 100%; + position: absolute; + width: 22%; + height: 34%; + top: 18.7%; + left: 26.7%; +} +.nivoSlider{ + width: 100%; + height: 100%; } .HighlightOne{ - background-repeat: no-repeat; - background-size: 100% 100%; - /*position: absolute;*/ - width:200px; - height: 200px; - /*top: 16%;*/ - /*left: 27.5%;*/ + /*width: 23vw;*/ + /*height: 35vh;*/ + width: 230px; + height: 350px; + } .HighlightTwo{ - background-repeat: no-repeat; - background-size: 100% 100%; - /*position: absolute;*/ - width:200px; - height: 200px; - /*top: 16%;*/ - /*left: 38.5%;*/ + /*width: 23vw;*/ + /*height: 35vh;*/ + width: 230px; + height: 350px; } .HighlightThree{ - background-repeat: no-repeat; - background-size: 100% 100%; - /*position: absolute;*/ - width:200px; - height: 200px; - /*top: 34.5%;*/ - /*left: 27.5%;*/ + /*width: 23vw;*/ + /*height: 35vh;*/ + width: 230px; + height: 350px; } .HighlightFour{ - background-repeat: no-repeat; - background-size: 100% 100%; - /*position: absolute;*/ - width:200px; - height: 200px; - /*top: 34.5%;*/ - /*left: 38.5%*/ + /*width: 23vw;*/ + /*height: 35vh;*/ + width: 230px; + height: 350px; } \ No newline at end of file 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 83a3cec..47b6361 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/js/board/month.js b/ruoyi-admin/src/main/resources/static/js/board/month.js index 230f314..760ec25 100644 --- a/ruoyi-admin/src/main/resources/static/js/board/month.js +++ b/ruoyi-admin/src/main/resources/static/js/board/month.js @@ -26,10 +26,14 @@ $(() => { }) autoUpdate(url + "/selectHighlightProducts", INTERVAL, data => { let url = data.map(val => val.picturePath) - $('#HighlightOne').css({backgroundImage: `url("http://10.100.70.5:9090/${url[0]}")`}) - $('#HighlightTwo').css({backgroundImage: `url("http://10.100.70.5:9090/${url[1]}")`}) - $('#HighlightThree').css({backgroundImage: `url("http://10.100.70.5:9090/${url[2]}")`}) - $('#HighlightFour').css({backgroundImage: `url("http://10.100.70.5:9090/${url[3]}")`}) + // $('#HighlightOne').css({backgroundImage: `url("http://10.100.70.5:9090/${url[0]}")`}) + // $('#HighlightTwo').css({backgroundImage: `url("http://10.100.70.5:9090/${url[1]}")`}) + // $('#HighlightThree').css({backgroundImage: `url("http://10.100.70.5:9090/${url[2]}")`}) + // $('#HighlightFour').css({backgroundImage: `url("http://10.100.70.5:9090/${url[3]}")`}) + $('#HighlightOne').attr("src" , `http://10.100.70.5:9090/${url[0]}`) + $('#HighlightTwo').attr("src" , `http://10.100.70.5:9090/${url[1]}`) + $('#HighlightThree').attr("src" , `http://10.100.70.5:9090/${url[2]}`) + $('#HighlightFour').attr("src" , `http://10.100.70.5:9090/${url[3]}`) }) lineChart(null, document.getElementById("quality")) @@ -65,15 +69,15 @@ const curWeek = () => { const moduleTitle = () => { const html = ` - 智能冷柜集成控制中心 - 用户满意度 - 产品升级 - 场景升级 - 全价值链 - 产量统计 - 品质提升 - 周质量分析 - 安全生产 + 智能冷柜集成控制中心 + 用户满意度 + 产品升级 + 场景升级 + 全价值链 + 产量统计 + 品质提升 + 周质量分析 + 安全生产 ` $('body').append(html) } diff --git a/ruoyi-admin/src/main/resources/templates/broad/month.html b/ruoyi-admin/src/main/resources/templates/broad/month.html index 39dadf9..8f395e9 100644 --- a/ruoyi-admin/src/main/resources/templates/broad/month.html +++ b/ruoyi-admin/src/main/resources/templates/broad/month.html @@ -51,12 +51,13 @@ - -