|
@@ -5,22 +5,22 @@
|
|
|
<div class="obj-item" v-for="form in forms" :key="form.id">
|
|
|
<el-form :model="form" label-width="150px">
|
|
|
<el-form-item label="对象类型:">
|
|
|
- {{form.TypeCode}}
|
|
|
+ {{form.TypeName}}
|
|
|
</el-form-item>
|
|
|
<el-form-item label="对象实例本地名称:">
|
|
|
{{form.ObjectLocalName}}
|
|
|
</el-form-item>
|
|
|
<el-form-item label="对象实例本地编码:">
|
|
|
- {{form.EquipmentMark}}
|
|
|
+ {{form.ObjectLocalCode}}
|
|
|
</el-form-item>
|
|
|
<el-form-item label="对象实例ID:">
|
|
|
{{form.ObjectID}}
|
|
|
</el-form-item>
|
|
|
<el-form-item label="信息点名称:">
|
|
|
- {{form.EquipLocalName}}
|
|
|
+ {{form.InfomationPointName}}
|
|
|
</el-form-item>
|
|
|
<el-form-item label="对应值:">
|
|
|
- {{form.InfomationPointCode}}
|
|
|
+ {{ reValue }}
|
|
|
</el-form-item>
|
|
|
<el-form-item label="对象实例位置图:">
|
|
|
<canvas height="200" width="100" class="instanceMap" :id="form.instanceId" v-loading="form.loading"></canvas>
|
|
@@ -44,16 +44,6 @@ export default {
|
|
|
data() {
|
|
|
return {
|
|
|
forms: [
|
|
|
- // {
|
|
|
- // id: '1', ID
|
|
|
- // objType: 'type1' , 对象类型
|
|
|
- // localName: 'name1', 对象实例本地名称
|
|
|
- // localNum: 'num1', 对象实例本地编码
|
|
|
- // instanceId: 'id1', 对象实例ID
|
|
|
- // mesPointName: 'name1', 信息点名称
|
|
|
- // mesPointVal: 'value1', 对应值
|
|
|
- // instanceMap: 'm' 对象实例位置图
|
|
|
- // }
|
|
|
],
|
|
|
views: [],
|
|
|
scenes: [],
|
|
@@ -75,30 +65,30 @@ export default {
|
|
|
that.forms = res.Content;
|
|
|
that.clearGraphy()
|
|
|
//加载canvas
|
|
|
- that.forms.map((key, item) => {
|
|
|
- that.views[key] = new SGraphyView('floorCanvas')
|
|
|
- that.scenes[key] = new DivideFloorScene();
|
|
|
- that.forms[key].loading = true;
|
|
|
+ // that.forms.map((key, item) => {
|
|
|
+ // that.views[key] = new SGraphyView('floorCanvas')
|
|
|
+ // that.scenes[key] = new DivideFloorScene();
|
|
|
+ // that.forms[key].loading = flase;
|
|
|
|
|
|
- that.scenes[key].loadUrl(`/image-service/common/file_get?systemId=revit&key=${this.FloorMap}`).then(() => {
|
|
|
- that.forms[key].loading = false;
|
|
|
- that.views[key].scene = that.scenes[key];
|
|
|
- let tempArr = that.BSPRelaISPLists[key].map((t, i) => {
|
|
|
- return {
|
|
|
- RoomLocalName: t.RoomLocalName,
|
|
|
- OutLine: t.Outline,
|
|
|
- RoomID: t.RoomID,
|
|
|
- Color: new SColor(colorArr[i % colorArr.length]),
|
|
|
- }
|
|
|
- })
|
|
|
- that.scenes[key].addZoneList(tempArr);
|
|
|
- that.scenes[key].click(that, that.canvasClick)
|
|
|
- that.views[key].fitSceneToView();
|
|
|
- that.views[key].maxScale = that.views[key].scale * 10;
|
|
|
- that.views[key].minScale = that.views[key].scale;
|
|
|
- // that.$refs.canvasFun.everyScale = that.views[key].scale;
|
|
|
- })
|
|
|
- });
|
|
|
+ // that.scenes[key].loadUrl(`/image-service/common/file_get?systemId=revit&key=${this.FloorMap}`).then(() => {
|
|
|
+ // that.forms[key].loading = false;
|
|
|
+ // that.views[key].scene = that.scenes[key];
|
|
|
+ // let tempArr = that.BSPRelaISPLists[key].map((t, i) => {
|
|
|
+ // return {
|
|
|
+ // RoomLocalName: t.RoomLocalName,
|
|
|
+ // OutLine: t.Outline,
|
|
|
+ // RoomID: t.RoomID,
|
|
|
+ // Color: new SColor(colorArr[i % colorArr.length]),
|
|
|
+ // }
|
|
|
+ // })
|
|
|
+ // that.scenes[key].addZoneList(tempArr);
|
|
|
+ // that.scenes[key].click(that, that.canvasClick)
|
|
|
+ // that.views[key].fitSceneToView();
|
|
|
+ // that.views[key].maxScale = that.views[key].scale * 10;
|
|
|
+ // that.views[key].minScale = that.views[key].scale;
|
|
|
+ // // that.$refs.canvasFun.everyScale = that.views[key].scale;
|
|
|
+ // })
|
|
|
+ // });
|
|
|
|
|
|
})
|
|
|
},
|
|
@@ -137,7 +127,8 @@ export default {
|
|
|
this.loadObjectInstance();
|
|
|
},
|
|
|
props: {
|
|
|
- tabFunNum: String//表号功能号
|
|
|
+ tabFunNum: String,//表号功能号,
|
|
|
+ reValue: String//对应值
|
|
|
},
|
|
|
computed: {
|
|
|
...mapGetters('layout', ['projectId', 'userId'])
|