TuringsMachine/imt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'zjw'

Browse Source
This commit is contained in:
zhangjunwen 2024-10-18 11:07:47 +08:00
commit 2a8bff7478
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
imt-server/imt-module-data/imt-module-data-biz/src/main/java/com/inspur/module/data/service/DataQueryService.java
View File

@ -305,9 +305,9 @@ public class DataQueryService implements IDataQueryService {
} }
resMap.put(realCn, list.stream().map(map -> { resMap.put(realCn, list.stream().map(map -> {
Double data = (Double) map.get(cn); Double data = (Double) map.get(cn);
if ("gateway_temp_data".equals(tableName)) {//温度处理 // if ("gateway_temp_data".equals(tableName)) {//温度处理
return data / 10.0; // return data / 10.0;
} // }
if ("work_time".equals(columnName) || "power_time".equals(columnName)) {//时间转小时 if ("work_time".equals(columnName) || "power_time".equals(columnName)) {//时间转小时
return data / 60.0; return data / 60.0;
} }
@ -456,7 +456,7 @@ public class DataQueryService implements IDataQueryService {
} }
sql.append(" time <= '").append(endTime).append("'"); sql.append(" time <= '").append(endTime).append("'");
} }
sql.append(" group by time(").append(interval).append(") fill(none)"); sql.append(" group by time(").append(interval).append(") fill(0)");
return influxDBService.queryResultProcess(influxDBService.query(sql.toString())); return influxDBService.queryResultProcess(influxDBService.query(sql.toString()));
} }

2
imt-ui/src/views/system/data/monitordatadashboard/index.vue
View File

@ -84,7 +84,7 @@
</div> </div>
<el-empty <el-empty
v-if="!this.selectCardNames || this.selectCardNames.length == 0" v-if="!this.selectCardNames || this.selectCardNames.length == 0"
description="暂无数据，请先选择参数来查看监控数据" description="暂无数据，请先选择参数来查看监测数据"
></el-empty> ></el-empty>
<div class="chart-1"> <div class="chart-1">
<el-card <el-card