From 9d48a3d80632ba01f21bdd57290dc9404b09203d Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Sat, 08 May 2021 15:37:53 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue
---
src/views/realTimePolice/real.vue | 8 ++++----
public/img/bjkeji.jpg | 0
src/views/supervisoryConsole/map.vue | 4 ++--
src/views/policeTracking/policeTracking.vue | 2 +-
src/views/security/security.vue | 10 +++++-----
src/views/dataL/dataL.vue | 8 ++++----
src/views/policeInformationDistribution/index.vue | 2 +-
public/weather/index.html | 5 +----
src/views/clientManagement/clientManagement_copy.vue | 2 +-
src/views/clientManagement/clientManagement.vue | 6 +++---
public/img/bjkeji3.jpg | 0
src/views/distribution/index.vue | 2 +-
12 files changed, 23 insertions(+), 26 deletions(-)
diff --git a/public/img/bjkeji.jpg b/public/img/bjkeji.jpg
index c5f3002..721729c 100644
--- a/public/img/bjkeji.jpg
+++ b/public/img/bjkeji.jpg
Binary files differ
diff --git a/public/img/bjkeji3.jpg b/public/img/bjkeji3.jpg
new file mode 100644
index 0000000..c5f3002
--- /dev/null
+++ b/public/img/bjkeji3.jpg
Binary files differ
diff --git a/public/weather/index.html b/public/weather/index.html
index b4ee95b..3c9e458 100644
--- a/public/weather/index.html
+++ b/public/weather/index.html
@@ -8,10 +8,7 @@
<title>天气</title>
<!-- axios -->
<script src='../map/lib/axios.js'></script>
- <script type="text/javascript" charset="utf-8"
- src="http://webapi.amap.com/maps?v=1.3&key=xxxxxx&plugin=AMap.Autocomplete,AMap.PlaceSearch"></script>
<script src="https://cdn.jsdelivr.net/npm/vue@2.6.12"></script>
- <script src="http://pv.sohu.com/cityjson?ie=utf-8"></script>
<style>
#weather {
font-weight: 400;
@@ -105,4 +102,4 @@
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/src/views/clientManagement/clientManagement.vue b/src/views/clientManagement/clientManagement.vue
index 7b0cb30..4562030 100644
--- a/src/views/clientManagement/clientManagement.vue
+++ b/src/views/clientManagement/clientManagement.vue
@@ -77,7 +77,7 @@
<i class="yj" v-if="row.dxzt == '2' "></i>
<i class="gz" v-if="row.dxzt == '3' "></i>
</el-tag>
-
+
</template>
<template slot-scope="{ row }" slot="type">
@@ -1029,7 +1029,7 @@
if(data.records[i].dtype=="" || data.records[i].dtype==0){
data.records[i].dxzt = 1;
}
-
+
}
}
@@ -1125,7 +1125,7 @@
this.showMap = true;
this.$nextTick(() => {
this.$refs.mapDiv.onload = () => {
- window.frames[0].init("equipment", {x: row.jd, y: row.wd});
+ window.frames[1].init("equipment", {x: row.jd, y: row.wd});
};
})
},rightClick(row, event) {
diff --git a/src/views/clientManagement/clientManagement_copy.vue b/src/views/clientManagement/clientManagement_copy.vue
index 808f5e7..98af045 100644
--- a/src/views/clientManagement/clientManagement_copy.vue
+++ b/src/views/clientManagement/clientManagement_copy.vue
@@ -722,7 +722,7 @@
this.showMap = true;
this.$nextTick(() => {
this.$refs.mapDiv.onload = () => {
- window.frames[0].init("equipment", {x: row.jd, y: row.wd});
+ window.frames[1].init("equipment", {x: row.jd, y: row.wd});
};
})
},
diff --git a/src/views/dataL/dataL.vue b/src/views/dataL/dataL.vue
index bfba118..49112ac 100644
--- a/src/views/dataL/dataL.vue
+++ b/src/views/dataL/dataL.vue
@@ -1186,7 +1186,7 @@
this.startEcharts01();
},
getMap() {
- window.frames[0].init("DetailMap", {
+ window.frames[1].init("DetailMap", {
x: this.a.jd,
y: this.a.wd,
});
@@ -1297,15 +1297,15 @@
// this.doEvents();
// var timel = setTimeout(() => {
this.$refs.detailMap.onload = () => {
- // window.frames[0].init("DetailMap", {
+ // window.frames[1].init("DetailMap", {
// x: this.a.jd,
// y: this.a.wd,
// });
- if (window.frames[0].init) {
+ if (window.frames[1].init) {
this.getMap();
} else {
// this.re();
- console.log(`没有找到到window.frames[0].init`);
+ console.log(`没有找到到window.frames[1].init`);
}
};
},
diff --git a/src/views/distribution/index.vue b/src/views/distribution/index.vue
index d5355b9..12b505e 100644
--- a/src/views/distribution/index.vue
+++ b/src/views/distribution/index.vue
@@ -243,7 +243,7 @@
mounted() {
this.$refs.DistributionMapDiv.onload = () => {
- window.frames[0].init("AlertSecurity", {
+ window.frames[1].init("AlertSecurity", {
x: this.form.jd,
y: this.form.wd,
});
diff --git a/src/views/policeInformationDistribution/index.vue b/src/views/policeInformationDistribution/index.vue
index aa81d43..8675cc7 100644
--- a/src/views/policeInformationDistribution/index.vue
+++ b/src/views/policeInformationDistribution/index.vue
@@ -538,7 +538,7 @@
this.showMap = true;
this.$nextTick(() => {
this.$refs.mapDiv.onload = () => {
- window.frames[0].init("ClientManagement", {x: row.jd, y: row.wd});
+ window.frames[1].init("ClientManagement", {x: row.jd, y: row.wd});
};
});
},
diff --git a/src/views/policeTracking/policeTracking.vue b/src/views/policeTracking/policeTracking.vue
index 15d3165..619bfae 100644
--- a/src/views/policeTracking/policeTracking.vue
+++ b/src/views/policeTracking/policeTracking.vue
@@ -604,7 +604,7 @@
this.getAudios();
this.getImgAndVideo();
this.$refs.mapDiv.onload = () => {
- window.frames[0].init("AlertSecurity", {
+ window.frames[1].init("AlertSecurity", {
x: this.form.jd,
y: this.form.wd,
});
diff --git a/src/views/realTimePolice/real.vue b/src/views/realTimePolice/real.vue
index 74dedae..1be720c 100644
--- a/src/views/realTimePolice/real.vue
+++ b/src/views/realTimePolice/real.vue
@@ -149,7 +149,7 @@
</el-drawer>
</basic-container>
</template>
-
+
<script>
import { getList, remove, update, add, getclient } from "@/api/real/real";
import { mapGetters } from "vuex";
@@ -800,7 +800,7 @@
this.showMap = true;
this.$nextTick(() => {
this.$refs.mapDiv.onload = () => {
- window.frames[0].init("ClientManagement", { x: row.jd, y: row.wd });
+ window.frames[1].init("ClientManagement", { x: row.jd, y: row.wd });
};
});
},
@@ -929,7 +929,7 @@
},
};
</script>
-
+
<style>
.el-card__body .waringTypeClass {
width: 12%;
@@ -1045,4 +1045,4 @@
.tabFontSize {
font-size: 15px;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/security/security.vue b/src/views/security/security.vue
index f5e744e..25f33f5 100644
--- a/src/views/security/security.vue
+++ b/src/views/security/security.vue
@@ -260,24 +260,24 @@
}
this.showMap=true;
this.$refs.securityMap.onload = () => {
- if (window.frames[0].init) {
+ if (window.frames[1].init) {
if(row.jd=="" || row.jd=="0.0"){
//如果处警员无位置信息，则赋值一个默认数据，否则地图无法加载
- window.frames[0].init("SecurityMap", {
+ window.frames[1].init("SecurityMap", {
x: rwjd,
y: rwwd,
code:row.code
});
}else{
- window.frames[0].init("SecurityMap", {
+ window.frames[1].init("SecurityMap", {
x: row.jd,
y: row.wd,
code:row.code
});
}
-
+
} else {
- console.log(`没有找到到window.frames[0].init`)
+ console.log(`没有找到到window.frames[1].init`)
}
}
},
diff --git a/src/views/supervisoryConsole/map.vue b/src/views/supervisoryConsole/map.vue
index 0063206..a1bf3ab 100644
--- a/src/views/supervisoryConsole/map.vue
+++ b/src/views/supervisoryConsole/map.vue
@@ -23,7 +23,7 @@
},
mounted() {
// this.$refs.supervisoryMap.onload = () => {
- // window.frames[0].init("AlertSecurity", {
+ // window.frames[1].init("AlertSecurity", {
// x: this.form.jd,
// y: this.form.wd,
// });
@@ -33,4 +33,4 @@
</script>
<style>
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3