From e841378f0e2bbfe7b448622bde52713ee8140f12 Mon Sep 17 00:00:00 2001
From: zhitong.yu <xynz17@163.com>
Date: 星期三, 17 四月 2024 11:43:31 +0800
Subject: [PATCH] 通用版本V1.6  注: 修复用户验证,新增默认增加用户,展示所有导航

---
 src/main/webapp/Home/Home1.jsp | 1015 +++++++++++++++++++++--------------------------------------
 1 files changed, 368 insertions(+), 647 deletions(-)

diff --git a/src/main/webapp/Home/Home1.jsp b/src/main/webapp/Home/Home1.jsp
index 0251a6b..f8d7a7a 100644
--- a/src/main/webapp/Home/Home1.jsp
+++ b/src/main/webapp/Home/Home1.jsp
@@ -20,6 +20,8 @@
     <link rel="stylesheet" href="https://developer.fengmap.com/fmAPI/demos/Search/mapReconnaissance/css/index.css">
     <link rel="stylesheet" href="https://developer.fengmap.com/fmAPI/demos/Marker/FMDomMarker/css/index.css">
     <script src="https://developer.fengmap.com/fmAPI/demos/Marker/FMDomMarker/js/index.js"></script>
+    <script src="https://developer.fengmap.com/fmAPI/demos/libs/js/fengmap.plugin.draw.min.js"></script>
+    <script src="https://developer.fengmap.com/fmAPI/demos/libs/js/fengmap.analyser.min.js"></script>
     <style>
         .box {
 
@@ -27,144 +29,8 @@
     </style>
 </head>
 <body>
-<%--<div class="layui-container">--%>
-<%--    <button class="layui-btn tileLayer-selector fm-btn">--%>
-<%--        鍒囨崲鐡︾墖搴曞浘--%>
-<%--        <i class="layui-icon layui-icon-down layui-font-12"></i>--%>
-<%--    </button>--%>
-<%--    <button type="button" id="init" class="layui-btn" onclick="initFilterLayer()">璁剧疆婊ら暅</button>--%>
-<%--</div>--%>
 <div id="fengmap"></div>
 </body>
-<%--<script>--%>
-<%--    var map;--%>
-
-<%--    var tileLayer;--%>
-
-<%--    var flag;--%>
-
-<%--    var objType = {--%>
-<%--        'tilelayer': fengmap.FMTileProvider.AMAP_VECTOR, //鐧惧害鐭㈤噺鍥炬浛鎹AIDU_VECTOR--%>
-<%--        'tilelayerAMAP': fengmap.FMTileProvider.AMAP_SATELLITE, //鐧惧害鍗槦鍥炬浛鎹AIDU_SATELLITE--%>
-<%--    }--%>
-
-<%--    var options = {--%>
-<%--        container: document.getElementById("fengmap"),--%>
-<%--        appName: 'map1',--%>
-<%--        key: '09facc4ee52d1844bc1e561dad5abf59',--%>
-<%--        mapID: '1732234539564851202',--%>
-<%--        themeID: '1717913720470753281',--%>
-<%--        mapURL: '../fengmap/data/',--%>
-<%--        themeURL: '../fengmap/data/theme/',--%>
-<%--        minTiltAngle: 0,--%>
-<%--        mapZoom: 16,--%>
-<%--        backgroundColor:'#001133',--%>
-<%--    }--%>
-
-<%--    /* 鍒濆鍖栧湴鍥� */--%>
-<%--    function InitMap(options) {--%>
-<%--        const promise = new Promise((resolve, reject) => {--%>
-<%--            if (map != null) {--%>
-<%--                map.dispose();--%>
-<%--                map = null;--%>
-<%--            }--%>
-<%--            map = new fengmap.FMMap(options);--%>
-<%--            map.on('loaded', function () {--%>
-<%--                SetTileLayerMode('tilelayer')--%>
-<%--                resolve('鍦板浘鍒濆鍖栧畬鎴愶紒');--%>
-<%--            });--%>
-<%--        });--%>
-<%--        return promise;--%>
-<%--    };--%>
-
-<%--    // 璁剧疆搴曞浘--%>
-<%--    function SetTileLayerMode(type) {--%>
-<%--        if (tileLayer != null) {--%>
-<%--            tileLayer.remove(map);--%>
-<%--            tileLayer = null;--%>
-<%--        }--%>
-<%--        tileLayer = new fengmap.FMTileLayer({--%>
-<%--            mode: objType[type],--%>
-<%--            offset: 1.0,--%>
-<%--            replaceColor: "#FCF9F2", //澶ф瘮渚嬪昂涓嬶紝涓嶆樉绀虹摝鐗囧簳鍥炬椂锛屾樉绀虹殑鑳屾櫙棰滆壊--%>
-<%--            replaceOpacity: 0.9, //澶ф瘮渚嬪昂涓嬶紝涓嶆樉绀虹摝鐗囧簳鍥炬椂锛屾樉绀虹殑鑳屾櫙棰滆壊閫忔槑搴�--%>
-<%--            filter: fengmap.FMTileFilter.NONE, //婊ら暅鏋氫妇锛岄粯璁や负fengmap.FMTileFilter.NONE锛孎MTileFilter绫讳腑棰勭疆浜�6绉嶆护闀滐紱涔熷彲浠ヨ嚜瀹氫箟婊ら暅锛堝鏋滃�间负fengmap.FMTileFilter.CUSTOM锛岄渶瑕侀厤缃甪ilterCustomization锛岃嚜瀹氫箟鍙傛暟璁剧疆鍙傝�冩枃妗o級--%>
-<%--        })--%>
-<%--        tileLayer.addTo(map);--%>
-
-<%--        setFilterDisabled();--%>
-<%--    }--%>
-
-<%--    // 鏄剧ず/闅愯棌--%>
-<%--    function toggleTileLayerVisibility() {--%>
-<%--        if (!tileLayer) return--%>
-
-<%--        tileLayer.visible = !tileLayer.visible;--%>
-
-<%--        setFilterDisabled(true);--%>
-<%--    }--%>
-
-<%--    // 鍒犻櫎--%>
-<%--    function removeTileLayer() {--%>
-<%--        if (!tileLayer) return--%>
-
-<%--        tileLayer.remove(map);--%>
-<%--        tileLayer = null;--%>
-<%--        setFilterDisabled(false, true);--%>
-<%--    }--%>
-
-<%--    function setFilterDisabled(isToggle, isDelete) {--%>
-<%--        if (isToggle) {--%>
-<%--            let btn = document.getElementById('init');--%>
-<%--            if (!btn) return--%>
-<%--            if (btn.classList.value.indexOf('layui-btn-disabled') > -1) {--%>
-<%--                btn.removeAttribute('disabled');--%>
-<%--                btn.classList.remove('layui-btn-disabled');--%>
-<%--            }--%>
-<%--            else {--%>
-<%--                btn.setAttribute('disabled', true);--%>
-<%--                btn.classList.add('layui-btn-disabled');--%>
-<%--            }--%>
-<%--        }--%>
-<%--        else {--%>
-<%--            let btn = document.getElementById('init');--%>
-<%--            if (btn) {--%>
-<%--                if (isDelete) {--%>
-<%--                    btn.setAttribute('disabled', true);--%>
-<%--                    btn.classList.add('layui-btn-disabled');--%>
-<%--                }--%>
-<%--                else {--%>
-<%--                    btn.classList.remove('layui-btn-disabled');--%>
-<%--                    btn.removeAttribute('disabled');--%>
-<%--                }--%>
-<%--            }--%>
-<%--        }--%>
-<%--        updateUI();--%>
-<%--    }--%>
-
-<%--    //婊ら暅--%>
-<%--    function FilterHandleClick(id, value) {--%>
-<%--        if (!tileLayer) return--%>
-
-<%--        tileLayer.setFilter(id, value);--%>
-<%--    }--%>
-
-<%--    //鍒濆鍖栨护闀�--%>
-<%--    function initFilterLayer() {--%>
-<%--        // 淇敼璁剧疆闈㈡澘灞曠ず鐘舵��--%>
-<%--        updateUI(true);--%>
-<%--    }--%>
-
-<%--    UI.Init().then(() => {--%>
-<%--        UI.Loading();--%>
-<%--        return InitMap(options);--%>
-<%--    }).then(() => {--%>
-<%--        UI.Completed();--%>
-<%--    });;--%>
-
-<%--</script>--%>
-
-
 <script>
     function attributeCount(obj) {
         var count = 0;
@@ -176,7 +42,7 @@
         return count;
     }
 
-    function getRealPositionsanwei() {
+    function getRealPositionsanweiOnline() {
         var realposition = [];
         $.ajax({
             async: false,
@@ -184,12 +50,21 @@
             url: "/hxzkuwb/getRealPositionsan2.do",
             dataType: 'json',
             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].baoliu2,data[i].baoliu3,data[i].time, data[i].fence == 1 || data[i].sos == 1, data[i].sousuo, data[i].shipin, data[i].inkaoqing, data
-                        [i].jiao, data[i].baoliu24, data[i].baoliu23, data[i].sex, data[i].minzu, data[i].phone, data[i].power, data[i].bumen, data[i].baoliu19,data[i].image,data[i].bumencolor,data[i].baoliu35])
-                }
+                realposition = data
+            },
+        });
+        return realposition
+    };
+    function getRealPositionsanweiOffOnline() {
+        var realposition = [];
+        $.ajax({
+            async: false,
+            type: 'POST',
+            url: "/hxzkuwb/getRealPositionsan3.do",
+            dataType: 'json',
+            success: function (data) {
+                realposition = data
             },
         });
         return realposition
@@ -222,10 +97,19 @@
         });
         return realposition
     };
