From bccfe9aef17b04ecdbd8dc2b42ba5ecd511e88d9 Mon Sep 17 00:00:00 2001
From: 15689705887 <396341246@qq.com>
Date: Fri, 25 Oct 2024 14:35:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=89=E7=BB=B4=E5=BA=94?=
 =?UTF-8?q?=E6=80=A5=E9=A2=84=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../3DVisualization/subitem/js/vehicleDuty.js     |  3 ++-
 .../3DVisualization/subitem/yjcz.html             | 15 ++++++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

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);
 				}
 			});