vijay
/
Mosqkiller
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#增加温度和湿度的数据显示

This commit is contained in:
vijay-huang 2020-05-28 12:00:01 +08:00
parent 30e825833e
commit de4c2a9700
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/views/counter/logs.vue
View File

@ -34,6 +34,18 @@
prop="energy" prop="energy"
:label="$t('counter.energy')" :label="$t('counter.energy')"
min-width="100"> min-width="100">
</el-table-column>
<el-table-column
sortable
prop="temperature"
:label="$t('counter.temperature')"
min-width="100">
</el-table-column>
<el-table-column
sortable
prop="humidity"
:label="$t('counter.humidity')"
min-width="100">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="coordinate" prop="coordinate"

11
src/views/counter/map2.vue
View File

@ -135,8 +135,10 @@ export default {
const content = [] const content = []
const curTime = moment().format('YYYY-MM-DD HH:mm:ss') const curTime = moment().format('YYYY-MM-DD HH:mm:ss')
content.push('<div class="count">' + item.count + '</div>') content.push('<div class="count">' + item.count + '</div>')
content.push('<div class="time">时间：' + curTime + '</div>') content.push('<div class="time">Time: ' + curTime + '</div>')
content.push('<div><span>信号：' + item.signal + '</span><span class="energy">电量：' + item.energy + '</span></div>') content.push('<div><span>Signal: ' + item.signal + '</span><span class="energy">Energy: ' + item.energy + '</span></div>')
content.push('<div><span>TEMP: ' + '30.3℃' + '</span><span class="humidity">HUM: ' + '69%' + '</span></div>')
// content.push('<div>区域：尖沙咀</div>\n') // content.push('<div>区域：尖沙咀</div>\n')
// if (drivingButton) { // if (drivingButton) {
// content.push('<button id="btn" class="btn">驾车规划</button>') // content.push('<button id="btn" class="btn">驾车规划</button>')
@ -314,7 +316,10 @@ export default {
margin: 0 0 .4rem 0; margin: 0 0 .4rem 0;
} }
.info-middle span.energy { .info-middle span.energy {
margin-left: 1.8rem; margin-left: 2.4rem;
}
.info-middle span.humidity {
margin-left: 1.0rem;
} }
div.info-bottom { div.info-bottom {
height: 0px; height: 0px;