|
@@ -13,20 +13,20 @@
|
|
<el-table :data="tableData" style="width: 100%" height="calc(100% - 40px)" v-loading="loading" :header-cell-style="headerStyle">
|
|
<el-table :data="tableData" style="width: 100%" height="calc(100% - 40px)" v-loading="loading" :header-cell-style="headerStyle">
|
|
<el-table-column prop='MeterFunc' label='表号-功能号' show-overflow-tooltip min-width="100">
|
|
<el-table-column prop='MeterFunc' label='表号-功能号' show-overflow-tooltip min-width="100">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
- <el-tooltip v-if="scope.row.DataQuality" content="已断数,请检查" placement="bottom" effect="light">
|
|
|
|
|
|
+ <el-tooltip v-if="scope.row.DataQuality!=0" content="已断数,请检查" placement="bottom" effect="light">
|
|
<i class="el-icon-warning-outline" style="float:left;margin: 0 5px;color: red;"></i>
|
|
<i class="el-icon-warning-outline" style="float:left;margin: 0 5px;color: red;"></i>
|
|
</el-tooltip>
|
|
</el-tooltip>
|
|
<span>{{ scope.row.MeterFunc }}</span>
|
|
<span>{{ scope.row.MeterFunc }}</span>
|
|
</template>
|
|
</template>
|
|
|
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
- <el-table-column prop='Data.Data' label='对应值(单位)' show-overflow-tooltip min-width="120">
|
|
|
|
|
|
+ <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.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>
|
|
|
|
|
|
+ <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.Time }}</span>
|
|
<i class="el-icon-refresh" @click="refreshThisRow(scope.row)"></i>
|
|
<i class="el-icon-refresh" @click="refreshThisRow(scope.row)"></i>
|
|
@@ -66,7 +66,7 @@
|
|
<dataSource :tabFunNum='drawers[1].objId'></dataSource>
|
|
<dataSource :tabFunNum='drawers[1].objId'></dataSource>
|
|
</el-drawer>
|
|
</el-drawer>
|
|
<el-drawer :title="'< ' + drawers[2].objId + ' > 的对象实例'" :visible.sync="drawers[2].drawer" :direction="drawers[2].direction" size="50%">
|
|
<el-drawer :title="'< ' + drawers[2].objId + ' > 的对象实例'" :visible.sync="drawers[2].drawer" :direction="drawers[2].direction" size="50%">
|
|
- <objectInstance :tabFunNum='drawers[2].objId'></objectInstance>
|
|
|
|
|
|
+ <objectInstance :tabFunNum='drawers[2].objId' :reValue='drawers[2].value'></objectInstance>
|
|
</el-drawer>
|
|
</el-drawer>
|
|
<el-dialog title="新增表号功能号" :visible.sync="drawers[3].drawer">
|
|
<el-dialog title="新增表号功能号" :visible.sync="drawers[3].drawer">
|
|
<addTabFunNum @closeDrawer="closeDrawer()"></addTabFunNum>
|
|
<addTabFunNum @closeDrawer="closeDrawer()"></addTabFunNum>
|
|
@@ -108,7 +108,7 @@ export default {
|
|
drawers: [
|
|
drawers: [
|
|
{drawer: false, direction: 'rtl', objId:''},
|
|
{drawer: false, direction: 'rtl', objId:''},
|
|
{drawer: false, direction: 'rtl', objId:''},
|
|
{drawer: false, direction: 'rtl', objId:''},
|
|
- {drawer: false, direction: 'rtl', objId:''},
|
|
|
|
|
|
+ {drawer: false, direction: 'rtl', objId:'',value: ''},
|
|
{drawer: false, direction: 'rtl', objId:''}
|
|
{drawer: false, direction: 'rtl', objId:''}
|
|
]
|
|
]
|
|
|
|
|
|
@@ -119,6 +119,8 @@ export default {
|
|
handleDrawer(row, index){
|
|
handleDrawer(row, index){
|
|
if(index != 3)
|
|
if(index != 3)
|
|
this.drawers[index].objId = row.MeterFunc;
|
|
this.drawers[index].objId = row.MeterFunc;
|
|
|
|
+ if(index == 2)
|
|
|
|
+ this.drawers[index].value = row.Data.Data;
|
|
this.drawers[index].drawer = true;
|
|
this.drawers[index].drawer = true;
|
|
},
|
|
},
|
|
//获取统计数据
|
|
//获取统计数据
|
|
@@ -133,12 +135,17 @@ export default {
|
|
},
|
|
},
|
|
//刷新当前行数据
|
|
//刷新当前行数据
|
|
refreshThisRow(row){
|
|
refreshThisRow(row){
|
|
- let index = this.allTableData.indexOf(row);
|
|
|
|
|
|
+ let index = this.tableData.indexOf(row);
|
|
let pa = {
|
|
let pa = {
|
|
MeterFunc: row.MeterFunc
|
|
MeterFunc: row.MeterFunc
|
|
}
|
|
}
|
|
getTabFunNumOverview(pa, res => {
|
|
getTabFunNumOverview(pa, res => {
|
|
- this.allTableData[index] = res.Content[0];
|
|
|
|
|
|
+ //this.tableData[index] = [];
|
|
|
|
+ this.tableData[index].Data.Data = res.Content[0].Data.Data;
|
|
|
|
+ this.tableData[index].Data.Time = res.Content[0].Data.Time;
|
|
|
|
+ this.tableData[index].DataQuality = res.Content[0].DataQuality;
|
|
|
|
+ this.tableData[index].RelatedInstance = res.Content[0].RelatedInstance;
|
|
|
|
+ this.tableData[index].RelatedPoint = res.Content[0].RelatedPoint;
|
|
});
|
|
});
|
|
},
|
|
},
|
|
//分页更换size
|
|
//分页更换size
|