diff --git a/src/api/itemManagement/itemList.js b/src/api/itemManagement/itemList.js index 01da7e3..f8d37c4 100644 --- a/src/api/itemManagement/itemList.js +++ b/src/api/itemManagement/itemList.js @@ -48,4 +48,11 @@ export const check = (params) => { method: 'get', params }) +} +export const deptList = (params) => { + return request({ + url: "/api/blade-system/dept/list", + method: "get", + params, + }); } \ No newline at end of file diff --git a/src/components/monitoring/electricity.vue b/src/components/monitoring/electricity.vue index a2be74b..eaf6be6 100644 --- a/src/components/monitoring/electricity.vue +++ b/src/components/monitoring/electricity.vue @@ -485,11 +485,15 @@ export default { tataiTotal: "", isMapViewer: 0, alarmAlert: true, //鼠标悬停在报警列表里查看详情和确认告警是否出现 + dialogItem: {} }; }, created() { this.getData(); - + window["handleDetail"] = () => { + this.handleDetail() + }; + // window.handleDetail = this.handleDetail }, beforeDestroy() { if (this.setInterval) { @@ -799,7 +803,7 @@ export default { // console.log(row) }, // 添加标签 - addLabel(objectId, name, type, location, dataNum,inventarNummer,maintainTime,maintainUser,maintainPhone,maintainDesc) { + addLabel(objectId, name, type, location, dataNum,inventarNummer,maintainTime,maintainUser,maintainPhone,maintainDesc, code) { console.log(type) // 构件id/设备名称/设备状态/设备位置/累计电量 // 获取当前点击坐标 @@ -854,11 +858,16 @@ export default { 维保内容: ${maintainDesc ? maintainDesc : ''} + `; customTag(position, null, content); + + }, + handleDetail() { + this.$router.push(`/equipment/operationDetails?name=${this.dialogItem.name}&code=${this.dialogItem.code}`) }, // 构件点击(暂定不用) onClick() { @@ -1105,7 +1114,19 @@ export default { }); }, getNavigationMap() { - commonValue.getNavigationMap("electricity"); + const label = commonValue.getNavigationMap("electricity") + // console.log('label', label) + + this.$nextTick(() => { + if (this.$route.query.code) { + this.tableData.forEach(item => { + if (item.code == this.$route.query.code) { + console.log('gxh', item) + this.bjClick(item) + } + }) + } + }) }, // 切换日月 selectBim(i) { @@ -1118,6 +1139,8 @@ export default { }, // 点击报警信息定位到指定设备 bjClick(item) { + this.dialogItem = item + console.log(this.bimModel, item.build) if (this.bimModel == 2) { if (item.build == 9) { //辅楼 diff --git a/src/components/monitoring/firefighting.vue b/src/components/monitoring/firefighting.vue index e9b85eb..c34d071 100644 --- a/src/components/monitoring/firefighting.vue +++ b/src/components/monitoring/firefighting.vue @@ -286,6 +286,7 @@ export default { safeTotal: 0, alarmLists: [], activeTab: 1, + dialogItem: {} }; }, components: { @@ -305,6 +306,9 @@ export default { this.getFiredWarnList(); //报警信息 this.addWaterLabel(); }, 3600000); + window["handleDetail"] = () => { + this.handleDetail() + }; }, mounted() { let dom = document.getElementById('fire_box'); @@ -550,6 +554,9 @@ export default { }, }, methods: { + handleDetail() { + this.$router.push(`/equipment/operationDetails?name=${this.dialogItem.name}&code=${this.dialogItem.code}`) + }, //确认告警 - 重新查询告警列表 doCancelWarn(item) { getCancelWarn(item.id).then((res) => { @@ -760,6 +767,7 @@ export default { // 获取报警信息 // 点击报警信息定位到指定设备 bjClick(item) { + this.dialogItem = item // bfHelper.clearDrawableContainer(); // // console.log(item) // let id = bfHelper.disposeId(1, item.build, item.modelId); @@ -946,6 +954,7 @@ export default { 维保内容： ${item.maintainDesc ? item.maintainDesc : ''} + diff --git a/src/components/monitoring/wall.vue b/src/components/monitoring/wall.vue index 90b7f16..270e429 100644 --- a/src/components/monitoring/wall.vue +++ b/src/components/monitoring/wall.vue @@ -708,6 +708,12 @@ export default { classOption: { step: 0.2, }, //报警信息滚动速度 + dialogItem: {} + }; + }, + created() { + window["handleDetail"] = () => { + this.handleDetail() }; }, watch: { @@ -816,6 +822,9 @@ export default { } }, methods: { + handleDetail() { + this.$router.push(`/equipment/operationDetails?name=${this.dialogItem.name}&code=${this.dialogItem.code}`) + }, //确认告警 - 重新查询告警列表 doCancelWarn(item) { getCancelWarn(item.id).then((res) => { @@ -988,6 +997,7 @@ export default { // console.log(row) }, bjClick(row) { + this.dialogItem = row bfHelper.clearTags(); if (this.bimModel == 1) { for (let i = 0; i < this.ywq.length; i++) { @@ -1133,6 +1143,7 @@ export default { 维保内容: ${maintainDesc ? maintainDesc : ''} + diff --git a/src/components/monitoring/warm.vue b/src/components/monitoring/warm.vue index 041f491..a0309d7 100644 --- a/src/components/monitoring/warm.vue +++ b/src/components/monitoring/warm.vue @@ -436,6 +436,7 @@ export default { classOption: { step: 0.3, }, //报警信息轮播速度配置 + dialogItem: {} }; }, watch: { @@ -594,7 +595,11 @@ export default { }, }, }, - created() { }, + created() { + window["handleDetail"] = () => { + this.handleDetail() + }; + }, beforeDestroy() { if (this.setInterval) { clearInterval(this.setInterval); @@ -611,6 +616,9 @@ export default { this.getNavigationMap(); }, methods: { + handleDetail() { + this.$router.push(`/equipment/operationDetails?name=${this.dialogItem.name}&code=${this.dialogItem.code}`) + }, //确认告警 - 重新查询告警列表 doCancelWarn(item) { getCancelWarn(item.id).then((res) => { @@ -764,6 +772,7 @@ export default { }, // 点击报警信息定位到指定设备 bjClick(item) { + this.dialogItem = item if (item.modelId == "") { this.$message.error('对不起，暂无该设备模型，请稍后点击') } else { @@ -940,6 +949,7 @@ export default { 维保内容: ${maintainDesc ? maintainDesc : ''} + diff --git a/src/components/monitoring/water.vue b/src/components/monitoring/water.vue index d3f5276..81f79cb 100644 --- a/src/components/monitoring/water.vue +++ b/src/components/monitoring/water.vue @@ -388,10 +388,14 @@ export default { offList: [], //离线的设备 bjList: [], //报警的设备 activeTab: 1, + dialogItem: {} }; }, created() { this.getData(); + window["handleDetail"] = () => { + this.handleDetail() + }; }, beforeDestroy() { if (this.setInterval) { @@ -576,6 +580,9 @@ export default { }, beforeDestroy() { }, methods: { + handleDetail() { + this.$router.push(`/equipment/operationDetails?name=${this.dialogItem.name}&code=${this.dialogItem.code}`) + }, //确认告警 - 重新查询告警列表 doCancelWarn(item) { getCancelWarn(item.id).then((res) => { @@ -718,6 +725,7 @@ export default { getWaterMeterData(this.bimModel, e.target.id.substring(25)).then( (res) => { const data = res.data.data; + this.dialogItem = data let content; if (data.status == 90000) { //正常状态 @@ -858,6 +866,7 @@ export default { 维保内容: ${maintainDesc ? maintainDesc : ''} + @@ -952,6 +961,7 @@ export default { 维保内容: ${maintainDesc ? maintainDesc : ''} + @@ -960,6 +970,7 @@ export default { }, // 点击报警信息定位到指定设备 bjClick(item) { + this.dialogItem = item console.log('item',item) if(item.modelId == ''){ this.$message.error('对不起，暂无该设备模型，请稍后点击') diff --git a/src/page/index/index.vue b/src/page/index/index.vue index 3b1d2ff..8274dcc 100644 --- a/src/page/index/index.vue +++ b/src/page/index/index.vue @@ -9,7 +9,7 @@ - +
@@ -151,7 +151,7 @@ export default {