From 53184b0ce284a6784356e1d1a2b57d86f6a9d5c1 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Wed, 28 Apr 2021 17:39:02 +0800
Subject: [PATCH] 地图 和详情 视频和 top 热力图细节
---
public/map/widgets/supervisoryMap/SupervisoryMap.js | 53 ++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 40 insertions(+), 13 deletions(-)
diff --git a/public/map/widgets/supervisoryMap/SupervisoryMap.js b/public/map/widgets/supervisoryMap/SupervisoryMap.js
index 215c332..1627883 100644
--- a/public/map/widgets/supervisoryMap/SupervisoryMap.js
+++ b/public/map/widgets/supervisoryMap/SupervisoryMap.js
@@ -287,19 +287,19 @@
// console.log($('#policeHeatMap').prop('checked') == true)
$('#policeHeatMap').prop('checked', false);
that.checkBoxSelect($('#policeHeatMap'));
- }else
- //解决打开热力图 切换top获取不了数据问题 业主
- if ($('#ownerHeatMap').prop('checked') == true) {
- // console.log($('#ownerHeatMap').prop('checked') == true)
- $('#ownerHeatMap').prop('checked', false);
- that.checkBoxSelect($('#ownerHeatMap'));
- }else
- //解决打开热力图 切换top获取不了数据问题 设备
- if ($('#equipmentHeatMap').prop('checked') == true) {
- // console.log($('#equipmentHeatMap').prop('checked') == true)
- $('#equipmentHeatMap').prop('checked', false);
- that.checkBoxSelect($('#equipmentHeatMap'));
- }
+ } else
+ //解决打开热力图 切换top获取不了数据问题 业主
+ if ($('#ownerHeatMap').prop('checked') == true) {
+ // console.log($('#ownerHeatMap').prop('checked') == true)
+ $('#ownerHeatMap').prop('checked', false);
+ that.checkBoxSelect($('#ownerHeatMap'));
+ } else
+ //解决打开热力图 切换top获取不了数据问题 设备
+ if ($('#equipmentHeatMap').prop('checked') == true) {
+ // console.log($('#equipmentHeatMap').prop('checked') == true)
+ $('#equipmentHeatMap').prop('checked', false);
+ that.checkBoxSelect($('#equipmentHeatMap'));
+ }
// console.log($('#policeHeatMap').prop('checked') == true)
@@ -735,6 +735,33 @@
// console.log(this,text,'text()')
// console.log(that.tabIndex,'tabIndex')
+
+ //解决打开热力图 切换top获取不了数据问题 警情
+ if ($('#policeHeatMap').prop('checked') == true) {
+ // console.log($('#policeHeatMap').prop('checked') == true)
+ $('#policeHeatMap').prop('checked', false);
+ that.checkBoxSelect($('#policeHeatMap'));
+ } else
+ //解决打开热力图 切换top获取不了数据问题 业主
+ if ($('#ownerHeatMap').prop('checked') == true) {
+ // console.log($('#ownerHeatMap').prop('checked') == true)
+ $('#ownerHeatMap').prop('checked', false);
+ that.checkBoxSelect($('#ownerHeatMap'));
+ } else
+ //解决打开热力图 切换top获取不了数据问题 设备
+ if ($('#equipmentHeatMap').prop('checked') == true) {
+ // console.log($('#equipmentHeatMap').prop('checked') == true)
+ $('#equipmentHeatMap').prop('checked', false);
+ that.checkBoxSelect($('#equipmentHeatMap'));
+ var time = setTimeout(() => {
+ // $('#equipmentHeatMap').click(function () {
+ // that.checkBoxSelect('#equipmentHeatMap');
+ // })();
+ $('#equipmentHeatMap').click();
+ }, 500);
+ }
+
+
$(this).parent().parent().prev().html(text + '<i></i>');
$(this).parent().parent().stop().slideUp(0);
--
Gitblit v1.9.3