gongjiale
/
gangkou
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

✨ feat: 左下方列表：读数加上单位：mg/m³;日期倒序排列

This commit is contained in:
LokerL 2024-12-13 19:37:33 +08:00
parent 4f70d910cb
commit 8d5ffae076
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RuoYi-Vue-Oracle/src/main/resources/mybatis/oil/ThDeviceReportMapper.xml
View File

@ -40,7 +40,7 @@
<if test="params.endTime != null and params.endTime != ''"> <if test="params.endTime != null and params.endTime != ''">
AND TRUNC(d.REPORT_TIME)&lt;= TO_DATE(#{params.endTime}, 'YYYY-MM-DD HH24:MI:SS') AND TRUNC(d.REPORT_TIME)&lt;= TO_DATE(#{params.endTime}, 'YYYY-MM-DD HH24:MI:SS')
</if> </if>
ORDER BY d.report_time ASC ORDER BY d.report_time DESC
</select> </select>
<select id="selectAvgDsByMonth" parameterType="map" resultType="map"> <select id="selectAvgDsByMonth" parameterType="map" resultType="map">

7
ruoyi-ui/src/views/dataStatistics/realtime/left-bottom.vue
View File

@ -65,17 +65,17 @@ export default {
label: "上报时间", label: "上报时间",
prop: "reportTime", prop: "reportTime",
}, },
{ {
label: "设备编号", label: "设备编号",
prop: "sn", prop: "sn",
}, },
{ {
label: "读数", label: "读数",
prop: "ds", prop: "ds",
}, },
], ],
pager: { pager: {
pageNum: 1, pageNum: 1,
@ -124,6 +124,7 @@ export default {
this.tableData = res.rows.map((item, index) => { this.tableData = res.rows.map((item, index) => {
return { return {
...item, ...item,
ds: item.ds + " mg/m³",
reportTime: moment(item.reportTime).format( reportTime: moment(item.reportTime).format(
"YYYY-MM-DD HH:mm:ss" "YYYY-MM-DD HH:mm:ss"
), ),