From 401c42a85d4c33b40b4a5902e9f21b01830e80c5 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Tue, 20 Jul 2021 18:26:54 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfptweb-publicSecurity
---
src/views/policeTracking/policeTracking.vue | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/views/policeTracking/policeTracking.vue b/src/views/policeTracking/policeTracking.vue
index 0ec892c..067099f 100644
--- a/src/views/policeTracking/policeTracking.vue
+++ b/src/views/policeTracking/policeTracking.vue
@@ -402,6 +402,7 @@
};
},
created() {
+
this.form = this.$route.query;
if (
!(
@@ -415,8 +416,15 @@
}
this.updatedPageData();
this.vaddress = this.form.vaddress;
+
this.getReceivingAlarm();
- this.baseUrl = `/map/index.html?ISinit=1&openid=AlertSecurity&id=${this.form.id}&jd=${this.form.jd}&wd=${this.form.wd}&pid=${this.form.deptId}&deptId=${this.form.deptId}&oneId=${this.form.oneId}`;
+ if (this.form.alarmType == "巡逻任务"){
+ this.baseUrl = `/map/index.html?ISinit=1&openid=AlertSecurity&id=${this.form.id}&jd=${this.form.jd}&wd=${this.form.wd}&pid=${this.form.deptId}&deptId=${this.form.deptId}&oneId=${this.form.oneId}&baid=${this.form.baid}`;
+ }else{
+ this.baseUrl = `/map/index.html?ISinit=1&openid=AlertSecurity&id=${this.form.id}&jd=${this.form.jd}&wd=${this.form.wd}&pid=${this.form.deptId}&deptId=${this.form.deptId}&oneId=${this.form.oneId}`;
+ }
+
+
},
mounted() {
this.getAudios();
--
Gitblit v1.9.3