From 726603df43447f8cfedfeaae4267209adbd01699 Mon Sep 17 00:00:00 2001
From: yzt <Xynz17@163.com>
Date: 星期三, 27 九月 2023 13:48:58 +0800
Subject: [PATCH] BSV1.8

---
 src/main/webapp/hxzk/mapshow/mapShow.jsp |  703 ++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 418 insertions(+), 285 deletions(-)

diff --git a/src/main/webapp/hxzk/mapshow/mapShow.jsp b/src/main/webapp/hxzk/mapshow/mapShow.jsp
index 6f2954e..7d2dfaf 100644
--- a/src/main/webapp/hxzk/mapshow/mapShow.jsp
+++ b/src/main/webapp/hxzk/mapshow/mapShow.jsp
@@ -7,13 +7,13 @@
 				<head>
 					<meta charset="utf-8">
 					<meta http-equiv="X-UA-Compatible" content="IE=edge">
-					<meta name="viewport"
-						content="width=device-width, initial-scale=1, maximum-scale=1, shrink-to-fit=no">
+					<meta name="viewport" content="width=device-width, initial-scale=1">
 					<title>鍒囨崲鍦板浘</title>
+
 					<link rel="icon" type="image/x-icon" href="/hxzkoa/hxzk/assets/img/favicon.ico" />
 					<link href="/hxzkoa/hxzk/assets/css/loader.css" rel="stylesheet" type="text/css" />
 					<script src="/hxzkoa/hxzk/assets/js/loader.js"></script>
-
+					<link href="/hxzkoa/hxzk/assets/css/structure.css" rel="stylesheet" type="text/css" />
 					<!-- BEGIN GLOBAL MANDATORY STYLES -->
 					<link href="https://fonts.googleapis.com/css?family=Quicksand:400,500,600,700&display=swap"
 						rel="stylesheet">
@@ -55,6 +55,7 @@
 							max-width: 100%;
 							height: 100%;
 							background-color: #F0F0F0;
+							background: url("/hxzkoa/resources/images/bottomBackground2.jpg");
 						}
 
 						#head {
@@ -99,7 +100,9 @@
 							top: 20px;
 							right: 10px;
 						}
-
+						span{
+							color: #191E3A;
+						}
 						.mark_list li {
 							float: left;
 							width: 100px;
@@ -141,6 +144,35 @@
 							/*padding: 10px 30px;*/
 							color: black;
 						}
+
+						.blue{
+							margin-top: 14px;
+							font-weight: bolder;
+							font-size: 14px;
+						}
+						.blue1,.blue2,.blue3,.blue4:active{
+							color: black;
+							border-radius: 5px;
+
+						}
+						.blue4{
+							color: black;
+							border-radius: 5px;
+						}
+						.blue1{
+							text-decoration: none;
+							color: white;
+							font-weight: bolder;
+						}
+						.container{
+							box-shadow: 1px 2px 5px #666666;
+							position: fixed;
+							top: 400px;
+							left: 1820px;
+							z-index: 99999999999;
+							opacity: 1;
+
+						}
 					</style>
 				</head>
 
@@ -171,14 +203,14 @@
 					<button style="width: 80px;position: fixed;top: 50px;right: 130px;z-index: 9999;" type="button"
 						class="btn btn-secondary" id="stop">鍙栨秷</button>
 				</div> -->
-					<div
-						style="width: 300px; display: flex; justify-content: space-between; position: absolute; top: 50px; right: 28px; z-index: 9999;">
-						<input style="width: 200px;" type="text" id="tagidaaa" class="form-control"
-							placeholder="璇疯緭鍏ユ爣绛綢D">
-						<button style="width: 80px;" type="button" class="btn btn-secondary" id="search">鎼滅储</button>
-						<button style="width: 80px;" type="button" class="btn btn-secondary" id="stop">鍙栨秷</button>
-						<!-- <button type="button" onclick="showPopup()">寮圭獥</button> -->
-					</div>
+<%--					<div--%>
+<%--						style="width: 300px; display: flex; justify-content: space-between; position: absolute; top: 50px; right: 28px; z-index: 9999;">--%>
+<%--						<input style="width: 200px;" type="text" id="tagidaaa" class="form-control"--%>
+<%--							placeholder="璇疯緭鍏ユ爣绛綢D">--%>
+<%--						<button style="width: 80px;" type="button" class="btn btn-secondary" id="search">鎼滅储</button>--%>
+<%--						<button style="width: 80px;" type="button" class="btn btn-secondary" id="stop">鍙栨秷</button>--%>
+<%--						<!-- <button type="button" onclick="showPopup()">寮圭獥</button> -->--%>
+<%--					</div>--%>
 					<!--  BEGIN NAVBAR  -->
 					<div class="login-page"></div>
 					<!--  END NAVBAR  -->
@@ -193,72 +225,74 @@
 							<div class="row layout-top-spacing" id="cancel-row">
 								<div class="col-xl-12 col-lg-12 col-sm-12  layout-spacing">
 									<div class="widget widget-one_hybrid widget-engagement" id="map0"
-										style="width: 49.5%; float: left;" ondblclick="changemap0()">
-										<div class="widget-heading" style="height: 450px; width: 100%" id="maphead0">
+										style="width: 100%; float: left;" ondblclick="changemap0()">
+										<div class="widget-heading" style="height: 800px; width: 100%" id="maphead0">
 											<div class='panel-head' id="mapname0">鍦板浘0</div>
-											<div style="width: 100%; height: 400px; float: left" id="wrap0">
+											<div style="width: 100%; height: 750px; float: left" id="wrap0">
 												<canvas id="draw0"></canvas>
 												<p style="z-index: 9999;" id="jiazai0">姝e湪鍔犺浇鍦板浘......</p>
 											</div>
 										</div>
 									</div>
 									<div class="widget widget-one_hybrid widget-engagement"
-										style="margin-left: 1%; width: 49.5%; float: left;" id="map1"
+										style=" width: 100%; float: left;position: absolute;" id="map1"
 										ondblclick="changemap1()">
-										<div class="widget-heading" style="height: 450px; width: 100%" id="maphead1">
+										<div class="widget-heading" style="height: 800px; width: 100%;" id="maphead1">
 											<div class='panel-head' id="mapname1">鍦板浘1</div>
-											<div style="width: 100%; height: 400px; float: left" id="wrap1">
+											<div style="width: 100%; height: 750px; float: left" id="wrap1">
 												<canvas id="draw1"></canvas>
 												<p style="z-index: 9999;" id="jiazai1">姝e湪鍔犺浇鍦板浘......</p>
 											</div>
 										</div>
 									</div>
 									<div class="widget widget-one_hybrid widget-engagement"
-										style="width: 49.5%; float: left; margin-top: 1%" id="map2"
+										style="width: 100%; float: left;position: absolute;" id="map2"
 										ondblclick="changemap2()">
-										<div class="widget-heading" style="height: 450px; width: 100%" id="maphead2">
+										<div class="widget-heading" style="height: 800px; width: 100%;" id="maphead2">
 											<div class='panel-head' id="mapname2">鍦板浘2</div>
