From 14e02654e0545ee69456d64aef2f35c7c219d708 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 07 May 2021 11:26:49 +0800
Subject: [PATCH] 地图模式设备状态修改
---
public/map/widgets/supervisoryMap/SupervisoryMap.js | 66 ++++++++++++++++++++++++++-------
1 files changed, 52 insertions(+), 14 deletions(-)
diff --git a/public/map/widgets/supervisoryMap/SupervisoryMap.js b/public/map/widgets/supervisoryMap/SupervisoryMap.js
index 215c332..8d81a33 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)
@@ -386,6 +386,10 @@
// 警情列表中的点击事件
$('.analysis-container-police .analysis-table-content .tbody').off('click', 'tr').on('click', 'tr', function (event) {
+ if ($('#policeHeatMap').prop('checked') == true) {// 点击关闭热力图
+ // console.log('relitu')
+ $('#policeHeatMap').click();
+ }
var id = $(this).attr('term-list');
var b = mySelf.Pdata;
for (var key in b) {
@@ -471,6 +475,10 @@
// 业主列表中的点击事件
$('.analysis-container-owner .analysis-table-content .tbody').off('click', 'tr').on('click', 'tr', function (event) {
+ if ($('#ownerHeatMap').prop('checked') == true) {// 点击关闭热力图
+ // console.log('relitu')
+ $('#ownerHeatMap').click();
+ }
var id = $(this).attr('term-list');
var b = mySelf.Ydata;
for (var key in b) {
@@ -566,7 +574,10 @@
// 设备列表中的点击事件
$('.analysis-container-equipment .analysis-table-content .tbody').off('click', 'tr').on('click', 'tr', function (event) {
var id = $(this).attr('term-listid');
-
+ if ($('#equipmentHeatMap').prop('checked') == true) {// 点击关闭热力图
+ // console.log('relitu')
+ $('#equipmentHeatMap').click();
+ }
event.stopPropagation();
var lgtd = Number($(this).find('input').attr('lgtd'));
@@ -735,6 +746,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