From acc9ea22b061fcd118d02bf4e9bb814664a0e033 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Sat, 10 Apr 2021 08:55:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/dataL/dataL.vue | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/src/views/dataL/dataL.vue b/src/views/dataL/dataL.vue
index 6559625..d4625f8 100644
--- a/src/views/dataL/dataL.vue
+++ b/src/views/dataL/dataL.vue
@@ -510,14 +510,22 @@
</div>
<div class="r-b-map">
<el-row>
- <iframe
+ <!-- <iframe
id="supervisoryMap"
ref="supervisoryMap"
:src="baseUrl"
frameborder="0"
width="100%"
height="100%"
- ></iframe>
+ ></iframe> -->
+ <iframe
+ id="mapL"
+ ref="mapL"
+ :src="baseUrl"
+ frameborder="0"
+ width="100%"
+ height="100%"
+ ></iframe>
</el-row>
</div>
</div>
@@ -535,6 +543,7 @@
export default {
data() {
return {
+ a: '',
myDeviceNumber: "",
//折线图
@@ -1024,11 +1033,11 @@
},
created() {
// let loadingInstance1 = Loading.service({ fullscreen: true });
- this.baseUrl = `/map/index.html?openid=SupervisoryMap`;
+ // this.baseUrl = `/map/index.html?openid=SupervisoryMap`;
+ this.a = this.$route.query;
+ console.log(this.a);
+ this.baseUrl = `/map/index.html?ISinit=1&openid=AlertSecurity&id=${this.a.id}&jd=${this.a.jd}&wd=${this.a.wd}&pid=${this.a.deptId}&deptId=${this.a.deptId}&oneId=${this.a.oneId}`;
this.myDeviceNumber = this.$route.query.deviceNumber;
-
- var a = this.$route.query;
- console.log(a);
// console.log(this.myDeviceNumber);
this.getdata();
@@ -1038,7 +1047,13 @@
mounted() {
this.loginEcharts01(); //载入折线图等待数据
// this.eventDetails = this.eventDetaill;//载入历史事件数据
- // this.doEvents();//cc
+ // this.doEvents();//cc\
+ this.$refs.mapL.onload = () => {
+ window.frames[0].init("AlertSecurity", {
+ x: this.a.jd,
+ y: this.a.wd,
+ });
+ };
},
};
</script>
@@ -1352,7 +1367,7 @@
.r-b-map {
height: 550px;
border: 1px solid rgba(109, 109, 109, 0.2);
- #supervisoryMap {
+ #mapL {
width: 100%;
height: 550px;
}
--
Gitblit v1.9.3