From e079341d79cb283855e22f8383c432d21fe68393 Mon Sep 17 00:00:00 2001
From: fei.wang <wf18701153496@163.com>
Date: 星期一, 01 四月 2024 17:55:53 +0800
Subject: [PATCH] 基站信息,标签信息,对讲功能

---
 src/main/webapp/Home/Home.jsp |  228 ++++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 185 insertions(+), 43 deletions(-)

diff --git a/src/main/webapp/Home/Home.jsp b/src/main/webapp/Home/Home.jsp
index f3cc749..5731a8b 100644
--- a/src/main/webapp/Home/Home.jsp
+++ b/src/main/webapp/Home/Home.jsp
@@ -1,4 +1,4 @@
-<%--
+锘�<%--
   Created by IntelliJ IDEA.
   User: Dell
   Date: 2023/11/13
@@ -12,17 +12,16 @@
     <title></title>
     <meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <link rel="stylesheet" href="../CSS/layui.css">
     <link rel="stylesheet" href="../Home/HomeCss/Home.css"/>
     <link rel="stylesheet" href="../CSS/layui1.css"/>
     <link rel="stylesheet" href="../Home/HomeCss/Time.css/">
     <link rel="stylesheet" href="Search/css/style.css"/>
     <link rel="stylesheet" href="Search/css/style-search.css"/>
     <style>
-        .layui-table-click {
-            background-color: #10DB3E !important;
-            color: black; /*璁剧疆鏂囧瓧棰滆壊涓虹櫧鑹�*/
-        }
+        /*.layui-table-click {*/
+        /*    background-color: #10DB3E !important;*/
+        /*    color: black; !*璁剧疆鏂囧瓧棰滆壊涓虹櫧鑹�*!*/
+        /*}*/
         .BMap_noprint{
             z-index: 9999;
         }
@@ -75,8 +74,8 @@
             background-color: rgba(28, 52, 89, 0) !important;
             border: none !important;
         }
