From 741d66c00c593d4f14cd6731d3e4af6ee5c191ac Mon Sep 17 00:00:00 2001
From: 15832144755 <67030627+15832144755@users.noreply.github.com>
Date: 星期五, 23 七月 2021 10:51:51 +0800
Subject: [PATCH] 7.23

---
 src/main/webapp/hxzk/mapshow/mapShow.jsp |  427 +++++++++++++++++++++++++++++++----------------------
 1 files changed, 248 insertions(+), 179 deletions(-)

diff --git a/src/main/webapp/hxzk/mapshow/mapShow.jsp b/src/main/webapp/hxzk/mapshow/mapShow.jsp
index a03b76c..1359327 100644
--- a/src/main/webapp/hxzk/mapshow/mapShow.jsp
+++ b/src/main/webapp/hxzk/mapshow/mapShow.jsp
@@ -84,10 +84,34 @@
 						background: #009a8f;
 						color: #fff;
 					}
+
+					.popup {
+						width: 100vw;
+						height: 100vh;
+						background-color: rgba(0, 0, 0, .5);
+						position: fixed;
+						left: 0;
+						top: 0;
+						bottom: 0;
+						right: 0;
+						display: none;
+						justify-content: center;
+						align-items: center;
+						z-index: 9999锛�
+					}
+
+					.popup-content {
+						width: 640px;
+						height: 360px;
+						background-color: #fff;
+						box-sizing: border-box;
+						/*padding: 10px 30px;*/
+						color: black;
+					}
 				</style>
 			</head>
 
-			<body class="alt-menu sidebar-noneoverflow">
+			<body class="alt-menu sidebar-noneoverflow" style="position: relative;">
 
 				<!-- BEGIN LOADER -->
 				<div id="load_screen">
@@ -111,13 +135,12 @@
 					<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: 130px;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>
+				<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>
@@ -173,6 +196,11 @@
 						</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>
 				<!--  END CONTENT PART  -->
 
 				<!-- END MAIN CONTAINER -->
@@ -477,7 +505,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])
+									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])
 								}
 							},
 						});
@@ -686,10 +714,15 @@
 
 						new MarkPoints(index, fr, imgList, tml, ydl, fzbl, fcl, fnl, ftl, ail_on, ail_off, sysSetting, ttm);
 					};
+					var serial;
+					var code;
+					var isDelete = false;
+					var shipinka = true;
 					var tuodong = false;
+					var colorbbb = "rgba(255,0,0,0.3)";
 					var sosType = [];
 					var sousuoType = true;
-					for (var i = 0;i < 500;i++) {
+					for (var i = 0; i < 500; i++) {
 						sosType[i] = true;
 					}
 					var sos = document.createElement('img');
@@ -940,196 +973,220 @@
 								_this.fenceMarkCount.push(tmp_count);
 							};
 
-
-							//鐢绘爣绛惧強鍩虹珯
-							for (var key in images) {
-								if (key == "icon" && _this.playMark) {
-									for (var i = 0; i < _this.playMark.length; i++) {
-										//_this.trackNow = [];
-										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) {
-													//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();
-													//_this.trackNow.push([trackNow]);
+							// if (shipinka) {
+								//鐢绘爣绛惧強鍩虹珯
+								for (var key in images) {
+									if (key == "icon" && _this.playMark) {
+										for (var i = 0; i < _this.playMark.length; i++) {
+											//_this.trackNow = [];
+											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;
+														}
+													});
+													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;
 												}
-												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][_this.playMark[i].length - 2];
-											if (_this.playMark[i][_this.playMark[i].length - 1] == "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]);
+											//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();
+														//_this.trackNow.push([trackNow]);
 													}
-													sosType[i] = !sosType[i];
+													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 {
-													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]);
+													_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]);
+												//鐢诲湪鐩稿簲浣嶇疆涓�
+												// 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=f+"px Arial";
+												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];
-												can.fillText(tagzuobiao, x_cor_now - 20, y_cor_now + 10);
+													tagzuobiao = _this.playMark[i][4] + ',' + _this.playMark[i][5];
+													can.fillText(tagzuobiao, x_cor_now - 20, y_cor_now + 10);
+												};
+												if (_this.viewName == '1') { //鏄惁鏄剧ず浜哄憳鍚嶇О
+													can.fillStyle = 'white';
+													can.font = '13px sans-serif';
+													if (_this.viewTagid == '1') { //鏄惁鏄剧ず鏍囩id
+														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 {
+														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') {
+														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 - 20, y_cor_now + 20);
+												};
 											};
