diff --git a/src/components/monitoring/door.vue b/src/components/monitoring/door.vue
index d4def67..827cbb8 100644
--- a/src/components/monitoring/door.vue
+++ b/src/components/monitoring/door.vue
@@ -1059,6 +1059,26 @@ export default {
所在位置：
${item.location}
+
+ 固定资产编号：
+ ${item.inventarNummer ? item.inventarNummer : ''}
+
+
+ 维保人：
+ ${item.maintainUser ? item.maintainUser : ''}
+
+
+ 维保人电话：
+ ${item.maintainPhone ? item.maintainPhone : ''}
+
+
+ 维保时间：
+ ${item.maintainTime ? item.maintainTime.substring(0, 10) : ''}
+
+
+ 维保内容：
+ ${item.maintainDesc ? item.maintainDesc : ''}
+
diff --git a/src/components/monitoring/electricity.vue b/src/components/monitoring/electricity.vue
index a2dc981..9880e2c 100644
--- a/src/components/monitoring/electricity.vue
+++ b/src/components/monitoring/electricity.vue
@@ -765,7 +765,8 @@ export default {
// console.log(row)
},
// 添加标签
- addLabel(objectId, name, type, location, dataNum) {
+ addLabel(objectId, name, type, location, dataNum,inventarNummer,maintainTime,maintainUser,maintainPhone,maintainDesc) {
+ console.log(type)
// 构件id/设备名称/设备状态/设备位置/累计电量
// 获取当前点击坐标
let zb = getBoxMessage(objectId, true);
@@ -779,8 +780,9 @@ export default {
- ${name}
+ : "../../../public/img/monitoring/electricity/offline2.png")}');background-repeat: no-repeat;background-size: cover;
+ display: flex;align-items: center;">
+ ${name}
累计电量(kw·h):
${dataNum}
+
+
+ 固定资产编号:
+ ${inventarNummer ? inventarNummer : ''}
+
+
+ 维保人:
+ ${maintainUser ? maintainUser : ''}
+
+
+ 维保人电话:
+ ${maintainPhone ? maintainPhone.substring(0, 10) : ''}
+
+
+ 维保时间:
+ ${maintainTime ? maintainTime : ''}
+
+
+ 维保内容:
+ ${maintainDesc ? maintainDesc : ''}
+ 固定资产编号：
+ ${item.inventarNummer ? item.inventarNummer : ''}
+
+
+ 维保人：
+ ${item.maintainUser ? item.maintainUser : ''}
+
+
+ 维保人电话：
+ ${item.maintainPhone ? item.maintainPhone : ''}
+
+
+ 维保时间：
+ ${item.maintainTime ? item.maintainTime.substring(0, 10) : ''}
+
+
+ 维保内容：
+ ${item.maintainDesc ? item.maintainDesc : ''}
+
diff --git a/src/components/monitoring/lift.vue b/src/components/monitoring/lift.vue
index 153230a..6710a31 100644
--- a/src/components/monitoring/lift.vue
+++ b/src/components/monitoring/lift.vue
@@ -596,14 +596,14 @@ export default {
getMessage(msg) {
let obj = JSON.parse(msg.data)
// obj.createTime = dateFormat(new Date(obj.createTime), 'yyyy-MM-dd hh:mm');
- // obj.tendingTime = dateFormat(new Date(obj.tendingTime), 'yyyy-MM-dd hh:mm');
+ // obj.maintainTime = dateFormat(new Date(obj.maintainTime), 'yyyy-MM-dd hh:mm');
// if(obj.status != 90000){
let idx = this.arr.findIndex(item => { return item.id == obj.id });
if (idx > -1) {
// this.arr[idx].modelId = obj.modelId;
// this.arr[idx].status = obj.status;
// this.arr[idx].createTime = obj.createTime;
- // this.arr[idx].tendingTime = obj.tendingTime;
+ // this.arr[idx].maintainTime = obj.maintainTime;
// this.arr[idx].factory = obj.factory;
// this.arr[idx].floor = obj.floor;
// this.arr[idx].statusMsg = obj.statusMsg;
@@ -677,17 +677,25 @@ export default {
所在楼层：
${obj.floor}F
+
+ 规定资产编号：
+ ${obj.inventarNummer ? obj.inventarNummer : ''}
+
维保时间：
- ${obj.tendingTime.substring(0, 10)}
+ ${obj.maintainTime.substring(0, 10)}
维保人：
- ${obj.tendingUser}
+ ${obj.maintainUser}
维保电话：
- ${obj.tendingPhone}
+ ${obj.maintainPhone}
+
+
+ 维保内容：
+ ${obj.maintainDesc}
运行方向：
@@ -725,17 +733,25 @@ export default {
所在楼层：
${obj.floor}F
+
+ 固定资产编号：
+ ${obj.inventarNummer ? obj.inventarNummer : ''}
+
维保时间：
- ${obj.tendingTime.substring(0, 10)}
+ ${obj.maintainTime.substring(0, 10)}
维保人：
- ${obj.tendingUser}
+ ${obj.maintainUser}
维保电话：
- ${obj.tendingPhone}
+ ${obj.maintainPhone}
+
+
+ 维保内容：
+ ${obj.maintainDesc}
运行方向：
@@ -775,17 +791,25 @@ export default {
所在楼层：
${obj.floor}F
+
+ 固定资产编号：
+ ${obj.inventarNummer ? obj.inventarNummer : ''}
+
维保时间：
- ${obj.tendingTime.substring(0, 10)}
+ ${obj.maintainTime.substring(0, 10)}
维保人：
- ${obj.tendingUser}
+ ${obj.maintainUser}
维保电话：
- ${obj.tendingPhone}
+ ${obj.maintainPhone}
+
+
+ 维保内容：
+ ${obj.maintainDesc}
运行方向：
@@ -823,17 +847,25 @@ export default {
所在楼层：
${obj.floor}F
+
+ 固定资产编号：
+ ${obj.inventarNummer ? obj.inventarNummer : ''}
+
维保时间：
- ${obj.tendingTime.substring(0, 10)}
+ ${obj.maintainTime.substring(0, 10)}
维保人：
- ${obj.tendingUser}
+ ${obj.maintainUser}
维保电话：
- ${obj.tendingPhone}
+ ${obj.maintainPhone}
+
+
+ 维保内容：
+ ${obj.maintainDesc}
运行方向：
diff --git a/src/components/monitoring/wall.vue b/src/components/monitoring/wall.vue
index eb2e141..de98418 100644
--- a/src/components/monitoring/wall.vue
+++ b/src/components/monitoring/wall.vue
@@ -1004,7 +1004,12 @@ export default {
row.name,
row.location,
row.warnContent ? row.warnContent : row.warnMsg,
- row.warnDate ? row.warnDate : row.warnTime
+ row.warnDate ? row.warnDate : row.warnTime,
+ row.inventarNummer,
+ row.maintainTime,
+ row.maintainUser,
+ row.maintainPhone,
+ row.maintainDesc
)
);
// bfHelper.zoomToBoundingBox(bfHelper.getBoxMessage(this.ywq[i].walls[0]));
@@ -1038,7 +1043,12 @@ export default {
row.name,
row.location,
row.warnContent ? row.warnContent : row.warnMsg,
- row.warnDate ? row.warnDate : row.warnTime
+ row.warnDate ? row.warnDate : row.warnTime,
+ row.inventarNummer,
+ row.maintainTime,
+ row.maintainUser,
+ row.maintainPhone,
+ row.maintainDesc
)
);
// bfHelper.zoomToBoundingBox(bfHelper.getBoxMessage(this.ywq[i].walls[0]));
@@ -1052,7 +1062,7 @@ export default {
bfHelper.resetStatus(2);
bfHelper.lookEquipmentCop("电子围界");
},
- getWallContent(status, statusName, name, location, warnMsg, warnTime) {
+ getWallContent(status, statusName, name, location, warnMsg, warnTime,inventarNummer,maintainTime,maintainUser,maintainPhone,maintainDesc) {
let content = `
${warnTime ? warnTime.substring(5, 16) : ""
}
+
+ 固定资产编号:
+ ${inventarNummer ? inventarNummer : ''}
+
+
+ 维保人:
+ ${maintainUser ? maintainUser : ''}
+
+
+ 维保人电话:
+ ${maintainPhone ? maintainPhone : ''}
+
+
+ 维保时间:
+ ${maintainTime ? maintainTime.substring(0, 10) : ''}
+
+
+ 维保内容:
+ ${maintainDesc ? maintainDesc : ''}
+
diff --git a/src/components/monitoring/warm.vue b/src/components/monitoring/warm.vue
index b0f58a5..7431f17 100644
--- a/src/components/monitoring/warm.vue
+++ b/src/components/monitoring/warm.vue
@@ -761,7 +761,12 @@ export default {
item.name,
item.location,
item.status == 90001 ? "离线" : "在线",
- item.dataNum
+ item.dataNum,
+ item.inventarNummer,
+ item.maintainUser,
+ item.maintainPhone,
+ item.maintainTime,
+ item.maintainDesc,
)
);
this.$refs.clickcp.active = commonValue.activeValue(
@@ -807,6 +812,7 @@ export default {
e.target.id.substring(9),
true
).max;
+ console.log('e',e)
getWarmMeterData(this.bimModel, e.target.id.substring(24)).then(
(res) => {
const data = res.data.data;
@@ -834,7 +840,7 @@ export default {
}
});
},
- warmContent(id, type, name, location, statusName, dataNum) {
+ warmContent(id, type, name, location, statusName, dataNum,inventarNummer,maintainUser,maintainPhone,maintainTime,maintainDesc) {
//热量表标签显示信息
let content = `
@@ -849,7 +855,8 @@ export default {
? "../../../public/img/monitoring/electricity/customTag1-1.png"
: type == 90001
? "../../../public/img/monitoring/electricity/customTag2-1.png"
- : "../../../public/img/monitoring/electricity/customTag3-1.png")}');">
+ : "../../../public/img/monitoring/electricity/customTag3-1.png")}');background-repeat: no-repeat;background-size: cover;
+ display: flex;align-items: center;">
${name}
+ 固定资产编号:
+ ${inventarNummer ? inventarNummer : ''}
+
+
+ 维保人:
+ ${maintainUser ? maintainUser : ''}
+
+
+ 维保人电话:
+ ${maintainPhone ? maintainPhone : ''}
+
+
+ 维保时间:
+ ${maintainTime ? maintainTime.substring(0, 10) : ''}
+
+
+ 维保内容:
+ ${maintainDesc ? maintainDesc : ''}
+
diff --git a/src/components/monitoring/water.vue b/src/components/monitoring/water.vue
index 9f82bc0..d08540b 100644
--- a/src/components/monitoring/water.vue
+++ b/src/components/monitoring/water.vue
@@ -793,7 +793,7 @@ export default {
);
}
},
- labelContent(img, img1, id, type, name, location, msg, dataNum) {
+ labelContent(img, img1, id, type, name, location, msg, dataNum,inventarNummer,maintainUser,maintainPhone,maintainTime,maintainDesc) {
//图标标签
// console.log(msg)
let content = `
@@ -832,7 +832,26 @@ export default {
-
+
+ 固定资产编号:
+ ${inventarNummer ? inventarNummer : ''}
+
+
+ 维保人:
+ ${maintainUser ? maintainUser : ''}
+
+
+ 维保人电话:
+ ${maintainPhone ? maintainPhone : ''}
+
+
+ 维保时间:
+ ${maintainTime ? maintainTime.substring(0, 10) : ''}
+
+
+ 维保内容:
+ ${maintainDesc ? maintainDesc : ''}
+
@@ -849,7 +868,7 @@ export default {
return content;
},
// 添加标签
- addLabel(objectId, name, type, location, statusName, dataNum, msg) {
+ addLabel(objectId, name, type, location, statusName, dataNum, msg,inventarNummer,maintainUser,maintainPhone,maintainTime,maintainDesc,) {
// 构件id/设备名称/设备状态/设备位置/累计电量
// bfHelper.setColor('#ff761a',[objectId])
// 获取当前点击坐标
@@ -874,8 +893,9 @@ export default {
? "../../../public/img/monitoring/electricity/customTag1-1.png"
: type == 90001
? "../../../public/img/monitoring/electricity/customTag2-1.png"
- : "../../../public/img/monitoring/electricity/customTag3-1.png")}');">
- ${name}
+ : "../../../public/img/monitoring/electricity/customTag3-1.png")}');background-repeat: no-repeat;background-size: cover;
+ display: flex;align-items: center;">
+ ${name}
-
+
+
+ 固定资产编号:
+ ${inventarNummer ? inventarNummer : ''}
+
+
+ 维保人:
+ ${maintainUser ? maintainUser : ''}
+
+
+ 维保人电话:
+ ${maintainPhone ? maintainPhone : ''}
+
+
+ 维保时间:
+ ${maintainTime ? maintainTime.substring(0, 10) : ''}
+
+
+ 维保内容:
+ ${maintainDesc ? maintainDesc : ''}
+
@@ -914,7 +954,7 @@ export default {
},
// 点击报警信息定位到指定设备
bjClick(item) {
- // console.log(item)
+ console.log('item',item)
// 如果当前点击的是电箱 先清除所以标签
bfHelper.clearDrawableContainer();
let id = bfHelper.disposeId(item.area, item.build, item.modelId);
@@ -926,7 +966,12 @@ export default {
item.location,
item.status == 90000 ? "正常" : "离线",
item.dataNum,
- item.warnContent
+ item.warnContent,
+ item.inventarNummer,
+ item.maintainUser,
+ item.maintainPhone,
+ item.maintainTime,
+ item.maintainDesc,
);
bfHelper.zoomToBoundingBox(boundingBox, 20);
},