|
@@ -23,8 +23,8 @@
|
|
|
{{ reValue || '--'}}
|
|
|
</el-form-item>
|
|
|
<el-form-item label="对象实例位置图:">
|
|
|
- <span v-if="!drawCanvas">--</span>
|
|
|
- <canvas v-else height="300px" width="600" class="instanceMap" :id="form.instanceId" :k="refreshCanvas"></canvas>
|
|
|
+ <span v-show="!drawCanvas">--</span>
|
|
|
+ <canvas v-show="drawCanvas" height="300px" width="600" class="instanceMap" :id="form.instanceId" :k="refreshCanvas"></canvas>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
</div>
|
|
@@ -49,7 +49,7 @@ export default {
|
|
|
scenes: [],//canvas scene
|
|
|
loading: true,
|
|
|
refreshCanvas: '',//重载canvas组件
|
|
|
- drawCanvas: true//是否画canvas
|
|
|
+ drawCanvas: false//是否画canvas
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
@@ -74,22 +74,19 @@ export default {
|
|
|
Filters: `EquipID='${item.TypeCode + this.projectId.substring(2) + item.ObjectID}'`
|
|
|
}
|
|
|
//获取设备信息
|
|
|
- getEquipByEqID(pa, res1 => {
|
|
|
- if (res1.Content[0].LocationJson && res1.Content[0].FloorId) {
|
|
|
- let param = {
|
|
|
- Filters: `FloorId='${res1.Content[0].FloorId}'`
|
|
|
- }
|
|
|
+ getEquipByEqID(pa, equipMsg => {
|
|
|
+ if (equipMsg.Content[0].LocationJson && equipMsg.Content[0].FloorId) {
|
|
|
let canvasOption = {
|
|
|
/** 标记的id */
|
|
|
- Id: res1.Content[0].EquipID,
|
|
|
+ Id: equipMsg.Content[0].EquipID,
|
|
|
/** 标记的名称 */
|
|
|
- Name: res1.Content[0].EquipName,
|
|
|
+ Name: equipMsg.Content[0].EquipName,
|
|
|
/** X坐标 */
|
|
|
- X: res1.Content[0].LocationJson.X,
|
|
|
+ X: equipMsg.Content[0].LocationJson.X,
|
|
|
/** Y坐标 */
|
|
|
- Y: -res1.Content[0].LocationJson.Y
|
|
|
+ Y: -equipMsg.Content[0].LocationJson.Y
|
|
|
}
|
|
|
- this.loadDataToInstanceByFloorID(param, key, item.TypeCode, canvasOption);
|
|
|
+ this.loadDataToInstanceByFloorID(equipMsg.Content[0].FloorId, key, item.TypeCode, canvasOption);
|
|
|
}
|
|
|
})
|
|
|
}
|
|
@@ -102,39 +99,30 @@ export default {
|
|
|
zone: item.SubTypeCode
|
|
|
}
|
|
|
//获取空间信息
|
|
|
- queryZone(pa, res1 => {
|
|
|
- if (res1.Content[0] && res1.Content[0].Outline) {
|
|
|
- let param = {
|
|
|
- Filters: `FloorId='${res1.Content[0].FloorId}'`
|
|
|
- }
|
|
|
+ queryZone(pa, zoneMsg => {
|
|
|
+ if (zoneMsg.Content[0] && zoneMsg.Content[0].Outline) {
|
|
|
let canvasOption = {
|
|
|
- RoomLocalName: res1.Content[0].RoomLocalName,
|
|
|
- OutLine: res1.Content[0].Outline,
|
|
|
- RoomID: res1.Content[0].RoomID,
|
|
|
+ RoomLocalName: zoneMsg.Content[0].RoomLocalName,
|
|
|
+ OutLine: zoneMsg.Content[0].Outline,
|
|
|
+ RoomID: zoneMsg.Content[0].RoomID,
|
|
|
Color: new SColor('#F9C3C3')
|
|
|
}
|
|
|
- this.loadDataToInstanceByFloorID(param, key, item.TypeCode, canvasOption);
|
|
|
- }
|
|
|
- else {
|
|
|
- this.drawCanvas = false;
|
|
|
+ this.loadDataToInstanceByFloorID(zoneMsg.Content[0].FloorId, key, item.TypeCode, canvasOption);
|
|
|
}
|
|
|
});
|
|
|
}
|
|
|
- else {
|
|
|
- this.drawCanvas = false;
|
|
|
- }
|
|
|
- }
|
|
|
- else {
|
|
|
- this.drawCanvas = false;
|
|
|
}
|
|
|
});
|
|
|
})
|
|
|
},
|
|
|
//通过floorid获取信息,后通过floormap获取数据后绘制canvas
|
|
|
- loadDataToInstanceByFloorID(param, key, typecode, options) {
|
|
|
+ loadDataToInstanceByFloorID(floorId, key, typecode, options) {
|
|
|
+ let param = {
|
|
|
+ Filters: `FloorId='${floorId}'`
|
|
|
+ }
|
|
|
let that = this;
|
|
|
//获取楼层信息
|
|
|
- getFloorMsgByFloorID(param, res2 => {
|
|
|
+ getFloorMsgByFloorID(param, floorMsg => {
|
|
|
//刷新canvas
|
|
|
that.refreshCanvas = new Date().getTime();
|
|
|
if (!that.views[key]) {
|
|
@@ -149,12 +137,10 @@ export default {
|
|
|
else if (typecode == 'Sp') {
|
|
|
that.scenes[key] = new DivideFloorScene();
|
|
|
}
|
|
|
- else {
|
|
|
- that.scenes[key] = null;
|
|
|
- }
|
|
|
- if (res2.Content[0].StructureInfo && res2.Content[0].StructureInfo.FloorMap) {
|
|
|
+ if (floorMsg.Content[0].StructureInfo && floorMsg.Content[0].StructureInfo.FloorMap) {
|
|
|
//获取数据,并加载canvas
|
|
|
- that.scenes[key].loadUrl(`/image-service/common/file_get?systemId=revit&key=${res2.Content[0].StructureInfo.FloorMap}`).then(() => {
|
|
|
+ that.scenes[key].loadUrl(`/image-service/common/file_get?systemId=revit&key=${floorMsg.Content[0].StructureInfo.FloorMap}`).then(() => {
|
|
|
+ that.drawCanvas = true;
|
|
|
that.views[key].scene = that.scenes[key];
|
|
|
that.scenes[key].isSpaceSelectable = false;
|
|
|
if (typecode == 'Eq' || typecode == 'Ec') {
|