-											<div style="width: 100%; height: 400px; float: left" id="wrap2">
+											<div style="width: 100%; height: 750px; float: left" id="wrap2">
 												<canvas id="draw2"></canvas>
 												<p style="z-index: 9999;" id="jiazai2">姝e湪鍔犺浇鍦板浘......</p>
 											</div>
 										</div>
 									</div>
 									<div class="widget widget-one_hybrid widget-engagement"
-										style="width: 49.5%; margin-left: 1%; float: left; margin-top: 1%" id="map3"
+										style="width:100%; float: left;position: absolute;" id="map3"
 										ondblclick="changemap3()">
-										<div class="widget-heading" style="height: 450px; width: 100%" id="maphead3">
-											<div class='panel-head' id="mapname3">鍦板浘4</div>
-											<div style="width: 100%; height: 400px; float: left" id="wrap3">
+										<div class="widget-heading" style="height: 800px; width: 100%;" id="maphead3">
+											<div class='panel-head' id="mapname3">鍦板浘3</div>
+											<div style="width: 100%; height: 750px; float: left" id="wrap3">
 												<canvas id="draw3"></canvas>
 												<p style="z-index: 9999;" id="jiazai3">姝e湪鍔犺浇鍦板浘......</p>
 											</div>
 										</div>
 									</div>
+
 								</div>
 							</div>
 						</div>
 					</div>
-					<!-- <div class="popup" id="popup" onclick="hidePopup(false)">
-					<div class="popup-content" id="tanchuang">
-						<iframe src="http://192.168.1.100:10000/play.html?serial=34020000001320000003&code=34020000001310000002&aspect=fullscreen" width="640" height="360" allowfullscreen allow="autoplay; fullscreen"></iframe>
-					</div>
-				</div> -->
-					<div class="content-absolute"
-						style="position: absolute;z-index: 99999;left: 31%;bottom: 10px;margin:0 auto;">
-						<div class="content2">
-							<div id="vxg_media_player1" class="vxgplayer" style="display:none;"
-								url="rtsp://admin:hxzk20151102@192.168.1.64:554/Streaming/Channels/101" autostart
-								controls avsync nmf-src="/hxzkoa/hxzk/pnacl/Release/media_player.nmf"
-								nmf-path="media_player.nmf"></div>
-						</div>
+
+
+					<div  id="boxfloor1" style="width: 46px;height: 40px;position: absolute;top: 430px;left: 1810px;background-color: white;border-radius: 8px;opacity: 0.8;">
+						<a href="/hxzkoa/show.do" onclick="shouye()" id="shouye" style="margin-top: 4px;display: inline-block" ><img src="/hxzkoa/hxzk/image/icon/shouye.png" width="30"></a>
 					</div>
 					<!--  END CONTENT PART  -->
+					<div style="background-color: white;width: 46px;height: 194px;border-radius: 10px;padding-top: 10px;padding-bottom: 10px;position: absolute;top: 500px;left: 1810px;opacity: 0.8;box-shadow: 2px 2px 3px black;z-index: 99999" id="boxfloor">
+						<a href="#" class="blue1"><div class="blue11" style="text-align: center;height: 30px;width: 30px;line-height: 30px;margin-top: 14px;margin: auto;color: black"onclick="f1()">F1</div></a>
+						<div style="margin: auto;width: 30px;border-top: 1px solid #cccccc;margin-top: 7px;display: none" class="f2"></div>
+						<a href="#" class="blue1"><div class="blue22" style="text-align: center;height: 30px;width: 30px;line-height: 30px;margin-top: 14px;margin: auto;margin-top: 10px;display: none;color: black" id="f2" onclick="f2()">F2</div></a>
+						<div style="margin: auto;width: 30px;border-top: 1px solid #cccccc;margin-top: 7px;display: none" class="f3"></div>
+						<a href="#" class="blue1"><div class="blue33" style="text-align: center;height: 30px;width: 30px;line-height: 30px;margin-top: 14px;margin: auto;margin-top: 10px;display: none;color: black" id="f3" onclick="f3()">F3</div></a>
+						<div style="margin: auto;width: 30px;border-top: 1px solid #cccccc;margin-top: 7px;display: none" class="f4"></div>
+						<a href="#" class="blue1"><div class="blue44" style="text-align: center;height: 30px;width: 30px;line-height: 30px;margin-top: 14px;margin: auto;margin-top: 10px;display: none;color: black" id="f4" onclick="f4()">F4</div></a>
+					</div>
 
 					<!-- END MAIN CONTAINER -->
 					<% String username=(String) session.getAttribute("username"); if (username==null ||
 						username.equals("")) { request.getRequestDispatcher("/hxzk/login.jsp").forward(request,
 						response); return; } %>
+						<input type="hidden" name="xianusera" id="xianusera" value="<%=username%>">
 						<!-- BEGIN GLOBAL MANDATORY SCRIPTS -->
 						<script src="/hxzkoa/hxzk/assets/js/libs/jquery-3.1.1.min.js"></script>
 						<script src="/hxzkoa/hxzk/assets/js/vxgplayer-1.8.40.min.js"></script>
@@ -274,23 +308,124 @@
 						<script src="/hxzkoa/hxzk/plugins/table/datatable/button-ext/jszip.min.js"></script>
 						<script src="/hxzkoa/hxzk/plugins/table/datatable/button-ext/buttons.html5.min.js"></script>
 						<script src="/hxzkoa/hxzk/plugins/table/datatable/button-ext/buttons.print.min.js"></script>
+					<script src="/hxzkoa/hxzk/assets/js/custom.js"></script>
 						<script>
 							var result;
-							$(document).ready(function () {
-								App.init(); $.ajax({ async: false, type: "POST", url: "/hxzkoa/getSysSetting_list.do", data: {}, dataType: "json", success: function (data) { /* title = data[0].title; document.title = title; */ }, });
+							var department = [];
+							window.onload = function () {
+								App.init();
+								$.ajax({
+									async: false,
+									type: "POST",
+									url: "/hxzkoa/jiedepartment.do",
+									data: {},
+									dataType: "json",
+									success: function (data) {
+										for (var i = 0; i < data.dataList.length; i++) {
+											department.push([data.dataList[i].departmentName, data.dataList[i].iconadress]);
+										};
+										if (data.dataList2[0].label == 0) {
+											$("#labela").css({ 'display': 'none' });
+										};
+										if (data.dataList2[0].achor == 0) {
+											$("#anchora").css({ 'display': 'none' });
+										};
+										if (data.dataList2[0].gps == 0) {
+											$("#gpsa").css({ 'display': 'none' });
+										};
+										if (data.dataList2[0].fence == 0) {
+											$("#fencea").css({ 'display': 'none' });
+										};
+										if (data.dataList2[0].warning == 0) {
+											$("#warninga").css({ 'display': 'none' });
+										};
+										if (data.dataList2[0].history == 0) {
+											$("#historya").css({ 'display': 'none' });
+										};
+										if (data.dataList2[0].attendance == 0) {
+											$("#attendancea").css({ 'display': 'none' });
+										};
+										if (data.dataList2[0].basiclnfo == 0) {
+											$("#basiclnfoa").css({ 'display': 'none' });
+										};
+										if (data.dataList2[0].video == 0) {
+											$("#videoa").css({ 'display': 'none' });
+										};
+										if (data.dataList2[0].gas == 0) {
+											$("#gasa").css({ 'display': 'none' });
+										};
+									},
+								});
+								document.getElementById("xianuser").innerHTML = document.getElementById("xianusera").value
 								result = getAllMap(); //result["mapname"]=mapnamelist, ['floor']=floorlist
 								diaoyonghuatu(result);
-							});
+							};
 
 							$('.header-page').load('/hxzkoa/hxzk/top.html'); $('.login-page').load('/hxzkoa/hxzk/head.html');
 						</script>
