From c1fea9f3710e1a26b8f1a58ba288f9fe60d29c18 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 02 Jul 2020 08:34:36 +0800
Subject: [PATCH] update

---
 src/main/webapp/view/uavdroppointnew.jsp |  266 ++++++++++++++++++++++----------------------
 src/main/webapp/view/uavchannelnew.jsp   |   55 ++++----
 2 files changed, 159 insertions(+), 162 deletions(-)

diff --git a/src/main/webapp/view/uavchannelnew.jsp b/src/main/webapp/view/uavchannelnew.jsp
index 792d071..c28a50e 100644
--- a/src/main/webapp/view/uavchannelnew.jsp
+++ b/src/main/webapp/view/uavchannelnew.jsp
@@ -103,7 +103,7 @@
 </head>
 <body>
 
-<div id="data" style="display:block">
+<div id="data" style="display:none">
     <%--������������������--%>
     <table id="tab" style="border:1px solid black;width: 280px">
     </table>
@@ -356,35 +356,34 @@
     if (trackPoints.length == 0) {
         showNoDroppoint();
     }
-    $(function () {
-        var points = getPoints(trackPoints);
-        map.centerAndZoom(points, 17);// ������������������������������������
-        map.setViewport(points);// ������������������������������������������������������
-        listen(trackPoints);
-        $("#form").change(function () {
-            map.clearOverlays();
-            var result = [];
-            $('input:checkbox:checked').each(function () {
-                var val = $(this).val();
-                if (val == "one") {
-                    getResult(result, trackPointsOne);
-                } else if (val == "two") {
-                    getResult(result, trackPointsTwo);
-                } else if (val == "three") {
-                    getResult(result, trackPointsThree);
-                } else if (val == "four") {
-                    getResult(result, trackPointsFour);
-                } else if (val == "five") {
-                    getResult(result, trackPointsFive);
-                }
-            });
-            var zoom = map.getZoom();
-            if (zoom > 17) {
-                addMarkers(result);
+
+    var points = getPoints(trackPoints);
+    map.centerAndZoom(points, 17);// ������������������������������������
+    map.setViewport(points);// ������������������������������������������������������
+    listen(trackPoints);
+    $("#form").change(function () {
+        map.clearOverlays();
+        var result = [];
+        $('input:checkbox:checked').each(function () {
+            var val = $(this).val();
+            if (val == "one") {
+                getResult(result, trackPointsOne);
+            } else if (val == "two") {
+                getResult(result, trackPointsTwo);
+            } else if (val == "three") {
+                getResult(result, trackPointsThree);
+            } else if (val == "four") {
+                getResult(result, trackPointsFour);
+            } else if (val == "five") {
+                getResult(result, trackPointsFive);
             }
-            addPolygon(getPoints(result));
-            listen(result);
         });
+        var zoom = map.getZoom();
+        if (zoom > 17) {
+            addMarkers(result);
+        }
+        addPolygon(getPoints(result));
+        listen(result);
     });
 
     function getResult(result, arry) {
diff --git a/src/main/webapp/view/uavdroppointnew.jsp b/src/main/webapp/view/uavdroppointnew.jsp
index 1f035dc..abf3339 100644
--- a/src/main/webapp/view/uavdroppointnew.jsp
+++ b/src/main/webapp/view/uavdroppointnew.jsp
@@ -4,128 +4,128 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-  <meta name="viewport" content="initial-scale=1.0, user-scalable=no"/>
-  <style type="text/css">
-    body,
-    html,
-    #mapCanvas {
-      width: 100%;
-      height: 100%;
-      overflow: hidden;
-      margin: 0;
-      z-index: 0;
-      font-size: 14px;
-      font-family: "������������";
-    }
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta name="viewport" content="initial-scale=1.0, user-scalable=no"/>
+    <style type="text/css">
+        body,
+        html,
+        #mapCanvas {
+            width: 100%;
+            height: 100%;
+            overflow: hidden;
+            margin: 0;
+            z-index: 0;
+            font-size: 14px;
+            font-family: "������������";
+        }
 
-    .main_body {
-      border: 0;
-      margin: 0;
-      width: 100%;
-      height: 100%;
-      position: relative;
-    }
+        .main_body {
+            border: 0;
+            margin: 0;
+            width: 100%;
+            height: 100%;
+            position: relative;
+        }
 
-    * {
-      margin: 0;
-      padding: 0;
-      list-style: none;
-    }
+        * {
+            margin: 0;
+            padding: 0;
+            list-style: none;
+        }
 
-    #cpm {
-      width: 300px;
-      height: 100px;
-      position: absolute;
-      background-color: #ffffff;
-      display: none;
-      left: 50%;
-      top: 50%;
-      margin-left: -150px;
-      margin-top: -50px;
-      z-index: 11;
-      color: #000000;
-      border: 2px solid #FF7F50;
-      font-size: 28px;
-      line-height: 100px;
-      text-align: center;
-    }
+        #cpm {
+            width: 300px;
+            height: 100px;
+            position: absolute;
+            background-color: #ffffff;
+            display: none;
+            left: 50%;
+            top: 50%;
+            margin-left: -150px;
+            margin-top: -50px;
+            z-index: 11;
+            color: #000000;
+            border: 2px solid #FF7F50;
+            font-size: 28px;
+            line-height: 100px;
+            text-align: center;
+        }
 
-    #data {
-      overflow: scroll;
-      width: 300px;
-      height: 400px;
-      top: 20px;
-      right: 5px;
-      position: absolute;
-      z-index: 1;
-      background-color: gainsboro;
-      opacity: 0.8;
-      border: 2px solid red;
-    }
+        #data {
+            overflow: scroll;
+            width: 300px;
+            height: 400px;
+            top: 20px;
+            right: 5px;
+            position: absolute;
+            z-index: 1;
+            background-color: gainsboro;
+            opacity: 0.8;
+            border: 2px solid red;
+        }
 
