|
@@ -21,13 +21,13 @@
|
|
<el-table-column prop='MeterFunc' label='表号-功能号' show-overflow-tooltip min-width="100"></el-table-column>
|
|
<el-table-column prop='MeterFunc' label='表号-功能号' show-overflow-tooltip min-width="100"></el-table-column>
|
|
<el-table-column prop='Data.Data' label='对应值(单位)' show-overflow-tooltip min-width="90">
|
|
<el-table-column prop='Data.Data' label='对应值(单位)' show-overflow-tooltip min-width="90">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
- <span>{{ scope.row.Data.Data }}</span>
|
|
|
|
|
|
+ <span>{{ scope.row.Data? scope.row.Data.Data : '' }}</span>
|
|
<i @click="handleDrawer(scope.row, 0)" class="el-icon-s-data"></i>
|
|
<i @click="handleDrawer(scope.row, 0)" class="el-icon-s-data"></i>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<el-table-column prop='Data.Time' label='获取时间' show-overflow-tooltip min-width="130">
|
|
<el-table-column prop='Data.Time' label='获取时间' show-overflow-tooltip min-width="130">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
- <span>{{ scope.row.Data.Time }}</span>
|
|
|
|
|
|
+ <span>{{ scope.row.Data? scope.row.Data.Time: '' }}</span>
|
|
<i class="el-icon-refresh" @click="refreshThisRow(scope.row)"></i>
|
|
<i class="el-icon-refresh" @click="refreshThisRow(scope.row)"></i>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
@@ -93,7 +93,7 @@ export default {
|
|
},
|
|
},
|
|
allTableData: [],//所有表格数据
|
|
allTableData: [],//所有表格数据
|
|
pageSizes: [10, 20, 50, 100],
|
|
pageSizes: [10, 20, 50, 100],
|
|
- pageSize: 10,
|
|
|
|
|
|
+ pageSize: 50,
|
|
currentPage: 1,
|
|
currentPage: 1,
|
|
loading: false,//加载
|
|
loading: false,//加载
|
|
tabFunNum: null,//表号功能号
|
|
tabFunNum: null,//表号功能号
|
|
@@ -113,7 +113,7 @@ export default {
|
|
if (index != 3)
|
|
if (index != 3)
|
|
this.drawers[index].objId = row.MeterFunc;
|
|
this.drawers[index].objId = row.MeterFunc;
|
|
if (index == 2)
|
|
if (index == 2)
|
|
- this.drawers[index].value = row.Data.Data;
|
|
|
|
|
|
+ this.drawers[index].value = row.Data? row.Data.Data : '';
|
|
this.drawers[index].drawer = true;
|
|
this.drawers[index].drawer = true;
|
|
},
|
|
},
|
|
//获取统计数据
|
|
//获取统计数据
|