-						<script src="/hxzkoa/hxzk/assets/js/custom.js"></script>
+
 						<!-- END GLOBAL MANDATORY SCRIPTS -->
 
 						<!-- > BEGIN PAGE FUNCTION SCRIPTS -->
 
 
 						<script>
+
+
+							//閫夋嫨妤煎眰
+							function f1(){
+								document.getElementById("map0").style.display = "block";
+								document.getElementById("map1").style.display = "none";
+								document.getElementById("map2").style.display = "none";
+								document.getElementById("map3").style.display = "none";
+								$(".blue11").css("background-color","#1DECFE")
+								$(".blue22").css("background-color","white")
+								$(".blue33").css("background-color","white")
+								$(".blue44").css("background-color","white")
+							}
+							function f2(){
+								document.getElementById("map1").style.width = "100%";
+								document.getElementById("maphead1").style.height = "800px";
+								document.getElementById("wrap1").style.height = "750px";
+								document.getElementById("map0").style.display = "none";
+								document.getElementById("map1").style.display = "block";
+								document.getElementById("map2").style.display = "none";
+								document.getElementById("map3").style.display = "none";
+								$(".blue22").css("background-color","#1DECFE")
+								$(".blue33").css("background-color","white")
+								$(".blue44").css("background-color","white")
+								$(".blue11").css("background-color","white")
+							}
+							function f3(){
+								document.getElementById("map2").style.width = "100%";
+								document.getElementById("maphead2").style.height = "800px";
+								document.getElementById("wrap2").style.height = "750px";
+								document.getElementById("map0").style.display = "none";
+								document.getElementById("map1").style.display = "none";
+								document.getElementById("map2").style.display = "block";
+								document.getElementById("map3").style.display = "none";
+								$(".blue33").css("background-color","#1DECFE")
+								$(".blue44").css("background-color","white")
+								$(".blue22").css("background-color","white")
+								$(".blue11").css("background-color","white")
+							}
+							function f4(){
+								document.getElementById("map3").style.width = "100%";
+								document.getElementById("maphead3").style.height = "800px";
+								document.getElementById("wrap3").style.height = "750px";
+								document.getElementById("map0").style.display = "none";
+								document.getElementById("map1").style.display = "none";
+								document.getElementById("map2").style.display = "none";
+								document.getElementById("map3").style.display = "block";
+								$(".blue44").css("background-color","#1DECFE")
+								$(".blue33").css("background-color","white")
+								$(".blue22").css("background-color","white")
+								$(".blue11").css("background-color","white")
+							}
+
+
+
+
 							//棣栭〉鍦板浘鎺у埗
 							var full_screen = false;
 							var timer_list = [];
@@ -309,7 +444,8 @@
 											document.getElementById("map1").style.display = "none";
 											document.getElementById("map2").style.display = "none";
 											document.getElementById("map3").style.display = "none";