-											if (_this.viewName == '1') { //鏄惁鏄剧ず浜哄憳鍚嶇О
-												can.fillStyle = 'white';
-												can.font = '13px sans-serif';
-												if (_this.viewTagid == '1') { //鏄惁鏄剧ず鏍囩id
-													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 {
-													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') {
-													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 - 20, y_cor_now + 20);
+										}
+									} else if (key == 'anchor_online') {
+										can.font = '10px sans-serif';
+										if (_this.anckicon == '1') { //鏄惁鏄剧ず鍩虹珯鍥炬爣
+											//_this.anchorList = [anchorid, posx,posy,posz,layer,greatetime]
+											for (var i = 0; i < _this.onlineAnchorList.length; i++) {
+												var cor_x = new Number(_this.onlineAnchorList[i][1]);
+												var cor_y = new Number(_this.onlineAnchorList[i][2]);
+												var x_cor = new Number(_this.imgXList['map'] + _this.imgScaleList['map'] * _this.rateNumList['map'] * _this.x_ratio * (cor_x - _this.x_x0));
+												var y_cor = new Number(_this.imgYList['map'] + _this.imgScaleList['map'] * _this.rateNumList['map'] * _this.y_ratio * (cor_y - _this.y_y0));
+												can.drawImage(images[key], 0, 0, images[key].naturalWidth, images[key].naturalHeight, x_cor - (images[key].naturalWidth * _this.imgScaleList[key] * _this.rateNumList[key]) / 2, y_cor - (images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key]), images[key].naturalWidth, images[key].naturalHeight);
+												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);
+												};
+												if (_this.viewAnckid == '1') { //鏄惁鏄剧ず鍩虹珯id
+													can.fillStyle = 'red';
+													var tigidd = _this.onlineAnchorList[i][0];
+													can.fillText(tigidd, x_cor - 2, y_cor - (images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key] + 10) / 2);
+												};
+											};
+										};
+									} else if (key == 'anchor_offline') {
+										can.font = '10px sans-serif';
+										if (_this.anckicon == '1') { //鏄惁鏄剧ず鍩虹珯鍥炬爣
+											//_this.anchorList = [anchorid, posx,posy,posz,layer,greatetime]
+											for (var i = 0; i < _this.offlineAnchorList.length; i++) {
+												var cor_x = new Number(_this.offlineAnchorList[i][1]);
+												var cor_y = new Number(_this.offlineAnchorList[i][2]);
+												var x_cor = new Number(_this.imgXList['map'] + _this.imgScaleList['map'] * _this.rateNumList['map'] * _this.x_ratio * (cor_x - _this.x_x0));
+												var y_cor = new Number(_this.imgYList['map'] + _this.imgScaleList['map'] * _this.rateNumList['map'] * _this.y_ratio * (cor_y - _this.y_y0));
+												can.drawImage(images[key], 0, 0, images[key].naturalWidth, images[key].naturalHeight, x_cor - (images[key].naturalWidth * _this.imgScaleList[key] * _this.rateNumList[key]) / 2, y_cor - (images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key]), images[key].naturalWidth, images[key].naturalHeight);
+												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);
+												};
+												if (_this.viewAnckid == '1') { //鏄惁鏄剧ず鍩虹珯id
+													can.fillStyle = 'red';
+													can.fillText(_this.offlineAnchorList[i][0], x_cor - 2, y_cor - (images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key] + 10) / 2);
+												};
 											};
 										};
 									}
