Compare commits

..

No commits in common. "2a8bff747844f0e76ba63614ce8f567bf8a3e1f7" and "943af49e1c8a9687d4c8d2fc0818416010c0324e" have entirely different histories.

2 changed files with 5 additions and 5 deletions

View File

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

View File

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