-										} else if (data.length == 1) {
+
+										} else if (data.length  == 1) {
 											tubiaochicun = 0.015;
 											document.getElementById("map0").style.width = "100%";
 											document.getElementById("mapname0").innerHTML = data[0].mapname;
@@ -319,11 +455,35 @@
 											document.getElementById("map2").style.display = "none";
 											document.getElementById("map3").style.display = "none";
 											full_screen = true;
-										} else if (data.length == 2) {
-											document.getElementById("map2").style.display = "none";
-											document.getElementById("map3").style.display = "none";
-										};
+										}
+
+										if (data.length == 1) {
+											$("#f1").css("display", "block")
+											$("#boxfloor").css("height","50px")
+										}
+										if (data.length == 2) {
+											$("#f2").css("display", "block")
+											$(".f2").css("display", "block")
+											$("#boxfloor").css("height","100px")
+										}
+										if (data.length == 3) {
+											$("#f2").css("display", "block")
+											$(".f2").css("display", "block")
+											$("#f3").css("display", "block")
+											$(".f3").css("display", "block")
+											$("#boxfloor").css("height","150px")
+										}
+										if (data.length == 4) {
+											$("#f2").css("display", "block")
+											$(".f2").css("display", "block")
+											$("#f3").css("display", "block")
+											$(".f3").css("display", "block")
+											$("#f4").css("display", "block")
+											$(".f4").css("display", "block")
+										}
+										$(".floor1").css("display", "block")
 										for (var i = 0; i < data.length; i++) {
+											console.log("123456789")
 											str = "mapname" + i;
 											document.getElementById(str).innerHTML = data[i].mapname;
 											map.push(data[i].mapname);
@@ -344,6 +504,21 @@
 
 						<!-- 甯哥敤鍑芥暟 -->
 						<script>
+							function BezierEllipse2(ctx, x, y, a, b) {
+								var k = .5522848,
+									ox = a * k, // 姘村钩鎺у埗鐐瑰亸绉婚噺
+									oy = b * k; // 鍨傜洿鎺у埗鐐瑰亸绉婚噺</p> <p> ctx.beginPath();
+
+								//浠庢き鍦嗙殑宸︾鐐瑰紑濮嬮『鏃堕拡缁樺埗鍥涙潯涓夋璐濆灏旀洸绾�
+								ctx.moveTo(x - a, y);
+								ctx.bezierCurveTo(x - a, y - oy, x - ox, y - b, x, y - b);
+								ctx.bezierCurveTo(x + ox, y - b, x + a, y - oy, x + a, y);
+								ctx.bezierCurveTo(x + a, y + oy, x + ox, y + b, x, y + b);
+								ctx.bezierCurveTo(x - ox, y + b, x - a, y + oy, x - a, y);
+								ctx.closePath();
+								ctx.stroke();
+							};
+
 							function getTruemap_all() {
 								var map_wl = {};
 								$.ajax({
@@ -561,7 +736,7 @@
 									success: function (data) {
 										for (var i = 0; i < data.length; i++) {
 											//playMark[id,name,power,life,x,y,time]
-											realposition.push([data[i].tagid, data[i].name, data[i].power, data[i].life, data[i].posx, data[i].posy, data[i].time, data[i].fence == 1 || data[i].sos == 1, data[i].sousuo, data[i].shipin])
+											realposition.push([data[i].tagid, data[i].name, data[i].power, data[i].life, data[i].posx, data[i].posy, data[i].time, data[i].fence == 1 || data[i].sos == 1, data[i].sousuo, data[i].shipin, data[i].bumen, data[i].baoliu22])
 										}
 									},
 								});
@@ -643,52 +818,52 @@
 								return [anchorList_on, anchorList_off]
 							};
 
-							/**璇ユ柟娉曠敤鏉ョ粯鍒朵竴涓湁濉厖鑹茬殑鍦嗚鐭╁舰 
-						 *@param cxt:canvas鐨勪笂涓嬫枃鐜 
-						 *@param x:宸︿笂瑙抶杞村潗鏍� 
-						 *@param y:宸︿笂瑙抷杞村潗鏍� 
-						 *@param width:鐭╁舰鐨勫搴� 
-						 *@param height:鐭╁舰鐨勯珮搴� 
-						 *@param radius:鍦嗙殑鍗婂緞 
-						 *@param fillColor:濉厖棰滆壊 
+							/**璇ユ柟娉曠敤鏉ョ粯鍒朵竴涓湁濉厖鑹茬殑鍦嗚鐭╁舰
+						 *@param cxt:canvas鐨勪笂涓嬫枃鐜
+						 *@param x:宸︿笂瑙抶杞村潗鏍�
+						 *@param y:宸︿笂瑙抷杞村潗鏍�
+						 *@param width:鐭╁舰鐨勫搴�
+						 *@param height:鐭╁舰鐨勯珮搴�
+						 *@param radius:鍦嗙殑鍗婂緞
+						 *@param fillColor:濉厖棰滆壊
 						 **/
 							function fillRoundRect(cxt, x, y, width, height, radius, /*optional*/ fillColor) {
-								//鍦嗙殑鐩村緞蹇呯劧瑕佸皬浜庣煩褰㈢殑瀹介珮          
+								//鍦嗙殑鐩村緞蹇呯劧瑕佸皬浜庣煩褰㈢殑瀹介珮
 								if (2 * radius > width || 2 * radius > height) { return false; }
 
 								cxt.save();
 								cxt.translate(x, y);
-								//缁樺埗鍦嗚鐭╁舰鐨勫悇涓竟  
+								//缁樺埗鍦嗚鐭╁舰鐨勫悇涓竟
 								drawRoundRectPath(cxt, width, height, radius);
-								cxt.fillStyle = fillColor || "#000"; //鑻ユ槸缁欏畾浜嗗�煎氨鐢ㄧ粰瀹氱殑鍊煎惁鍒欑粰浜堥粯璁ゅ��  
+								cxt.fillStyle = fillColor || "#000"; //鑻ユ槸缁欏畾浜嗗�煎氨鐢ㄧ粰瀹氱殑鍊煎惁鍒欑粰浜堥粯璁ゅ��
 								cxt.fill();
 								cxt.restore();
 							}
 
 							function drawRoundRectPath(cxt, width, height, radius) {
 								cxt.beginPath(0);
-								//浠庡彸涓嬭椤烘椂閽堢粯鍒讹紝寮у害浠�0鍒�1/2PI  
+								//浠庡彸涓嬭椤烘椂閽堢粯鍒讹紝寮у害浠�0鍒�1/2PI
 								cxt.arc(width - radius, height - radius, radius, 0, Math.PI / 2);
 
-								//鐭╁舰涓嬭竟绾�  
+								//鐭╁舰涓嬭竟绾�
 								cxt.lineTo(radius, height);
 
-								//宸︿笅瑙掑渾寮э紝寮у害浠�1/2PI鍒癙I  
+								//宸︿笅瑙掑渾寮э紝寮у害浠�1/2PI鍒癙I
 								cxt.arc(radius, height - radius, radius, Math.PI / 2, Math.PI);
 
-								//鐭╁舰宸﹁竟绾�  
+								//鐭╁舰宸﹁竟绾�
 								cxt.lineTo(0, radius);
 
-								//宸︿笂瑙掑渾寮э紝寮у害浠嶱I鍒�3/2PI  
+								//宸︿笂瑙掑渾寮э紝寮у害浠嶱I鍒�3/2PI
 								cxt.arc(radius, radius, radius, Math.PI, Math.PI * 3 / 2);
 
-								//涓婅竟绾�  
+								//涓婅竟绾�
 								cxt.lineTo(width - radius, 0);
 
-								//鍙充笂瑙掑渾寮�  
+								//鍙充笂瑙掑渾寮�
 								cxt.arc(width - radius, radius, radius, Math.PI * 3 / 2, Math.PI * 2);
 
-								//鍙宠竟绾�  
+								//鍙宠竟绾�
 								cxt.lineTo(width, height - radius);
 								cxt.closePath();
 							}
@@ -697,10 +872,10 @@
 
 						<!-- 璋冪敤瀹ゅ唴瀹氫綅鍦板浘鍔熻兘 -->
 						<script>
-						var tubiaochicun = 0.03;
-						var lio = 0;
-					    // var zuobiaochicun = 30;
-					    // var dianliangchicun = 15;
+							var tubiaochicun = 0.03;
+							var lio = 0;
+							// var zuobiaochicun = 30;
+							// var dianliangchicun = 15;
 							function diaoyonghuatu(result) {
 
 								var truemap_list = getTruemap_all();
@@ -761,9 +936,13 @@
 								imgList['map'] = imgUrl;
 								var iconUrl = '/hxzkoa/hxzk/image/targeticon/default.png';
 								imgList['icon'] = iconUrl;
+								for (var i = 0; i < department.length; i++) {
+									imgList[department[i][0]] = '/hxzkoa/hxzk/' + department[i][1];
+								}
+
 
 								// 	    var anckicon = '/hxzkoa/hxzk/image/anchor/lingjin.png';
-								// 	    imgList['anchor']=anckicon; 
+								// 	    imgList['anchor']=anckicon;
 								var anckicon_on = '/hxzkoa/hxzk/image/anchor/鍩虹珯鍦ㄧ嚎.png';
 								//var anckicon_on = '/hxzkoa/hxzk/image/anchor/lingjin.png';
 								imgList['anchor_online'] = anckicon_on;
@@ -776,8 +955,8 @@
 							};
 							var serial;
 							var code;
+							var sousuopanduan = "";
 							var isDelete = false;
-							var shipinka = true;
 							var tuodong = false;
 							var colorbbb = "rgba(255,0,0,0.3)";
 							var sosType = [];
@@ -844,7 +1023,7 @@
 								this.playMark; //姝e湪灞曠ず鐨勬爣璁�
 								this.playAchor; //姝e湪灞曠ず鐨勫熀绔�
 								this.playAchorli; //姝e湪灞曠ず鐨勫熀绔�
-								this.playMarkInKaoQin;//褰撳墠鏍囪鏄惁鍦ㄨ�冨嫟鍖哄煙鍐�   
+								this.playMarkInKaoQin;//褰撳墠鏍囪鏄惁鍦ㄨ�冨嫟鍖哄煙鍐�
 								this.trackNow; //褰撳墠杞ㄨ抗
 
 								this.onlineAnchorList;//褰撳墠鍩虹珯鍒楄〃
@@ -1040,178 +1219,153 @@
 										_this.fenceMarkCount.push(tmp_count);
 									};
 
