|
@@ -7,16 +7,14 @@
|
|
<el-col :span="23">
|
|
<el-col :span="23">
|
|
<el-form ref="form" :model="form" :inline="true">
|
|
<el-form ref="form" :model="form" :inline="true">
|
|
<el-row>
|
|
<el-row>
|
|
- <div class="query-item">
|
|
|
|
- <el-form-item class="special">
|
|
|
|
- <el-input placeholder="请输入设备标识关键字" v-model="form.EquipmentMark" @keyup.enter.native="queryTableData">
|
|
|
|
- <i slot="suffix" class="el-input__icon el-icon-search" @click="queryTableData"></i>
|
|
|
|
- </el-input>
|
|
|
|
- </el-form-item>
|
|
|
|
|
|
+ <div class="query-item special">
|
|
|
|
+ <el-input placeholder="请输入设备标识关键字" v-model="form.EquipmentMark" @keyup.enter.native="queryTableData">
|
|
|
|
+ <i slot="suffix" class="el-input__icon el-icon-search" @click="queryTableData"></i>
|
|
|
|
+ </el-input>
|
|
</div>
|
|
</div>
|
|
<div class="query-item">
|
|
<div class="query-item">
|
|
<label style="padding-right:9px">数据源</label>
|
|
<label style="padding-right:9px">数据源</label>
|
|
- <dataSource :Related="null" @change="changeDataSource" :typeName="typeName"></dataSource>
|
|
|
|
|
|
+ <dataSource :Related="null" @change="changeDataSource" :typeName="typeName"></dataSource>
|
|
</div>
|
|
</div>
|
|
<div class="query-item">
|
|
<div class="query-item">
|
|
<dictionary-device @change="changeDictionary" :Related="null" :typeName="typeName"></dictionary-device>
|
|
<dictionary-device @change="changeDictionary" :Related="null" :typeName="typeName"></dictionary-device>
|
|
@@ -55,8 +53,10 @@
|
|
<el-table-column prop="EquipLocalName" label="对应的设备实例" show-overflow-tooltip min-width="100" class-name="td-bl"></el-table-column>
|
|
<el-table-column prop="EquipLocalName" label="对应的设备实例" show-overflow-tooltip min-width="100" class-name="td-bl"></el-table-column>
|
|
<el-table-column label="实例所在建筑楼层" min-width="100">
|
|
<el-table-column label="实例所在建筑楼层" min-width="100">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
- <el-tooltip :content="scope.row.BuildLocalName&&scope.row.FloorLocalName?scope.row.BuildLocalName+'-'+scope.row.FloorLocalName:''" placement="top">
|
|
|
|
- <div class="tool-tip">{{scope.row.BuildLocalName&&scope.row.FloorLocalName?scope.row.BuildLocalName+'-'+scope.row.FloorLocalName:''}}</div>
|
|
|
|
|
|
+ <el-tooltip :content="scope.row.BuildLocalName&&scope.row.FloorLocalName?scope.row.BuildLocalName+'-'+scope.row.FloorLocalName:''"
|
|
|
|
+ placement="top">
|
|
|
|
+ <div class="tool-tip">{{scope.row.BuildLocalName&&scope.row.FloorLocalName?scope.row.BuildLocalName+'-'+scope.row.FloorLocalName:''}}
|
|
|
|
+ </div>
|
|
</el-tooltip>
|
|
</el-tooltip>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
@@ -188,7 +188,7 @@ export default {
|
|
//刷新列表
|
|
//刷新列表
|
|
refresh() {
|
|
refresh() {
|
|
this.page.pageNumber = 1;
|
|
this.page.pageNumber = 1;
|
|
- this.$emit('refresh',this.typeName);
|
|
|
|
|
|
+ this.$emit('refresh', this.typeName);
|
|
this.getTableData();
|
|
this.getTableData();
|
|
},
|
|
},
|
|
//数据字典设备类型修改
|
|
//数据字典设备类型修改
|
|
@@ -233,9 +233,9 @@ export default {
|
|
& + .query-item {
|
|
& + .query-item {
|
|
margin-left: 10px;
|
|
margin-left: 10px;
|
|
}
|
|
}
|
|
- /deep/ .special .el-input__inner{
|
|
|
|
- width: 220px;
|
|
|
|
- }
|
|
|
|
|
|
+ }
|
|
|
|
+ /deep/ .special .el-input__inner {
|
|
|
|
+ width: 220px;
|
|
}
|
|
}
|
|
/deep/ .table-area {
|
|
/deep/ .table-area {
|
|
width: 100%;
|
|
width: 100%;
|
|
@@ -248,7 +248,7 @@ export default {
|
|
.td-bl {
|
|
.td-bl {
|
|
border-left: 1px solid #ebeef5;
|
|
border-left: 1px solid #ebeef5;
|
|
}
|
|
}
|
|
- .tool-tip{
|
|
|
|
|
|
+ .tool-tip {
|
|
white-space: nowrap;
|
|
white-space: nowrap;
|
|
overflow: hidden;
|
|
overflow: hidden;
|
|
text-overflow: ellipsis;
|
|
text-overflow: ellipsis;
|