-
-
-
-
+    function FindShowJianZhu(){
+        var realposition = [];
+        $.ajax({
+            async: false,
+            type: 'Get',
+            url: "/hxzkuwb/FindShowJianZhuShan",
+            dataType: 'json',
+            success: function (data) {
+                realposition = data;
+            },
+        });
+        return realposition
+    }
     function getAnchorInfo2() {
         var online_anchorList = [];
         var offline_anchorList = [];
@@ -253,6 +137,10 @@
     var biaoqians = new Object();
     var biaoqianids = new Object();
     var biaoqianidc = new Object();
+    var jizhanbc = new Object();
+    var jizhanbclabel = new Object();
+    var wangguanbc = new Object();
+    var wangguanbclabel = new Object();
     var onlineanchor = new Object();
     var onlineanchor1 = new Object();
     var offlineanchor = new Object();
@@ -285,214 +173,6 @@
 
 
     var coordsTransformer = new fengmap.FMCoordsTransformer({ origon: origon, target: target });
-    function checkedfor() {
-        var personlist;
-        if (type == 0) {
-            personlist = getRealPositionsanwei();
-        } else {
-            personlist = getRealPositionsanwei();
-        }map.getLevel();
-        if (personlist.length != 0) {
-            if (markerpd) {
-                for (var i = 0; i < personlist.length; i++) {
-                    if (biaoqianids[personlist[i][0]] != null) {
-                        biaoqianids[personlist[i][0]].text = "";
-                        if (customSwitch1) {
-                            biaoqianids[personlist[i][0]].text = " " + personlist[i][1] + "  " + personlist[i][0] + "  " + personlist[i][2] + "% ";
-                            biaoqianids[personlist[i][0]].update();
-                        } else {
-                            if (customSwitch3) {
-                                biaoqianids[personlist[i][0]].text = " " + personlist[i][1] + " ";
-                            }
-                            if (customSwitch4) {
-                                biaoqianids[personlist[i][0]].text += " " + personlist[i][0] + " ";
-                            }
-                            if (customSwitch5) {
-                                biaoqianids[personlist[i][0]].text += " " + personlist[i][2] + "% ";
-                            }
-                            biaoqianids[personlist[i][0]].update();
-                        }
-                        if (biaoqianids[personlist[i][0]].text == "" || biaoqianids[personlist[i][0]].text == null) {
-                            biaoqianids[personlist[i][0]].visible = false;
-                        } else {
-                            if (((bm_offView == '1' && personlist[i][3] == '1') || (bm_offView == '0')) && ((bm_kaoqing == '1' && personlist[i][10] == '1') || (bm_kaoqing == '0'))) {
-                                biaoqianids[personlist[i][0]].visible = true;
-                            }
-                        }
-                    } else {
-                        if (personlist[i][3] == "1") {
-                            var markertext;
-                            var xy;
-                            if (type == 0) {
-                                xy = coordsTransformer.transform({ x: personlist[i][4], y: personlist[i][5] });
-
-                            } else {
-                                 xy = fengmap.FMCalculator.latlngToMapCoordinate({x: personlist[i][4],y: personlist[i][5]})
-
-                            }
-
-                            if (customSwitch1) {
-                                markertext = " " + personlist[i][1] + "  " + personlist[i][0] + "  " + personlist[i][2] + "% ";
-                            } else {
-                                if (customSwitch3) {
-                                    markertext = " " + personlist[i][1] + " ";
-                                }
-                                if (customSwitch4) {
-                                    markertext += " " + personlist[i][0] + " ";
-                                }
-                                if (customSwitch5) {
-                                    markertext += " " + personlist[i][2] + "% ";
-                                }
-                            }
-                            if (markertext != "" && markertext != null) {
-                                var lmarker = new fengmap.FMTextMarker({
-                                    text: " " + personlist[i][1] + " ",
-                                    height: +personlist[i][12] + 9,
-                                    x: xy.x,
-                                    y: xy.y,
-                                    textAlign: fengmap.FMTextAlign.Center,
-                                    fontsize: 18,
-                                    fillColor: '#ffffff',
-                                    strokeColor: '#ffffff',
-                                    plateColor: '60,141,196',
-                                    plateStrokeColor: '60,141,196',
-                                    strokeWidth: 0,
-                                })
-                                var level = map.getLevel();
-                                var floor = map.getFloor(level);
-                                lmarker.addTo(floor);
-                                biaoqianids[personlist[i][0]] = lmarker;
-                            }
-                        }
-                    }
-                }
-            } else {
-                for (var i = 0; i < personlist.length; i++) {
-                    if (biaoqianids[personlist[i][0]] != null) {
-                        biaoqianids[personlist[i][0]].remove();
-                        delete biaoqianids[personlist[i][0]];
-                    }
-                    if (biaoqians[personlist[i][0]] != null) {
-                        var windowHtml;
-                        var xy;
-                        if (type == 0) {
-                            xy = coordsTransformer.transform({ x: personlist[i][4], y: personlist[i][5] });
-                        } else {
-                             xy = fengmap.FMCalculator.latlngToMapCoordinate({x: personlist[i][4],y: personlist[i][5]})
-
-                        }
-                        // if (customSwitch1) {
-                        //     windowHtml = '<div class="fm-control-popmarker2" style="height: 94px;top: -100px;">';
-                        //     windowHtml += `<span class="fm-control-popmarker-bot2"></span>`;
-                        //     windowHtml += `<span class="fm-control-popmarker-top2"></span>`;
-                        //     windowHtml += `<div id="info">`;
-                        //     windowHtml += `<div class="content"><a> 濮撳悕:` + personlist[i][0] + `</a><br>
-						// 							<a> 缂栧彿:`+ personlist[i][0] + `</a><br>
-						// 							<a> 鐢甸噺:`+ personlist[i][2] + `</a>
-						// 							</div>`;
-                        //     windowHtml += `</div>`;
-                        //     windowHtml += `</div>`;
-                        // } else {
-                        //     if (customSwitch3) {
-                        //         if (customSwitch4) {
-                        //             if (customSwitch5) {
-                        //                 windowHtml = '<div class="fm-control-popmarker2" style="height: 94px;top: -100px;">';
-                        //                 windowHtml += `<span class="fm-control-popmarker-bot2"></span>`;
-                        //                 windowHtml += `<span class="fm-control-popmarker-top2"></span>`;
-                        //                 windowHtml += `<div id="info">`;
-                        //                 windowHtml += `<div class="content"><a> 濮撳悕:` + personlist[i][0] + `</a><br>
-						// 							<a> 缂栧彿:`+ personlist[i][0] + `</a><br>
-						// 							<a> 鐢甸噺:`+ personlist[i][2] + `</a>
-						// 							</div>`;
-                        //                 windowHtml += `</div>`;
-                        //                 windowHtml += `</div>`;
-                        //             } else {
-                        //                 windowHtml = '<div class="fm-control-popmarker2" style="height: 72px;top: -78px;">';
-                        //                 windowHtml += `<span class="fm-control-popmarker-bot2"></span>`;
-                        //                 windowHtml += `<span class="fm-control-popmarker-top2"></span>`;
-                        //                 windowHtml += `<div id="info">`;
-                        //                 windowHtml += `<div class="content"><a> 濮撳悕:` + personlist[i][0] + `</a><br>
-						// 							<a> 缂栧彿:`+ personlist[i][0] + `</a><br>
-						// 							</div>`;
-                        //                 windowHtml += `</div>`;
-                        //                 windowHtml += `</div>`;
-                        //             }
-                        //         } else {
-                        //             if (customSwitch5) {
-                        //                 windowHtml = '<div class="fm-control-popmarker2" style="height: 72px;top: -78px;">';
-                        //                 windowHtml += `<span class="fm-control-popmarker-bot2"></span>`;
-                        //                 windowHtml += `<span class="fm-control-popmarker-top2"></span>`;
-                        //                 windowHtml += `<div id="info">`;
-                        //                 windowHtml += `<div class="content"><a> 濮撳悕:` + personlist[i][1] + `</a><br>
-						// 							<a> 鐢甸噺:`+ personlist[i][2] + `</a>
-						// 							</div>`;
-                        //                 windowHtml += `</div>`;
-                        //                 windowHtml += `</div>`;
-                        //             } else {
-                        //                 windowHtml = '<div class="fm-control-popmarker2" style="height: 50px;top: -56px;">';
-                        //                 windowHtml += `<span class="fm-control-popmarker-bot2"></span>`;
-                        //                 windowHtml += `<span class="fm-control-popmarker-top2"></span>`;
-                        //                 windowHtml += `<div id="info">`;
-                        //                 windowHtml += `<div class="content"><a> 濮撳悕:` + personlist[i][1] + `</a><br>
-						// 							</div>`;
-                        //                 windowHtml += `</div>`;
-                        //                 windowHtml += `</div>`;
-                        //             }
-                        //         }
-                        //     } else {
-                        //         if (customSwitch4) {
-                        //             if (customSwitch5) {
-                        //                 windowHtml = '<div class="fm-control-popmarker2" style="height: 72px;top: -78px;">';
-                        //                 windowHtml += `<span class="fm-control-popmarker-bot2"></span>`;
-                        //                 windowHtml += `<span class="fm-control-popmarker-top2"></span>`;
-                        //                 windowHtml += `<div id="info">`;
-                        //                 windowHtml += `<div class="content"><a> 缂栧彿:` + personlist[i][0] + `</a><br>
-						// 							<a> 鐢甸噺:`+ personlist[i][2] + `</a>
-						// 							</div>`;
-                        //                 windowHtml += `</div>`;
-                        //                 windowHtml += `</div>`;
-                        //             } else {
-                        //                 windowHtml = '<div class="fm-control-popmarker2" style="height: 50px;top: -56px;">';
-                        //                 windowHtml += `<span class="fm-control-popmarker-bot2"></span>`;
-                        //                 windowHtml += `<span class="fm-control-popmarker-top2"></span>`;
-                        //                 windowHtml += `<div id="info">`;
-                        //                 windowHtml += `<div class="content"><a> 缂栧彿:` + personlist[i][0] + `</a><br>
-						// 							</div>`;
-                        //                 windowHtml += `</div>`;
-                        //                 windowHtml += `</div>`;
-                        //             }
-                        //         } else {
-                        //             if (customSwitch5) {
-                        //                 windowHtml = '<div class="fm-control-popmarker2" style="height: 50px;top: -56px;">';
-                        //                 windowHtml += `<span class="fm-control-popmarker-bot2"></span>`;
-                        //                 windowHtml += `<span class="fm-control-popmarker-top2"></span>`;
-                        //                 windowHtml += `<div id="info">`;
-                        //                 windowHtml += `<div class="content"><a> 鐢甸噺:` + personlist[i][2] + `</a>
-						// 							</div>`;
-                        //                 windowHtml += `</div>`;
-                        //                 windowHtml += `</div>`;
-                        //             } else {
-                        //
-                        //             }
-                        //         }
-                        //     }
-                        // }
-                        if (windowHtml != "" && windowHtml != null) {
-                            var lmarker = new fengmap.FMDomMarker({
-                                x: xy.x,
-                                y: xy.y,
-                                content: windowHtml
-                            });
-                            var level = map.getLevel();
-                            var floor = map.getFloor(level);
-                            lmarker.addTo(floor);
-                            biaoqianids[personlist[i][0]] = lmarker;
-                        }
-                    }
-                }
-            }
-        }
-    }
 
 
     function blues(e){
@@ -514,6 +194,9 @@
     var domMarker = null;
 
     //鍦板浘灞炴��
+    var boxselecttool;
+    var selectedModels = [];
+    var selectedModels1 = [];
         var options = {
             container: document.getElementById("fengmap"),
                 appName: 'map1',
@@ -535,11 +218,10 @@
         floorInfo = map.getFloorInfos()
         localStorage.removeItem("domMar")
     });
+    boxselecttool = new fengmap.FMBoxSelectTool(map);
     // 娉ㄥ唽鍦板浘鐐瑰嚮浜嬩欢
 
     map.on('click', function (event) {
-
-
         marker = null;
         var clickMode = event.targets.find(it => it.type === fengmap.FMType.MODEL)
         var floor = floorInfo.find(it => it.level === event.level)
@@ -547,11 +229,54 @@
         UI.updateInfo(clickMode, floor, event)
         var fencename = $(".Alise").text();
         JianZhuName = fencename
-        console.log(event.targets[0].FID)
-        console.log(JianZhuName)
         JianZhuMsg(event.targets[0].FID,JianZhuName)
     })
 
+
+
+    function kq(){
+        boxselecttool.enable = true
+        boxselecttool.boxStyle = {
+            border: "border:5px solid #EEEE00",
+            backgroundColor: "#FF4040",
+            opacity: 0.5
+        }
+        //缁樺埗瀹屾垚浜嬩欢
+        boxselecttool.on('boxselected', function (e) {
+            //閲嶇疆涓婃閫変腑model棰滆壊
+            for (var i = 0; i < selectedModels.length; i++) {
+                selectedModels[i].resetColor();
+            }
+            selectedModels1.length = 0;
+            //鑾峰彇閫変腑model
+            var targets = e.targets;
+            for (var i = 0; i < targets.length; i++) {
+                if (targets[i].type === fengmap.FMType.MODEL) {
+                    var models = map.getNodes(targets[i].children);
+                    for (var j = 0; j < models.length; j++) {
+                        if (models[j].FID != null) {
+                            //灏唌odel棰滆壊璁剧疆涓�0xff0000 閫忔槑搴﹀�间负0.5
+                            models[j].setColor(0xff0000, 0.5);
+                            selectedModels1.push(models[j].FID);
+                            selectedModels.push(models[j]);
+                        }
+                    }
+                    localStorage.setItem("KuangXuan",selectedModels1)
+                    localStorage.setItem("KuangXuan1","true")
+                    break;
+                }
+            }
+
+        });
+
+        kqhuizhi = false;
+        sessionStorage.setItem("kqhuizhi",false);
+    }
+
+
+    function closet(){
+        boxselecttool.enable = false
+    }
     var anchorObj = {
         'CENTER': fengmap.FMMarkerAnchor.CENTER,
         'BOTTOM': fengmap.FMMarkerAnchor.BOTTOM,
@@ -595,6 +320,7 @@
         localStorage.setItem("domMar",domMarker);
     }
 
+
     function removeMarker() {
         if (localStorage.getItem("domMar") == "" || localStorage.getItem("domMar") == null){
 
@@ -608,154 +334,160 @@
         domMarker.remove();
         localStorage.removeItem("domMar")
     }
-    function setFilterDisabled(isToggle, isDelete) {
-                if (isToggle) {
-                    let btn = document.getElementById('init');
-                    if (!btn) return
-                    if (btn.classList.value.indexOf('layui-btn-disabled') > -1) {
-                        btn.removeAttribute('disabled');
-                        btn.classList.remove('layui-btn-disabled');
-                    }
-                    else {
-                        btn.setAttribute('disabled', true);
-                        btn.classList.add('layui-btn-disabled');
-                    }
-                }
-                else {
-                    let btn = document.getElementById('init');
-                    if (btn) {
-                        if (isDelete) {
-                            btn.setAttribute('disabled', true);
-                            btn.classList.add('layui-btn-disabled');
-                        }
-                        else {
-                            btn.classList.remove('layui-btn-disabled');
-                            btn.removeAttribute('disabled');
-                        }
-                    }
-                }
+
+
+
+        var wangguanflag;
+        var jizhanflag;
+        var kqhuizhi = true;
+
+    var personlist2 = FindShowJiZhan();  //鑾峰彇鍩虹珯鏁版嵁
+    var personlist3 = FindShowWangGuan();   //鑾峰彇缃戝叧鏁版嵁
+    var p2; //鏄惁寮�鍚熀绔�
+    var p3; //鏄惁寮�鍚綉鍏�
+    var username = sessionStorage.getItem("username")
+    var data = "username="+username
+    var cir = false
+    $.ajax({
+        url: "/hxzkuwb/findScreenRole",
+        type: "GET",
+        data:data,
+        async: false, // Set async to false for synchronous request
+        success: function(data) {
+            p2 = data.jizhanshow;
+            p3 = data.wangguanshow;
+        }
+    });
+
+    setTimeout(function (){
+        if (p2 == "1"){
+            var level = map.getLevel();
+            var floor = map.getFloor(level);
+            for(var i = 0 ; i <personlist2.length;i++){
+                var xy
+                var turl;
+                xy = fengmap.FMCalculator.latlngToMapCoordinate({
+                    x: personlist2[i].baoliu6,
+                    y: personlist2[i].baoliu7
+                });
+                turl = '/hxzkuwb/Icon/jizhan.png';
+                fmarkerAnchor = new fengmap.FMImageMarker({
+                    url: turl,
+                    x: xy.x,
+                    y: xy.y,
+                });
+                var windowHtml = '<div class="" style="height: 100px;width: 80px;text-align: center;position: absolute;top: -40px;left: -40px">';
+                windowHtml += `<div class="content" style="border-radius: 5px;background-color:ghostwhite;"><a style="color: black;font-size: 14px"> 鍩虹珯锛歚 + personlist2[i].anchorid + `</a></div>`;
+                windowHtml += `</div>`;
+                lmarkerAnchor = new fengmap.FMDomMarker({
+                    x: xy.x,
+                    y: xy.y,
+                    content: windowHtml
+                });
+                fmarkerAnchor.addTo(floor);
+                lmarkerAnchor.addTo(floor)
+                jizhanbc[personlist2[i].anchorid] = fmarkerAnchor;
+                jizhanbclabel[personlist2[i].anchorid] = lmarkerAnchor;
             }
-
-
-
-
-
-
-        function quxiao3() {
-            sousuopd = false;
-            sousuoid = "";
-
-            document.getElementById("sou").style.display = "";
-            document.getElementById("sousuotagid").value = "";
+            jizhanflag = true;
         }
+        //鏄剧ず缃戝叧
+        if (p3 == "1"){
+            var level = map.getLevel();
+            var floor = map.getFloor(level);
+            for(var i = 0 ; i <personlist3.length;i++){
 
-        function sousuo3() {
-            sousuopd = true;
-            sousuoid = $("#sousuotagid").val();
-
-            document.getElementById("qu").style.display = "";
+                var xy
+                var turl;
+                xy = fengmap.FMCalculator.latlngToMapCoordinate({
+                    x: personlist3[i].lon,
+                    y: personlist3[i].lat
+                });
+                turl = '/hxzkuwb/Icon/wangguan.png';
+                fmarkerAnchor = new fengmap.FMImageMarker({
+                    url: turl,
+                    x: xy.x,
+                    y: xy.y,
+                });
+                var windowHtml = '<div class="" style="height: 100px;width: 80px;text-align: center;position: absolute;top: -40px;left: -40px">';
+                windowHtml += `<div class="content" style="border-radius: 5px;background-color:ghostwhite;"><a style="color: black;font-size: 14px"> 缃戝叧锛歚 + personlist3[i].loragwid + `</a></div>`;
+                windowHtml += `</div>`;
+                lmarkerAnchor = new fengmap.FMDomMarker({
+                    x: xy.x,
+                    y: xy.y,
+                    content: windowHtml
+                });
+                fmarkerAnchor.addTo(floor);
+                lmarkerAnchor.addTo(floor)
+                wangguanbc[personlist3[i].loragwid] = fmarkerAnchor;
+                wangguanbclabel[personlist3[i].loragwid] = lmarkerAnchor;
+            }
+            wangguanflag = true;
         }
-        sousuo = sousuo3;
-        quxiao = quxiao3;
+        //鏄剧ず鑱氶泦鏁堟灉
+    },1000)
 
-    var timer = setTimeout(function f() {
-        fn3();
-        timer = setTimeout(f, 3000);
-    }, 3000);
-    var ans = "Yes";
-        //寰幆绉诲姩
-    var personlist2 = FindShowJiZhan();
-    var personlist3 = FindShowWangGuan();
+
+    var radioes = 0;
+    $.ajax({
+        url: "/hxzkuwb/findPerAll",
+        type: "GET",
+        async: false,
+        success: function(data) {
+            if(data == "-1" || data == ""){
+                radioes = 20
+            }else{
+                radioes = data[0].redius/100
+            }
+        },
+    });
+radioes = 100
+   setInterval(function (){
+       fn3();
+   },2000)
         function fn3() {
             if(localStorage.getItem("涓夌淮鍦板浘") != "鎵ц"){
                 return
             }
-            var personlist1 = getRealPositionsanwei();
-            var radioes = 0;
-            $.ajax({
-                url: "/hxzkuwb/findPerAll",
-                type: "GET",
-                async: false,
-                success: function(data) {
-                    radioes = data[0].redius
-                },
-            });
-                //鏄剧ず鍩虹珯
-            if (localStorage.getItem("jizhanshow") == "1"){
-                for(var i = 0 ; i <personlist2.length;i++){
-                    var level = map.getLevel();
-                    var floor1 = map.getFloor(level);
-                        var xy
-                        var turl;
-                        xy = fengmap.FMCalculator.latlngToMapCoordinate({
-                            x: personlist2[i].baoliu6,
-                            y: personlist2[i].baoliu7
-                        });
-                        turl = '/hxzkuwb/Icon/jizhan.png';
-                        fmarkerAnchor = new fengmap.FMImageMarker({
-                            url: turl,
-                            x: xy.x,
-                            y: xy.y,
-                        });
-                        var windowHtml = '<div class="" style="height: 100px;width: 80px;text-align: center;position: absolute;top: -40px;left: -40px">';
-                        windowHtml += `<div class="content" style="border-radius: 5px;background-color:ghostwhite;"><a style="color: black;font-size: 14px"> 鍩虹珯锛歚 + personlist2[i].anchorid + `</a></div>`;
-                        windowHtml += `</div>`;
-                        lmarkerAnchor = new fengmap.FMDomMarker({
-                            x: xy.x,
-                            y: xy.y,
-                            content: windowHtml
-                        });
-                        fmarkerAnchor.addTo(floor1);
-                        lmarkerAnchor.addTo(floor1)
+            kqhuizhi = sessionStorage.getItem("kqhuizhi")
+            if (sessionStorage.getItem("QuYuKuangXuan") == "1" && kqhuizhi == "true"){
+                kq()
+            }else if (kqhuizhi == "false1"){
+                closet()
+            }
+            var personlist4 = FindShowJianZhu();
+            var levelJian = map.getLevel()
+            var floorJian = map.getFloor(levelJian)
+            for (var i = 0; i <personlist4.length; i++){
+                if (personlist4[i].pname ==3 && personlist4[i].baoliu39 != ""  && personlist4[i].baoliu39 != "0" && personlist4[i].baoliu39 != "-1"){
+                    //榛勮壊闂儊
+                    model = floorJian.getLayers(fengmap.FMType.MODEL_LAYER)[0].getFeatures().find(item => item.FID === personlist4[i].baoliu39)
+                    model.flash('yellow')
+                }
+                if (personlist4[i].pname >3 && personlist4.pname <=6 && personlist4[i].baoliu39 != "" && personlist4[i].baoliu39 != "0" && personlist4[i].baoliu39 != "-1"){
+                    //姗欒壊闂儊
+                    model = floorJian.getLayers(fengmap.FMType.MODEL_LAYER)[0].getFeatures().find(item => item.FID === personlist4[i].baoliu39)
+                    model.flash('orange')
+                }
+                if (personlist4[i].pname >6 && personlist4[i].baoliu39 != "" && personlist4[i].baoliu39 != "-1" && personlist4[i].baoliu39 != "0" ){
+
+                    model = floorJian.getLayers(fengmap.FMType.MODEL_LAYER)[0].getFeatures().find(item => item.FID === personlist4[i].baoliu39)
+
+                    model.flash('blue')
                 }
             }
-            //鏄剧ず缃戝叧
-            if (localStorage.getItem("wangguanshow") == "1"){
-                for(var i = 0 ; i <personlist3.length;i++){
-                    var level = map.getLevel();
-                    var floor1 = map.getFloor(level);
-                    var xy
-                    var turl;
-                    xy = fengmap.FMCalculator.latlngToMapCoordinate({
-                        x: personlist3[i].lon,
-                        y: personlist3[i].lat
-                    });
-                    console.log(xy)
-                    turl = '/hxzkuwb/Icon/wangguan.png';
-                    fmarkerAnchor = new fengmap.FMImageMarker({
-                        url: turl,
-                        x: xy.x,
-                        y: xy.y,
-                    });
-                    var windowHtml = '<div class="" style="height: 100px;width: 80px;text-align: center;position: absolute;top: -40px;left: -40px">';
-                    windowHtml += `<div class="content" style="border-radius: 5px;background-color:ghostwhite;"><a style="color: black;font-size: 14px"> 缃戝叧锛歚 + personlist3[i].loragwid + `</a></div>`;
-                    windowHtml += `</div>`;
-                    lmarkerAnchor = new fengmap.FMDomMarker({
-                        x: xy.x,
-                        y: xy.y,
-                        content: windowHtml
-                    });
-                    fmarkerAnchor.addTo(floor1);
-                    lmarkerAnchor.addTo(floor1)
-                }
-            }
-
-
-
+            var personlist1 = getRealPositionsanweiOffOnline();
             for (var i = 0; i < personlist1.length; i++) {
                 var xy;
                 var turl;
                 xy = fengmap.FMCalculator.latlngToMapCoordinate({
-                    x: personlist1[i][4],
-                    y: personlist1[i][5]
+                    x: personlist1[i].baoliu2,
+                    y: personlist1[i].baoliu3
                 });
-
-                turl = '/hxzkuwb/Icon/' + personlist1[i][20] + '';
-
-
-                var fmarker = biaoqians[personlist1[i][0]];
-                var lmarker = biaoqianids[personlist1[i][0]];
-                var circles = biaoqianidc[personlist1[i][0]]
+                turl = '/hxzkuwb/Icon/' + personlist1[i].pimage + '';
+                var fmarker = biaoqians[personlist1[i].ptagid];
+                var lmarker = biaoqianids[personlist1[i].ptagid];
+                var circles = biaoqianidc[personlist1[i].ptagid]
                 if (fmarker) {
                     // 濡傛灉鏍囪瀛樺湪锛屽垯鏇存柊鍧愭爣
                     fmarker.moveTo({
@@ -766,16 +498,145 @@
                         x: xy.x,
                         y: xy.y
                     });
-                    if (circles){
-                        circles.remove();
-                        //浠庢暟鎹簱鑾峰彇鍗婂緞
-                        var level = map.getLevel();
-                        var floor = map.getFloor(level);
-                        var panelSet;
-                        if(personlist1[i][22] <=3 && personlist1[i][3] == 1 && personlist1[i][22] > 0){
+                    // if (circles) {
+                    //     circles.remove();
+                    //     var level = map.getLevel();
+                    //     var floor = map.getFloor(level);
+                    //     var panelSet;
+                    //     if (personlist1[i].baoliu38 <= 3 && personlist1[i].ponline == 1 && personlist1[i].baoliu38 > 1) {
+                    //         //榛勮壊鍛婅鍖哄煙
+                    //         panelSet = {
+                    //             height: 0,
+                    //             opacity: 50,
+                    //             color: '#FFFF00',
+                    //             borderWidth: 0,
+                    //             borderColor: '#FFFF00',
+                    //         }
+                    //         var publicOption = {
+                    //             ...panelSet,
+                    //             opacity: Number(panelSet.opacity) / 100,
+                    //         }
+                    //
+                    //         /* 娣诲姞鍦嗗舰 */
+                    //         var circle_radius = radioes;
+                    //         // segments 褰卞搷褰㈡垚鐨勫渾褰㈢殑杈规暟鍜岄《鐐规暟閲忥紝鏁板�艰秺澶у渾褰㈠湪瑙嗚涓婅秺 鈥欏钩婊戔��
+                    //         var circle_segments = 500;
+                    //         var circle_center = {
+                    //             x: xy.x,
+                    //             y: xy.y,
+                    //         };
+                    //         /* 浣跨敤 FMCalculator 鐨勭煩褰㈡瀯閫犲櫒鍙互蹇�熸瀯閫犲嚭鍦嗗舰鐨勫嚑浣曞舰鐘跺潗鏍囬泦鍚� */
+                    //         var circleOption = {
+                    //             points: fengmap.FMCalculator.circleBuilder(circle_radius, circle_center, circle_segments),
+                    //             x: xy.x,
+                    //             y: xy.y,
+                    //             ...publicOption
+                    //         }
+                    //         circle = new fengmap.FMPolygonMarker(circleOption);
+                    //         circle.addTo(floor);
+                    //     }
+                    //
+                    //     if (personlist1[i].baoliu38 > 3 && personlist1[i].baoliu38 <= 6 && personlist1[i].ponline == 1) {
+                    //         //姗欒壊鍛婅鍖哄煙
+                    //         panelSet = {
+                    //             height: 0,
+                    //             opacity: 50,
+                    //             color: '#FFBF01',
+                    //             borderWidth: 0,
+                    //             borderColor: '#FFBF01',
+                    //         }
+                    //         var publicOption = {
+                    //             ...panelSet,
+                    //             opacity: Number(panelSet.opacity) / 100,
+                    //         }
+                    //
+                    //         /* 娣诲姞鍦嗗舰 */
+                    //         var circle_radius = radioes;
+                    //         // segments 褰卞搷褰㈡垚鐨勫渾褰㈢殑杈规暟鍜岄《鐐规暟閲忥紝鏁板�艰秺澶у渾褰㈠湪瑙嗚涓婅秺 鈥欏钩婊戔��
+                    //         var circle_segments = 500;
+                    //         var circle_center = {
+                    //             x: xy.x,
+                    //             y: xy.y,
+                    //         };
+                    //         /* 浣跨敤 FMCalculator 鐨勭煩褰㈡瀯閫犲櫒鍙互蹇�熸瀯閫犲嚭鍦嗗舰鐨勫嚑浣曞舰鐘跺潗鏍囬泦鍚� */
+                    //         var circleOption = {
+                    //             points: fengmap.FMCalculator.circleBuilder(circle_radius, circle_center, circle_segments),
+                    //             x: xy.x,
+                    //             y: xy.y,
+                    //             ...publicOption
+                    //         }
+                    //         circle = new fengmap.FMPolygonMarker(circleOption);
+                    //         circle.addTo(floor);
+                    //     }
+                    //
+                    //     if (personlist1[i].baoliu38 > 6 && personlist1[i].ponline == 1) {
+                    //         //绾㈣壊鍛婅鍖哄煙
+                    //         panelSet = {
+                    //             height: 0,
+                    //             opacity: 50,
+                    //             color: '#FF0000',
+                    //             borderWidth: 0,
+                    //             borderColor: '#FF0000',
+                    //         }
+                    //         var publicOption = {
+                    //             ...panelSet,
+                    //             opacity: Number(panelSet.opacity) / 100,
+                    //         }
+                    //
+                    //         /* 娣诲姞鍦嗗舰 */
+                    //         var circle_radius = radioes;
+                    //         // segments 褰卞搷褰㈡垚鐨勫渾褰㈢殑杈规暟鍜岄《鐐规暟閲忥紝鏁板�艰秺澶у渾褰㈠湪瑙嗚涓婅秺 鈥欏钩婊戔��
+                    //         var circle_segments = 500;
+                    //         var circle_center = {
+                    //             x: xy.x,
+                    //             y: xy.y,
+                    //         };
+                    //         /* 浣跨敤 FMCalculator 鐨勭煩褰㈡瀯閫犲櫒鍙互蹇�熸瀯閫犲嚭鍦嗗舰鐨勫嚑浣曞舰鐘跺潗鏍囬泦鍚� */
+                    //         var circleOption = {
+                    //             points: fengmap.FMCalculator.circleBuilder(circle_radius, circle_center, circle_segments),
+                    //             x: xy.x,
+                    //             y: xy.y,
+                    //             ...publicOption
+                    //         }
+                    //         circle = new fengmap.FMPolygonMarker(circleOption);
+                    //         circle.addTo(floor);
+                    //     }
+                    //     biaoqianidc[personlist1[i].ptagid] = circle;
+                    // }
+                } else {
+                        // 濡傛灉鏍囪涓嶅瓨鍦紝鍒欐坊鍔爉arker
+                        fmarker = new fengmap.FMImageMarker({
+                            url: turl,
+                            x: xy.x,
+                            y: xy.y,
+                        });
+                         if (personlist1[i].ponline == "1"){
+                             var windowHtml = '<div class="" style="height: 100px;width: 100px;text-align: center;position: absolute;top: -40px;left: -50px">';
+                             windowHtml += `<div class="content" style="border-radius: 5px;background-color: ` + personlist1[i].bumencolor + `;"><a style="color: white;font-size: 12px"> ` + personlist1[i].pname+ `</a></div>`;
+                             windowHtml += `</div>`;
+                             lmarker = new fengmap.FMDomMarker({
+                                 x: xy.x,
+                                 y: xy.y,
+                                 content: windowHtml
+                             });
+                         }else{
+                             var windowHtml = '<div class="" style="height: 100px;width: 100px;text-align: center;position: absolute;top: -40px;left: -50px">';
+                             windowHtml += `<div class="content" style="border-radius: 5px;background-color: ` + personlist1[i].bumencolor + `;"><a style="color: white;font-size: 12px"> ` + personlist1[i].pname + `-绂荤嚎</a></div>`;
+                             windowHtml += `</div>`;
+                             lmarker = new fengmap.FMDomMarker({
+                                 x: xy.x,
+                                 y: xy.y,
+                                 content: windowHtml
+                             });
+                         }
+
+                    var level = map.getLevel();
+                    var floor = map.getFloor(level);
+                    if (sessionStorage.getItem("PerCircles") == "Yes"){
+                        if (personlist1[i].baoliu38 <= 3 && personlist1[i].ponline == 1 && personlist1[i].baoliu38 > 1) {
                             //榛勮壊鍛婅鍖哄煙
                             panelSet = {
-                                height: 10,
+                                height: 0,
                                 opacity: 50,
                                 color: '#FFFF00',
                                 borderWidth: 0,
@@ -805,10 +666,10 @@
                             circle.addTo(floor);
                         }
 
-                        if(personlist1[i][22]>3 && personlist1[i][22] <=6 && personlist1[i][3] == 1){
+                        if (personlist1[i].baoliu38 > 3 && personlist1[i].baoliu38 <= 6 && personlist1[i].ponline == 1) {
                             //姗欒壊鍛婅鍖哄煙
                             panelSet = {
-                                height: 10,
+                                height: 0,
                                 opacity: 50,
                                 color: '#FFBF01',
                                 borderWidth: 0,
@@ -838,10 +699,10 @@
                             circle.addTo(floor);
                         }
 
-                        if(personlist1[i][22] >6 && personlist1[i][3] == 1){
+                        if (personlist1[i].baoliu38 > 6 && personlist1[i].ponline == 1) {
                             //绾㈣壊鍛婅鍖哄煙
                             panelSet = {
-                                height: 10,
+                                height: 0,
                                 opacity: 50,
                                 color: '#FF0000',
                                 borderWidth: 0,
@@ -870,157 +731,16 @@
                             circle = new fengmap.FMPolygonMarker(circleOption);
                             circle.addTo(floor);
                         }
-                        biaoqianidc[personlist1[i][0]] = circle;
                     }
-                } else {
-                    // 濡傛灉鏍囪涓嶅瓨鍦紝鍒欐坊鍔爉arker
-                    fmarker = new fengmap.FMImageMarker({
-                        url: turl,
-                        x: xy.x,
-                        y: xy.y,
-                    });
-                    var windowHtml = "";
-
-                   if(personlist1[i][3]=="0"){
-                        windowHtml = '<div class="" style="height: 100px;width: 100px;text-align: center;position: absolute;top: -30px;left: -30px">';
-                       windowHtml += `<div class="content" style="border-radius: 5px;background-color:rgb(102,102,102,0.5);"><a style="color: white;font-size: 16px"> ` + personlist1[i][1] + `-绂荤嚎</a></div>`;
-                       windowHtml += `</div>`;
-                       lmarker = new fengmap.FMDomMarker({
-                           x: xy.x,
-                           y: xy.y,
-                           content: windowHtml
-                       });
-                   }else{
-                      if (personlist1[i][1].length>7){
-                          var name = personlist1[i][1].substring(0,6)
-                          var windowHtml = '<div class="" style="height: 100px;width: 100px;text-align: center;position: absolute;top: -40px;left: -50px">';
-                          windowHtml += `<div class="content" style="border-radius: 5px;background-color: ` + personlist1[i][21] + `;"><a style="color: white;font-size: 16px"> ` + name + `</a></div>`;
-                          windowHtml += `</div>`;
-                          lmarker = new fengmap.FMDomMarker({
-                              x: xy.x,
-                              y: xy.y,
-                              content: windowHtml
-                          });
-                      }else{
-                          var windowHtml = '<div class="" style="height: 100px;width: 100px;text-align: center;position: absolute;top: -40px;left: -50px">';
-                          windowHtml += `<div class="content" style="border-radius: 5px;background-color: ` + personlist1[i][21] + `;"><a style="color: white;font-size: 16px"> ` + personlist1[i][1] + `</a></div>`;
-                          windowHtml += `</div>`;
-                          lmarker = new fengmap.FMDomMarker({
-                              x: xy.x,
-                              y: xy.y,
-                              content: windowHtml
-                          });
-                      }
-                   }
-
                     var level = map.getLevel();
                     var floor = map.getFloor(level);
-                    var panelSet;
-                    if(personlist1[i][22] <=3 && personlist1[i][3] == 1 && personlist1[i][22] > 0){
-                        //榛勮壊鍛婅鍖哄煙
-                        panelSet = {
-                            height: 10,
-                            opacity: 50,
-                            color: '#FFFF00',
-                            borderWidth: 2,
-                            borderColor: '#FFFF00',
-                        }
-                        var publicOption = {
-                            ...panelSet,
-                            opacity: Number(panelSet.opacity) / 100,
-                        }
-
-                        /* 娣诲姞鍦嗗舰 */
-                        var circle_radius = radioes;
-                        // segments 褰卞搷褰㈡垚鐨勫渾褰㈢殑杈规暟鍜岄《鐐规暟閲忥紝鏁板�艰秺澶у渾褰㈠湪瑙嗚涓婅秺 鈥欏钩婊戔��
-                        var circle_segments = 500;
-                        var circle_center = {
-                            x: xy.x,
-                            y: xy.y,
-                        };
-                        /* 浣跨敤 FMCalculator 鐨勭煩褰㈡瀯閫犲櫒鍙互蹇�熸瀯閫犲嚭鍦嗗舰鐨勫嚑浣曞舰鐘跺潗鏍囬泦鍚� */
-                        var circleOption = {
-                            points: fengmap.FMCalculator.circleBuilder(circle_radius, circle_center, circle_segments),
-                            x: xy.x,
-                            y: xy.y,
-                            ...publicOption
-                        }
-                        circle = new fengmap.FMPolygonMarker(circleOption);
-                        circle.addTo(floor);
-                    }
-
-                    if(personlist1[i][22]>3 && personlist1[i][22] <=6 && personlist1[i][3] == 1){
-                        //姗欒壊鍛婅鍖哄煙
-                        panelSet = {
-                            height: 10,
-                            opacity: 50,
-                            color: '#FFBF01',
-                            borderWidth: 2,
-                            borderColor: '#FFBF01',
-                        }
-                        var publicOption = {
-                            ...panelSet,
-                            opacity: Number(panelSet.opacity) / 100,
-                        }
-
-                        /* 娣诲姞鍦嗗舰 */
-                        var circle_radius = radioes;
-                        // segments 褰卞搷褰㈡垚鐨勫渾褰㈢殑杈规暟鍜岄《鐐规暟閲忥紝鏁板�艰秺澶у渾褰㈠湪瑙嗚涓婅秺 鈥欏钩婊戔��
-                        var circle_segments = 500;
-                        var circle_center = {
-                            x: xy.x,
-                            y: xy.y,
-                        };
-                        /* 浣跨敤 FMCalculator 鐨勭煩褰㈡瀯閫犲櫒鍙互蹇�熸瀯閫犲嚭鍦嗗舰鐨勫嚑浣曞舰鐘跺潗鏍囬泦鍚� */
-                        var circleOption = {
-                            points: fengmap.FMCalculator.circleBuilder(circle_radius, circle_center, circle_segments),
-                            x: xy.x,
-                            y: xy.y,
-                            ...publicOption
-                        }
-                        circle = new fengmap.FMPolygonMarker(circleOption);
-                        circle.addTo(floor);
-                    }
-
-                    if(personlist1[i][22] >6 && personlist1[i][3] == 1){
-                        //绾㈣壊鍛婅鍖哄煙
-                        panelSet = {
-                            height: 10,
-                            opacity: 50,
-                            color: '#FF0000',
-                            borderWidth: 2,
-                            borderColor: '#FF0000',
-                        }
-                        var publicOption = {
-                            ...panelSet,
-                            opacity: Number(panelSet.opacity) / 100,
-                        }
-
-                        /* 娣诲姞鍦嗗舰 */
-                        var circle_radius = radioes;
-                        // segments 褰卞搷褰㈡垚鐨勫渾褰㈢殑杈规暟鍜岄《鐐规暟閲忥紝鏁板�艰秺澶у渾褰㈠湪瑙嗚涓婅秺 鈥欏钩婊戔��
-                        var circle_segments = 500;
-                        var circle_center = {
-                            x: xy.x,
-                            y: xy.y,
-                        };
-                        /* 浣跨敤 FMCalculator 鐨勭煩褰㈡瀯閫犲櫒鍙互蹇�熸瀯閫犲嚭鍦嗗舰鐨勫嚑浣曞舰鐘跺潗鏍囬泦鍚� */
-                        var circleOption = {
-                            points: fengmap.FMCalculator.circleBuilder(circle_radius, circle_center, circle_segments),
-                            x: xy.x,
-                            y: xy.y,
-                            ...publicOption
-                        }
-                        circle = new fengmap.FMPolygonMarker(circleOption);
-                        circle.addTo(floor);
-                    }
                     fmarker.addTo(floor);
                     lmarker.addTo(floor);
-                    biaoqians[personlist1[i][0]] = fmarker;
-                    biaoqianids[personlist1[i][0]] = lmarker;
-                    biaoqianidc[personlist1[i][0]] = circle;
+                    biaoqians[personlist1[i].ptagid] = fmarker;
+                    biaoqianids[personlist1[i].ptagid] = lmarker;
+                    biaoqianidc[personlist1[i].ptagid] = circle;
                 }
-                if (localStorage.getItem("oNLine") == "No" && personlist1[i][3] == "0") {
+                if (sessionStorage.getItem("oNLine")== "No" && personlist1[i].ponline == "0") {
                     // 濡傛灉鏍囪涓嶅湪绾夸笖璁惧绂荤嚎锛屽垯绉婚櫎鏍囪
                     fmarker.remove();
                     lmarker.remove();;
@@ -1028,6 +748,7 @@
                     delete biaoqianids[personlist1[i][0]];
                 }
             }
+
         }
 
 

--
Gitblit v1.10.0