Merge remote-tracking branch 'gitee/master'

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

@@ -73,7 +73,7 @@ $(() => {
         $('#HighlightFour').attr("src" , `http://10.100.70.5:9090/${url[3]}`)
         let options = {
             navButton:false,
-            sideButtonL:false,
+            sideButton:false,
             effects: ['fade', 'slideX', 'slideY', 'page', 'circle', 'rollingX', 'rollingY', 'blindsX', 'blindsY'],
             data: [
                 {
@@ -97,8 +97,18 @@ $(() => {
         lineChart(null, document.getElementById("quality"))
     })
     autoUpdate(url + "/selectDtNenglist", INTERVAL, data => {
-        console.log(data)
+        let month = ["1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"]
-        lineChart(null, document.getElementById("energyConsumption"), '')
+        let value = []
+        for (let i = 1; i <= 12; i++) {
+            if(data[0][`month${i}`]){
+                value.push(data[0][`month${i}`])
+            }
+        }
+        lineChart({
+            xName: month.splice(0,value.length),
+            yData: value,
+            yDataName: "能耗百分比"
+        }, document.getElementById("energyConsumption"), '')
     })