Merge remote-tracking branch 'gitee/master'

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;
+    /*position: absolute;*/
-    width: 10%;
+    width:200px;
-    height: 16.5%;
+    height: 200px;
-    top: 16%;
+    /*top: 16%;*/
-    left: 27.5%;
+    /*left: 27.5%;*/
 }
 .HighlightTwo{
     background-repeat: no-repeat;
     background-size: 100% 100%;
-    position: absolute;
+    /*position: absolute;*/
-    width: 10%;
+    width:200px;
-    height: 16.5%;
+    height: 200px;
-    top: 16%;
+    /*top: 16%;*/
-    left: 38.5%;
+    /*left: 38.5%;*/
 }
 .HighlightThree{
     background-repeat: no-repeat;
     background-size: 100% 100%;
-    position: absolute;
+    /*position: absolute;*/
-    width: 10%;
+    width:200px;
-    height: 16.5%;
+    height: 200px;
-    top: 34.5%;
+    /*top: 34.5%;*/
-    left: 27.5%;
+    /*left: 27.5%;*/
 }
 .HighlightFour{
     background-repeat: no-repeat;
     background-size: 100% 100%;
-    position: absolute;
+    /*position: absolute;*/
-    width: 10%;
+    width:200px;
-    height: 16.5%;
+    height: 200px;
-    top: 34.5%;
+    /*top: 34.5%;*/
-    left: 38.5%
+    /*left: 38.5%*/
 }

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;}

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);
     })
 
     //成品质量详情轮询

ruoyi-admin/src/main/resources/static/js/board/month.js

@@ -9,32 +9,46 @@ $(() => {
     autoUpdate(url + "/selectUserSatisfaction", INTERVAL, data => {
         console.log(data)
         multipleVerticalBarChartTwo({
-            xName: ['产品体验', "购物体验","服务体验","订单履行率"],
+            xName: ['产品体验', "购物体验", "服务体验", "订单履行率"],
-            yDataOne: [data[0].productRate, data[0].shoppingRate,data[0].serviceRate,data[0].orderRate],
+            yDataOne: [data[0].productRate, data[0].shoppingRate, data[0].serviceRate, data[0].orderRate],
-            yDataOneName: ''+data.map(val => val.yearName)[0],
+            yDataOneName: '' + data.map(val => val.yearName)[0],
-            yDataTwo: [data[1].productRate, data[1].shoppingRate,data[1].serviceRate,data[1].orderRate],
+            yDataTwo: [data[1].productRate, data[1].shoppingRate, data[1].serviceRate, data[1].orderRate],
-            yDataTwoName: ''+data.map(val => val.yearName)[1],
+            yDataTwoName: '' + data.map(val => val.yearName)[1],
-        }, document.getElementById("satisfaction"),undefined,'%')
+        }, 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)
+        let url = data.map(val => val.picturePath)
-        $('#HighlightOne').css({backgroundImage:`url("http://10.100.70.5:9090/${url[0]}")`})
+        $('#HighlightOne').css({backgroundImage: `url("http://10.100.70.5:9090/${url[0]}")`})
-        $('#HighlightTwo').css({backgroundImage:`url("http://10.100.70.5:9090/${url[1]}")`})
+        $('#HighlightTwo').css({backgroundImage: `url("http://10.100.70.5:9090/${url[1]}")`})
-        $('#HighlightThree').css({backgroundImage:`url("http://10.100.70.5:9090/${url[2]}")`})
+        $('#HighlightThree').css({backgroundImage: `url("http://10.100.70.5:9090/${url[2]}")`})
-        $('#HighlightFour').css({backgroundImage:`url("http://10.100.70.5:9090/${url[3]}")`})
+        $('#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) => {
     <span style="position: absolute;top: 54.2%;left: 10.7%;color: #fff;font-size: 1vw;">${new Date().getFullYear()}年 合计：${val1} 台</span>
     `
     $(el).html(html)
-}
+}

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",

ruoyi-admin/src/main/resources/templates/broad/month.html

@@ -10,6 +10,7 @@
     <link href="../../static/css/materialdesignicons.min.css" rel="stylesheet"
           th:href="@{/css/materialdesignicons.min.css}"/>
     <link href="../../static/css/autoscroll-table.css" rel="stylesheet" th:href="@{/css/autoscroll-table.css}">
+    <link href="../../static/css/sliderStyle.css" rel="stylesheet" th:href="@{/css/sliderStyle.css}">
     <!-- 360浏览器急速模式 -->
     <meta content="webkit" name="renderer">
     <!-- 避免IE使用兼容模式 -->
@@ -23,6 +24,7 @@
     <script src="../../static/js/update-split-blocks.js" th:src="@{/js/update-split-blocks.js}"></script>
     <script src="../../static/js/auto-update.js" th:src="@{/js/auto-update.js}"></script>
     <script src="../../static/js/data-merger.js" th:src="@{/js/data-merger.js}"></script>
+    <script src="../../static/js/jquery.nivo.slider.pack.js" th:src="@{/js/jquery.nivo.slider.pack.js}"></script>
 
 </head>
 <body style="display:flex;">
@@ -45,10 +47,17 @@
 <div class="ecosphere" id="ecosphere"></div>
 
 <!--亮点产品-->
-<div class="HighlightOne" id="HighlightOne"></div>
+<!--<div class="HighlightOne" id="HighlightOne"></div>-->
-<div class="HighlightTwo" id="HighlightTwo"></div>
+<!--<div class="HighlightTwo" id="HighlightTwo"></div>-->
-<div class="HighlightThree" id="HighlightThree"></div>
+<!--<div class="HighlightThree" id="HighlightThree"></div>-->
-<div class="HighlightFour" id="HighlightFour"></div>
+<!--<div class="HighlightFour" id="HighlightFour"></div>-->
+
+<div id="sliderq" class="nivoSlider">
+    <img class="HighlightOne" id="HighlightOne"></img>
+    <img class="HighlightTwo" id="HighlightTwo"></img>
+    <img class="HighlightThree" id="HighlightThree"></img>
+    <img class="HighlightFour" id="HighlightFour"></img>
+</div>
 </body>
 <script src="../../static/js/board/month.js" th:src="@{/js/board/month.js}"></script>
 <script>