-								} else if (key == 'anchor_online') {
-									can.font = '10px sans-serif';
-									if (_this.anckicon == '1') { //鏄惁鏄剧ず鍩虹珯鍥炬爣
-										//_this.anchorList = [anchorid, posx,posy,posz,layer,greatetime]
-										for (var i = 0; i < _this.onlineAnchorList.length; i++) {
-											var cor_x = new Number(_this.onlineAnchorList[i][1]);
-											var cor_y = new Number(_this.onlineAnchorList[i][2]);
-											var x_cor = new Number(_this.imgXList['map'] + _this.imgScaleList['map'] * _this.rateNumList['map'] * _this.x_ratio * (cor_x - _this.x_x0));
-											var y_cor = new Number(_this.imgYList['map'] + _this.imgScaleList['map'] * _this.rateNumList['map'] * _this.y_ratio * (cor_y - _this.y_y0));
-											can.drawImage(images[key], 0, 0, images[key].naturalWidth, images[key].naturalHeight, x_cor - (images[key].naturalWidth * _this.imgScaleList[key] * _this.rateNumList[key]) / 2, y_cor - (images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key]), images[key].naturalWidth * _this.imgScaleList[key] * _this.rateNumList[key] + 10, images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key] + 10);
-											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 - 20, y_cor + 20);
-											};
-											if (_this.viewAnckid == '1') { //鏄惁鏄剧ず鍩虹珯id
-												can.fillStyle = 'red';
-												var tigidd = _this.onlineAnchorList[i][0];
-												can.fillText(tigidd, x_cor - 7, y_cor - (images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key] + 10) / 2);
-											};
-										};
-									};
-								} else if (key == 'anchor_offline') {
-									can.font = '10px sans-serif';
-									if (_this.anckicon == '1') { //鏄惁鏄剧ず鍩虹珯鍥炬爣
-										//_this.anchorList = [anchorid, posx,posy,posz,layer,greatetime]
-										for (var i = 0; i < _this.offlineAnchorList.length; i++) {
-											var cor_x = new Number(_this.offlineAnchorList[i][1]);
-											var cor_y = new Number(_this.offlineAnchorList[i][2]);
-											var x_cor = new Number(_this.imgXList['map'] + _this.imgScaleList['map'] * _this.rateNumList['map'] * _this.x_ratio * (cor_x - _this.x_x0));
-											var y_cor = new Number(_this.imgYList['map'] + _this.imgScaleList['map'] * _this.rateNumList['map'] * _this.y_ratio * (cor_y - _this.y_y0));
-											can.drawImage(images[key], 0, 0, images[key].naturalWidth, images[key].naturalHeight, x_cor - (images[key].naturalWidth * _this.imgScaleList[key] * _this.rateNumList[key]) / 2, y_cor - (images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key]), images[key].naturalWidth * _this.imgScaleList[key] * _this.rateNumList[key] + 10, images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key] + 10);
-											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 - 20, y_cor + 20);
-											};
-											if (_this.viewAnckid == '1') { //鏄惁鏄剧ず鍩虹珯id
-												can.fillStyle = 'red';
-												can.fillText(_this.offlineAnchorList[i][0], x_cor - 7, y_cor - (images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key] + 10) / 2);
-											};
-										};
-									};
-								}
-							};
+								};
+							// }
 
 							//寮�鍚毀閬撳畾浣嶅悗锛岄渶瑕佹樉绀哄綋鍓嶈�冨嫟鍖哄煙鍐呯殑鎬绘爣绛炬暟閲�
-							//_this.fenceMarkCount(count)
-							//_this.realFenceList([name, type, zuobiao_array])
-							//_this.FenceColor(color)
 							if (_this.tunlDw == "1") {
 								var k = 0;
+								fillRoundRect(can, 10, 10, 140, 40 * _this.fenceMarkCount.length, 10, colorbbb);
 								for (var i = 0; i < _this.fenceMarkCount.length; i++) {
-									//             		if (_this.realFenceList[i][1] == "鑰冨嫟鍖哄煙"){
 									can.beginPath();
 									can.fillStyle = getDrawColor(_this.FenceColor[i]);
-									can.fillRect(10, 10 + 50 * k, 140, 30);
-									can.fillStyle = "red";
-									can.fillText(_this.realFenceList[i][0] + ":" + _this.fenceMarkCount[i], 65, 25 + 50 * k);
+									can.fillStyle = "yellow";
+									can.font = "15px Verdana";
+									can.fillText(_this.realFenceList[i][0] + ":" + _this.fenceMarkCount[i], 34, 36 + 40 * k);
 									can.closePath();
 									k += 1;
-									//             		};
 								};
 							};
 
@@ -1266,6 +1323,9 @@
 								if (tuodong == true) {
 									return false;
 								}
+								if (shipinka == false) {
+									return false;
+								}
 								//褰撳墠瀹炴椂鍧愭爣
 								_this.playMark = getRealPosition(current_floor);
 								// 	            	var tagid_str = "";
@@ -1567,6 +1627,15 @@
 						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 = "";
+					}
 				</script>
 				<!-- 缁撴潫璋冪敤瀹ゅ唴瀹氫綅鍦板浘鍔熻兘 -->
 				<!-- > END PAGE FUNCTION SCRIPTS -->

--
Gitblit v1.10.0