From 6e47eceb8053c31809b459713fdb3d4fdc397e86 Mon Sep 17 00:00:00 2001 From: ICEC <414933307@qq.com> Date: Tue, 7 Jul 2020 10:38:54 +0800 Subject: [PATCH] no commit message --- ruoyi-ui/src/views/fx_density/fx_density_30d.vue | 2 +- ruoyi-ui/src/views/fx_density/fx_density_72h.vue | 4 ++-- .../src/views/fx_density/fx_density_date_range.vue | 2 +- ruoyi-ui/src/views/fx_density/fx_density_group.vue | 2 +- .../db/mssql/DB_Ajax_DashBoard_Density_48102.java | 14 +++++++------- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ruoyi-ui/src/views/fx_density/fx_density_30d.vue b/ruoyi-ui/src/views/fx_density/fx_density_30d.vue index 173f7afbd..60debfe14 100644 --- a/ruoyi-ui/src/views/fx_density/fx_density_30d.vue +++ b/ruoyi-ui/src/views/fx_density/fx_density_30d.vue @@ -40,7 +40,7 @@ getDensity30Day().then(response => { for (var i = 0; i < response.data.length; i++) { lineChartData.xAxisData.push((response.data[i].time + '').replace(' 00:00:00.0', '')) - lineChartData.actualData.push(parseFloat(response.data[i].density).toFixed(4)) + lineChartData.actualData.push(parseFloat(response.data[i].density).toFixed(3)) } const chart_energy_avg = echarts.init(document.getElementById('chart_density_avg')) diff --git a/ruoyi-ui/src/views/fx_density/fx_density_72h.vue b/ruoyi-ui/src/views/fx_density/fx_density_72h.vue index 0d6af13c2..70da8450d 100644 --- a/ruoyi-ui/src/views/fx_density/fx_density_72h.vue +++ b/ruoyi-ui/src/views/fx_density/fx_density_72h.vue @@ -39,8 +39,8 @@ getDensity72h().then(response => { for (let i = 0; i < response.data.length; i++) { - lineChartData.xAxisData.push((response.data[i].time + '').replace(' 00:00:00.0', '')) - lineChartData.actualData.push(parseFloat(response.data[i].density).toFixed(4)) + lineChartData.xAxisData.push((response.data[i].time + '').replace(':00.0', '')) + lineChartData.actualData.push(parseFloat(response.data[i].density).toFixed(3)) } const chart_energy_avg = echarts.init(document.getElementById('chart_density_avg')) diff --git a/ruoyi-ui/src/views/fx_density/fx_density_date_range.vue b/ruoyi-ui/src/views/fx_density/fx_density_date_range.vue index b867cb76e..524e987ba 100644 --- a/ruoyi-ui/src/views/fx_density/fx_density_date_range.vue +++ b/ruoyi-ui/src/views/fx_density/fx_density_date_range.vue @@ -112,7 +112,7 @@ getDensityDataRange(this.daterange_time1,this.daterange_time2).then(response => { for (var i = 0; i < response.data.length; i++) { lineChartData.xAxisData.push((response.data[i].time + '').replace(' 00:00:00.0', '')) - lineChartData.actualData.push(parseFloat(response.data[i].density).toFixed(4)) + lineChartData.actualData.push(parseFloat(response.data[i].density).toFixed(3)) } const chart_energy_avg = echarts.init(document.getElementById('chart_density_avg')) diff --git a/ruoyi-ui/src/views/fx_density/fx_density_group.vue b/ruoyi-ui/src/views/fx_density/fx_density_group.vue index f8c99921f..db748e4f6 100644 --- a/ruoyi-ui/src/views/fx_density/fx_density_group.vue +++ b/ruoyi-ui/src/views/fx_density/fx_density_group.vue @@ -40,7 +40,7 @@ getDensityGroup().then(response => { for (var i = 0; i < response.data.length; i++) { lineChartData.xAxisData.push((response.data[i].time + '').replace(' 00:00:00.0', '')) - lineChartData.actualData.push(parseFloat(response.data[i].density).toFixed(4)) + lineChartData.actualData.push(parseFloat(response.data[i].density).toFixed(3)) } const chart_energy_avg = echarts.init(document.getElementById('chart_density_avg')) diff --git a/ruoyi/src/main/java/com/ruoyi/db/mssql/DB_Ajax_DashBoard_Density_48102.java b/ruoyi/src/main/java/com/ruoyi/db/mssql/DB_Ajax_DashBoard_Density_48102.java index e8ecbe50b..b12deeba5 100644 --- a/ruoyi/src/main/java/com/ruoyi/db/mssql/DB_Ajax_DashBoard_Density_48102.java +++ b/ruoyi/src/main/java/com/ruoyi/db/mssql/DB_Ajax_DashBoard_Density_48102.java @@ -48,7 +48,7 @@ public class DB_Ajax_DashBoard_Density_48102 { " ProductDate,\r\n" + "TIME ORDER BY MAX(CreatedOn)"; Statement stmt = conn.createStatement();// - System.out.println(sql); +// System.out.println(sql); ResultSet rs = stmt.executeQuery(sql); while (rs.next()) { @@ -81,7 +81,7 @@ public class DB_Ajax_DashBoard_Density_48102 { "ORDER BY\r\n" + " convert(int,REPLACE( line, '#', '' ) )"; Statement stmt = conn.createStatement();// - System.out.println(sql); +// System.out.println(sql); ResultSet rs = stmt.executeQuery(sql); while (rs.next()) { @@ -112,7 +112,7 @@ public class DB_Ajax_DashBoard_Density_48102 { "GROUP BY\r\n" + " ProductDate ORDER BY MAX(CreatedOn)"; Statement stmt = conn.createStatement();// - System.out.println(sql); +// System.out.println(sql); ResultSet rs = stmt.executeQuery(sql); while (rs.next()) { @@ -145,7 +145,7 @@ public class DB_Ajax_DashBoard_Density_48102 { "GROUP BY\r\n" + " ProductDate ORDER BY MAX(CreatedOn)"; Statement stmt = conn.createStatement();// - System.out.println(sql); +// System.out.println(sql); ResultSet rs = stmt.executeQuery(sql); while (rs.next()) { @@ -183,7 +183,7 @@ public class DB_Ajax_DashBoard_Density_48102 { " ProductDate,\r\n" + "TIME ORDER BY MAX(CreatedOn)"; Statement stmt = conn.createStatement();// - System.out.println(sql); +// System.out.println(sql); ResultSet rs = stmt.executeQuery(sql); while (rs.next()) { @@ -222,7 +222,7 @@ public class DB_Ajax_DashBoard_Density_48102 { "ORDER BY\r\n" + " convert(int,REPLACE( line, '#', '' ) )"; Statement stmt = conn.createStatement();// - System.out.println(sql); +// System.out.println(sql); ResultSet rs = stmt.executeQuery(sql); while (rs.next()) { @@ -259,7 +259,7 @@ public class DB_Ajax_DashBoard_Density_48102 { "ORDER BY\n" + "\tMAX ( CreatedOn );"; Statement stmt = conn.createStatement();// - System.out.println(sql); +// System.out.println(sql); ResultSet rs = stmt.executeQuery(sql); while (rs.next()) {