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 feeb724..d2aa9e6 100644 --- a/ruoyi-admin/src/main/resources/static/css/board/month.css +++ b/ruoyi-admin/src/main/resources/static/css/board/month.css @@ -52,36 +52,36 @@ body { .HighlightOne{ background-repeat: no-repeat; background-size: 100% 100%; - position: absolute; - width: 10%; - height: 16.5%; - top: 16%; - left: 27.5%; + /*position: absolute;*/ + width:200px; + height: 200px; + /*top: 16%;*/ + /*left: 27.5%;*/ } .HighlightTwo{ background-repeat: no-repeat; background-size: 100% 100%; - position: absolute; - width: 10%; - height: 16.5%; - top: 16%; - left: 38.5%; + /*position: absolute;*/ + width:200px; + height: 200px; + /*top: 16%;*/ + /*left: 38.5%;*/ } .HighlightThree{ background-repeat: no-repeat; background-size: 100% 100%; - position: absolute; - width: 10%; - height: 16.5%; - top: 34.5%; - left: 27.5%; + /*position: absolute;*/ + width:200px; + height: 200px; + /*top: 34.5%;*/ + /*left: 27.5%;*/ } .HighlightFour{ background-repeat: no-repeat; background-size: 100% 100%; - position: absolute; - width: 10%; - height: 16.5%; - top: 34.5%; - left: 38.5% + /*position: absolute;*/ + width:200px; + height: 200px; + /*top: 34.5%;*/ + /*left: 38.5%*/ } \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/static/css/sliderStyle.css b/ruoyi-admin/src/main/resources/static/css/sliderStyle.css new file mode 100644 index 0000000..9bafc0b --- /dev/null +++ b/ruoyi-admin/src/main/resources/static/css/sliderStyle.css @@ -0,0 +1,35 @@ +@charset "utf-8"; +/* theme-default */ +.theme-default #slider{margin:34px auto 0px;width:960px;height:366px;} +.theme-default .nivoSlider{background:url("../images/loading.gif") no-repeat 50% 50% rgb(255, 255, 255);margin-bottom:50px;position:relative;} +.theme-default .nivoSlider img{left:0px;top:0px;display:none;position:absolute;} +.theme-default .nivoSlider a{border:0px currentColor;display:block;} +.theme-default .nivo-controlNav{left:384px;width:193px;height:38px;bottom:-14px;padding-top:14px;padding-left:50px;position:absolute;z-index:9;background-image:url("../images/bullets-bg.png");background-repeat:no-repeat;} +.theme-default .nivo-controlNav a{background:url("../images/bullets.png") no-repeat;border:0px currentColor;width:23px;height:17px;text-indent:-9999px;margin-right:3px;float:left;display:block;} +.theme-default .nivo-controlNav a.active{background-position:0px -17px;} +.theme-default .nivo-directionNav a{background:url("../images/arrows.png") no-repeat;border:0px currentColor;width:65px;height:65px;text-indent:-9999px;display:block;} +.theme-default a.nivo-nextNav{background-position:-65px 0px;top:151px;right:30px;} +.theme-default a.nivo-prevNav{left:30px;top:151px;} +.theme-default a.nivo-nextNav:hover{background-position:-65px -65px;top:151px;right:30px;} +.theme-default a.nivo-prevNav:hover{background-position:0px -65px;left:30px;top:151px;} +.theme-default .nivo-caption{font-family:Helvetica,Arial,sans-serif;} +.theme-default .nivo-caption a{color:rgb(255, 255, 255);border-bottom-color:rgb(255, 255, 255);border-bottom-width:1px;border-bottom-style:dotted;} +.theme-default .nivo-caption a:hover{color:rgb(255, 255, 255);} +/* nivoSlider */ +.nivoSlider{position:relative;} +.nivoSlider img{left:0px;top:0px;position:absolute;} +.nivoSlider a.nivo-imageLink{margin:0px;padding:0px;border:0px currentColor;left:0px;top:0px;width:100%;height:100%;display:none;position:absolute;z-index:6;} +.nivoSlider{position:relative;} +.nivoSlider img{left:0px;top:0px;position:absolute;} +.nivoSlider a.nivo-imageLink{margin:0px;padding:0px;border:0px currentColor;left:0px;top:0px;width:100%;height:100%;display:none;position:absolute;z-index:6;} +.nivo-slice{height:100%;display:block;position:absolute;z-index:5;} +.nivo-box{display:block;position:absolute;z-index:5;} +.nivo-caption{background:rgb(0, 0, 0);left:0px;width:30%;bottom:0px;color:rgb(255, 255, 255);display:none;position:absolute;z-index:8;opacity:0.8;} +.nivo-caption p{margin:0px;display:none;} +.nivo-caption a{display:inline !important;} +.nivo-html-caption{display:none;} +.nivo-directionNav a{top:45%;position:absolute;z-index:9;cursor:pointer;} +.nivo-prevNav{left:0px;} +.nivo-nextNav{right:0px;} +.nivo-controlNav a{position:relative;z-index:9;cursor:pointer;} +.nivo-controlNav a.active{font-weight:bold;} \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/arrows.gif b/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/arrows.gif index a75ee16..da20a55 100644 Binary files a/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/arrows.gif and b/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/arrows.gif differ diff --git a/ruoyi-admin/src/main/resources/static/js/board/beforeLibrary.js b/ruoyi-admin/src/main/resources/static/js/board/beforeLibrary.js index 5502c44..150822f 100644 --- a/ruoyi-admin/src/main/resources/static/js/board/beforeLibrary.js +++ b/ruoyi-admin/src/main/resources/static/js/board/beforeLibrary.js @@ -103,7 +103,7 @@ $(() => { xName: data.map(value => value.name), yDataTwo: data.map(value => value.qty), yDataTwoName: "成品数量", - }, document.getElementById("FinishedGoodsWarehousingStatisticsByHour")); + }, document.getElementById("FinishedGoodsWarehousingStatisticsByHour"),30); }) //成品质量详情轮询 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 cda066d..230f314 100644 --- a/ruoyi-admin/src/main/resources/static/js/board/month.js +++ b/ruoyi-admin/src/main/resources/static/js/board/month.js @@ -9,32 +9,46 @@ $(() => { autoUpdate(url + "/selectUserSatisfaction", INTERVAL, data => { console.log(data) multipleVerticalBarChartTwo({ - xName: ['产品体验', "购物体验","服务体验","订单履行率"], - yDataOne: [data[0].productRate, data[0].shoppingRate,data[0].serviceRate,data[0].orderRate], - yDataOneName: ''+data.map(val => val.yearName)[0], - yDataTwo: [data[1].productRate, data[1].shoppingRate,data[1].serviceRate,data[1].orderRate], - yDataTwoName: ''+data.map(val => val.yearName)[1], - }, document.getElementById("satisfaction"),undefined,'%') + xName: ['产品体验', "购物体验", "服务体验", "订单履行率"], + yDataOne: [data[0].productRate, data[0].shoppingRate, data[0].serviceRate, data[0].orderRate], + yDataOneName: '' + data.map(val => val.yearName)[0], + yDataTwo: [data[1].productRate, data[1].shoppingRate, data[1].serviceRate, data[1].orderRate], + yDataTwoName: '' + data.map(val => val.yearName)[1], + }, document.getElementById("satisfaction"), undefined, '%') }) autoUpdate(url + "/selectProductInStoreGroupMonth", INTERVAL, data => { - total(data.map(val => val.qty).reduce((val1,val2) => val1 + val2,0),'#total') + total(data.map(val => val.qty).reduce((val1, val2) => val1 + val2, 0), '#total') verticalBarChart({ xName: data.map(val => `${val.name}月`), yData: data.map(val => val.qty), }, document.getElementById("outputStatistics"), '') }) 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]}")`}) + 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]}")`}) }) lineChart(null, document.getElementById("quality")) + }) +$(document).ready(function(){ + + $('#slider').nivoSlider({ + effect:'random', + slices:15, + animSpeed:500, + pauseTime:3000, + directionNav:false, + controlNav:false, + keyboardNav:false + }); + +}); const curWeek = () => { let today = new Date(); @@ -69,4 +83,4 @@ const total = (val1 = 0, el) => { ${new Date().getFullYear()}年 合计：${val1} 台 ` $(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 ddb7535..71744a7 100644 --- a/ruoyi-admin/src/main/resources/static/js/echartsCommon.js +++ b/ruoyi-admin/src/main/resources/static/js/echartsCommon.js @@ -279,7 +279,7 @@ const horizontalRoundedBarChartWithBackgroundTwo = function (data, id) { } // 柱状+折线图 -const barChartAndLineChart = function (data, id) { +const barChartAndLineChart = function (data, id,rotate=0) { let charts = echarts.init(id); if (!data) { data = { @@ -325,6 +325,8 @@ const barChartAndLineChart = function (data, id) { }, }, axisLabel: { + rotate:rotate, + interval:0, //坐标轴刻度标签的相关设置 textStyle: { color: "#d1e6eb", @@ -665,6 +667,7 @@ const barChartAndLineChartThree = function (data, id) { }, }, axisLabel: { + interval:0, //坐标轴刻度标签的相关设置 textStyle: { color: "#d1e6eb", diff --git a/ruoyi-admin/src/main/resources/static/js/jquery.nivo.slider.pack.js b/ruoyi-admin/src/main/resources/static/js/jquery.nivo.slider.pack.js new file mode 100644 index 0000000..6463362 --- /dev/null +++ b/ruoyi-admin/src/main/resources/static/js/jquery.nivo.slider.pack.js @@ -0,0 +1,10 @@ +/* + * jQuery Nivo Slider v2.7.1 + * http://www.jiepin.net/ + * + * http://www.jiepin.net/ + * + * March 2010 + */ + +(function(a){var b=function(b,c){var d=a.extend({},a.fn.nivoSlider.defaults,c);var e={currentSlide:0,currentImage:"",totalSlides:0,running:false,paused:false,stop:false};var f=a(b);f.data("nivo:vars",e);f.css("position","relative");f.addClass("nivoSlider");var g=f.children();g.each(function(){var b=a(this);var c="";if(!b.is("img")){if(b.is("a")){b.addClass("nivo-imageLink");c=b}b=b.find("img:first")}var d=b.width();if(d==0)d=b.attr("width");var g=b.height();if(g==0)g=b.attr("height");if(d>f.width()){f.width(d)}if(g>f.height()){f.height(g)}if(c!=""){c.css("display","none")}b.css("display","none");e.totalSlides++});if(d.randomStart){d.startSlide=Math.floor(Math.random()*e.totalSlides)}if(d.startSlide>0){if(d.startSlide>=e.totalSlides)d.startSlide=e.totalSlides-1;e.currentSlide=d.startSlide}if(a(g[e.currentSlide]).is("img")){e.currentImage=a(g[e.currentSlide])}else{e.currentImage=a(g[e.currentSlide]).find("img:first")}if(a(g[e.currentSlide]).is("a")){a(g[e.currentSlide]).css("display","block")}f.css("background",'url("'+e.currentImage.attr("src")+'") no-repeat');f.append(a('

').css({display:"none",opacity:d.captionOpacity}));a(".nivo-caption",f).css("opacity",0);var h=function(b){var c=a(".nivo-caption",f);if(e.currentImage.attr("title")!=""&&e.currentImage.attr("title")!=undefined){var d=e.currentImage.attr("title");if(d.substr(0,1)=="#")d=a(d).html();if(c.css("opacity")!=0){c.find("p").stop().fadeTo(b.animSpeed,0,function(){a(this).html(d);a(this).stop().fadeTo(b.animSpeed,1)})}else{c.find("p").html(d)}c.stop().fadeTo(b.animSpeed,b.captionOpacity)}else{c.stop().fadeTo(b.animSpeed,0)}};h(d);var i=0;if(!d.manualAdvance&&g.length>1){i=setInterval(function(){o(f,g,d,false)},d.pauseTime)}if(d.directionNav){f.append('
'+d.prevText+''+d.nextText+"
");if(d.directionNavHide){a(".nivo-directionNav",f).hide();f.hover(function(){a(".nivo-directionNav",f).show()},function(){a(".nivo-directionNav",f).hide()})}a("a.nivo-prevNav",f).live("click",function(){if(e.running)return false;clearInterval(i);i="";e.currentSlide-=2;o(f,g,d,"prev")});a("a.nivo-nextNav",f).live("click",function(){if(e.running)return false;clearInterval(i);i="";o(f,g,d,"next")})}if(d.controlNav){var j=a('
');f.append(j);for(var k=0;k')}else{j.append('')}}else{j.append(''+(k+1)+"")}}a(".nivo-controlNav a:eq("+e.currentSlide+")",f).addClass("active");a(".nivo-controlNav a",f).live("click",function(){if(e.running)return false;if(a(this).hasClass("active"))return false;clearInterval(i);i="";f.css("background",'url("'+e.currentImage.attr("src")+'") no-repeat');e.currentSlide=a(this).attr("rel")-1;o(f,g,d,"control")})}if(d.keyboardNav){a(window).keypress(function(a){if(a.keyCode=="37"){if(e.running)return false;clearInterval(i);i="";e.currentSlide-=2;o(f,g,d,"prev")}if(a.keyCode=="39"){if(e.running)return false;clearInterval(i);i="";o(f,g,d,"next")}})}if(d.pauseOnHover){f.hover(function(){e.paused=true;clearInterval(i);i=""},function(){e.paused=false;if(i==""&&!d.manualAdvance){i=setInterval(function(){o(f,g,d,false)},d.pauseTime)}})}f.bind("nivo:animFinished",function(){e.running=false;a(g).each(function(){if(a(this).is("a")){a(this).css("display","none")}});if(a(g[e.currentSlide]).is("a")){a(g[e.currentSlide]).css("display","block")}if(i==""&&!e.paused&&!d.manualAdvance){i=setInterval(function(){o(f,g,d,false)},d.pauseTime)}d.afterChange.call(this)});var m=function(b,c,d){for(var e=0;e').css({left:f*e+"px",width:b.width()-f*e+"px",height:"0px",opacity:"0",background:'url("'+d.currentImage.attr("src")+'") no-repeat -'+(f+e*f-f)+"px 0%"}))}else{b.append(a('
').css({left:f*e+"px",width:f+"px",height:"0px",opacity:"0",background:'url("'+d.currentImage.attr("src")+'") no-repeat -'+(f+e*f-f)+"px 0%"}))}}};var n=function(b,c,d){var e=Math.round(b.width()/c.boxCols);var f=Math.round(b.height()/c.boxRows);for(var g=0;g').css({opacity:0,left:e*h+"px",top:f*g+"px",width:b.width()-e*h+"px",height:f+"px",background:'url("'+d.currentImage.attr("src")+'") no-repeat -'+(e+h*e-e)+"px -"+(f+g*f-f)+"px"}))}else{b.append(a('
').css({opacity:0,left:e*h+"px",top:f*g+"px",width:e+"px",height:f+"px",background:'url("'+d.currentImage.attr("src")+'") no-repeat -'+(e+h*e-e)+"px -"+(f+g*f-f)+"px"}))}}}};var o=function(b,c,d,e){var f=b.data("nivo:vars");if(f&&f.currentSlide==f.totalSlides-1){d.lastSlide.call(this)}if((!f||f.stop)&&!e)return false;d.beforeChange.call(this);if(!e){b.css("background",'url("'+f.currentImage.attr("src")+'") no-repeat')}else{if(e=="prev"){b.css("background",'url("'+f.currentImage.attr("src")+'") no-repeat')}if(e=="next"){b.css("background",'url("'+f.currentImage.attr("src")+'") no-repeat')}}f.currentSlide++;if(f.currentSlide==f.totalSlides){f.currentSlide=0;d.slideshowEnd.call(this)}if(f.currentSlide<0)f.currentSlide=f.totalSlides-1;if(a(c[f.currentSlide]).is("img")){f.currentImage=a(c[f.currentSlide])}else{f.currentImage=a(c[f.currentSlide]).find("img:first")}if(d.controlNav){a(".nivo-controlNav a",b).removeClass("active");a(".nivo-controlNav a:eq("+f.currentSlide+")",b).addClass("active")}h(d);a(".nivo-slice",b).remove();a(".nivo-box",b).remove();var g=d.effect;if(d.effect=="random"){var i=new Array("sliceDownRight","sliceDownLeft","sliceUpRight","sliceUpLeft","sliceUpDown","sliceUpDownLeft","fold","fade","boxRandom","boxRain","boxRainReverse","boxRainGrow","boxRainGrowReverse");g=i[Math.floor(Math.random()*(i.length+1))];if(g==undefined)g="fade"}if(d.effect.indexOf(",")!=-1){var i=d.effect.split(",");g=i[Math.floor(Math.random()*i.length)];if(g==undefined)g="fade"}if(f.currentImage.attr("data-transition")){g=f.currentImage.attr("data-transition")}f.running=true;if(g=="sliceDown"||g=="sliceDownRight"||g=="sliceDownLeft"){m(b,d,f);var j=0;var k=0;var l=a(".nivo-slice",b);if(g=="sliceDownLeft")l=a(".nivo-slice",b)._reverse();l.each(function(){var c=a(this);c.css({top:"0px"});if(k==d.slices-1){setTimeout(function(){c.animate({height:"100%",opacity:"1.0"},d.animSpeed,"",function(){b.trigger("nivo:animFinished")})},100+j)}else{setTimeout(function(){c.animate({height:"100%",opacity:"1.0"},d.animSpeed)},100+j)}j+=50;k++})}else if(g=="sliceUp"||g=="sliceUpRight"||g=="sliceUpLeft"){m(b,d,f);var j=0;var k=0;var l=a(".nivo-slice",b);if(g=="sliceUpLeft")l=a(".nivo-slice",b)._reverse();l.each(function(){var c=a(this);c.css({bottom:"0px"});if(k==d.slices-1){setTimeout(function(){c.animate({height:"100%",opacity:"1.0"},d.animSpeed,"",function(){b.trigger("nivo:animFinished")})},100+j)}else{setTimeout(function(){c.animate({height:"100%",opacity:"1.0"},d.animSpeed)},100+j)}j+=50;k++})}else if(g=="sliceUpDown"||g=="sliceUpDownRight"||g=="sliceUpDownLeft"){m(b,d,f);var j=0;var k=0;var o=0;var l=a(".nivo-slice",b);if(g=="sliceUpDownLeft")l=a(".nivo-slice",b)._reverse();l.each(function(){var c=a(this);if(k==0){c.css("top","0px");k++}else{c.css("bottom","0px");k=0}if(o==d.slices-1){setTimeout(function(){c.animate({height:"100%",opacity:"1.0"},d.animSpeed,"",function(){b.trigger("nivo:animFinished")})},100+j)}else{setTimeout(function(){c.animate({height:"100%",opacity:"1.0"},d.animSpeed)},100+j)}j+=50;o++})}else if(g=="fold"){m(b,d,f);var j=0;var k=0;a(".nivo-slice",b).each(function(){var c=a(this);var e=c.width();c.css({top:"0px",height:"100%",width:"0px"});if(k==d.slices-1){setTimeout(function(){c.animate({width:e,opacity:"1.0"},d.animSpeed,"",function(){b.trigger("nivo:animFinished")})},100+j)}else{setTimeout(function(){c.animate({width:e,opacity:"1.0"},d.animSpeed)},100+j)}j+=50;k++})}else if(g=="fade"){m(b,d,f);var q=a(".nivo-slice:first",b);q.css({height:"100%",width:b.width()+"px"});q.animate({opacity:"1.0"},d.animSpeed*2,"",function(){b.trigger("nivo:animFinished")})}else if(g=="slideInRight"){m(b,d,f);var q=a(".nivo-slice:first",b);q.css({height:"100%",width:"0px",opacity:"1"});q.animate({width:b.width()+"px"},d.animSpeed*2,"",function(){b.trigger("nivo:animFinished")})}else if(g=="slideInLeft"){m(b,d,f);var q=a(".nivo-slice:first",b);q.css({height:"100%",width:"0px",opacity:"1",left:"",right:"0px"});q.animate({width:b.width()+"px"},d.animSpeed*2,"",function(){q.css({left:"0px",right:""});b.trigger("nivo:animFinished")})}else if(g=="boxRandom"){n(b,d,f);var r=d.boxCols*d.boxRows;var k=0;var j=0;var s=p(a(".nivo-box",b));s.each(function(){var c=a(this);if(k==r-1){setTimeout(function(){c.animate({opacity:"1"},d.animSpeed,"",function(){b.trigger("nivo:animFinished")})},100+j)}else{setTimeout(function(){c.animate({opacity:"1"},d.animSpeed)},100+j)}j+=20;k++})}else if(g=="boxRain"||g=="boxRainReverse"||g=="boxRainGrow"||g=="boxRainGrowReverse"){n(b,d,f);var r=d.boxCols*d.boxRows;var k=0;var j=0;var t=0;var u=0;var v=new Array;v[t]=new Array;var s=a(".nivo-box",b);if(g=="boxRainReverse"||g=="boxRainGrowReverse"){s=a(".nivo-box",b)._reverse()}s.each(function(){v[t][u]=a(this);u++;if(u==d.boxCols){t++;u=0;v[t]=new Array}});for(var w=0;w=0&&x + @@ -23,6 +24,7 @@ + @@ -45,10 +47,17 @@
-
-
-
-
+ + + + + +
+ + + + +