|
@@ -6,42 +6,42 @@
|
|
|
<div class="details">
|
|
|
<h4>{{index | numTransformation(4)}}<el-badge value="待删除" class="item"></el-badge>
|
|
|
</h4>
|
|
|
- <h4>{{`${item.BuildingName}建筑模型`}}-{{`${item.FloorName}层`}}-{{`${item.EquipLocalName?item.EquipLocalName:item.EquipName}`}}</h4>
|
|
|
+ <h4>{{`${item.buildingName || '**'}`}}-{{`${item.floorName || '**'}`}}-{{`${item.localName?item.localName:item.name}`}}</h4>
|
|
|
<b>BIM ID:<span @dblclick="copyContent"
|
|
|
- id="copy">{{item.ScanTaskBase && item.ScanTaskBase[0]?item.ScanTaskBase[0].BIMID:'' | bimIdTransformation}}</span></b><span class="copy"
|
|
|
+ id="copy">{{item.bimId | bimIdTransformation}}</span></b><span class="copy"
|
|
|
@click="clickCopy">点击复制</span>
|
|
|
<input id="copyContent" type="text" @dblclick="copyContent" style="border:none;opacity:0;position:absolute;top:0;left:0;">
|
|
|
- <p style="margin-top:30px;">Revit族:{{item.BIMFamilyName}}</p>
|
|
|
- <p>设计图纸中编码:{{item.CADID}}</p>
|
|
|
- <p><span>设备类型:{{item.Category}}</span></p>
|
|
|
- <p>设备ID:{{item.EquipID}}</p>
|
|
|
- <p><span v-if="item.Property && item.Property.FamilyName">资产族:{{item.Property.FamilyName.Name}}</span><span
|
|
|
- v-if="item.PropertyId">关联的资产ID:{{item.PropertyId}}</span></p>
|
|
|
- <p>现场任务ID:{{item.ScanTaskBase && item.ScanTaskBase[0]?item.ScanTaskBase[0].TaskId:""}}</p>
|
|
|
+ <!-- <p style="margin-top:30px;">Revit族:{{item.BIMFamilyName}}</p> -->
|
|
|
+ <p>设计图纸中编码:{{item.cadId || '--'}}</p>
|
|
|
+ <p><span>设备类型:{{item.codeName || '--'}}</span></p>
|
|
|
+ <p>设备ID:{{item.id}}</p>
|
|
|
+ <!-- <p><span v-if="item.Property && item.Property.FamilyName">资产族:{{item.Property.FamilyName.Name}}</span><span
|
|
|
+ v-if="item.PropertyId">关联的资产ID:{{item.PropertyId}}</span></p> -->
|
|
|
+ <p>现场任务ID:{{item.scanTaskBase && item.scanTaskBase[0]?item.scanTaskBase[0].TaskId:""}}</p>
|
|
|
<p>
|
|
|
- <span>执行人:{{item.ScanTaskBase && item.ScanTaskBase[0]?item.ScanTaskBase[0].WorkerName:''}}</span><span>确认人:{{item.ScanTaskBase && item.ScanTaskBase[0]?item.ScanTaskBase[0].ConfirmingPersonName:''}}</span>
|
|
|
+ <span>执行人:{{item.scanTaskBase && item.scanTaskBase[0]?item.scanTaskBase[0].WorkerName:''}}</span><span>确认人:{{item.scanTaskBase && item.scanTaskBase[0]?item.scanTaskBase[0].ConfirmingPersonName:''}}</span>
|
|
|
</p>
|
|
|
</div>
|
|
|
<div class="plan">
|
|
|
<p>平面图上的位置:<span>{{item.local | localTransformation}}</span></p>
|
|
|
<div class="img-box">
|
|
|
- <canvas :id="'canvas'+index" :width="canvasWidth" :height="canvasHeight" ref="canvas" tabindex="0" :data-modelid="item.ModelId"
|
|
|
- :data-EquipID='item.EquipID' :data-x="item.local.X" :data-y="item.local.Y"></canvas>
|
|
|
+ <canvas :id="'canvas'+index" :width="canvasWidth" :height="canvasHeight" ref="canvas" tabindex="0" :data-modelid="item.modelId"
|
|
|
+ :data-equipid='item.id' :data-x="item.local.X" :data-y="item.local.Y"></canvas>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="content-bottom">
|
|
|
- <div class="explain" v-if="item.ScanTaskBase && item.ScanTaskBase[0] && item.ScanTaskBase[0].Note">
|
|
|
+ <div class="explain" v-if="item.scanTaskBase && item.scanTaskBase[0] && item.scanTaskBase[0].Note">
|
|
|
<p>现场问题说明:</p>
|
|
|
<el-scrollbar>
|
|
|
<p class="explain-content">
|
|
|
<el-scrollbar>
|
|
|
- {{item.ScanTaskBase?item.ScanTaskBase[0].Note:""}}
|
|
|
+ {{item.scanTaskBase?item.scanTaskBase[0].Note:""}}
|
|
|
</el-scrollbar>
|
|
|
</p>
|
|
|
</el-scrollbar>
|
|
|
</div>
|
|
|
- <div class="photo" v-for="(it,ind) in item.ScanTaskBase[0].TaskPicList" :key='ind' v-else-if="item.ScanTaskBase && item.ScanTaskBase[0]">
|
|
|
+ <div class="photo" v-for="(it,ind) in item.scanTaskBase[0].TaskPicList" :key='ind' v-else-if="item.scanTaskBase && item.scanTaskBase[0]">
|
|
|
<div class="img-box">
|
|
|
<p>{{it.Name}}<span>拍摄时间:{{it.CreateTime | timeTransformation}}</span></p>
|
|
|
<div class="img-content">
|
|
@@ -160,70 +160,51 @@ export default {
|
|
|
},
|
|
|
queryToBelDelEquip() {// 请求待删除数据
|
|
|
let params = {
|
|
|
- ProjectId: this.projectId,
|
|
|
- Cascade: [
|
|
|
- {
|
|
|
- Name: "scanTaskBase",// 级联-任务
|
|
|
- Filters: 'TaskState = 0',
|
|
|
- Orders: "CreateTime desc ,EquipName asc",
|
|
|
- },
|
|
|
- {
|
|
|
- Name: "property",// 级联-资产
|
|
|
- Cascade: [
|
|
|
- {
|
|
|
- Name: "familyName"
|
|
|
- }
|
|
|
- ]
|
|
|
- },
|
|
|
- {
|
|
|
- Name: "equipCategory"// 级联-设备类型
|
|
|
- }
|
|
|
- ],
|
|
|
- Orders: "CreateTime desc ,EquipName asc",
|
|
|
- Filters: `ModelId in ${this.equipComDelList}`,
|
|
|
- PageNumber: this.page.pageNumber,
|
|
|
- PageSize: this.page.pageSize
|
|
|
+ orders: "createTime desc ,id asc",
|
|
|
+ filters: `modelId in ${this.equipComDelList}`,
|
|
|
+ pageNumber: this.page.pageNumber,
|
|
|
+ pageSize: this.page.pageSize
|
|
|
}
|
|
|
toBeDelEquipPage(params, res => {
|
|
|
- this.page.total = res.PageSize < 20 ? res.PageSize : res.Total;
|
|
|
- res.Content.forEach(item => {
|
|
|
- if (item.BIMLocation) {
|
|
|
+ this.page.total = res.pageSize < 20 ? res.pageSize : res.total;
|
|
|
+ res.content.forEach(item => {
|
|
|
+ if (item.bimLocation) {
|
|
|
let local = {};
|
|
|
- let ary = item.BIMLocation.split(',');
|
|
|
+ let ary = item.bimLocation.split(',');
|
|
|
let localAry = ['X', 'Y', 'Z'];
|
|
|
ary.forEach((item, index) => {
|
|
|
local[localAry[index]] = ary[index];
|
|
|
})
|
|
|
item.local = local;
|
|
|
}
|
|
|
- if (item.ScanTaskBase && item.ScanTaskBase.length > 1) {
|
|
|
- item.ScanTaskBase = item.ScanTaskBase.shift();
|
|
|
+ if (item.scanTaskBase && item.scanTaskBase.length > 1) {
|
|
|
+ item.scanTaskBase = item.scanTaskBase.shift();
|
|
|
}
|
|
|
});
|
|
|
if (this.page.pageNumber == 1) {
|
|
|
- this.pageData = res.Content;
|
|
|
+ this.pageData = res.content;
|
|
|
this.$nextTick(() => {
|
|
|
this.getGraphy();
|
|
|
})
|
|
|
} else {
|
|
|
- this.pageData = this.pageData.concat(res.Content);
|
|
|
+ this.pageData = this.pageData.concat(res.content);
|
|
|
console.log(this.pageData.length, 19)
|
|
|
this.$nextTick(() => {
|
|
|
this.getGraphy();
|
|
|
})
|
|
|
}
|
|
|
this.pageData.forEach(item => {
|
|
|
- if (item.BIMLocation) {
|
|
|
+ if (item.bimLocation) {
|
|
|
let local = {};
|
|
|
- let ary = item.BIMLocation.split(',');
|
|
|
+ let ary = item.bimLocation.split(',');
|
|
|
let localAry = ['X', 'Y', 'Z'];
|
|
|
ary.forEach((item, index) => {
|
|
|
local[localAry[index]] = ary[index];
|
|
|
})
|
|
|
item.local = local;
|
|
|
}
|
|
|
- if (item.ScanTaskBase && item.ScanTaskBase.length > 1) {
|
|
|
- item.ScanTaskBase = item.ScanTaskBase.shift();
|
|
|
+ if (item.scanTaskBase && item.scanTaskBase.length > 1) {
|
|
|
+ item.scanTaskBase = item.scanTaskBase.shift();
|
|
|
}
|
|
|
});
|
|
|
})
|
|
@@ -231,18 +212,18 @@ export default {
|
|
|
getGraphy() {// 绘制空间位置图片
|
|
|
console.log(this.i);
|
|
|
let can = this.$refs.canvas;
|
|
|
+ let modelId = can[this.i].dataset.modelid
|
|
|
let that = this;
|
|
|
that.clearGraphy(this.i)
|
|
|
that.scene = new LocationPointScene();
|
|
|
this.canvasLoading = true;
|
|
|
- that.scene.getFloorData('/modelapi/base-graph/query', { ModelId: can[this.i].dataset.modelid }).then(res => {
|
|
|
+ that.scene.getFloorData('/modelapi/base-graph/query', { ModelId: modelId }).then(res => {
|
|
|
that.canvasLoading = false;
|
|
|
if (res == 'error') {
|
|
|
this.FloorMap = '';
|
|
|
console.log('数据解析异常');
|
|
|
return;
|
|
|
}
|
|
|
- let modelID = can[this.i].dataset.modelid
|
|
|
let EquipID = can[this.i].dataset.equipid;
|
|
|
let X = Number(can[this.i].dataset.x);
|
|
|
let Y = can[this.i].dataset.y * -1;
|
|
@@ -253,6 +234,7 @@ export default {
|
|
|
Y: Y
|
|
|
})
|
|
|
that.view.fitSceneToView();
|
|
|
+ that.view.scalable = false;
|
|
|
this.scene.isSpaceSelectable = false;
|
|
|
this.i++;
|
|
|
if (this.i !== this.pageData.length) {
|