diff --git a/public/img/monitoring/electricity/dianBiao.png b/public/img/monitoring/electricity/dianBiao.png new file mode 100644 index 0000000..7cd519f Binary files /dev/null and b/public/img/monitoring/electricity/dianBiao.png differ diff --git a/src/api/opsVisualization/alarmProcess.js b/src/api/opsVisualization/alarmProcess.js index 277fd6c..ba4380b 100644 --- a/src/api/opsVisualization/alarmProcess.js +++ b/src/api/opsVisualization/alarmProcess.js @@ -3,7 +3,7 @@ import request from '@/router/axios'; //设备类型通讯链路及排除方案 export const getWarnPoint = (params) => { return request({ - url: '/monitor-business/getWarnPoint', + url: '/kgApi/monitor-business/getWarnPoint', method: 'get', params }) @@ -11,7 +11,7 @@ export const getWarnPoint = (params) => { //排查方案信息列表 export const getResolveTips = (params) => { return request({ - url: '/monitor-business/getResolveTips', + url: '/kgApi/monitor-business/getResolveTips', method: 'get', params }) diff --git a/src/api/opsVisualization/serviceDataOAM.js b/src/api/opsVisualization/serviceDataOAM.js index 6efd016..1f51a2f 100644 --- a/src/api/opsVisualization/serviceDataOAM.js +++ b/src/api/opsVisualization/serviceDataOAM.js @@ -2,7 +2,7 @@ import request from '@/router/axios'; //报警设备列表 export const getEquipList = (params) => { return request({ - url: '/monitor-business/getEquipList', + url: '/kgApi/monitor-business/getEquipList', method: 'get', params }) @@ -10,7 +10,7 @@ export const getEquipList = (params) => { //当前报警信息 export const getWarnMsg = (params) => { return request({ - url: '/monitor-business/getWarnMsg', + url: '/kgApi/monitor-business/getWarnMsg', method: 'get', params }) @@ -18,7 +18,7 @@ export const getWarnMsg = (params) => { //报警记录 export const getWarnHisList = (params) => { return request({ - url: '/monitor-business/getWarnHisList', + url: '/kgApi/monitor-business/getWarnHisList', method: 'get', params }) diff --git a/src/api/opsVisualization/systemMonitoring.js b/src/api/opsVisualization/systemMonitoring.js index afdcd3f..3d0ceb7 100644 --- a/src/api/opsVisualization/systemMonitoring.js +++ b/src/api/opsVisualization/systemMonitoring.js @@ -2,19 +2,19 @@ import request from '@/router/axios'; export const getServiceList = () => { return request({ - url: '/monitor-system/getServiceList', + url: '/kgApi/monitor-system/getServiceList', method: 'get', }) } export const getMiddleList = () => { return request({ - url: '/monitor-system/getMiddleList', + url: '/kgApi/monitor-system/getMiddleList', method: 'get', }) } export const getServerParamsList = () => { return request({ - url: '/monitor-system/getServerParamsList', + url: '/kgApi/monitor-system/getServerParamsList', method: 'get', }) } diff --git a/src/api/opsVisualization/tuobu.js b/src/api/opsVisualization/tuobu.js index 94b4616..9716e0d 100644 --- a/src/api/opsVisualization/tuobu.js +++ b/src/api/opsVisualization/tuobu.js @@ -2,7 +2,7 @@ import request from '@/router/axios'; export const getMonitorList = () => { return request({ - url: '/monitor-system/getMonitorList', + url: '/kgApi/monitor-system/getMonitorList', method: 'get', }) } diff --git a/src/components/monitoring/electricity.vue b/src/components/monitoring/electricity.vue index 1ab9b75..fa3bd44 100644 --- a/src/components/monitoring/electricity.vue +++ b/src/components/monitoring/electricity.vue @@ -409,6 +409,7 @@ import { onClick, getObjectDataById, clearDrawableContainer, + removeGlowEffectById, zoomToBoundingBox, cameraPosition, mapUpdate, @@ -488,7 +489,9 @@ export default { tataiTotal: "", isMapViewer: 0, alarmAlert: true, //鼠标悬停在报警列表里查看详情和确认告警是否出现 - dialogItem: {} + dialogItem: {}, + items: Array.from({ length: 15 }, (_, i) => i + 1), // 生成一个包含 1 到 15 的数组 + dianXiangData: null }; }, created() { @@ -496,6 +499,9 @@ export default { window["handleDetail"] = () => { this.handleDetail() }; + window["handleCloseDialog"] = () => { + this.handleCloseDialog() + }; }, beforeDestroy() { if (this.setInterval) { @@ -634,6 +640,94 @@ export default { setOpacityFun(false,0.3); this.comeBim(); } + bfHelper.onClick((data) => { + if (this.tower == '03' && this.layer == '01') { + if (bfHelper.getCondition(data.objectId).family == '低压配电柜' || bfHelper.getCondition(data.objectId).family == '高压配电柜') { + if (this.dianXiangData && this.dianXiangData.objectId == data.objectId) { + clearDrawableContainer(); + this.dianXiangData = null + return + } + this.dianXiangData = data + clearDrawableContainer(); + // 构件id/设备名称/设备状态/设备位置/累计电量 + // 获取当前点击坐标 + let zb = getBoxMessage(data.objectId, true); + console.log('zb', zb) + // //引线标签的顶点 + let position = zb.max; + let content = + `
+
+ +
+
+ 配电箱 + +
+
+
+
+
+
+
`; + customTag(position, null, content); + this.$nextTick(() => { + const imageContainer = document.getElementById('image-container'); + console.log(imageContainer) + if (imageContainer) { + for(let i = 0; i < 15; i++) { + const img = document.createElement('img'); + img.src = require("../../../public/img/monitoring/electricity/dianBiao.png"); + img.style.width = '30px'; + img.style.height = '30px'; + img.style.margin = '10px 0 0 0'; + imageContainer.appendChild(img); + } + } + }) + } else { + clearDrawableContainer() + } + } + }) } else { // 查看管线 window.sessionStorage.setItem( @@ -902,6 +996,12 @@ export default { const routerUrl = this.$router.resolve({ path: '/equipment/operationDetails', query: { code: this.dialogItem.code,type:'电',area: this.bimModel} }); window.open(routerUrl.href, "_blank"); }, + handleCloseDialog() { + console.log('handleCloseDialog') + bfHelper.clearGlowEffect() + bfHelper.cancelSelected() + clearDrawableContainer() + }, // 构件点击(暂定不用) onClick() { onClick((data) => { diff --git a/src/util/bfHelper.js b/src/util/bfHelper.js index b3d663c..036c365 100644 --- a/src/util/bfHelper.js +++ b/src/util/bfHelper.js @@ -3006,6 +3006,7 @@ const onSDKLoadSucceeded = (viewMetaData) => { function (e) { console.log(e); let condition = viewer3D.getObjectDataById(e.objectId); + getCondition(condition) console.log('condition', condition); } ); @@ -3023,6 +3024,11 @@ const onSDKLoadSucceeded = (viewMetaData) => { } }; +const getCondition = (objectId) => { + let condition = viewer3D.getObjectDataById(objectId); + return condition +} + // 获取点击构件的筛选条件 const getObjectDataById = (objectId) => { // console.log(objectId) @@ -6063,5 +6069,6 @@ export { ttequipmentCondition2, cameraPosition, buildBoxbounding, - settoumingdu + settoumingdu, + getCondition }; \ No newline at end of file