-    .trr th, td {
-      border: 1px solid black;
-      text-align: center;
-    }
+        .trr th, td {
+            border: 1px solid black;
+            text-align: center;
+        }
 
-    table {
-      border-collapse: collapse;
-      font-size: 12px;
-    }
+        table {
+            border-collapse: collapse;
+            font-size: 12px;
+        }
 
-    #details {
-      position: absolute;
-      z-index: 1;
-      width: 100px;
-      height: 30px;
-      right: 100px;
-      bottom: 5px;
-      font-size: 100%;
-    }
+        #details {
+            position: absolute;
+            z-index: 1;
+            width: 100px;
+            height: 30px;
+            right: 100px;
+            bottom: 5px;
+            font-size: 100%;
+        }
 
-    #form {
-      position: absolute;
-      z-index: 1;
-      width: 100px;
-      height: 30px;
-      right: 200px;
-      bottom: 5px;
-      font-size: 100%;
-    }
-  </style>
-  <script type="text/javascript"
-          src="http://api.map.baidu.com/api?v=2.0&ak=dmzBXk6VTBG1SKUvqSSEgGBU8HcuoajQ"></script>
-  <script type="text/javascript" src="../js/jquery.min.js"></script>
+        #form {
+            position: absolute;
+            z-index: 1;
+            width: 100px;
+            height: 30px;
+            right: 200px;
+            bottom: 5px;
+            font-size: 100%;
+        }
+    </style>
+    <script type="text/javascript"
+            src="http://api.map.baidu.com/api?v=2.0&ak=dmzBXk6VTBG1SKUvqSSEgGBU8HcuoajQ"></script>
+    <script type="text/javascript" src="../js/jquery.min.js"></script>
 </head>
 <body>
 
 <div id="data" style="display: none">
-  <%--������������������--%>
-  <table id="tab" style="border:1px solid black;width: 280px">
-  </table>
+    <%--������������������--%>
+    <table id="tab" style="border:1px solid black;width: 280px">
+    </table>
 </div>
 
 <form id="form">
-  <label>
-    <select id="select"><!--������������-->
-      <option value="zero" selected>������</option>
-      <option value="one">0-20m</option>
-      <option value="two">21-40m</option>
-      <option value="three">41-60m</option><!--���������������������������������������-->
-      <option value="four">61-80m</option>
-      <option value="five">80m������</option>
-    </select>
-  </label>
+    <label>
+        <select id="select"><!--������������-->
+            <option value="zero" selected>������</option>
+            <option value="one">0-20m</option>
+            <option value="two">21-40m</option>
+            <option value="three">41-60m</option><!--���������������������������������������-->
+            <option value="four">61-80m</option>
+            <option value="five">80m������</option>
+        </select>
+    </label>
 </form>
 <button id="details" onclick="show()">������������</button>
 <div class="main_body">
-  <div id="cpm">������������</div>
-  <div id="mapCanvas"></div> <!-- ������������������-->
-  <!-- ���sensorInfo,regionCode,regionName,monitorPoint,device-->
-  <div id="uavDroppointParams" style="display: none;">
-    ${requestScope.uavDroppointParams}
-  </div>
+    <div id="cpm">������������</div>
+    <div id="mapCanvas"></div> <!-- ������������������-->
+    <!-- ���sensorInfo,regionCode,regionName,monitorPoint,device-->
+    <div id="uavDroppointParams" style="display: none;">
+        ${requestScope.uavDroppointParams}
+    </div>
 </div>
 </body>
 </html>
@@ -353,36 +353,34 @@
         showNoDroppoint();
     }
 
-    $(function () {
-        var points = getPoints(trackPoints);
-        map.centerAndZoom(points, 17);// ������������������������������������
-        map.setViewport(points);// ������������������������������������������������������
-        listen(trackPoints);
-        $("#select").change(function () {
-            map.clearOverlays();
-            var val = $("#select").val();
-            var arry = "";
-            if (val == "one") {
-                arry = trackPointsOne;
-            } else if (val == "two") {
-                arry = trackPointsTwo;
-            } else if (val == "three") {
-                arry = trackPointsThree;
-            } else if (val == "four") {
-                arry = trackPointsFour;
-            } else if (val == "five") {
-                arry = trackPointsFive;
-            } else if (val == "zero") {
-                arry = trackPoints;
-            }
-            var zoom = map.getZoom();
-            if (zoom > 17) {
-                addMarkers(arry);
-            }
-            addPolygon(getPoints(arry));
-            listen(arry);
-        })
-    });
+    var points = getPoints(trackPoints);
+    map.centerAndZoom(points, 17);// ������������������������������������
+    map.setViewport(points);// ������������������������������������������������������
+    listen(trackPoints);
+    $("#select").change(function () {
+        map.clearOverlays();
+        var val = $("#select").val();
+        var arry = "";
+        if (val == "one") {
+            arry = trackPointsOne;
+        } else if (val == "two") {
+            arry = trackPointsTwo;
+        } else if (val == "three") {
+            arry = trackPointsThree;
+        } else if (val == "four") {
+            arry = trackPointsFour;
+        } else if (val == "five") {
+            arry = trackPointsFive;
+        } else if (val == "zero") {
+            arry = trackPoints;
+        }
+        var zoom = map.getZoom();
+        if (zoom > 17) {
+            addMarkers(arry);
+        }
+        addPolygon(getPoints(arry));
+        listen(arry);
+    })
 
     function listen(arry) {
         map.addEventListener("zoomend", function () {

--
Gitblit v1.8.0