diff --git a/Code/智慧营区/DOCManageAPP(阿克苏)/3DVisualization/subitem/js/vehicleDuty.js b/Code/智慧营区/DOCManageAPP(阿克苏)/3DVisualization/subitem/js/vehicleDuty.js index 0286859..a6ed2e9 100644 --- a/Code/智慧营区/DOCManageAPP(阿克苏)/3DVisualization/subitem/js/vehicleDuty.js +++ b/Code/智慧营区/DOCManageAPP(阿克苏)/3DVisualization/subitem/js/vehicleDuty.js @@ -924,6 +924,7 @@ $("#bubble_VehicleVideo_btn").click(function() { }); function vedioClick(id) { + console.log(id); if(zqclData[id] == null) { _layer.msg("暂未开通车联网功能!"); @@ -932,7 +933,7 @@ function vedioClick(id) { var detail = JSON.parse(zqclData[id]); var imei = detail.IMEI; if(imei == null || imei == "") { - _layer.msg($("#bubble_CarPlate").text() + ",暂未开通车联网功能!"); + _layer.msg(id + ",暂未开通车联网功能!"); return; } if(detail.FACTORY == "1"){ diff --git a/Code/智慧营区/DOCManageAPP(阿克苏)/3DVisualization/subitem/yjcz.html b/Code/智慧营区/DOCManageAPP(阿克苏)/3DVisualization/subitem/yjcz.html index ce238f4..d53476a 100644 --- a/Code/智慧营区/DOCManageAPP(阿克苏)/3DVisualization/subitem/yjcz.html +++ b/Code/智慧营区/DOCManageAPP(阿克苏)/3DVisualization/subitem/yjcz.html @@ -804,7 +804,11 @@ if ($('.shigu-after').is(':hidden')) { //应急广播 $(".gjl-icon2").removeClass("current"); - yjczsjzhide(); + try{ + yjczsjzhide(); + }catch(e){ + + } $(".container").hide(); $(".gjl-icon2").attr("data-value", "0"); //暂停 @@ -1810,8 +1814,13 @@ layer.close(index); }, btn2: function () { - $(".gjl-icon13").toggleClass("current"); - $(".gjl-icon13").attr("data-value", "0"); + if(flag == "tb"){ + $(".gjl-icon13").toggleClass("current"); + $(".gjl-icon13").attr("data-value", "0"); + }else if(flag == "jh"){ + $(".gjl-icon14").toggleClass("current"); + $(".gjl-icon14").attr("data-value", "0"); + } layer.close(index); } });