|
@@ -12,16 +12,16 @@
|
|
|
<el-form-item label="对象实例本地编码:">
|
|
|
{{form.ObjectLocalCode || '--'}}
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="对象实例ID:">
|
|
|
+ <el-form-item label="对象实例ID:">
|
|
|
{{form.ObjectID || '--'}}
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="信息点名称:">
|
|
|
+ <el-form-item label="信息点名称:">
|
|
|
{{form.InfomationPointName || '--'}}
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="对应值:">
|
|
|
+ <el-form-item label="对应值:">
|
|
|
{{ reValue || '--'}}
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="对象实例位置图:">
|
|
|
+ <el-form-item label="对象实例位置图:">
|
|
|
<span v-show="!drawCanvas">--</span>
|
|
|
<div v-show="drawCanvas" style="border:1px solid rgba(0, 0, 0, 0.2);height:300px;">
|
|
|
<canvas v-show="drawCanvas" height="300" :width="canvasWidth" class="instanceMap" :id="form.instanceId" :k="refreshCanvas"></canvas>
|
|
@@ -84,19 +84,22 @@ export default {
|
|
|
queryEquip({
|
|
|
Filters: `EquipID='${item.TypeCode + item.ProjectId + item.ObjectID}'`
|
|
|
}, equipMsg => {
|
|
|
- if (equipMsg.Content[0] && equipMsg.Content[0].LocationJson && equipMsg.Content[0].FloorId) {
|
|
|
- let canvasOption = {
|
|
|
- /** 标记的id */
|
|
|
- Id: equipMsg.Content[0].EquipID,
|
|
|
- /** 标记的名称 */
|
|
|
- Name: equipMsg.Content[0].EquipName,
|
|
|
- /** X坐标 */
|
|
|
- X: equipMsg.Content[0].LocationJson.X,
|
|
|
- /** Y坐标 */
|
|
|
- Y: -equipMsg.Content[0].LocationJson.Y
|
|
|
+ if (equipMsg.Content[0]) {
|
|
|
+ if (equipMsg.Content[0].LocationJson && equipMsg.Content[0].FloorId) {
|
|
|
+ let canvasOption = {
|
|
|
+ /** 标记的id */
|
|
|
+ Id: equipMsg.Content[0].EquipID,
|
|
|
+ /** 标记的名称 */
|
|
|
+ Name: equipMsg.Content[0].EquipName,
|
|
|
+ /** X坐标 */
|
|
|
+ X: equipMsg.Content[0].LocationJson.X,
|
|
|
+ /** Y坐标 */
|
|
|
+ Y: -equipMsg.Content[0].LocationJson.Y
|
|
|
+ }
|
|
|
+ that.forms[key].ObjectLocalName = equipMsg.Content[0].EquipLocalName
|
|
|
+ that.forms[key].ObjectLocalCode = equipMsg.Content[0].EquipLocalID
|
|
|
+ this.loadDataToInstanceByFloorID(equipMsg.Content[0].FloorId, key, item.TypeCode, canvasOption);
|
|
|
}
|
|
|
- that.forms[key].ObjectLocalName = equipMsg.Content[0].EquipLocalName
|
|
|
- that.forms[key].ObjectLocalCode = equipMsg.Content[0].EquipLocalID
|
|
|
if (item.InfoList.length && equipMsg.Content[0].Category) {
|
|
|
let params = {
|
|
|
data: {
|
|
@@ -105,10 +108,10 @@ export default {
|
|
|
type: equipMsg.Content[0].Category
|
|
|
}
|
|
|
getDataDictionary(params, resp => {
|
|
|
- that.forms[key].InfomationPointName = resp.Content.map(t => t.InfoPointName || '').join(',');
|
|
|
+ that.forms[key].InfomationPointName = resp.Content.map(t => t.InfoPointName).join(',');
|
|
|
+ that.$forceUpdate()
|
|
|
})
|
|
|
}
|
|
|
- this.loadDataToInstanceByFloorID(equipMsg.Content[0].FloorId, key, item.TypeCode, canvasOption);
|
|
|
}
|
|
|
})
|
|
|
} else if (item.TypeCode == 'Sp') {
|
|
@@ -118,15 +121,18 @@ export default {
|
|
|
Filters: `RoomID='${item.TypeCode + item.ProjectId + item.ObjectID}'`,
|
|
|
ZoneType: item.SpaceType
|
|
|
}, zoneMsg => {
|
|
|
- if (zoneMsg.Content[0] && zoneMsg.Content[0].Outline) {
|
|
|
- let canvasOption = {
|
|
|
- RoomLocalName: zoneMsg.Content[0].RoomLocalName,
|
|
|
- OutLine: zoneMsg.Content[0].Outline,
|
|
|
- RoomID: zoneMsg.Content[0].RoomID,
|
|
|
- Color: '#F9C3C3'
|
|
|
+ if (zoneMsg.Content[0]) {
|
|
|
+ if (zoneMsg.Content[0].Outline) {
|
|
|
+ let canvasOption = {
|
|
|
+ RoomLocalName: zoneMsg.Content[0].RoomLocalName,
|
|
|
+ OutLine: zoneMsg.Content[0].Outline,
|
|
|
+ RoomID: zoneMsg.Content[0].RoomID,
|
|
|
+ Color: '#F9C3C3'
|
|
|
+ }
|
|
|
+ that.forms[key].ObjectLocalName = zoneMsg.Content[0].RoomLocalName
|
|
|
+ that.forms[key].ObjectLocalCode = zoneMsg.Content[0].RoomLocalID
|
|
|
+ this.loadDataToInstanceByFloorID(zoneMsg.Content[0].FloorId, key, item.TypeCode, canvasOption);
|
|
|
}
|
|
|
- that.forms[key].ObjectLocalName = zoneMsg.Content[0].RoomLocalName
|
|
|
- that.forms[key].ObjectLocalCode = zoneMsg.Content[0].RoomLocalID
|
|
|
if (item.InfoList.length && zoneMsg.Content[0].ObjectType) {
|
|
|
let params = {
|
|
|
data: {
|
|
@@ -136,9 +142,9 @@ export default {
|
|
|
}
|
|
|
getDataDictionary(params, resp => {
|
|
|
that.forms[key].InfomationPointName = resp.Content.map(t => t.InfoPointName || '').join(',');
|
|
|
+ that.$forceUpdate()
|
|
|
})
|
|
|
}
|
|
|
- this.loadDataToInstanceByFloorID(zoneMsg.Content[0].FloorId, key, item.TypeCode, canvasOption);
|
|
|
}
|
|
|
});
|
|
|
}
|
|
@@ -146,19 +152,22 @@ export default {
|
|
|
partsQuery({
|
|
|
Filters: `EquipID='${item.TypeCode + item.ProjectId + item.ObjectID}'`
|
|
|
}, equipMsg => {
|
|
|
- if (equipMsg.Content[0] && equipMsg.Content[0].LocationJson && equipMsg.Content[0].FloorId) {
|
|
|
- let canvasOption = {
|
|
|
- /** 标记的id */
|
|
|
- Id: equipMsg.Content[0].EquipID,
|
|
|
- /** 标记的名称 */
|
|
|
- Name: equipMsg.Content[0].EquipName,
|
|
|
- /** X坐标 */
|
|
|
- X: equipMsg.Content[0].LocationJson.X,
|
|
|
- /** Y坐标 */
|
|
|
- Y: -equipMsg.Content[0].LocationJson.Y
|
|
|
+ if (equipMsg.Content[0]) {
|
|
|
+ if (equipMsg.Content[0].LocationJson && equipMsg.Content[0].FloorId) {
|
|
|
+ let canvasOption = {
|
|
|
+ /** 标记的id */
|
|
|
+ Id: equipMsg.Content[0].EquipID,
|
|
|
+ /** 标记的名称 */
|
|
|
+ Name: equipMsg.Content[0].EquipName,
|
|
|
+ /** X坐标 */
|
|
|
+ X: equipMsg.Content[0].LocationJson.X,
|
|
|
+ /** Y坐标 */
|
|
|
+ Y: -equipMsg.Content[0].LocationJson.Y
|
|
|
+ }
|
|
|
+ that.forms[key].ObjectLocalName = equipMsg.Content[0].EquipLocalName
|
|
|
+ that.forms[key].ObjectLocalCode = equipMsg.Content[0].EquipLocalID
|
|
|
+ this.loadDataToInstanceByFloorID(equipMsg.Content[0].FloorId, key, item.TypeCode, canvasOption);
|
|
|
}
|
|
|
- that.forms[key].ObjectLocalName = equipMsg.Content[0].EquipLocalName
|
|
|
- that.forms[key].ObjectLocalCode = equipMsg.Content[0].EquipLocalID
|
|
|
if (item.InfoList.length && equipMsg.Content[0].Category) {
|
|
|
let params = {
|
|
|
data: {
|
|
@@ -168,9 +177,9 @@ export default {
|
|
|
}
|
|
|
getDataDictionary(params, resp => {
|
|
|
that.forms[key].InfomationPointName = resp.Content.map(t => t.InfoPointName || '').join(',');
|
|
|
+ that.$forceUpdate()
|
|
|
})
|
|
|
}
|
|
|
- this.loadDataToInstanceByFloorID(equipMsg.Content[0].FloorId, key, item.TypeCode, canvasOption);
|
|
|
}
|
|
|
})
|
|
|
} else if (item.TypeCode == 'Sy') {
|
|
@@ -189,6 +198,7 @@ export default {
|
|
|
}
|
|
|
getDataDictionary(params, resp => {
|
|
|
that.forms[key].InfomationPointName = resp.Content.map(t => t.InfoPointName || '').join(',');
|
|
|
+ that.$forceUpdate()
|
|
|
})
|
|
|
}
|
|
|
}
|
|
@@ -209,6 +219,7 @@ export default {
|
|
|
}
|
|
|
getDataDictionary(params, resp => {
|
|
|
that.forms[key].InfomationPointName = resp.Content.map(t => t.InfoPointName || '').join(',');
|
|
|
+ that.$forceUpdate()
|
|
|
})
|
|
|
}
|
|
|
}
|
|
@@ -229,6 +240,7 @@ export default {
|
|
|
}
|
|
|
getDataDictionary(params, resp => {
|
|
|
that.forms[key].InfomationPointName = resp.Content.map(t => t.InfoPointName || '').join(',');
|
|
|
+ that.$forceUpdate()
|
|
|
})
|
|
|
}
|
|
|
}
|
|
@@ -249,6 +261,7 @@ export default {
|
|
|
}
|
|
|
getDataDictionary(params, resp => {
|
|
|
that.forms[key].InfomationPointName = resp.Content.map(t => t.InfoPointName || '').join(',');
|
|
|
+ that.$forceUpdate()
|
|
|
})
|
|
|
}
|
|
|
}
|
|
@@ -269,6 +282,7 @@ export default {
|
|
|
}
|
|
|
getDataDictionary(params, resp => {
|
|
|
that.forms[key].InfomationPointName = resp.Content.map(t => t.InfoPointName || '').join(',');
|
|
|
+ that.$forceUpdate()
|
|
|
})
|
|
|
}
|
|
|
}
|