-									// if (shipinka) {
 									//鐢绘爣绛惧強鍩虹珯
 									for (var key in images) {
 										if (key == "icon" && _this.playMark) {
 											for (var i = 0; i < _this.playMark.length; i++) {
-												var tagzhuangtai = _this.playMark[i][3]; //鍦ㄧ嚎鐘舵��
-												var shipinzhuangtai = _this.playMark[i][9];
-												if (shipinka) {
-													if (shipinzhuangtai == "1") {
-														$.ajax({
-															async: false,
-															url: "/hxzkoa/shipinzhuangtai.do",
-															type: 'POST',
-															dataType: 'JSON',
-															data: {
-																tagid: _this.playMark[i][0],
-															},
-															success: function (data) {
-																serial = data[0].shebeiid;
-																code = data[0].tongdaoid;
+												if (sousuopanduan == "" || sousuopanduan == _this.playMark[i][0] || sousuopanduan == _this.playMark[i][1]) {
+													var tagzhuangtai = _this.playMark[i][3]; //鍦ㄧ嚎鐘舵��
+													//var playMarkInKaoQin = true;
+													if (((_this.offView == '1' && tagzhuangtai == '1') || (_this.offView == '0')) && ((_this.diskaoqin == "1" && _this.playMarkInKaoQin[i]) || (_this.diskaoqin == "0"))) {
+														//鏄惁寮�鍚绾挎秷澶憋紝骞跺垽鏂姸鎬侊紙鍦ㄧ嚎1/绂荤嚎0锛夛紱褰撳紑鍚绾挎秷澶辨椂锛堜粎鏄剧ず鍦ㄧ嚎鏍囩锛夛紝褰撴湭寮�鍚绾挎秷澶辨椂锛堝叏閮ㄦ樉绀猴級
+														//鏄惁寮�鍚嚭鑰冨嫟鍖哄煙娑堝け锛屽苟鍒ゆ柇鏄惁鍦ㄨ�冨嫟鍖哄煙鍐咃紱褰撳紑鍚嚭鑰冨嫟鍖哄煙娑堝け鏃讹紙闇�瑕佸湪鑰冨嫟鍖哄煙鍐咃級锛屽綋鏈紑鍚椂锛堝叏閮ㄦ樉绀猴級
+
+														//璇诲彇褰撳墠瀹為檯鍧愭爣
+														var cor_x = new Number(_this.playMark[i][4]); // 姝ゅ_this.playMark鏄暟鎹簱閲屽彇鍒扮殑褰撳墠鐐瑰潗鏍�,4鏄痯osx,5鏄痯osy
+														var cor_y = new Number(_this.playMark[i][5]);
+
+														//杞负鍥句笂鍧愭爣
+														var x_cor_now = new Number(_this.imgXList['map'] + _this.imgScaleList['map'] * _this.rateNumList['map'] * _this.x_ratio * (cor_x - _this.x_x0));
+														var y_cor_now = new Number(_this.imgYList['map'] + _this.imgScaleList['map'] * _this.rateNumList['map'] * _this.y_ratio * (cor_y - _this.y_y0));
+
+														//鏄惁鏈夎建杩规嫋灏�
+														if (_this.real_trak_time != 0) {
+															var trackNow;
+															var pm = _this.playMark;
+
+															function ftn(current_floor, pm, tn, rtk, ctt, rtc, igxm, igym, igslm, rnlm, xr, yr, xx0, yy0) {
+																alert(tn)
+																//trackNow = getTracknow(current_floor, pm[0], rtk)
+																if (tn.length == 0) {
+																	trackNow = [];
+																} else if (pm[0] in tn) {
+																	trackNow = tn[pm[0]];
+																} else {
+																	trackNow = [];
+																};
+																var can = ctt;
+																can.beginPath();
+																can.strokeStyle = rtc;
+																can.fillStyle = rtc;
+																for (var i = 0; i < trackNow.length; i++) {
+																	var cor_x = new Number(trackNow[i][0]);
+																	var cor_y = new Number(trackNow[i][1]);
+																	var x_cor = new Number(igxm + igslm * rnlm * xr * (cor_x - xx0));
+																	var y_cor = new Number(igym + igslm * rnlm * yr * (cor_y - yy0));
+																	can.moveTo(x_cor, y_cor);
+																	can.arc(x_cor, y_cor, 1, 0, Math.PI * 2, true);
+																	can.fill();
+																};
+																can.closePath();
+																can.stroke();
+																trackNow = null;
 															}
-														});
-														/* document.getElementById("popup").style.display = "flex";
-														var tanchuang = document.getElementById("tanchuang")
-														var rr = document.createElement("iframe")
-														rr.src = "http://39.106.210.13:10000/play.html?serial=" + serial + "&code=" + code + "&aspect=fullscreen";
-														rr.width = "640";
-														rr.height = "360";
-														rr.allowFullscreen = "true";
-														var object = tanchuang.appendChild(rr);
-														shipinka = false; */
-														document.getElementById("vxg_media_player1").style.display = "";
-														$('.content-absolute').css('display', 'inline');
-														window.vxgplayer('vxg_media_player1').stop();
-														window.vxgplayer('vxg_media_player1').src("rtsp://admin:hxzk20151102@192.168.1.64:554/Streaming/Channels/101");
-														window.vxgplayer('vxg_media_player1').play();
-													}
+															setTimeout(ftn(current_floor, _this.playMark[i], _this.trackNow, _this.real_trak_time, _this.context, _this.real_trak_color, _this.imgXList['map'], _this.imgYList['map'], _this.imgScaleList['map'], _this.rateNumList['map'], _this.x_ratio, _this.y_ratio, _this.x_x0, _this.y_y0), 5);
+															//var trackNow = getTracknow( _this.playMark[i][0], _this.real_trak_time);//鑾峰彇鎸囧畾鏃堕棿娈靛唴璇agid鐨勬暟鎹繘琛岀粯鍒�
+														} else {
+															_this.trackNow = [];
+														}
+														var isSos = _this.playMark[i][7];
+
+														if (_this.playMark[i][8] == "1") {
+															if (sousuoType) {
+																can.drawImage(images[_this.playMark[i][10]], 0, 0, images[key].naturalWidth, images[key].naturalHeight, x_cor_now - (images[key].naturalWidth * _this.imgScaleList[key] * _this.rateNumList[key]) / 2, y_cor_now - (images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key]), images[key].naturalWidth * _this.imgScaleList[key] * _this.rateNumList[key], images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key]);
+															} else {
+																can.drawImage(sousuo0, 0, 0, images[key].naturalWidth, images[key].naturalHeight, x_cor_now - (images[key].naturalWidth * _this.imgScaleList[key] * _this.rateNumList[key]) / 2, y_cor_now - (images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key]), images[key].naturalWidth * _this.imgScaleList[key] * _this.rateNumList[key], images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key]);
+															}
+															sousuoType = !sousuoType;
+														} else {
+															if (isSos) {
+																if (sosType[i]) {
+																	can.drawImage(sos, 0, 0, images[key].naturalWidth, images[key].naturalHeight, x_cor_now - (images[key].naturalWidth * _this.imgScaleList[key] * _this.rateNumList[key]) / 2 + 3, y_cor_now - (images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key]) + 2, images[key].naturalWidth * _this.imgScaleList[key] * _this.rateNumList[key], images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key]);
+																} else {
+																	can.drawImage(sos1, 0, 0, images[key].naturalWidth, images[key].naturalHeight, x_cor_now - (images[key].naturalWidth * _this.imgScaleList[key] * _this.rateNumList[key]) / 2 + 3, y_cor_now - (images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key]) + 2, images[key].naturalWidth * _this.imgScaleList[key] * _this.rateNumList[key], images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key]);
+																}
+																if (_this.playMark[i][11] == 0) {
+																	can.strokeStyle = 'red';
+																} else {
+																	can.strokeStyle = 'green';
+																}
+																can.lineWidth = 3;
+																BezierEllipse2(can,x_cor_now - (images[key].naturalWidth * _this.imgScaleList[key] * _this.rateNumList[key]) / 2+14,y_cor_now - (images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key]) + 28,10,5)
+																sosType[i] = !sosType[i];
+															} else {
+																if (_this.playMark[i][11] == 0) {
+																	can.strokeStyle = 'red';
+																} else {
+																	can.strokeStyle = 'green';
+																}
+																can.lineWidth = 3;
+																BezierEllipse2(can,x_cor_now - (images[key].naturalWidth * _this.imgScaleList[key] * _this.rateNumList[key]) / 2+14,y_cor_now - (images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key]) + 28,10,5)
+																can.drawImage(images[_this.playMark[i][10]], 0, 0, images[key].naturalWidth, images[key].naturalHeight, x_cor_now - (images[key].naturalWidth * _this.imgScaleList[key] * _this.rateNumList[key]) / 2, y_cor_now - (images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key]), images[key].naturalWidth * _this.imgScaleList[key] * _this.rateNumList[key], images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key]);
+															}
+														}
+
+														//鐢诲湪鐩稿簲浣嶇疆涓�
+														// can.drawImage(images[key], 0, 0, images[key].naturalWidth, images[key].naturalHeight, x_cor_now - (images[key].naturalWidth * _this.imgScaleList[key] * _this.rateNumList[key]) / 2, y_cor_now - (images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key]), images[key].naturalWidth * _this.imgScaleList[key] * _this.rateNumList[key], images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key]);
+
+														if (_this.tagZb == '1') { //鏄惁鏄剧ず鏍囩鍧愭爣
+															can.fillStyle = 'red';
+															//var f = 8*( _this.imgScaleList['map']);
+															can.font = "11px Arial";
+
+															tagzuobiao = _this.playMark[i][4] + ',' + _this.playMark[i][5];
+															lio = tagzuobiao.length / 2 * 6
+															can.fillText(tagzuobiao, x_cor_now - lio, y_cor_now + 15);
+														};
+														if (_this.viewName == '1') { //鏄惁鏄剧ず浜哄憳鍚嶇О
+															can.fillStyle = 'white';
+															can.font = '13px sans-serif';
+															if (_this.viewTagid == '1') { //鏄惁鏄剧ず鏍囩id
+																if (_this.playMark[i][2] <= 10) {
+																	fillRoundRect(can, x_cor_now - 40, y_cor_now - 40 * _this.imgScaleList[key] * _this.rateNumList[key] - 18, 40 * 2, 20, 4, '#FF0000');
+																} else {
+																	fillRoundRect(can, x_cor_now - 40, y_cor_now - 40 * _this.imgScaleList[key] * _this.rateNumList[key] - 18, 40 * 2, 20, 4, '#32CD32');
+																}
+																can.fillStyle = 'white';
+																can.fillText(_this.playMark[i][1], x_cor_now - 38, y_cor_now - 40 * _this.imgScaleList[key] * _this.rateNumList[key] - 3);
+																can.fillText(_this.playMark[i][0], x_cor_now + 5, y_cor_now - 40 * _this.imgScaleList[key] * _this.rateNumList[key] - 3);
+															} else {
+																if (_this.playMark[i][2] <= 10) {
+																	fillRoundRect(can, x_cor_now - 20, y_cor_now - images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key] - 18, images[key].naturalHeight * 1.1, 20, 4, '#FF0000');
+																} else {
+																	fillRoundRect(can, x_cor_now - 20, y_cor_now - images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key] - 18, images[key].naturalHeight * 1.1, 20, 4, '#32CD32');
+																}
+																can.fillStyle = 'white';
+																can.fillText(_this.playMark[i][1], x_cor_now - 19, y_cor_now - images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key] - 3);
+															}
+														} else {
+															can.font = '13px sans-serif';
+															can.fillStyle = 'white';
+															if (_this.viewTagid == '1') {
+																if (_this.playMark[i][2] <= 10) {
+																	fillRoundRect(can, x_cor_now - 20, y_cor_now - images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key] - 18, images[key].naturalHeight * 1.1, 20, 4, '#FF0000');
+																} else {
+																	fillRoundRect(can, x_cor_now - 20, y_cor_now - images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key] - 18, images[key].naturalHeight * 1.1, 20, 4, '#32CD32');
+																}
+																can.fillStyle = 'white';
+																can.fillText(_this.playMark[i][0], x_cor_now - 14, y_cor_now - images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key] - 3);
+															}
+														}
+
+														if (_this.viewPower == '1') { //鏄惁鏄剧ず鐢甸噺
+															can.font = '10px sans-serif';
+															can.fillStyle = 'red';
+															can.fillText("鐢甸噺:" + _this.playMark[i][2], x_cor_now - 16, y_cor_now + 20);
+														};
+													};
 												}
