基站信息，标签信息，对讲功能

fei.wang

2024-04-01 e079341d79cb283855e22f8383c432d21fe68393

 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="请输入设备ID" /></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"> 正在加载中.....</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>有不少其他答案说是因为JS太差。我下面的答案已经说了，这不是根本性的原因。但除此之外，我还要纠正一些对JS具体问题的误解。JS当初是被作为脚本语言设计的，所以某些问题并不是JS设计得差或者是JS设计者的失误。比如var的作用域问题，并不是“错误”，而是当时绝大部分脚本语言都是这样的，如perl/php/sh等。模块的问题也是，脚本语言几乎都没有模块/命名空间功能。弱类型、for-in之类的问题也是，只不过现在用那些老的脚本语言的人比较少，所以很多人都误以为是JS才有的坑。另外有人说JS是半残语言，满足不了开发需求，1999年就该死。半残这个嘛，就夸张了。JS虽然有很多问题，但是设计总体还是优秀的。——来自知乎@贺师俊</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到PI--%>
<%--        cxt.arc(radius, height - radius, radius, Math.PI / 2, Math.PI);--%>