Merge remote-tracking branch 'gitee/master'

ruoyi-admin/src/main/resources/static/js/echartsCommon.js

@@ -1,5 +1,5 @@
 const vw = (document.documentElement.clientWidth || document.body.clientWidth) / 100
-
+let time1 =() =>{}
 // 随机数
 const random = (val = 1) => {
     return Math.ceil(Math.random() * val)
@@ -138,9 +138,7 @@ const horizontalRoundedBarChartWithBackground = function (data, id) {
     $(window).resize(charts.resize);
 }
 const horizontalRoundedBarChartWithBackgroundTwo = function (data, id) {
-    let time = () => {
+    clearInterval(time1)
-    }
-    clearInterval(time)
     let charts = echarts.init(id);
     if (!data) {
         data = {
@@ -254,8 +252,7 @@ const horizontalRoundedBarChartWithBackgroundTwo = function (data, id) {
         })
 
         let step = 1 / (data.yNameOne.length / 9) * 100
-        time = () => {
+        time1 = setInterval(() => {
-            setInterval(() => {
                 option.dataZoom[0].end += step
                 option.dataZoom[0].start += step
                 if (option.dataZoom[0].start >= 100) {
@@ -268,8 +265,7 @@ const horizontalRoundedBarChartWithBackgroundTwo = function (data, id) {
                 }
                 charts.setOption(option);
             }, 6000)
-        }
+        // time()
-        time()
     }
     charts.setOption(option);
     $(window).resize(charts.resize);