|
@@ -84,7 +84,7 @@
|
|
<div class="query-box clearfix">
|
|
<div class="query-box clearfix">
|
|
<div class="query-item">
|
|
<div class="query-item">
|
|
<label>设备实例关键字</label>
|
|
<label>设备实例关键字</label>
|
|
- <el-input placeholder="请输入设备实例关键字" v-model="form.EquipLocalName" @keyup.enter.native="queryRightTable">
|
|
|
|
|
|
+ <el-input placeholder="请输入设备实例关键字" v-model="form.ObjectLocalName" @keyup.enter.native="queryRightTable">
|
|
<i slot="suffix" class="el-input__icon el-icon-search" @click="queryRightTable"></i>
|
|
<i slot="suffix" class="el-input__icon el-icon-search" @click="queryRightTable"></i>
|
|
</el-input>
|
|
</el-input>
|
|
</div>
|
|
</div>
|
|
@@ -100,7 +100,7 @@
|
|
@selection-change="rightSelectionChange">
|
|
@selection-change="rightSelectionChange">
|
|
<el-table-column type="selection" width="35" class-name="bgf5"></el-table-column>
|
|
<el-table-column type="selection" width="35" class-name="bgf5"></el-table-column>
|
|
<el-table-column label="设备实例名称" width="200" class-name="bgf5" show-overflow-tooltip>
|
|
<el-table-column label="设备实例名称" width="200" class-name="bgf5" show-overflow-tooltip>
|
|
- <template slot-scope="scope">{{ scope.row.EquipLocalName }}</template>
|
|
|
|
|
|
+ <template slot-scope="scope">{{ scope.row.ObjectLocalName }}</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<el-table-column prop="ObjectID" label="设备实例编码" show-overflow-tooltip></el-table-column>
|
|
<el-table-column prop="ObjectID" label="设备实例编码" show-overflow-tooltip></el-table-column>
|
|
<el-table-column prop="SubTypeName" label="设备类型" show-overflow-tooltip></el-table-column>
|
|
<el-table-column prop="SubTypeName" label="设备类型" show-overflow-tooltip></el-table-column>
|
|
@@ -128,7 +128,7 @@
|
|
<el-checkbox v-model="t.checked"></el-checkbox>
|
|
<el-checkbox v-model="t.checked"></el-checkbox>
|
|
<span>{{(t.Proximity*100).toFixed(2)}}%</span>
|
|
<span>{{(t.Proximity*100).toFixed(2)}}%</span>
|
|
</p>
|
|
</p>
|
|
- <p>{{t.EquipLocalName}}</p>
|
|
|
|
|
|
+ <p>{{t.ObjectLocalName}}</p>
|
|
<p>
|
|
<p>
|
|
{{t.BuildLocalName&&t.BuildLocalName!='null'&&t.FloorLocalName&&t.FloorLocalName!='null'?t.BuildLocalName+'-'+t.FloorLocalName:''}}
|
|
{{t.BuildLocalName&&t.BuildLocalName!='null'&&t.FloorLocalName&&t.FloorLocalName!='null'?t.BuildLocalName+'-'+t.FloorLocalName:''}}
|
|
</p>
|
|
</p>
|
|
@@ -179,7 +179,7 @@ export default {
|
|
SubTypeName: [], //数据字典设备类型
|
|
SubTypeName: [], //数据字典设备类型
|
|
LocationFlag: [], //位置标签
|
|
LocationFlag: [], //位置标签
|
|
Datasource: [], //数据源
|
|
Datasource: [], //数据源
|
|
- EquipLocalName: "", //设备实例关键字
|
|
|
|
|
|
+ ObjectLocalName: "", //设备实例关键字
|
|
locationVal: [] //所在位置下拉
|
|
locationVal: [] //所在位置下拉
|
|
}, //查询条件
|
|
}, //查询条件
|
|
leftRecoList: [], //左推荐
|
|
leftRecoList: [], //左推荐
|
|
@@ -385,8 +385,8 @@ export default {
|
|
TypeNameList: [this.typeName]
|
|
TypeNameList: [this.typeName]
|
|
};
|
|
};
|
|
//处理查询条件
|
|
//处理查询条件
|
|
- if (this.form.EquipLocalName && this.form.EquipLocalName.length) {
|
|
|
|
- param.EquipLocalName = this.form.EquipLocalName;
|
|
|
|
|
|
+ if (this.form.ObjectLocalName && this.form.ObjectLocalName.length) {
|
|
|
|
+ param.ObjectLocalName = this.form.ObjectLocalName;
|
|
}
|
|
}
|
|
if (this.form.SubTypeName.length) {
|
|
if (this.form.SubTypeName.length) {
|
|
param.SubTypeNameList = this.form.SubTypeName;
|
|
param.SubTypeNameList = this.form.SubTypeName;
|