|
@@ -6,33 +6,33 @@
|
|
<i slot="suffix" class="el-input__icon el-icon-search" @click="getOverViewList()"></i>
|
|
<i slot="suffix" class="el-input__icon el-icon-search" @click="getOverViewList()"></i>
|
|
</el-input>
|
|
</el-input>
|
|
|
|
|
|
- <el-button size="mini" @click="handleDrawer({},3)" style="float: right;">新增自定义</el-button>
|
|
|
|
|
|
+ <el-button type="primary" size="mini" @click="handleDrawer({},3)" style="float: right;">新增自定义</el-button>
|
|
</div>
|
|
</div>
|
|
<!-- 数据表格 -->
|
|
<!-- 数据表格 -->
|
|
<div class="table-area">
|
|
<div class="table-area">
|
|
<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='TableNum' label='表号-功能号' show-overflow-tooltip min-width="100"></el-table-column>
|
|
|
|
- <el-table-column prop='CoValue' label='对应值(单位)' show-overflow-tooltip min-width="120">
|
|
|
|
|
|
+ <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="120">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
- <span>{{ scope.row.CoValue }}</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='GetTime' label='获取时间' show-overflow-tooltip>
|
|
|
|
|
|
+ <el-table-column prop='Data.Time' label='获取时间' show-overflow-tooltip>
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
- <span>{{ scope.row.GetTime }}</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>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
- <el-table-column prop='SubSysPoint' label='涉及子系统点位(数据来源)' show-overflow-tooltip min-width="150">
|
|
|
|
|
|
+ <el-table-column prop='RelatedPoint' label='涉及子系统点位(数据来源)' show-overflow-tooltip min-width="150">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
- <span>{{ scope.row.SubSysPoint }}</span>
|
|
|
|
|
|
+ <span>{{ scope.row.RelatedPoint }}</span>
|
|
<i @click="handleDrawer(scope.row, 1)" class="el-icon-coin"></i>
|
|
<i @click="handleDrawer(scope.row, 1)" class="el-icon-coin"></i>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
- <el-table-column prop='ObjInstance' label='涉及的对象实例(应用到)' show-overflow-tooltip min-width="150">
|
|
|
|
|
|
+ <el-table-column prop='RelatedInstance' label='涉及的对象实例(应用到)' show-overflow-tooltip min-width="150">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
- <span>{{ scope.row.ObjInstance }}</span>
|
|
|
|
|
|
+ <span>{{ scope.row.RelatedInstance }}</span>
|
|
<i @click="handleDrawer(scope.row, 2)" class="el-icon-coin"></i>
|
|
<i @click="handleDrawer(scope.row, 2)" class="el-icon-coin"></i>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
@@ -113,32 +113,17 @@ export default {
|
|
getOverViewList(){
|
|
getOverViewList(){
|
|
this.loading = true;
|
|
this.loading = true;
|
|
getTabFunNumOverview({}, res => {
|
|
getTabFunNumOverview({}, res => {
|
|
- // this.tableData = res;
|
|
|
|
- this.allTableData = [
|
|
|
|
- {TableNum: 'DK1', CoValue: 'DK2', GetTime: 'DK3', SubSysPoint: 'DK4', ObjInstance: 'DK5'},
|
|
|
|
- {TableNum: 'DK2', CoValue: 'DK7', GetTime: 'DK8', SubSysPoint: 'DK9', ObjInstance: 'DK10'},
|
|
|
|
- {TableNum: 'DK3', CoValue: 'DK12', GetTime: 'DK13', SubSysPoint: 'DK14', ObjInstance: 'DK15'},
|
|
|
|
- {TableNum: 'DK4', CoValue: 'DK2', GetTime: 'DK3', SubSysPoint: 'DK4', ObjInstance: 'DK5'},
|
|
|
|
- {TableNum: 'DK5', CoValue: 'DK7', GetTime: 'DK8', SubSysPoint: 'DK9', ObjInstance: 'DK10'},
|
|
|
|
- {TableNum: 'DK6', CoValue: 'DK12', GetTime: 'DK13', SubSysPoint: 'DK14', ObjInstance: 'DK15'},
|
|
|
|
- {TableNum: 'DK7', CoValue: 'DK2', GetTime: 'DK3', SubSysPoint: 'DK4', ObjInstance: 'DK5'},
|
|
|
|
- {TableNum: 'DK8', CoValue: 'DK7', GetTime: 'DK8', SubSysPoint: 'DK9', ObjInstance: 'DK10'},
|
|
|
|
- {TableNum: 'DK9', CoValue: 'DK12', GetTime: 'DK13', SubSysPoint: 'DK14', ObjInstance: 'DK15'},
|
|
|
|
- {TableNum: 'DK10', CoValue: 'DK2', GetTime: 'DK3', SubSysPoint: 'DK4', ObjInstance: 'DK5'},
|
|
|
|
- {TableNum: 'DK11', CoValue: 'DK7', GetTime: 'DK8', SubSysPoint: 'DK9', ObjInstance: 'DK10'},
|
|
|
|
- {TableNum: 'DK12', CoValue: 'DK12', GetTime: 'DK13', SubSysPoint: 'DK14', ObjInstance: 'DK15'},
|
|
|
|
- {TableNum: 'DK13', CoValue: 'DK2', GetTime: 'DK3', SubSysPoint: 'DK4', ObjInstance: 'DK5'},
|
|
|
|
- {TableNum: 'DK14', CoValue: 'DK7', GetTime: 'DK8', SubSysPoint: 'DK9', ObjInstance: 'DK10'},
|
|
|
|
- {TableNum: 'DK15', CoValue: 'DK12', GetTime: 'DK13', SubSysPoint: 'DK14', ObjInstance: 'DK15'}
|
|
|
|
- ];
|
|
|
|
- this.loading = false;
|
|
|
|
|
|
+ if(res.Result && res.Result == "success"){
|
|
|
|
+ this.allTableData = res.Content;
|
|
|
|
+ this.loading = false;
|
|
|
|
+ }
|
|
});
|
|
});
|
|
},
|
|
},
|
|
//刷新当前行数据
|
|
//刷新当前行数据
|
|
refreshThisRow(row){
|
|
refreshThisRow(row){
|
|
let index = this.tableData.indexOf(row);
|
|
let index = this.tableData.indexOf(row);
|
|
getTabFunNumOverview({}, res => {
|
|
getTabFunNumOverview({}, res => {
|
|
- this.tableData[index].GetTime = new Date().getTime();
|
|
|
|
|
|
+ this.tableData[index].Data.Time = new Date().getTime();
|
|
});
|
|
});
|
|
},
|
|
},
|
|
//分页更换size
|
|
//分页更换size
|