|
@@ -164,6 +164,7 @@ import {
|
|
|
dynamicQueryAI,
|
|
|
dynamicRelatedObj,
|
|
|
partsQuery, //数据中心部件查询
|
|
|
+ dynamicPartQuery
|
|
|
} from "@/api/scan/request";
|
|
|
export default {
|
|
|
components: {
|
|
@@ -395,7 +396,8 @@ export default {
|
|
|
let pa = {
|
|
|
PageNumber: this.rPage.pageNumber,
|
|
|
PageSize: this.rPage.pageSize,
|
|
|
- Filters: 'not EquipID isNull'
|
|
|
+ Filters: 'not EquipID isNull',
|
|
|
+ Cascade: [{ Name: "zoneSpaceInBase" }, { Name: 'building' }, { Name: 'floor' }, { Name: 'equipCategory' }, { Name: 'belongedEquipment' }]
|
|
|
};
|
|
|
//处理查询条件
|
|
|
if (this.form.ObjectLocalName && this.form.ObjectLocalName.length) {
|
|
@@ -405,10 +407,24 @@ export default {
|
|
|
pa.Filters += `;Category in ${JSON.stringify(this.form.SubTypeName)}`;
|
|
|
}
|
|
|
if (this.form.locationVal.length > 0) {
|
|
|
- pa.Filters += `;BuildingId='${this.form.locationVal[0]}'`;
|
|
|
+ if (this.form.locationVal[0] == 'unknowBuild') {
|
|
|
+ pa.Filters += `;BuildingId isNull`;
|
|
|
+ } else {
|
|
|
+ pa.Filters += `;BuildingId='${this.form.locationVal[0]}'`;
|
|
|
+ }
|
|
|
}
|
|
|
if (this.form.locationVal.length > 1) {
|
|
|
- pa.Filters += `;FloorId='${this.form.locationVal[1]}'`;
|
|
|
+ if (this.form.locationVal[1] == 'unknowFloor') {
|
|
|
+ pa.Filters += `;FloorId isNull`;
|
|
|
+ } else {
|
|
|
+ pa.Filters += `;FloorId='${this.form.locationVal[1]}'`;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (this.form.locationVal.length > 2) {
|
|
|
+ pa.ZoneType = this.form.locationVal[2];
|
|
|
+ }
|
|
|
+ if (this.form.locationVal.length > 3) {
|
|
|
+ pa.ZoneId = this.form.locationVal[3];
|
|
|
}
|
|
|
let pa2 = {
|
|
|
Filters: `TypeName='${this.typeName}'`
|
|
@@ -424,22 +440,23 @@ export default {
|
|
|
if (tempArr.length) {
|
|
|
pa.Filters += `;not EquipID in ${JSON.stringify(tempArr)}`
|
|
|
}
|
|
|
- partsQuery(pa, res => {
|
|
|
+ dynamicPartQuery(pa, res => {
|
|
|
this.rPage.total = res.Total;
|
|
|
let tempArr = res.Content.map(t => {
|
|
|
t.ObjectID = t.EquipID.substr(12);
|
|
|
t.ObjectLocalName = t.EquipLocalName;
|
|
|
t.ObjectLocalCode = t.EquipLocalID;
|
|
|
- // t.SubTypeName = t.EquipCategory ? t.EquipCategory.EquipName : '';
|
|
|
- // t.BuildLocalName = t.Building ? t.Building.BuildLocalName : '';
|
|
|
- // t.FloorLocalName = t.Floor ? t.Floor.FloorLocalName : '';
|
|
|
- // t.RoomLocalName = '';
|
|
|
- // if (t.ZoneSpaceBaseIn) {
|
|
|
- // t.ZoneSpaceBaseIn.forEach(item => {
|
|
|
- // t.RoomLocalName += item.RoomLocalName + ',';
|
|
|
- // })
|
|
|
- // t.RoomLocalName = t.RoomLocalName.substring(0, t.RoomLocalName.length - 1);
|
|
|
- // }
|
|
|
+ t.SubTypeName = t.EquipCategory ? t.EquipCategory.EquipName : '';
|
|
|
+ t.CascadeEquipLocalName = t.BelongedEquipment ? t.BelongedEquipment.EquipLocalName : '';
|
|
|
+ t.BuildLocalName = t.Building ? t.Building.BuildLocalName : '';
|
|
|
+ t.FloorLocalName = t.Floor ? t.Floor.FloorLocalName : '';
|
|
|
+ t.RoomLocalName = '';
|
|
|
+ if (t.ZoneSpaceInBase) {
|
|
|
+ t.ZoneSpaceInBase.forEach(item => {
|
|
|
+ t.RoomLocalName += item.RoomLocalName + ',';
|
|
|
+ })
|
|
|
+ t.RoomLocalName = t.RoomLocalName.substring(0, t.RoomLocalName.length - 1);
|
|
|
+ }
|
|
|
return t;
|
|
|
});
|
|
|
if (this.rPage.pageNumber == 1) {
|
|
@@ -550,7 +567,14 @@ export default {
|
|
|
let param = []
|
|
|
n.map(item => {
|
|
|
param.push({
|
|
|
- Objs: [item],
|
|
|
+ Objs: [{
|
|
|
+ ObjectID: item.ObjectID,
|
|
|
+ TypeCode: 'Ec',
|
|
|
+ ProjectId: item.ProjectId.substring(2),
|
|
|
+ ObjectLocalCode: item.ObjectLocalCode,
|
|
|
+ ObjectLocalName: item.ObjectLocalName,
|
|
|
+ SubTypeCode: item.Category
|
|
|
+ }],
|
|
|
Top: 3,
|
|
|
Proximity: 0.5
|
|
|
})
|