|
@@ -23,10 +23,14 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="groupId" label="设备组" min-width="120" />
|
|
|
<el-table-column prop="createTime" label="创建时间" min-width="180" />
|
|
|
+ <el-table-column prop="freq" label="上传频率(秒)" min-width="120" />
|
|
|
<el-table-column prop="powerVolt" label="电池电压" min-width="100" />
|
|
|
<el-table-column prop="signal4g" label="4G信号" min-width="80" />
|
|
|
<el-table-column prop="oemType" label="板卡类型" min-width="100" />
|
|
|
<el-table-column prop="version" label="软件版本号" min-width="100" />
|
|
|
+ <el-table-column prop="lon" label="经度" min-width="120" />
|
|
|
+ <el-table-column prop="lat" label="纬度" min-width="120" />
|
|
|
+ <el-table-column prop="satNum" label="卫星颗数" min-width="80" />
|
|
|
<el-table-column label="状态" min-width="100">
|
|
|
<template #default="scope">
|
|
|
<el-tag type="success" v-if="scope.row.status===1" size="small">在线</el-tag>
|
|
@@ -34,11 +38,11 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="updateTime" label="最近通讯时间" min-width="180" />
|
|
|
- <el-table-column label="操作" min-width="80">
|
|
|
- <template #default="scope">
|
|
|
- <el-button @click="detailHandler(scope.row.openNum)" type="text" size="small">详情</el-button>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
+<!-- <el-table-column label="操作" min-width="80">-->
|
|
|
+<!-- <template #default="scope">-->
|
|
|
+<!-- <el-button @click="detailHandler(scope.row.openNum)" type="text" size="small">详情</el-button>-->
|
|
|
+<!-- </template>-->
|
|
|
+<!-- </el-table-column>-->
|
|
|
</el-table>
|
|
|
<el-pagination class="zy-table-pagination" background layout="prev, pager, next"
|
|
|
:current-page="page.current" :total="page.total" :page-size="page.size" @current-change="pagination" />
|
|
@@ -47,20 +51,6 @@
|
|
|
<el-dialog title="设备详情" v-model="detailDialog" width="500px">
|
|
|
<el-descriptions :column="2" border>
|
|
|
<el-descriptions-item label="设备码:">{{detail.openNum}}</el-descriptions-item>
|
|
|
- <el-descriptions-item label="唤醒间隔:">{{detail.wakeInt}}</el-descriptions-item>
|
|
|
- <el-descriptions-item label="阈值:">{{detail.thresh}}</el-descriptions-item>
|
|
|
- <el-descriptions-item label="温度:">{{detail.temp}}</el-descriptions-item>
|
|
|
- <el-descriptions-item label="电量:">{{detail.battery}}</el-descriptions-item>
|
|
|
- <el-descriptions-item label="信号:">{{detail.s4g}}</el-descriptions-item>
|
|
|
- <el-descriptions-item label="上传类型:">{{detail.dataType}}</el-descriptions-item>
|
|
|
- <el-descriptions-item label="X:">{{detail.x}}</el-descriptions-item>
|
|
|
- <el-descriptions-item label="Y:">{{detail.y}}</el-descriptions-item>
|
|
|
- <el-descriptions-item label="Z:">{{detail.z}}</el-descriptions-item>
|
|
|
- <el-descriptions-item label="angleX:">{{detail.anglex}}</el-descriptions-item>
|
|
|
- <el-descriptions-item label="angleY:">{{detail.angley}}</el-descriptions-item>
|
|
|
- <el-descriptions-item label="angleZ:">{{detail.anglexz}}</el-descriptions-item>
|
|
|
- <el-descriptions-item label="经度:">{{detail.lon}}</el-descriptions-item>
|
|
|
- <el-descriptions-item label="纬度:">{{detail.lat}}</el-descriptions-item>
|
|
|
<el-descriptions-item label="定位模式:">{{detail.mode==1?'GPS':'基站'}}</el-descriptions-item>
|
|
|
</el-descriptions>
|
|
|
</el-dialog>
|
|
@@ -138,8 +128,9 @@
|
|
|
getDeviceDetail: function(openNum) {
|
|
|
const params = {
|
|
|
openNum: openNum
|
|
|
- }
|
|
|
+ };
|
|
|
this.$http.Get(this.$global.ubi.detail, params).then(res => {
|
|
|
+ console.log(res.data);
|
|
|
this.detail = res.data;
|
|
|
})
|
|
|
},
|