diff --git a/src/components/monitoring/electricity.vue b/src/components/monitoring/electricity.vue
index 9880e2c..f9b3298 100644
--- a/src/components/monitoring/electricity.vue
+++ b/src/components/monitoring/electricity.vue
@@ -1125,6 +1125,7 @@ export default {
}
} else {
if (item.modelId == "") {
+ this.$message.error('对不起,暂无该设备模型,请稍后点击')
} else {
// 如果当前点击的是电箱 先清除所以标签
// this.tower = item.build;
diff --git a/src/components/monitoring/firefighting.vue b/src/components/monitoring/firefighting.vue
index eb78ad6..2c1aa5c 100644
--- a/src/components/monitoring/firefighting.vue
+++ b/src/components/monitoring/firefighting.vue
@@ -741,6 +741,7 @@ export default {
// this.addLabel(id, item.name, item.status, item.location, item.dataNum);
} else {
if (item.modelId == "") {
+ this.$message.error('对不起,暂无该设备模型,请稍后点击')
} else {
// 如果当前点击的是电箱 先清除所以标签
// window.sessionStorage.setItem('build',tower != null? tower + 1:'26');
diff --git a/src/components/monitoring/lift.vue b/src/components/monitoring/lift.vue
index 6710a31..9c5df57 100644
--- a/src/components/monitoring/lift.vue
+++ b/src/components/monitoring/lift.vue
@@ -648,6 +648,7 @@ export default {
},
//动态标签
getContent(idx, obj) {
+ console.log(obj)
let content;
if (this.bimModel == 1) {
if (obj.location == '1号楼' || obj.location == '2号楼') {
@@ -679,7 +680,7 @@ export default {
规定资产编号:
- ${obj.inventarNummer ? obj.inventarNummer : ''}
+ ${obj.inventarNummer}F
维保时间:
@@ -735,7 +736,7 @@ export default {
固定资产编号:
- ${obj.inventarNummer ? obj.inventarNummer : ''}
+ ${obj.inventarNummer}F
维保时间:
@@ -793,7 +794,7 @@ export default {
固定资产编号:
- ${obj.inventarNummer ? obj.inventarNummer : ''}
+ ${obj.inventarNummer}F
维保时间:
@@ -849,7 +850,7 @@ export default {
固定资产编号:
- ${obj.inventarNummer ? obj.inventarNummer : ''}
+ ${obj.inventarNummer}F
维保时间:
diff --git a/src/components/monitoring/warm.vue b/src/components/monitoring/warm.vue
index 091c067..f9c924c 100644
--- a/src/components/monitoring/warm.vue
+++ b/src/components/monitoring/warm.vue
@@ -746,6 +746,7 @@ export default {
// 点击报警信息定位到指定设备
bjClick(item) {
if (item.modelId == "") {
+ this.$message.error('对不起,暂无该设备模型,请稍后点击')
} else {
this.tower = item.build;
this.layer = item.floored;
diff --git a/src/components/monitoring/water.vue b/src/components/monitoring/water.vue
index d08540b..534c3a0 100644
--- a/src/components/monitoring/water.vue
+++ b/src/components/monitoring/water.vue
@@ -955,25 +955,30 @@ export default {
// 点击报警信息定位到指定设备
bjClick(item) {
console.log('item',item)
- // 如果当前点击的是电箱 先清除所以标签
- bfHelper.clearDrawableContainer();
- let id = bfHelper.disposeId(item.area, item.build, item.modelId);
- let boundingBox = bfHelper.getBoxMessage(id);
- this.addLabel(
- id,
- item.name,
- item.status,
- item.location,
- item.status == 90000 ? "正常" : "离线",
- item.dataNum,
- item.warnContent,
- item.inventarNummer,
- item.maintainUser,
- item.maintainPhone,
- item.maintainTime,
- item.maintainDesc,
- );
- bfHelper.zoomToBoundingBox(boundingBox, 20);
+ if(item.modelId == ''){
+ this.$message.error('对不起,暂无该设备模型,请稍后点击')
+ }else{
+ // 如果当前点击的是电箱 先清除所以标签
+ bfHelper.clearDrawableContainer();
+ let id = bfHelper.disposeId(item.area, item.build, item.modelId);
+ let boundingBox = bfHelper.getBoxMessage(id);
+ this.addLabel(
+ id,
+ item.name,
+ item.status,
+ item.location,
+ item.status == 90000 ? "正常" : "离线",
+ item.dataNum,
+ item.warnContent,
+ item.inventarNummer,
+ item.maintainUser,
+ item.maintainPhone,
+ item.maintainTime,
+ item.maintainDesc,
+ );
+ bfHelper.zoomToBoundingBox(boundingBox, 20);
+ }
+
},
// 本月用电饼图
electroPie() {