From c6d9be2aac4965e847fd958288170e26e79b219d Mon Sep 17 00:00:00 2001
From: 15832144755 <67030627+15832144755@users.noreply.github.com>
Date: 星期三, 01 九月 2021 16:09:44 +0800
Subject: [PATCH] 9.1

---
 src/main/webapp/hxzk/index.jsp |  102 +++++++++++++++++++++++++--------------------------
 1 files changed, 50 insertions(+), 52 deletions(-)

diff --git a/src/main/webapp/hxzk/index.jsp b/src/main/webapp/hxzk/index.jsp
index 69faddc..36c44ff 100644
--- a/src/main/webapp/hxzk/index.jsp
+++ b/src/main/webapp/hxzk/index.jsp
@@ -976,12 +976,12 @@
 									for (var i = 0; i < gps_node_list1.length; i++) {
 										//var zhuangtaia = gps_node_list1[i][4];
 										if ((bm_offView == '1' && gps_node_list1[i][4] == '1') || (bm_offView == '0')) {
-										if (current_node_list[gps_node_list1[i][0]] == null) {
-											current_node_list[gps_node_list1[i][0]] = new Queue();
-										}
-										var point = new BMap.Point(new Number(gps_node_list1[i][1]), new Number(gps_node_list1[i][2]));
-										points.push(point);
-										gps_node_list.push(gps_node_list1[i]);
+											if (current_node_list[gps_node_list1[i][0]] == null) {
+												current_node_list[gps_node_list1[i][0]] = new Queue();
+											}
+											var point = new BMap.Point(new Number(gps_node_list1[i][1]), new Number(gps_node_list1[i][2]));
+											points.push(point);
+											gps_node_list.push(gps_node_list1[i]);
 										}
 									};
 									gps_node_list1 = null
@@ -990,55 +990,53 @@
 								}
 
 								function baidumm(data) {
+									bm.clearOverlays();
 									for (var i = 0; i < gps_node_list.length; i++) {
 										//var zhuangtaia = getstatus(gps_node_list[i][0]);
-										if (current_node_list[gps_node_list[i][0]].size() > 0) {
-											old_mark = current_node_list[gps_node_list[i][0]].front();
-											current_node_list[gps_node_list[i][0]].dequeue();
-											bm.removeOverlay(old_mark);//娓呴櫎涓婁竴涓�
+										// if (current_node_list[gps_node_list[i][0]].size() > 0) {
+										// 	old_mark = current_node_list[gps_node_list[i][0]].front();
+										// 	current_node_list[gps_node_list[i][0]].dequeue();
+										// 	bm.removeOverlay(old_mark);//娓呴櫎涓婁竴涓�
+										// 	old_mark = null;
+										// }
+										marker = new BMap.Marker(data[i], { icon: myIcon });
+										bm.addOverlay(marker);
+										current_node_list[gps_node_list[i][0]].enqueue(marker);
+										if (bm_viewTagid == "1") {
+											var aaaaa = gps_node_list[i][15] + "  " + gps_node_list[i][0]
+											var tagid = new BMap.Label(aaaaa, { offset: new BMap.Size(20, -30) });
+											tagid.setStyle({
+												color: "#fff",
+												fontSize: "14px",
+												borderRadius: "5px",
+												padding: "5px 5px",
+												border: "0",
+												backgroundColor: "#32CD32",
+												transform: 'translateX(-50%)',
+											});
+											marker.setLabel(tagid); //娣诲姞label-tagid
+											tagid = null;
 										}
-										//if ((bm_offView == '1' && zhuangtaia == '1') || (bm_offView == '0')) {
-											marker = new BMap.Marker(data[i], { icon: myIcon });
-											bm.addOverlay(marker);
-											current_node_list[gps_node_list[i][0]].enqueue(marker);
-
-											if (bm_viewTagid == "1") {
-												var aaaaa = gps_node_list[i][15] + "  " + gps_node_list[i][0]
-												var tagid = new BMap.Label(aaaaa, { offset: new BMap.Size(20, -30) });
-												tagid.setStyle({
-													color: "#fff",
-													fontSize: "14px",
-													borderRadius: "5px",
-													padding: "5px 5px",
-													border: "0",
-													backgroundColor: "#32CD32",
-													transform: 'translateX(-50%)',
-												});
-												marker.setLabel(tagid); //娣诲姞label-tagid
-												tagid = null;
-											}
-											if (bm_tagZb == "1") {
-												var zuobiao = new BMap.Label(gps_node_list[i][1] + ',' + gps_node_list[i][2], { offset: new BMap.Size(20, +40) });
-												zuobiao.setStyle({
-													transform: 'translateX(-50%)',
-													backgroundColor: "0.000000000001",
-													border: 'none'
-												});
-												marker.setLabel(zuobiao);
-												zuobiao = null;
-											}
-											if (bm_viewPower == "1") {
-												var dianliang = new BMap.Label("璁惧鐢甸噺" + gps_node_list[i][12], { offset: new BMap.Size(20, +55) });
-												dianliang.setStyle({
-													transform: 'translateX(-50%)',
-													backgroundColor: "0.000000000001",
-													border: 'none'
-												});
-												marker.setLabel(dianliang);
-												dianliang = null;
-											}
-											marker = null;
-										//}
+										if (bm_tagZb == "1") {
+											var zuobiao = new BMap.Label(gps_node_list[i][1] + ',' + gps_node_list[i][2], { offset: new BMap.Size(20, +40) });
+											zuobiao.setStyle({
+												transform: 'translateX(-50%)',
+												backgroundColor: "0.000000000001",
+												border: 'none'
+											});
+											marker.setLabel(zuobiao);
+											zuobiao = null;
+										}
+										if (bm_viewPower == "1") {
+											var dianliang = new BMap.Label("璁惧鐢甸噺" + gps_node_list[i][12], { offset: new BMap.Size(20, +55) });
+											dianliang.setStyle({
+												transform: 'translateX(-50%)',
+												backgroundColor: "0.000000000001",
+												border: 'none'
+											});
+											marker.setLabel(dianliang);
+											dianliang = null;
+										}
 									}
 									gps_node_list = null;
 								};

--
Gitblit v1.10.0