From 70223b3ef4df02622869425fed4ba9b290e1aa74 Mon Sep 17 00:00:00 2001 From: fei.wang <wf18701153496@163.com> Date: 星期二, 16 四月 2024 14:07:59 +0800 Subject: [PATCH] V定制1.0 1:对讲功能 2:计算经纬度控制器systemcontrollen --- src/main/webapp/Home/Home.jsp | 550 ++++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 428 insertions(+), 122 deletions(-) diff --git a/src/main/webapp/Home/Home.jsp b/src/main/webapp/Home/Home.jsp index d4f23ac..439d13d 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,28 +12,31 @@ <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"/> - <script type="text/javascript" src="../Home/HomeJs/map_load.js"></script> + +<%-- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />--%> + <meta http-equiv="Pragma" content="no-cache" /> + <meta http-equiv="Cache-Control" content="no-cache, must-revalidate" /> + <meta http-equiv="Expires" content="0" /> <style> - .layui-table-click { - background-color: #10DB3E !important; - color: black; /*璁剧疆鏂囧瓧棰滆壊涓虹櫧鑹�*/ - } - .BMap_noprint{ + /*.layui-table-click {*/ + /* background-color: #10DB3E !important;*/ + /* color: black; !*璁剧疆鏂囧瓧棰滆壊涓虹櫧鑹�*!*/ + /*}*/ + .BMapGL_noprint{ z-index: 9999; } - . BMap_noprint anchorTR{ + . BMapGL_noprint anchorTR{ z-index: 1000; } .anchorTR{ z-index: 1000; } - .BMap_naviControl { + .BMapGL_naviControl { z-index: 1000; /* 璁剧疆鎺т欢鐨勫眰绾т负1000 */ } element.style { @@ -76,8 +79,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; @@ -124,12 +127,26 @@ dd{ background-color:#1C3459 ; } - + li:hover { + color: #57E1E0; /* 褰撻紶鏍囨偓鍋滄椂瀛椾綋棰滆壊鍙樹负绾㈣壊 */ + } dd:hover{ background-color:#1C3459 ; } .layui-select-title:hover { background-color:#1C3459 ; /* 璁剧疆鎮诞鏃剁殑鑳屾櫙棰滆壊涓鸿摑鑹� */ + } + .plugin { + width: 600px; + height: 400px; + /**/ + + /**/ + /**/ + /* margin-top: 100px; + margin-left: 100px; */ + /**/ + /**/ } #titles{ background: url("/hxzkuwb/Home/HomeImg/title.png")no-repeat; @@ -153,19 +170,78 @@ <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 style="position: fixed; z-index: 999;">--%> +<%-- <div style=" height: 400px; width: 600px;position: absolute;margin: auto;top: 500px;left: 650px;right: 0;bottom: 0;">--%> +<%-- <div id="divPlugin" class="plugin" ></div>--%> +<%-- <input id="loginip" type="text" class="txt" value="192.168.31.64" style="display:none;"/>--%> +<%-- <input id="port" type="text" class="txt" value="80" style="display:none;"/>--%> +<%-- <input id="username1" value="admin" type="text" class="txt" style="display:none;"/>--%> +<%-- <input id="password" type="password" class="txt" value="hxzk2015" style="display:none;"/>--%> +<%--<%– <input type="button" class="btn" value="鐧诲綍" onclick="clickLogin();" />–%>--%> +<%-- <input type="button" class="btn2" value="寮�濮嬮瑙�" onclick="clickStartRealPlay();" />--%> +<%-- <input type="button" class="btn2" value="鍋滄棰勮" onclick="clickStopRealPlay();" />--%> + +<%-- </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> <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;"> + <ul class="qytj" style="position: relative;"> + <li style="font-size: 14px">璁惧</li> + + <li style="font-size: 14px">鐢甸噺</li> + <li style="font-size: 14px">鐘舵��</li> + <li style="font-size: 14px;margin-left: 40px">鏃堕棿</li> + </ul> + <div id="bqxj" class="hover-text" 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> <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: 14px">璁惧</li> + <li style="font-size: 14px">鐘舵��</li> + <li style="font-size: 14px;margin-left: 40px">鏃堕棿</li> + </ul> + <div id="jzxx" class="hover-text" 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%;"> @@ -189,10 +265,16 @@ <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/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="璇疯緭鍏ョ紪鍙�" /></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 href="javascript:;" onclick="testAuth()">鐧诲綍</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> @@ -434,7 +516,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;z-index: 999999;background-color: rgba(64,75,92,0.5)" 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> @@ -546,6 +628,13 @@ <span>鏂囧瓧锛�</span> <span><input type="text" id="context1" style="width: 70%;height: 25px;border: 1px solid #BFE4F2"></span> <a href="javascript:;" onclick="sendMsg()"><span style="border: 1px solid #BFE4F2;height: 23px;line-height: 23px;width: 40px;background-color:#BFE4F2;display: inline-block;text-align: center;position: relative;left: -5px;top: -1px">鍙戦��</span></a> + <p style="width: 90%;position: relative;top: 20px"> + + <%-- <a href="javascript:;" onclick="testAuth()">鐧诲綍</a>--%> + <a style="display: inline;" href="javascript:;" onclick="testSesCallInitiate1()" ><img src="HomeImg/bs5.png" width="100"/></a> + <a style="display: inline;" href="javascript:;" onclick="testSesTalkRequest1()" >寮�濮嬪彂瑷�</a> + <a href="javascript:;" onclick="testSesTalkRelease1()" >鍋滄鍙戣█</a> + </p> </div> </div> </div> @@ -557,9 +646,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"> @@ -573,6 +662,7 @@ </ul> </div> </div> + <div class="layui-row" id="warningMsg1"> <div class="layui-col-xs12 layui-col-md12" style=""> <ul style="height: 100%;padding: 20px"> @@ -611,10 +701,34 @@ <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> -<div style="height: 100%;width: 20%;position: fixed;top: 0px;left: 0px;z-index: 9;" id="border2s"></div> -<div style="height: 100%;width: 20%;position: fixed;top: 0px;right: 0px;z-index: 9;" id="border3s"></div> +<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> +<input id="loginMdn" type="text" value="1064932754180" style="display:none;"/> +<input id="pwd" type="text" value="Aa147369.." autocomplete="off" style="display:none;"/> +<input id="serAddr" value="https://open.189diaodu.cn:7290/ptt" type="text" style="display:none;"/> +<input id="serverKey" value="0f80514d3bfa405198e9ea7f24b47baf" type="text" style="display:none;"/> <%--<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> +</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> @@ -622,11 +736,22 @@ <span class="" style="color: white;display: inline-block;width: 35px;height: 20px;line-height: 20px;text-align:center;background-color: limegreen;border-radius: 5px;font-size: 12px;position: relative;left: -3px">鍦ㄧ嚎</span> {{# } }} </script> +<%--<script type="text/html" id="titleTpl1">--%> +<%-- {{# if(d.ponline === '0' || d.ponline === '-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: 0px">绂荤嚎</span>--%> +<%-- {{# } else if(d.ponline === '1') { }}--%> +<%-- <span class="" style="color: white;display: inline-block;width: 35px;height: 20px;line-height: 20px;text-align:center;background-color: limegreen;border-radius: 5px;font-size: 12px;position: relative;left: 0px">鍦ㄧ嚎</span>--%> +<%-- {{# } }}--%> +<%--</script>--%> <script type="text/html" id="titleTpl1"> - {{# if(d.ponline === '0' || d.ponline === '-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: 0px">绂荤嚎</span> - {{# } else if(d.ponline === '1') { }} - <span class="" style="color: white;display: inline-block;width: 35px;height: 20px;line-height: 20px;text-align:center;background-color: limegreen;border-radius: 5px;font-size: 12px;position: relative;left: 0px">鍦ㄧ嚎</span> + {{# if(d.baoliu5 === '0' || d.baoliu5 === '-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: 0px">鏈厖鐢�,鏈媶闄� </span> + {{# } else if(d.baoliu5 === '1') { }} + <span class="" style="color: white;display: inline-block;width: 35px;height: 20px;line-height: 20px;text-align:center;background-color: limegreen;border-radius: 5px;font-size: 12px;position: relative;left: 0px">鍏呯數</span> + {{# } else if(d.baoliu5 === '2') { }} + <span class="" style="color: white;display: inline-block;width: 35px;height: 20px;line-height: 20px;text-align:center;background-color: limegreen;border-radius: 5px;font-size: 12px;position: relative;left: 0px">鎷嗛櫎</span> + {{# } else if(d.baoliu5 === '3') { }} + <span class="" style="color: white;display: inline-block;width: 35px;height: 20px;line-height: 20px;text-align:center;background-color: limegreen;border-radius: 5px;font-size: 12px;position: relative;left: 0px">鍏呯數,鎷嗛櫎</span> {{# } }} </script> <script type="text/html" id="barDemotag"> @@ -653,17 +778,126 @@ {{# var formattedPhone = phone.slice(0, 3) + '****' + phone.slice(-3); }} {{ formattedPhone }} </script> + +<script src="../Home/HomeJs/jquery-1.7.1.min.js"></script> +<%--<script src="../jquery-1.7.1.min.js"></script>--%> +<script src="../Home/HomeJs/sea-3.0.1.min.js"></script> +<script src="../Home/HomeJs/codebase/webVideoCtrl.js"></script> <script src="../JS/layui.js"></script> <script src="../JS/layer.js"></script> <script src="../Home/HomeJs/echarts.min.js"></script> <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="../HouTai/Js/jquery-3.5.1.js"></script> +<script src="../Home/HomeJs/js/testWS.js"></script> +<script src="../Home/HomeJs/js/import.js"></script> +<script src="../Home/HomeJs/js/testData.js"></script> +<script src="../Home/HomeJs/js/testWSEx.js"></script> +<script src="../Home/HomeJs/js/testWSEvents.js"></script> +<script src="../Home/HomeJs/js/account.js"></script> +<script src="../Home/HomeJs/js/ctchat.min.js"></script> +<script src="../Home/HomeJs/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 src="../Home/HomeJs/demo.js"></script>--%> + <script> + + // setTimeout(function (){ + // console.log("鎵撳嵃鏁版嵁===========銆嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨��") + // console.log($("#username1").val()) + // clickLogin() + // // clickStartRealPlay() + // },1000) + + // function onload(){ + + + // sessionStorage.removeItem("username") + // localStorage.removeItem("username") + // if(sessionStorage.getItem('username') == null || localStorage.getItem("username")){ + // window.location='../index.jsp' + // }else{ + // $(".layui-container").show(); + // $("#yhm").text(login) + // } + // } + // seajs.config({ + // base: "./", + // alias: { + // + // }, + // preload: [] + // }); + // // seajs.use(["/hxzkuwb/Home/HomeJs/codebase/webVideoCtrl"], function (WebVideoCtrl) { + // $(function () { + // console.log("鎵撳嵃鏁版嵁====銆嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨��1111111") + // // 妫�鏌ユ彃浠舵槸鍚﹀凡缁忓畨瑁呰繃 + // var iRet = WebVideoCtrl.I_CheckPluginInstall(); + // console.log(iRet) + // if (-1 == iRet) { + // alert("鎮ㄨ繕鏈畨瑁呰繃鎻掍欢锛屽弻鍑诲紑鍙戝寘鐩綍閲岀殑WebComponentsKit.exe瀹夎锛�"); + // return; + // } + // + // var oPlugin = { + // iWidth: 600, // plugin width + // iHeight: 400 // plugin height + // }; + // + // var oLiveView = { + // iProtocol: 1, // protocol 1锛歨ttp, 2:https + // szIP: "192.168.31.64", // protocol ip + // szPort: "8888", // protocol port + // szUsername: "admin", // device username + // szPassword: "hxzk2015", // device password + // iStreamType: 1, // stream 1锛歮ain stream 2锛歴ub-stream 3锛歵hird stream 4锛歵ranscode stream + // iChannelID: 1, // channel no + // bZeroChannel: false // zero channel + // }; + // console.log(22222222222) + // // 鍒濆鍖栨彃浠跺弬鏁板強鎻掑叆鎻掍欢 + // WebVideoCtrl.I_InitPlugin(oPlugin.iWidth, oPlugin.iHeight, { + // // szBasePath: "../Home/HomeJs/codebase", + // bWndFull: true,//鏄惁鏀寔鍗曠獥鍙e弻鍑诲叏灞忥紝榛樿鏀寔 true:鏀寔 false:涓嶆敮鎸� + // iWndowType: 1, + // cbInitPluginComplete: function () { + // WebVideoCtrl.I_InsertOBJECTPlugin("divPlugin"); + // + // // 妫�鏌ユ彃浠舵槸鍚︽渶鏂� + // if (-1 == WebVideoCtrl.I_CheckPluginVersion()) { + // alert("妫�娴嬪埌鏂扮殑鎻掍欢鐗堟湰锛屽弻鍑诲紑鍙戝寘鐩綍閲岀殑WebComponentsKit.exe鍗囩骇锛�"); + // return; + // } + // console.log("333333333333") + // // 鐧诲綍璁惧 + // WebVideoCtrl.I_Login(oLiveView.szIP, oLiveView.iProtocol, oLiveView.szPort, oLiveView.szUsername, oLiveView.szPassword, { + // + // success: function (xmlDoc) { + // console.log(444444444444); + // // 寮�濮嬮瑙� + // var szDeviceIdentify = oLiveView.szIP + "_" + oLiveView.szPort; + // + // console.log(szDeviceIdentify) + // setTimeout(function () { + // WebVideoCtrl.I_StartRealPlay(szDeviceIdentify, { + // iStreamType: oLiveView.iStreamType, + // iChannelID: oLiveView.iChannelID, + // bZeroChannel: oLiveView.bZeroChannel + // }); + // }, 1000); + // } + // }); + // } + // }); + // + // // 鍏抽棴娴忚鍣� + // $(window).unload(function () { + // WebVideoCtrl.I_Stop(); + // }); + // }); + // // }); var login = sessionStorage.getItem('username') $("#warningusername").val(login) if(login == null){ @@ -701,6 +935,7 @@ localStorage.setItem("浜岀淮鍦板浘","涓嶆墽琛�") //浠庨儴闂ㄦ煡璇㈠浘鏍囪儗鏅鑹诧細骞舵樉绀哄埌 涓夌淮/浜岀淮/鐧惧害 function findBuMenColor(dename){ + // console.log(1234) var data = "departmentname="+dename var color = ""; $.ajax({ @@ -733,18 +968,27 @@ map.on('loaded', function () { }); } + + loadJScript(); + + function loadJScript() { + var script = document.createElement('script'); + script.type = 'text/javascript'; + script.src = '//api.map.baidu.com/api?type=webgl&v=1.0&ak=zoVtgLNWuaZBjMAa32RZRFIagXxST0fm&callback=init'; + document.body.appendChild(script); + } + // GL鐗堝懡鍚嶇┖闂翠负BMapGL + window.onload = function () { + console.log($("#serAddr").val()) + console.log("鎵撳嵃鏁版嵁===========") + console.log($("#loginMdn").val()) + // console.log(_DATA.loginMdn) + // console.log(_DATA.pwd) + // console.log(_DATA.serverKey) + // auth(_DATA.serAddr,_DATA.loginMdn,_DATA.pwd, _DATA.serverKey); // - // loadJScript(); - - // function loadJScript() { - // var script = document.createElement('script'); - // script.type = 'text/javascript'; - // script.src = '../Home/HomeJs/bmap_offline_api_v3.0_min.js' - // document.body.appendChild(script); - // } - // GL鐗堝懡鍚嶇┖闂翠负BMap - - + auth($("#serAddr").val(), $("#loginMdn").val(), $("#pwd").val(), $("#serverKey").val()); + } //鐧惧害 function Qh(){ $(".qhWeiLan").css("display","inline-block"); @@ -781,7 +1025,6 @@ var erweis = document.getElementById("erweis") var baidus = document.getElementById("baidus") sanweis.checked = true; - baidus.checked = false; layer.msg('鎿嶄綔鎴愬姛') $(".MapType").hide(); $("#weilanxs").hide(); @@ -789,6 +1032,7 @@ var qhWeiLanNum = 0; var qhOnline = 0 + var qhJiZhan = 0; </script> <script> @@ -994,20 +1238,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; - init() - 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; @@ -1026,6 +1275,22 @@ // 鍦ㄨ繖閲屽鐞嗗け璐ョ殑鍥炶皟鍑芥暟 } }); + // 璁剧疆鐧惧害鍦板浘鐨勮嚜瀹氫箟鏍峰紡锛屽彧鏄剧ず鐡︾墖鍥惧眰 + var customStyleJson = [ + { + "featureType": "all", + "elementType": "all", + "stylers": { + "visibility": "off" + } + } + ]; + + + + +// 鍒涘缓鍦板浘瀹炰緥 + //璇诲彇绯荤粺璁剧疆 var fences = getfence(); var showRect = true; @@ -1035,32 +1300,46 @@ var bm_viewPower = 0;//鏄惁鏄剧ず鐢甸噺 var bm_viewTagid = 1;//鏄惁鏄剧ず鏍囩ID var bm_offView = 1;//鏄惁绂荤嚎涓嶆樉绀哄浘鏍� - // 鐧惧害鍦板浘API鍔熻兘//榛樿鍗槦鍦板浘 {mapType:BMAP_SATELLITE_MAP} - var outputPath = 'tiles/'; //鍦板浘鐡︾墖鎵�鍦ㄧ殑鏂囦欢澶� - var fromat = ".jpg"; //鏍煎紡 - /*var tileLayer = new BMap.TileLayer(); - tileLayer.getTilesUrl = function (tileCoord, zoom) { - var x = tileCoord.x; - var y = tileCoord.y; - var url = outputPath + zoom + '/' + x + '/' + y + fromat; - return url; - } - var tileMapType = new BMap.MapType('tileMapType', tileLayer);*/ - - - var bm = new BMap.Map("container"); // 鍒涘缓Map瀹炰緥 + // 鐧惧害鍦板浘API鍔熻兘//榛樿鍗槦鍦板浘 {mapType:BMapGL_SATELLITE_MAP} + var bm = new BMapGL.Map("container"); // 鍒涘缓Map瀹炰緥 var zhong =zhongxindian.split(';') ; - bm.centerAndZoom(new BMap.Point(zhong[0],zhong[1]), level); // 鍒濆鍖栧湴鍥�,璁剧疆涓績鐐瑰潗鏍囧拰鍦板浘绾у埆 + bm.centerAndZoom(new BMapGL.Point(zhong[0],zhong[1]), level); // 鍒濆鍖栧湴鍥�,璁剧疆涓績鐐瑰潗鏍囧拰鍦板浘绾у埆 bm.enableScrollWheelZoom(true); //寮�鍚紶鏍囨粴杞缉鏀� console.log() if(localStorage.getItem("mapType") == "鍦扮悆妯″紡"){ - bm.setMapType(BMAP_EARTH_MAP); + bm.setMapType(BMapGL_EARTH_MAP); }else{ } //娣诲姞鍦板浘绫诲瀷鎺т欢 - var tileLayer = new BMap.TileLayer(); + bm.setMapStyleV2({ + styleJson: [{ + "featureType": "all", + "elementType": "all", + "stylers": { + "visibility": "off" + } + }] + }); + bm.setHeading(shijiao); //璁剧疆鍦板浘鏃嬭浆瑙掑害 + bm.setTilt(gao); + var scaleCtrl = new BMapGL.ScaleControl({offset: new BMapGL.Size(250,40),showInfo:true}); + bm.addControl(scaleCtrl); + + + 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 .replace("{x}", tileCoord.x) @@ -1071,15 +1350,21 @@ } bm.addTileLayer(tileLayer); + // var navi3DCtrl = new BMapGL.NavigationControl3D({ + // anchor: BMapGL_ANCHOR_BOTTOM_RIGHT, // 灏嗘帶浠堕敋鐐硅缃负鍦板浘搴曢儴 + // offset: new BMapGL.Size(0, 0) // 璁剧疆鎺т欢鐩稿浜庨敋鐐圭殑鍋忕Щ閲忥紝杩欓噷灏嗗亸绉婚噺璁句负(0, 0) + // }); + // bm.addControl(navi3DCtrl); + // var offset = new BMapGL.Size(525, 20); // 姘村钩鍜屽瀭鐩村亸绉婚噺 + // navi3DCtrl.setOffset(offset); + // bm.addEventListener('click', function (e) { + // $(".JingWeiDu").text('褰撳墠浣嶇疆缁忕含搴︼細' + e.latlng.lng + ',' + e.latlng.lat) + // }); - var offset = new BMap.Size(525, 20); // 姘村钩鍜屽瀭鐩村亸绉婚噺 - bm.addEventListener('click', function (e) { - $(".JingWeiDu").text('褰撳墠浣嶇疆缁忕含搴︼細' + e.latlng.lng + ',' + e.latlng.lat) - }); - var myIcon = new BMap.Icon("../Home/HomeImg/default.png", new BMap.Size(40, 40), { - anchor: new BMap.Size(20, 40) + var myIcon = new BMapGL.Icon("../Home/HomeImg/default.png", new BMapGL.Size(40, 40), { + anchor: new BMapGL.Size(20, 40) } ); var timer2; @@ -1107,12 +1392,18 @@ 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 BMap.Point(rr1.lng, rr1.lat); + + var targetPoint = new BMapGL.Point(rr1.lng, rr1.lat); bm.panTo(targetPoint); bm.removeOverlay(markers[pTagid]); delete markers[pTagid] @@ -1128,19 +1419,24 @@ 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") { // 濡傛灉鏍囪宸插瓨鍦紝鍒欐洿鏂板潗鏍� if (markers[userId]) { - markers[userId].setPosition(new BMap.Point(lng, lat)); - markers1[userId].setPoint(new BMap.Point(lng, lat)); + markers[userId].setPosition(new BMapGL.Point(lng, lat)); + markers1[userId].setPoint(new BMapGL.Point(lng, lat)); } else { - const customOverlay = new BMap.CustomOverlay(createDOM, { - point: new BMap.Point(lng, lat), + const customOverlay = new BMapGL.CustomOverlay(createDOM, { + point: new BMapGL.Point(lng, lat), opacity: 0.7, map: bm, offsetY: 26, @@ -1149,17 +1445,17 @@ bm.addOverlay(customOverlay); markers1[userId] = customOverlay; // 鍒涘缓鍧愭爣鐐� - var point = new BMap.Point(lng, lat); + var point = new BMapGL.Point(lng, lat); // 鍒涘缓鏍囪 - var myIcon = new BMap.Icon("../Icon/" + gpsInfo.pimage, new BMap.Size(40, 40), { - anchor: new BMap.Size(20, 40), + var myIcon = new BMapGL.Icon("../Icon/" + gpsInfo.pimage, new BMapGL.Size(40, 40), { + anchor: new BMapGL.Size(20, 40), zIndex:10 }); - var marker = new BMap.Marker(point, {icon: myIcon}); + var marker = new BMapGL.Marker(point, {icon: myIcon}); // 灏嗘爣璁版坊鍔犲埌鍦板浘涓� bm.addOverlay(marker); - var label = new BMap.Label(gpsInfo.pname + " " + userId, {offset: new BMap.Size(0, -70)}); + var label = new BMapGL.Label(gpsInfo.pname + " " + userId, {offset: new BMapGL.Size(0, -70)}); label.setStyle({ color: "#fff", fontSize: "14px", @@ -1181,6 +1477,8 @@ data: data, async: false, success: function (data) { + console.log(1111111111) + console.log(data.pname) if (data.ponline == "1") { data.ponline = "鍦ㄧ嚎"; } else { @@ -1269,7 +1567,7 @@ var gpslist = getGPS(); for (const key in gpslist) { if (gpslist[key][0] == sousuoid) { - bm.panTo(new BMap.Point(gpslist[key][1], gpslist[key][2])); + bm.panTo(new BMapGL.Point(gpslist[key][1], gpslist[key][2])); } } } @@ -1295,7 +1593,7 @@ var points = []; for(var i = 0 ; i < fences.length;i++){ for (var j = i ; j< fences[i].length;j++){ - var point = new BMap.Point(fences[i][j][0], fences[i][j][1]); + var point = new BMapGL.Point(fences[i][j][0], fences[i][j][1]); points.push(point); } @@ -1303,18 +1601,20 @@ 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 = {}; bm.clearOverlays(); if(onFence == 0){ - var polygon = new BMap.Polygon(points, { strokeColor: "red", strokeOpacity: 0.5, fillColor: "red", fillOpacity: 0.3 }); + var polygon = new BMapGL.Polygon(points, { strokeColor: "red", strokeOpacity: 0.5, fillColor: "red", fillOpacity: 0.3 }); bm.addOverlay(polygon); } // bm.addOverlay(polygon); @@ -1325,22 +1625,24 @@ 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(121.455326), lat: parseFloat(30.79417)}); - console.log(rr) - var lng = parseFloat(rr.lng); - var lat = parseFloat(rr.lat); + var rr = c.WGS2BD09({ lng: parseFloat(gpsInfo.baoliu2), lat: parseFloat(gpsInfo.baoliu3)}); + 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)) { // 濡傛灉宸茬粡瀛樺湪璇ユ爣璁帮紝鍒欑Щ闄ゅ師鏉ョ殑鏍囪 bm.removeOverlay(markers1[userId]); // 鏇存柊鏍囪浣嶇疆 - const customOverlay = new BMap.CustomOverlay(createDOM, { - point: new BMap.Point(lng, lat), + const customOverlay = new BMapGL.CustomOverlay(createDOM, { + point: new BMapGL.Point(lng, lat), opacity: 1, bm: bm, offsetY: 26, @@ -1350,8 +1652,8 @@ markers1[userId] = customOverlay; } else { // 濡傛灉涓嶅瓨鍦ㄨ鏍囪锛屽垯娣诲姞鏂版爣璁� - const customOverlay = new BMap.CustomOverlay(createDOM, { - point: new BMap.Point(lng, lat), + const customOverlay = new BMapGL.CustomOverlay(createDOM, { + point: new BMapGL.Point(lng, lat), opacity: 1, bm: bm, offsetY: 26, @@ -1367,15 +1669,15 @@ } } // 鍒涘缓鍧愭爣鐐� - var point = new BMap.Point(lng, lat); + var point = new BMapGL.Point(lng, lat); // 鍒涘缓鏍囪 - var myIcon = new BMap.Icon("../Icon/"+gpsInfo.pimage, new BMap.Size(40, 40), { - anchor: new BMap.Size(20, 40) + var myIcon = new BMapGL.Icon("../Icon/"+gpsInfo.pimage, new BMapGL.Size(40, 40), { + anchor: new BMapGL.Size(20, 40) }); - var marker = new BMap.Marker(point, { icon: myIcon }); + var marker = new BMapGL.Marker(point, { icon: myIcon }); // 灏嗘爣璁版坊鍔犲埌鍦板浘涓� bm.addOverlay(marker); - var label = new BMap.Label(gpsInfo.pname+" "+userId, {offset: new BMap.Size(0, -70)}); + var label = new BMapGL.Label(gpsInfo.pname+" "+userId, {offset: new BMapGL.Size(0, -70)}); label.setStyle({ color: "#fff", fontSize: "14px", @@ -1390,12 +1692,15 @@ markers[userId] = marker; marker.setTitle(gpsInfo.ptagid); marker.addEventListener("click", function () { + console.log(this.getTitle()) var data = "id="+this.getTitle(); $.ajax({ url: "/hxzkuwb/findtagIdPerson", data: data, async: false, success: function(data) { + console.log(2222222) + console.log(data.pname) if (data.ponline == "1") { data.ponline = "鍦ㄧ嚎"; } else { @@ -1443,8 +1748,8 @@ // 濡傛灉宸茬粡瀛樺湪璇ユ爣璁帮紝鍒欑Щ闄ゅ師鏉ョ殑鏍囪 bm.removeOverlay(markers1[userId]); // 鏇存柊鏍囪浣嶇疆 - const customOverlay = new BMap.CustomOverlay(createDOM, { - point: new BMap.Point(lng, lat), + const customOverlay = new BMapGL.CustomOverlay(createDOM, { + point: new BMapGL.Point(lng, lat), opacity: 1, bm: bm, offsetY: 26, @@ -1454,8 +1759,8 @@ markers1[userId] = customOverlay; } else { // 濡傛灉涓嶅瓨鍦ㄨ鏍囪锛屽垯娣诲姞鏂版爣璁� - const customOverlay = new BMap.CustomOverlay(createDOM, { - point: new BMap.Point(lng, lat), + const customOverlay = new BMapGL.CustomOverlay(createDOM, { + point: new BMapGL.Point(lng, lat), opacity: 1, bm: bm, offsetY: 26, @@ -1472,15 +1777,15 @@ } } // 鍒涘缓鍧愭爣鐐� - var point = new BMap.Point(lng, lat); + var point = new BMapGL.Point(lng, lat); // 鍒涘缓鏍囪 - var myIcon = new BMap.Icon("../Icon/"+gpsInfo.pimage, new BMap.Size(40, 40), { - anchor: new BMap.Size(20, 40) + var myIcon = new BMapGL.Icon("../Icon/"+gpsInfo.pimage, new BMapGL.Size(40, 40), { + anchor: new BMapGL.Size(20, 40) }); - var marker = new BMap.Marker(point, { icon: myIcon }); + var marker = new BMapGL.Marker(point, { icon: myIcon }); // 灏嗘爣璁版坊鍔犲埌鍦板浘涓� bm.addOverlay(marker); - var label = new BMap.Label(gpsInfo.pname+" "+userId, {offset: new BMap.Size(0, -70)}); + var label = new BMapGL.Label(gpsInfo.pname+" "+userId, {offset: new BMapGL.Size(0, -70)}); if (gpsInfo.ponline == "0"){ label.setStyle({ @@ -1515,6 +1820,8 @@ data: data, async: false, success: function(data) { + console.log(333) + console.log(data.pname) if (data.ponline == "1") { data.ponline = "鍦ㄧ嚎"; } else { @@ -1572,11 +1879,8 @@ onFence = 0 $("#weilanxs").text("闅愯棌鍥存爮") - }else{ $("#weilanxs").text("鏄剧ず鍥存爮") - - onFence = 1 } layer.msg('鎿嶄綔鎴愬姛') @@ -1596,7 +1900,9 @@ onLine = "1" localStorage.setItem("oNLine","Yes") } + layer.msg('鎿嶄綔鎴愬姛') } + function getdateTime() { var date = new Date(); @@ -1685,6 +1991,7 @@ lonlat.lat = y; return lonlat; }; + </script> <%--<script>--%> <%-- var result;--%> @@ -2081,7 +2388,6 @@ <%-- //鐭╁舰涓嬭竟绾�--%> <%-- cxt.lineTo(radius, height);--%> - <%-- //宸︿笅瑙掑渾寮э紝寮у害浠�1/2PI鍒癙I--%> <%-- cxt.arc(radius, height - radius, radius, Math.PI / 2, Math.PI);--%> -- Gitblit v1.9.3