-        .layui-table tr:hover{
-            background-color: black !important;
+        .layui-table tr:hover td{
+            color: #57E1E0;
         }
         .layui-laypage {
             background-color: rgba(5, 73, 146, 0) !important;
@@ -152,23 +151,68 @@
                 <h1 style="text-align: center;height: 70px;line-height: 65px;color: white;font-size: 25px;width: 100%;position: relative;top: -8px" id="titles"></h1>
         </div>
     </div>
-     <div class="layui-row" style="position: fixed;top: 30px;right: 15px;z-index: 9999999999">
+     <div class="layui-row" id="wealcome" style="position: fixed;top: 30px;right: 15px;z-index: 9999999999">
             <div class="layui-col-xs12 layui-col-md12" style="width: 100%">
                 <ul class="htxx" style="width: 100%;">
                     <li style="display: inline-block"><img src="HomeImg/date.png" style="position: relative;top: 0px"/></li>
                     <li id="current-time" style="display: inline-block;font-size: 12px;margin-left: 10px;">鏃ユ湡:2024-00-00 00:00:00</li>
                     <li style="font-size: 12px">娆㈣繋:</li>
                     <li id="yhm" style="font-size: 12px;margin-left: 15px"></li>
-                    <li style="margin-left: 15px;"><a href="javascript:;" onclick="joinHouTai()" style="font-size: 12px;position: relative;top: -2px">鍚庡彴</a></li>
+                    <li style="margin-left: 15px;"><a id="Ht" href="javascript:;" onclick="joinHouTai()" style="font-size: 12px;position: relative;top: -2px">鍚庡彴</a></li>
                     <li style="margin-left: 15px;"><a href="javascript:;" onclick="out()" title="鐐瑰嚮閫�鍑虹櫥褰曠郴缁�"><img src="HomeImg/logout.png" style="width: 20px;position: relative;top: -3px"> </a> </li>
                 </ul>
             </div>
         </div>
-    <%--   鍛婅淇℃伅 璺戦┈鐏�--%>
+    <div id="biaoqian" style="display: none;position: fixed; z-index: 999;">
+    <div class="layui-col-xs12 layui-col-md12">
+        <div style="width: 100%;">
+            <span id="biaoqiantitle" style="display: inline-block;width: 100%;height: 10%;line-height: 35px;padding-left: 120px;color: white;font-size: 16px">鏍囩淇℃伅</span><span style="position: absolute;top: 10px;left: 310px"><a href="javascript:;" title="涓婁竴椤�" onclick="nextpagebiaoqian('涓婁竴椤�')"><img src="HomeImg/jt1.png" style="width: 20px"/></a>&nbsp;<a href="javascript:;" title="涓嬩竴椤�" onclick="nextpagebiaoqian('涓嬩竴椤�')"><img src="HomeImg/jt2.png" style="width: 20px"/></a></span>
+        </div>
+        <img src="HomeImg/border1.png" style="width: 100%"/>
+
+        <div id="biaoqianbody" style="width: 100%;height: 90%;padding-top: 10px;text-align: left;overflow:hidden;">
+            <div style="z-index: 9999;color: white;width: 360px;">
+                <ul class="qytj" style="position: relative;">
+                    <li style="font-size: 12px">璁惧</li>
+                    <li style="font-size: 12px">鐢甸噺</li>
+                    <li style="font-size: 12px;margin-left: 40px">鏃堕棿</li>
+                </ul>
+                <div id="bqxj" style="z-index: 9999;color: white;width: 100%;left: 20px">
+
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<div id="jizhan" style="display: none;position: fixed; z-index: 999;">
+    <div class="layui-col-xs12 layui-col-md12">
+        <div style="width: 100%;">
+            <span id="jizhantitle" style="display: inline-block;width: 100%;height: 10%;line-height: 35px;padding-left: 120px;color: white;font-size: 16px">鍩虹珯淇℃伅</span><span style="position: absolute;top: 10px;left: 10px"><a href="javascript:;" title="涓婁竴椤�" onclick="nextpagejizhan('涓婁竴椤�')"><img src="HomeImg/jt1.png" style="width: 20px"/></a>&nbsp;<a href="javascript:;" title="涓嬩竴椤�" onclick="nextpagejizhan('涓嬩竴椤�')"><img src="HomeImg/jt2.png" style="width: 20px"/></a></span>
+
+        </div>
+        <img src="HomeImg/border1.png" style="width: 100%"/>
+        <div id="jizhanbody" style="width: 100%;height: 90%;padding-top: 10px;text-align: left;overflow:hidden;">
+            <div style="z-index: 9999;color: white;width: 360px;">
+                <ul class="qytj" style="position: relative;">
+                    <li style="font-size: 12px">璁惧</li>
+                    <li style="font-size: 12px">鐘舵��</li>
+                    <li style="font-size: 12px;">鏃堕棿</li>
+                </ul>
+                <div id="jzxx" style="z-index: 9999;color: white;width: 100%;left: 20px">
+
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<%--   鍛婅淇℃伅 璺戦┈鐏�--%>
     <div class="layui-row" id="warningTong"  style="width: 19.5%;height:39%;margin-left: 12px;z-index: 999;position: fixed;margin-top:117px;display: none">
         <div class="layui-col-xs12 layui-col-md12">
             <div style="width: 100%;">
-                <span id="warningTongtitle" style="display: inline-block;width: 100%;height: 10%;line-height: 35px;padding-left: 78px;color: white;font-size: 16px">鍛婅缁熻</span>
+                <span id="warningTongtitle" style="display: inline-block;width: 100%;height: 10%;line-height: 35px;text-align: center;color: white;font-size: 16px">鍛婅缁熻</span>
+                <span id="warningBorder" style="width: 100%;height: 1px;display: inline-block"></span>
             </div>
             <div id="warningTongbody"  style="width: 100%;height: 90%">
                 <marquee direction="up" scrollamount="2" id="myMarquee" class="gjxx" style="height: 300px;width: 18%;z-index: 99999999;display: none">
@@ -183,13 +227,19 @@
     <div id="txin" class="layui-row" style="display: none;width: 19.5%;height: 39%;margin-left: 12px;;margin-top: 3.5%;position: fixed;z-index: 999;">
         <div class="layui-col-xs12 layui-col-md12">
             <div style="width: 100%;">
-                <span id="TongXuntitle" style="display: inline-block;width: 100%;height: 10%;line-height: 35px;padding-left: 78px;color: white;font-size: 16px">鍗虫椂閫氳</span>
+                <span id="TongXuntitle" style="display: inline-block;width: 100%;height: 10%;line-height: 35px;text-align: center;color: white;font-size: 16px">鍗虫椂閫氳</span>
+                <span id="warningBorder" style="width: 100%;height: 1px;display: inline-block"></span>
             </div>
             <div id="TongXunbody" style="width: 100%;height: 90%;padding-top: 10px;text-align: center;overflow:hidden;">
                 <p style=""><img src="HomeImg/bs2.png" width="360" style="height: 15%"/><br><input type="text" id="username" style="position: relative;height: 40px;top: -46px;left: 0px;width: 300px;background-color: transparent;;left: -20px;border: none" placeholder="璇疯緭鍏ヨ澶嘔D" /></p>
                 <p style=""><img src="HomeImg/bs3.png" width="360" style="height: 30%;margin-top: 0px"/><input type="text" id="context" style="height: 60px;position: relative;top: -80px;left: 0px;width: 300px;background-color: transparent;left: -20px;border: none;color: red" placeholder="璇疯緭鍏ュ唴瀹�" /></p>
                 <p style="width: 90%;text-align: left;margin-left: 5%;height: 10%;position: relative;top: -30px"><img src="HomeImg/bs6.png"/><span id="gouxuan" style=""> 鍕鹃�夊彂缁欐墍鏈変汉</span></p>
-                <p style="width: 90%;position: relative;top: -20px"><a href="javascript:;" onclick="send()" ><img src="HomeImg/bs4.png" width="100"/></a> <a href="javascript:;"><img src="HomeImg/bs5.png" width="100"/></a></p>
+                <p style="width: 90%;position: relative;top: -20px"><a  href="javascript:;" onclick="send()" ><img src="HomeImg/bs4.png" width="100"/></a>
+
+                    <a  style="display: inline;" href="javascript:;" onclick="testSesCallInitiate()" ><img src="HomeImg/bs5.png" width="100"/></a>
+                    <a  style="display: inline;" href="javascript:;" onclick="testSesTalkRequest()" >寮�濮嬪彂瑷�</a>
+                    <a href="javascript:;" onclick="testSesTalkRelease()" >鍋滄鍙戣█</a>
+                </p>
             </div>
         </div>
     </div>
@@ -197,7 +247,9 @@
     <div class="layui-row" id="tong1" style="display:none;width: 19.5%;height: 39%">
         <div class="layui-col-xs12 layui-col-md12">
             <div style="width: 100%;">
-                <span id="JinRiTongJititle" style="display: inline-block;width: 100%;height: 10%;line-height: 35px;padding-left: 78px;color: white;font-size: 16px">浠婃棩缁熻</span>
+                <span id="JinRiTongJititle" style="display: inline-block;width: 100%;height: 10%;line-height: 35px;text-align: center;color: white;font-size: 16px">浠婃棩缁熻</span>
+                <span id="warningBorder" style="width: 100%;height: 1px;display: inline-block"></span>
+
             </div>
             <div id="JinRiTongJibody" style="width: 100%;height: 90%;text-align: center;overflow:hidden;">
             <div class="weichuli" ><img src="HomeImg/WeiChuLi.png" style="width: 120px;position: relative;top: 90px;left: 50px"></div>
@@ -228,7 +280,9 @@
     <div class="layui-row" id="tong2" style="width: 19.5%;height: 39%;z-index: 999999;display: none;">
         <div class="layui-col-xs12 layui-col-md12">
             <div style="width: 100%;">
-                <span id="QuYutitle" style="display: inline-block;width: 100%;height: 10%;line-height: 35px;padding-left: 78px;color: white;font-size: 16px">鍖哄煙缁熻</span><span style="position: absolute;top: 10px;left: 310px"><a href="javascript:;" title="涓婁竴椤�" onclick="nextpageQuYu('涓婁竴椤�')"><img src="HomeImg/jt1.png" style="width: 20px"/></a>&nbsp;<a href="javascript:;" title="涓嬩竴椤�" onclick="nextpageQuYu('涓嬩竴椤�')"><img src="HomeImg/jt2.png" style="width: 20px"/></a></span>
+                <span id="QuYutitle" style="display: inline-block;width: 100%;height: 10%;line-height: 35px;text-align: center;color: white;font-size: 16px">鍖哄煙缁熻</span><span style="position: absolute;top: 10px;left: 310px"><a href="javascript:;" title="涓婁竴椤�" onclick="nextpageQuYu('涓婁竴椤�')"><img src="HomeImg/jt1.png" style="width: 20px"/></a>&nbsp;<a href="javascript:;" title="涓嬩竴椤�" onclick="nextpageQuYu('涓嬩竴椤�')"><img src="HomeImg/jt2.png" style="width: 20px"/></a></span>
+                <span id="warningBorder" style="width: 100%;height: 1px;display: inline-block"></span>
+
             </div>
             <div id="QuYubody" style="width: 100%;height: 90%;padding-top: 10px;text-align: left;overflow:hidden;">
             <div style="z-index: 9999;color: white;width: 360px;">
@@ -427,7 +481,7 @@
     <div class="layui-row" id="Ditu">
         <div class="layui-col-xs12 layui-col-md12" style="text-align: center">
             <div style="text-align: center;z-index: 99999">
-                <ul style="margin: auto;text-align: center;width: 100%;padding: 5px;background-color: rgb(35, 48, 73,0.7);z-index: 999999" class="MapShow">
+                <ul style="margin: auto;text-align: center;width: 100%;padding: 5px;z-index: 999999;background-color: rgb(66,110,162,0.8)" class="MapShow">
 
                 </ul>
             </div>
@@ -550,9 +604,9 @@
                    <li style="margin: 15px 0px">搴忓彿锛�<input type="text" id="warningid" name="ids" readonly style="background-color: whitesmoke;width: 200px;border: none;padding: 5px"></li>
                    <span style="display:none" id="warningidtype"></span>
                    <li style="margin: 15px 0px">蹇�熷鐞嗭細
-                       <input type="radio" name="baoliu5" value="鏃犻渶澶勭悊" title="鏃犻渶澶勭悊" checked>鏃犻渶澶勭悊
-                       <input type="radio" name="baoliu5" value="璇姤" title="璇姤">璇姤
-                       <input type="radio" name="baoliu5" value="宸茶仈绯�" title="宸茶仈绯�">宸茶仈绯�
+                       <input type="radio" name="baoliu5" onclick="gjxzt('鏃犻渶澶勭悊')" value="鏃犻渶澶勭悊" title="鏃犻渶澶勭悊" checked>鏃犻渶澶勭悊
+                       <input type="radio" name="baoliu5"  onclick="gjxzt('璇姤')" value="璇姤" title="璇姤">璇姤
+                       <input type="radio" name="baoliu5"  onclick="gjxzt('宸茶仈绯�')" value="宸茶仈绯�" title="宸茶仈绯�">宸茶仈绯�
                    </li>
                    <li style="margin: 15px 0px">璇︾粏澶勭悊璁板綍锛�</li>
                    <li style="margin: 15px 0px">
@@ -562,6 +616,7 @@
                        <button type="submit" class="layui-btn" lay-submit="" lay-filter="" onclick="warningbc()">淇濆瓨</button>
                        <button type="button" class="layui-btn layui-btn-normal" lay-filter="" onclick="warningqx()"  style="margin-left: 50px">鍙栨秷</button>
                    </li>
+                   <input type="hidden" value="" id="idwar">
                </ul>
         </div>
     </div>
@@ -596,14 +651,36 @@
         </div>
     </div>
 </div>
-<span class="JingWeiDu" style="position: fixed;bottom: 0px;display: inline-block;height: 20px;z-index: 9;right: 0px">
+<span class="JingWeiDu" style="position: fixed;bottom: 0px;display: inline-block;height: 20px;z-index: 9999;right: 0px">
 
 </span>
 <div class="heimu" style="display: none;width: 100%;height: 100%;position: fixed;top: 0px;left: 0px;z-index: 9999;background-color: black;opacity: 0.8"></div>
 <span class="heimu1" style="display: none;z-index: 99999999;position: fixed;top: 0px;width: 100%;text-align: center;margin-top: 20%">
    <span style="display: inline-block;width: 200px;height: 40px;line-height: 40px;background-color: rgba(0,0,0,0.6);color: white"> 姝e湪鍔犺浇涓�.....</span>
 </span>
-</body>
+<div style="height: 100%;width: 24%;position: fixed;top: 0px;left: 0px;z-index: 9;" id="border2s"></div>
+<div style="height: 100%;width: 24%;position: fixed;top: 0px;right: 0px;z-index: 9;" id="border3s"></div>
+<%--涓夌淮寤虹瓚鍐呬汉鍛樻暟閲忎俊鎭�--%>
+<div id="JianZhuMsg" style="background: url(../Home/HomeImg/FloorBg1.png) no-repeat; background-size: 100% 200%;position: fixed;top: -2%;right: -25%;width: 25%;height: 105%;z-index: 999999999999">
+
+<%--    <div style="margin-top: 5%;margin-left: 5%;width: 85%">--%>
+<%--        <h2 style="display: inline-block;font-weight: bold;color: black;font-size: 15px">褰撳墠妤煎眰锛�1灞�</h2><h2 style="margin-top: 0%;display: inline-block;float: right;font-weight: bold;color: black;font-size: 14px">浜烘暟锛�<span>10浜�</span></h2>--%>
+<%--        <div style="margin-top: 5%;margin-left: 8%;width: 85%;height: 80%;">--%>
+<%--            <div class="layui-collapse">--%>
+<%--                <div class="layui-colla-item" style="background-color: rgba(255, 255, 255, 0)">--%>
+<%--                    <h2 class="layui-colla-title" style="background-color: rgba(255, 255, 255, 0)"><img src="HomeImg/PersonShi.png" style="width: 25px;height: 25px"/>1111</h2>--%>
+<%--                    <div class="layui-colla-content">--%>
+<%--                        <p>鏈変笉灏戝叾浠栫瓟妗堣鏄洜涓篔S澶樊銆傛垜涓嬮潰鐨勭瓟妗堝凡缁忚浜嗭紝杩欎笉鏄牴鏈�х殑鍘熷洜銆備絾闄ゆ涔嬪锛屾垜杩樿绾犳涓�浜涘JS鍏蜂綋闂鐨勮瑙c�侸S褰撳垵鏄浣滀负鑴氭湰璇█璁捐鐨勶紝鎵�浠ユ煇浜涢棶棰樺苟涓嶆槸JS璁捐寰楀樊鎴栬�呮槸JS璁捐鑰呯殑澶辫銆傛瘮濡倂ar鐨勪綔鐢ㄥ煙闂锛屽苟涓嶆槸鈥滈敊璇�濓紝鑰屾槸褰撴椂缁濆ぇ閮ㄥ垎鑴氭湰璇█閮芥槸杩欐牱鐨勶紝濡俻erl/php/sh绛夈�傛ā鍧楃殑闂涔熸槸锛岃剼鏈瑷�鍑犱箮閮芥病鏈夋ā鍧�/鍛藉悕绌洪棿鍔熻兘銆傚急绫诲瀷銆乫or-in涔嬬被鐨勯棶棰樹篃鏄紝鍙笉杩囩幇鍦ㄧ敤閭d簺鑰佺殑鑴氭湰璇█鐨勪汉姣旇緝灏戯紝鎵�浠ュ緢澶氫汉閮借浠ヤ负鏄疛S鎵嶆湁鐨勫潙銆傚彟澶栨湁浜鸿JS鏄崐娈嬭瑷�锛屾弧瓒充笉浜嗗紑鍙戦渶姹傦紝1999骞村氨璇ユ銆傚崐娈嬭繖涓槢锛屽氨澶稿紶浜嗐�侸S铏界劧鏈夊緢澶氶棶棰橈紝浣嗘槸璁捐鎬讳綋杩樻槸浼樼鐨勩�傗�斺�旀潵鑷煡涔嶡璐哄笀淇�</p>--%>
+<%--                    </div>--%>
+<%--                </div>--%>
+
+<%--            </div>--%>
+<%--        </div>--%>
+<%--    </div>--%>
+
+</div>
+<%--<div style="height: 5%;width: 100%;position: fixed;bottom: 0px;left: 0px;z-index: 9;background: linear-gradient(to top, rgba(0, 0, 0, 1) 1%, rgba(0, 0, 0, 0));"></div>--%>
+</body>路
 <script type="text/html" id="titleTpl">
     {{# if(d.anchormode === '0' || d.anchormode === '-1' ) { }}
     <span class="" style="color: white;display: inline-block;width: 35px;height: 20px;line-height: 20px;text-align:center;background-color: #666666;border-radius: 5px;font-size: 12px;position: relative;left: -3px">绂荤嚎</span>
@@ -648,10 +725,17 @@
 <script src="../Home/HomeJs/Home.js"></script>
 <script src="../JS/fengmap/fengmap.map.min.js"></script>
 <script src="../JS/fengmap/fengmap.plugin.min.js"></script>
+<script src="../Home/HomeJs/testWS.js"></script>
+<script src="../Home/HomeJs/import.js"></script>
+<script src="../Home/HomeJs/testData.js"></script>
+<script src="../Home/HomeJs/testWSEvents.js"></script>
+<script src="../Home/HomeJs/account.js"></script>
+<script src="../Home/HomeJs/ctchat.min.js"></script>
 <script src="../HouTai/Js/jquery-3.5.1.js"></script>
 <script src="HomeJs/Time.js"></script>
 <script src="../Home/HomeJs/TuBiao.js"></script>
 <script src="HomeJs/checkdJs.js"></script>
+
 <script>
     var login = sessionStorage.getItem('username')
     $("#warningusername").val(login)
@@ -769,7 +853,6 @@
         var erweis = document.getElementById("erweis")
         var baidus = document.getElementById("baidus")
         sanweis.checked = true;
-        baidus.checked = false;
         layer.msg('鎿嶄綔鎴愬姛')
         $(".MapType").hide();
         $("#weilanxs").hide();
@@ -777,6 +860,7 @@
 
     var qhWeiLanNum = 0;
     var qhOnline = 0
+    var qhJiZhan = 0;
 </script>
 
 <script>
@@ -982,19 +1066,25 @@
         }
     };
 
-    var maptypesnum = 0;
+    if (localStorage.getItem("maptypesnum") == null || localStorage.getItem("maptypesnum") == ""){
+        localStorage.setItem("maptypesnum",0)
+    }else{
+        localStorage.setItem("maptypesnum",localStorage.getItem("maptypesnum"))
+    }
+
     var onLine = 0;
     var onFence = 0;
-    function init() {
-        maptypesnum=maptypesnum+1;
-        var mapts = $(".MapType").text();
-        if( maptypesnum%2==0){
-            $(".MapType").text("鍦板浘");
+    var onJiZhan = 0;
+    function inits(){
+        localStorage.setItem("maptypesnum",parseInt(localStorage.getItem("maptypesnum"))+parseInt(1));
+        if(localStorage.getItem("maptypesnum")%2==0){
             localStorage.setItem("mapType","鍦扮悆妯″紡")
         }else{
             localStorage.setItem("mapType","璺綉妯″紡")
-            $(".MapType").text("鍦扮悆");
         }
+        location.reload();
+    }
+    function init() {
         var shijiao;
         var zhongxindian;
         var gao;
@@ -1037,6 +1127,19 @@
         bm.setHeading(shijiao);   //璁剧疆鍦板浘鏃嬭浆瑙掑害
         bm.setTilt(gao);
 
+
+
+        var zuobiaoxi = "";
+        //浠庢暟鎹簱鏌ヨ褰撳墠閫夋嫨鐨勪粈涔堢郴鍧愭爣
+        $.ajax({
+            url: "/hxzkuwb/findbaidumapList",
+            type: "GET",
+            async: false,
+            success: function(data) {
+                zuobiaoxi = data[0].zhuanhuan
+            }
+        });
+
         var tileLayer = new BMapGL.TileLayer();
         tileLayer.getTilesUrl = function(tileCoord, zoom) {
             var name = nameFormat
@@ -1090,11 +1193,17 @@
                         if (data == "") {
                             layer.msg("璇ヤ汉鍛樹笉瀛樺湪锛�")
                         } else {
+                            if (zuobiaoxi == "鐧惧害"){
+                                var c = new Convertor();
+                                var rr1 = c.WGS2BD09({
+                                    lng: parseFloat(data.baoliu2),
+                                    lat: parseFloat(data.baoliu3)
+                                });
+                            }else{
+                                var rr1 = ({lng: parseFloat(data.baoliu2), lat: parseFloat(data.baoliu3)});
+                            }
                             var c = new Convertor();
-                            var rr1 = c.WGS2BD09({
-                                lng: parseFloat(data.baoliu2),
-                                lat: parseFloat(data.baoliu3)
-                            });
+
                             var targetPoint = new BMapGL.Point(rr1.lng, rr1.lat);
                             bm.panTo(targetPoint);
                             bm.removeOverlay(markers[pTagid]);
@@ -1111,8 +1220,13 @@
                                         lng: parseFloat(gpsInfo.baoliu2),
                                         lat: parseFloat(gpsInfo.baoliu3)
                                     });
-                                    var lng = parseFloat(rr.lng);
-                                    var lat = parseFloat(rr.lat);
+                                    if (zuobiaoxi == "鐧惧害"){
+                                        var lng = parseFloat(rr.lng);
+                                        var lat = parseFloat(rr.lat);
+                                    }else{
+                                        var lng = parseFloat(gpsInfo.baoliu2);
+                                        var lat = parseFloat(gpsInfo.baoliu3);
+                                    }
                                     var userId = gpsInfo.ptagid;
                                     // 鍒ゆ柇鍦ㄧ嚎鐘舵��
                                     if (gpsInfo.ponline == "1" || gpsInfo.ponline == "0") {
@@ -1286,12 +1400,14 @@
         var tt = 0;
         var tt2 = true;
         var tt3 = 0;
+
+
+
         //var t = 300; 姣�600ms浠庡悗鍙拌姹備竴娆℃渶鏂扮殑鏁版嵁
         var markers = {};
         var markers1 = {};
         var timer = setInterval(function() {
             if (localStorage.getItem("鐧惧害鍦板浘") == "涓嶆墽琛�"){
-                console.log("鐧惧害鍦板浘涓嶆墽琛�")
                 return
             }
             markers = {};
@@ -1308,14 +1424,17 @@
                    var gpsInfo = gps_node_list1[i];
                    var c = new Convertor();
                    if(gpsInfo.baoliu2!= "-1" && gpsInfo.baoliu2 !=""){
-                       // var rr = c.WGS2BD09({ lng: parseFloat(105.883329), lat: parseFloat(37.228208)});
-                       // var lng = parseFloat(gpsInfo.baoliu2);
-                       // var lat = parseFloat(gpsInfo.baoliu3);
                        var rr = c.WGS2BD09({ lng: parseFloat(gpsInfo.baoliu2), lat: parseFloat(gpsInfo.baoliu3)});
-                       var lng = parseFloat(rr.lng);
-                       var lat = parseFloat(rr.lat);
+                       if (zuobiaoxi == "鐧惧害"){
+                           var lng = parseFloat(rr.lng);
+                           var lat = parseFloat(rr.lat);
+                       }else{
+                           var lng = parseFloat(gpsInfo.baoliu2);
+                           var lat = parseFloat(gpsInfo.baoliu3);
+                       }
                        var userId = gpsInfo.ptagid;
                        // 鍒ゆ柇鍦ㄧ嚎鐘舵��
+                       localStorage.setItem("username","瓒呯骇绠$悊鍛�")
                            if(gpsInfo.psos == "1") {
                                if (markers1.hasOwnProperty(userId)) {
                                    // 濡傛灉宸茬粡瀛樺湪璇ユ爣璁帮紝鍒欑Щ闄ゅ師鏉ョ殑鏍囪
@@ -1567,12 +1686,17 @@
             var lixian = document.getElementById("xianshilixian")
             lixian.checked = false;
             onLine = "0"
+            localStorage.setItem("oNLine","No")
+
         }else{
             var lixian = document.getElementById("xianshilixian")
             lixian.checked = true;
             onLine = "1"
+            localStorage.setItem("oNLine","Yes")
         }
+        layer.msg('鎿嶄綔鎴愬姛')
     }
+
     function getdateTime() {
         var date = new Date();
 
@@ -1643,6 +1767,25 @@
     $("#switc").fadeIn(4000);
     $("#switc1").fadeIn(4000);
     $("#switc2").fadeIn(4000);
+
+
+
+
+    mercatorTolonlat()
+    function mercatorTolonlat(){
+        let lonlat={lon:0,lat:0};
+
+
+        let x = 13521642.21136821/20037508.34*180;
+        let y = 3584507.2560229967/20037508.34*180;
+
+        y= 180/Math.PI*(2*Math.atan(Math.exp(y*Math.PI/180))-Math.PI/2);
+
+        lonlat.lon = x;
+        lonlat.lat = y;
+        return lonlat;
+    };
+
 </script>
 <%--<script>--%>
 <%--    var result;--%>
@@ -2039,7 +2182,6 @@
 
 <%--        //鐭╁舰涓嬭竟绾�--%>
 <%--        cxt.lineTo(radius, height);--%>
-
 <%--        //宸︿笅瑙掑渾寮э紝寮у害浠�1/2PI鍒癙I--%>
 <%--        cxt.arc(radius, height - radius, radius, Math.PI / 2, Math.PI);--%>
 

--
Gitblit v1.10.0