修改

ruoyi-admin/src/main/resources/templates/websiteAccess.html

@@ -64,7 +64,6 @@
       // 基于准备好的dom，初始化echarts实例
       var myChart = echarts.init(document.getElementById("chart-panel"));
       let dataSourceOne = [[${dataSourceOne}]];
-      console.log("dataSourceOne",dataSourceOne)
       option = {
         title: {
           show: false,
@@ -134,7 +133,6 @@
                 color: "rgba(255,255,255,1)",
               },
               formatter: function (params) {
-                console.log(params);
                 return params;
               },
             },
@@ -247,7 +245,6 @@
     <script type="text/javascript" th:inline="javascript">
       // 基于准备好的dom，初始化echarts实例
       var myChart = echarts.init(document.getElementById("chart-panel2"));
-      var message = myChart.textContent;
       let dataSourceTwo = [[${dataSourceTwo}]];
       var data1 = dataSourceTwo.deptDatas;
       var datacity = dataSourceTwo.deptNames;
@@ -362,7 +359,6 @@
       // 基于准备好的dom，初始化echarts实例
       var myChart = echarts.init(document.getElementById("chart-panel3"));
       let dataSourceThree = [[${dataSourceThree}]];
-      console.log("dataSourceThree",dataSourceThree)
       function getPageList(arrays, pageNum, pageSize) {
         //计算分页页数
         pageNum = pageNum - 1;
@@ -386,15 +382,17 @@
       var pageNum = 1,
         pageSize = 10;
       var baseRows = getPageList(yLabel, pageNum, pageSize);
-      console.log("baseRows",baseRows)
-      let yData = dataSourceThree.browseList;
+      let yData = [];
       baseRows.forEach((item,index) => {
-        // baseRows.push(item)
-        yData.push(yData[index]);
+        yData.push(dataSourceThree.browseList[index]);
+      });
+      var browseList = dataSourceThree.browseList;
+      var max = browseList.reduce(function(a, b) {
+        return Math.max(a, b);
       });
       let bgData = [];
       for (let i in yData) {
-        bgData.push(400);
+        bgData.push(max);
       }
 
       var option = {
@@ -455,9 +453,10 @@
             axisLine: "none",
             show: true,
             axisLabel: {
+              margin: 15,
               textStyle: {
                 color: "#9aeced",
-                fontSize: "12",
+                fontSize: "15",
               },
             },
             data: yData,
@@ -519,13 +518,16 @@
         yData.splice(0, 1);
         rows.forEach((item,index) => {
           baseRows.push(item)
-          yData.push(yData[index]);
+          yData.push(dataSourceThree.browseList[index]);
         });
-        console.log("dataSourceThree.browseList",yData)
         //x轴
         bgData.splice(0, 1);
+        var browseList = dataSourceThree.browseList;
+        var max = browseList.reduce(function(a, b) {
+          return Math.max(a, b);
+        });
         rows.forEach((item) => {
-          bgData.push(400);
+          bgData.push(max);
         });
 
         myChart.setOption({
@@ -548,7 +550,7 @@
             },
           ],
         });
-      }, 1000);
+      }, 3000);
 
       if (option) {
         myChart.setOption(option);
@@ -630,7 +632,6 @@
                     color: "rgba(255,255,255,1)",
                   },
                   formatter: function (params) {
-                    console.log(params);
                     return params;
                   },
                 },
@@ -849,6 +850,10 @@
             myChart.setOption(option);
           }
         }
+        if (10018 == JSON.parse(res).code) {
+          message = JSON.parse(res).data
+          console.log("message",message)
+        }
         if (10019 == JSON.parse(res).code) {
           message = JSON.parse(res).data
           // 处理接收到的消息