-												//var playMarkInKaoQin = true;
-												if (((_this.offView == '1' && tagzhuangtai == '1') || (_this.offView == '0')) && ((_this.diskaoqin == "1" && _this.playMarkInKaoQin[i]) || (_this.diskaoqin == "0"))) {
-													//鏄惁寮�鍚绾挎秷澶憋紝骞跺垽鏂姸鎬侊紙鍦ㄧ嚎1/绂荤嚎0锛夛紱褰撳紑鍚绾挎秷澶辨椂锛堜粎鏄剧ず鍦ㄧ嚎鏍囩锛夛紝褰撴湭寮�鍚绾挎秷澶辨椂锛堝叏閮ㄦ樉绀猴級
-													//鏄惁寮�鍚嚭鑰冨嫟鍖哄煙娑堝け锛屽苟鍒ゆ柇鏄惁鍦ㄨ�冨嫟鍖哄煙鍐咃紱褰撳紑鍚嚭鑰冨嫟鍖哄煙娑堝け鏃讹紙闇�瑕佸湪鑰冨嫟鍖哄煙鍐咃級锛屽綋鏈紑鍚椂锛堝叏閮ㄦ樉绀猴級
-
-													//璇诲彇褰撳墠瀹為檯鍧愭爣
-													var cor_x = new Number(_this.playMark[i][4]); // 姝ゅ_this.playMark鏄暟鎹簱閲屽彇鍒扮殑褰撳墠鐐瑰潗鏍�,4鏄痯osx,5鏄痯osy
-													var cor_y = new Number(_this.playMark[i][5]);
-
-													//杞负鍥句笂鍧愭爣
-													var x_cor_now = new Number(_this.imgXList['map'] + _this.imgScaleList['map'] * _this.rateNumList['map'] * _this.x_ratio * (cor_x - _this.x_x0));
-													var y_cor_now = new Number(_this.imgYList['map'] + _this.imgScaleList['map'] * _this.rateNumList['map'] * _this.y_ratio * (cor_y - _this.y_y0));
-
-													//鏄惁鏈夎建杩规嫋灏�
-													if (_this.real_trak_time != 0) {
-														var trackNow;
-														var pm = _this.playMark;
-
-														function ftn(current_floor, pm, tn, rtk, ctt, rtc, igxm, igym, igslm, rnlm, xr, yr, xx0, yy0) {
-															//trackNow = getTracknow(current_floor, pm[0], rtk)
-															if (tn.length == 0) {
-																trackNow = [];
-															} else if (pm[0] in tn) {
-																trackNow = tn[pm[0]];
-															} else {
-																trackNow = [];
-															};
-															var can = ctt;
-															can.beginPath();
-															can.strokeStyle = rtc;
-															can.fillStyle = rtc;
-															for (var i = 0; i < trackNow.length; i++) {
-																var cor_x = new Number(trackNow[i][0]);
-																var cor_y = new Number(trackNow[i][1]);
-																var x_cor = new Number(igxm + igslm * rnlm * xr * (cor_x - xx0));
-																var y_cor = new Number(igym + igslm * rnlm * yr * (cor_y - yy0));
-
-																// 			            	                var cor_x2 = new Number(trackNow[i+1][0]);
-																// 			            	                var cor_y2 = new Number(trackNow[i+1][1]);
-																// 			            	                var x_cor2 = new Number(igxm + igslm * rnlm * xr * (cor_x2 - xx0));
-																// 			            	                var y_cor2 = new Number(igym + igslm * rnlm * yr * (cor_y2 - yy0));
-
-																// 			            	                can.moveTo(x_cor, y_cor);
-																// 			            	               	can.lineTo(x_cor2, y_cor2);
-																// 			            	               	can.stroke();
-																// 			            	               	can.fill();
-																can.moveTo(x_cor, y_cor);
-																can.arc(x_cor, y_cor, 1, 0, Math.PI * 2, true);
-																can.fill();
-															};
-															can.closePath();
-															can.stroke();
-															trackNow = null;
-														}
-														setTimeout(ftn(current_floor, _this.playMark[i], _this.trackNow, _this.real_trak_time, _this.context, _this.real_trak_color, _this.imgXList['map'], _this.imgYList['map'], _this.imgScaleList['map'], _this.rateNumList['map'], _this.x_ratio, _this.y_ratio, _this.x_x0, _this.y_y0), 5);
-														//var trackNow = getTracknow( _this.playMark[i][0], _this.real_trak_time);//鑾峰彇鎸囧畾鏃堕棿娈靛唴璇agid鐨勬暟鎹繘琛岀粯鍒�
-													} else {
-														_this.trackNow = [];
-													}
-													var isSos = _this.playMark[i][7];
-													if (_this.playMark[i][8] == "1") {
-														if (sousuoType) {
-															can.drawImage(images[key], 0, 0, images[key].naturalWidth, images[key].naturalHeight, x_cor_now - (images[key].naturalWidth * _this.imgScaleList[key] * _this.rateNumList[key]) / 2, y_cor_now - (images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key]), images[key].naturalWidth * _this.imgScaleList[key] * _this.rateNumList[key], images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key]);
-														} else {
-															can.drawImage(sousuo0, 0, 0, images[key].naturalWidth, images[key].naturalHeight, x_cor_now - (images[key].naturalWidth * _this.imgScaleList[key] * _this.rateNumList[key]) / 2, y_cor_now - (images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key]), images[key].naturalWidth * _this.imgScaleList[key] * _this.rateNumList[key], images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key]);
-														}
-														sousuoType = !sousuoType;
-													} else {
-														if (isSos) {
-															if (sosType[i]) {
-																can.drawImage(sos, 0, 0, images[key].naturalWidth, images[key].naturalHeight, x_cor_now - (images[key].naturalWidth * _this.imgScaleList[key] * _this.rateNumList[key]) / 2 + 3, y_cor_now - (images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key]) + 2, images[key].naturalWidth * _this.imgScaleList[key] * _this.rateNumList[key], images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key]);
-															} else {
-																can.drawImage(sos1, 0, 0, images[key].naturalWidth, images[key].naturalHeight, x_cor_now - (images[key].naturalWidth * _this.imgScaleList[key] * _this.rateNumList[key]) / 2 + 3, y_cor_now - (images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key]) + 2, images[key].naturalWidth * _this.imgScaleList[key] * _this.rateNumList[key], images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key]);
-															}
-															sosType[i] = !sosType[i];
-														} else {
-															can.drawImage(images[key], 0, 0, images[key].naturalWidth, images[key].naturalHeight, x_cor_now - (images[key].naturalWidth * _this.imgScaleList[key] * _this.rateNumList[key]) / 2, y_cor_now - (images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key]), images[key].naturalWidth * _this.imgScaleList[key] * _this.rateNumList[key], images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key]);
-														}
-													}
-
-													//鐢诲湪鐩稿簲浣嶇疆涓�
-													// can.drawImage(images[key], 0, 0, images[key].naturalWidth, images[key].naturalHeight, x_cor_now - (images[key].naturalWidth * _this.imgScaleList[key] * _this.rateNumList[key]) / 2, y_cor_now - (images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key]), images[key].naturalWidth * _this.imgScaleList[key] * _this.rateNumList[key], images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key]);
-
-													if (_this.tagZb == '1') { //鏄惁鏄剧ず鏍囩鍧愭爣
-														can.fillStyle = 'red';
-														//var f = 8*( _this.imgScaleList['map']);
-														can.font = "11px Arial";
-														
-														tagzuobiao = _this.playMark[i][4] + ',' + _this.playMark[i][5];
-														lio = tagzuobiao.length / 2 * 6
-														can.fillText(tagzuobiao, x_cor_now - lio, y_cor_now + 10);
-													};
-													if (_this.viewName == '1') { //鏄惁鏄剧ず浜哄憳鍚嶇О
-														can.fillStyle = 'white';
-														can.font = '13px sans-serif';
-														if (_this.viewTagid == '1') { //鏄惁鏄剧ず鏍囩id
-															if (_this.playMark[i][2] <= 10) {
-																fillRoundRect(can, x_cor_now - 40, y_cor_now - images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key] - 18, images[key].naturalHeight * 2, 20, 4, '#FF0000');
-															} else {
-																fillRoundRect(can, x_cor_now - 40, y_cor_now - images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key] - 18, images[key].naturalHeight * 2, 20, 4, '#32CD32');
-															}
-															can.fillStyle = 'white';
-															can.fillText(_this.playMark[i][1], x_cor_now - 38, y_cor_now - images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key] - 3);
-															can.fillText(_this.playMark[i][0], x_cor_now + 5, y_cor_now - images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key] - 3);
-														} else {
-															if (_this.playMark[i][2] <= 10) {
-																fillRoundRect(can, x_cor_now - 20, y_cor_now - images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key] - 18, images[key].naturalHeight * 1.1, 20, 4, '#FF0000');
-															} else {
-																fillRoundRect(can, x_cor_now - 20, y_cor_now - images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key] - 18, images[key].naturalHeight * 1.1, 20, 4, '#32CD32');
-															}
-															can.fillStyle = 'white';
-															can.fillText(_this.playMark[i][1], x_cor_now - 19, y_cor_now - images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key] - 3);
-														}
-													} else {
-														can.font = '13px sans-serif';
-														can.fillStyle = 'white';
-														if (_this.viewTagid == '1') {
-															if (_this.playMark[i][2] <= 10) {
-																fillRoundRect(can, x_cor_now - 20, y_cor_now - images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key] - 18, images[key].naturalHeight * 1.1, 20, 4, '#FF0000');
-															} else {
-																fillRoundRect(can, x_cor_now - 20, y_cor_now - images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key] - 18, images[key].naturalHeight * 1.1, 20, 4, '#32CD32');
-															}
-															can.fillStyle = 'white';
-															can.fillText(_this.playMark[i][0], x_cor_now - 14, y_cor_now - images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key] - 3);
-														}
-													}
-
-													if (_this.viewPower == '1') { //鏄惁鏄剧ず鐢甸噺
-														can.font = '10px sans-serif';
-														can.fillStyle = 'red';
-														can.fillText("鐢甸噺:" + _this.playMark[i][2], x_cor_now - 16, y_cor_now + 20);
-													};
-												};
-											}
+											};
 										} else if (key == 'anchor_online') {
 											can.font = '10px sans-serif';
 											if (_this.anckicon == '1') { //鏄惁鏄剧ず鍩虹珯鍥炬爣
@@ -1225,7 +1379,8 @@
 													if (_this.viewAnckzb == '1') { //鏄惁鏄剧ず鍩虹珯鍧愭爣
 														can.fillStyle = 'red'
 														var anchorzuobiao = _this.onlineAnchorList[i][1] + ',' + _this.onlineAnchorList[i][2] + ',' + _this.onlineAnchorList[i][3];
-														can.fillText(anchorzuobiao, x_cor - 15, y_cor + 30);
+														// can.fillText(anchorzuobiao, x_cor - 15, y_cor + 30);
+														can.fillText(anchorzuobiao, x_cor - (images[key].naturalWidth * _this.imgScaleList[key] * _this.rateNumList[key]) / 2, y_cor - (images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key]) + 33);
 													};
 													if (_this.viewAnckid == '1') { //鏄惁鏄剧ず鍩虹珯id
 														can.fillStyle = 'red';
@@ -1247,7 +1402,8 @@
 													if (_this.viewAnckzb == '1') { //鏄惁鏄剧ず鍩虹珯鍧愭爣
 														can.fillStyle = 'red'
 														var anchorzuobiao = _this.offlineAnchorList[i][1] + ',' + _this.offlineAnchorList[i][2] + ',' + _this.offlineAnchorList[i][3];
-														can.fillText(anchorzuobiao, x_cor - 15, y_cor + 30);
+														// can.fillText(anchorzuobiao, x_cor - 15, y_cor + 30);
+														can.fillText(anchorzuobiao, x_cor - (images[key].naturalWidth * _this.imgScaleList[key] * _this.rateNumList[key]) / 2, y_cor - (images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key]) + 33);
 													};
 													if (_this.viewAnckid == '1') { //鏄惁鏄剧ず鍩虹珯id
 														can.fillStyle = 'red';
@@ -1410,9 +1566,6 @@
 										if (tuodong == true) {
 											return false;
 										}
-										if (shipinka == false) {
-											return false;
-										}
 										//褰撳墠瀹炴椂鍧愭爣
 										_this.playMark = getRealPosition(current_floor);
 										// var onachor = getAnchorInfo_all()[0][current_floor];
@@ -1440,7 +1593,7 @@
 											var track_now = Date.parse(new Date());  //timestamp涓烘绉掑崟浣�
 											track_now = track_now / 1000;
 											var track_now_head = track_now - _this.real_trak_time;
-											//褰撳墠track鏈�寮�濮嬬殑鏃堕棿    
+											//褰撳墠track鏈�寮�濮嬬殑鏃堕棿
 											var track_head_date = new Date();
 											track_head_date.setTime(track_now_head * 1000 + 8 * 3600 * 1000);
 											var track_head_date_str = track_head_date.toJSON().substr(0, 19).replace('T', ' ');
@@ -1509,7 +1662,7 @@
 									if ((event.type == "dblclick") && (full_screen == false)) {
 										_this.expand = true;
 										full_screen = true;
-		
+
 										tubiaochicun = 0.015;
 										// zuobiaochicun = 35;
 										// dianliangchicun = 17;
@@ -1586,7 +1739,6 @@
 										tuodong = true;
 										//_this.canvas.style.cursor = "move";
 										_this.pos = _this.xyToCanvas(_this.canvas, event.clientX, event.clientY);
-
 									}
 								},
 								/*榧犳爣绉诲姩浜嬩欢*/
@@ -1697,49 +1849,30 @@
 							document.getElementById("stop").style.display = 'none';
 							$("#search").click(function () {
 								var input = document.getElementById("tagidaaa").value;
-								$.ajax({
-									async: false,
-									url: "/hxzkoa/sousuo.do",
-									type: "POST",
-									dataType: "JSON",
-									data: {
-										tagid: input
-									}
-								})
+								// $.ajax({
+								// 	async: false,
+								// 	url: "/hxzkoa/sousuo.do",
+								// 	type: "POST",
+								// 	dataType: "JSON",
+								// 	data: {
+								// 		tagid: input
+								// 	}
+								// })
+								sousuopanduan = input;
 								document.getElementById("search").style.display = 'none';
 								document.getElementById("stop").style.display = '';
-								document.getElementById("tagidaaa").value = "";
 							});
 							$("#stop").click(function () {
-								$.ajax({
-									async: false,
-									url: "/hxzkoa/sousuoquxiao.do",
-									type: "POST",
-									dataType: "JSON"
-								})
+								// $.ajax({
+								// 	async: false,
+								// 	url: "/hxzkoa/sousuoquxiao.do",
+								// 	type: "POST",
+								// 	dataType: "JSON"
+								// })
+								sousuopanduan = "";
 								document.getElementById("search").style.display = '';
 								document.getElementById("stop").style.display = 'none';
-							});
-							function hidePopup(x, e) {
-								if (e != undefined) {
-									e.cancelBubble = true;
-								}
-								document.getElementById("popup").style.display = "none";
-								isDelete = x;
-								shipinka = true;
-								document.getElementById("tanchuang").innerHTML = "";
-							}
-							
-							$(document).bind('click', function (e) {
-								var e = e || window.event; //娴忚鍣ㄥ吋瀹规��   
-								var elem = e.target || e.srcElement;
-								while (elem) { //寰幆鍒ゆ柇鑷宠窡鑺傜偣锛岄槻姝㈢偣鍑荤殑鏄痙iv瀛愬厓绱�   
-									if (elem.id && elem.id == 'test') {
-										return;
-									}
-									elem = elem.parentNode;
-								}
-								$('.content-absolute').css('display', 'none'); //鐐瑰嚮鐨勪笉鏄痙iv鎴栧叾瀛愬厓绱�   
+								document.getElementById("tagidaaa").value = "";
 							});
 						</script>
 						<!-- 缁撴潫璋冪敤瀹ゅ唴瀹氫綅鍦板浘鍔熻兘 -->

--
Gitblit v1.10.0