From e34d88ad7d3d950da12f032e6932ba14f868db72 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Wed, 21 Aug 2019 10:22:50 +0800
Subject: [PATCH] 修改大屏无人机地图弹窗显示不全问题,设置可拖动

---
 src/main/webapp/view/uavTrajectory.jsp |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/webapp/view/uavTrajectory.jsp b/src/main/webapp/view/uavTrajectory.jsp
index b00d930..b029cf9 100644
--- a/src/main/webapp/view/uavTrajectory.jsp
+++ b/src/main/webapp/view/uavTrajectory.jsp
@@ -370,7 +370,7 @@
             }
             var count = 0;
             var winfowText =
-                '<div style="min-height:20px;overflow:auto;max-height:400px;" >';
+                '<div style="min-height:20px;overflow:auto;max-height:330px;" >';
             var opts = {
                 width: 420,
                 title: '<h3>���������' + sensorInfo[i].time + '</h3>', // ������������������
@@ -417,7 +417,7 @@
                                 var prop1 = sensorsMap[key];
                             }
                         }
-                        winfowText += ("<p style='height: 22px;line-height: 22px'>" + prop1 + "���" + monitorDataResult[prop] + '<input id="a' + i + monitorSensorsCount + '" class="' + i + '" type="button" value="���������" onclick="showMonitorMinOrMax(this,sensorInfoMin,monitorDataMin,monitorParameters)" onmousemove="moveChangeColor(this)" onmouseout="outChangeColor(this)" style="width:80px;height:18px;margin-top:2px;display: inline-block;position: absolute;right:120px;border-width: 0px;border-radius: 3px; background:#7C73E9;cursor: pointer; outline: none;color:white"/><span id="aa' + i + monitorSensorsCount + '" style="width:80px;display: none;position: absolute;right:120px;text-align: center"></span><input id="b' + i + monitorSensorsCount + '" class="' + i + '" type="button" value="���������" onclick="showMonitorMinOrMax(this,sensorInfoMax,monitorDataMax,monitorParameters)" onmousemove="moveChangeColor(this)" onmouseout="outChangeColor(this)" style="width:80px;height:18px;margin-top:2px;display: inline-block;position: absolute;right:25px;border-width: 0px;border-radius: 3px; background:#7C73E9;cursor: pointer; outline: none;color:white"/><span id="bb' + i + monitorSensorsCount + '" style="width:80px;display: none;position: absolute;right:25px;text-align: center"></span>' + "</p>");
+                        winfowText += ("<p style='height: 22px;line-height: 22px'>" + prop1 + "���" + monitorDataResult[prop] + '<input id="b' + i + monitorSensorsCount + '" class="' + i + '" type="button" value="���������" onclick="showMonitorMinOrMax(this,sensorInfoMax,monitorDataMax,monitorParameters)" onmousemove="moveChangeColor(this)" onmouseout="outChangeColor(this)" style="width:80px;height:18px;margin-top:2px;display: inline-block;float:right;margin-right:15px;border-width: 0px;border-radius: 3px; background:#7C73E9;cursor: pointer; outline: none;color:white"/><span id="bb' + i + monitorSensorsCount + '" style="width:80px;display: none;float:right;margin-right:15px;text-align: center"></span><input id="a' + i + monitorSensorsCount + '" class="' + i + '" type="button" value="���������" onclick="showMonitorMinOrMax(this,sensorInfoMin,monitorDataMin,monitorParameters)" onmousemove="moveChangeColor(this)" onmouseout="outChangeColor(this)" style="width:80px;height:18px;margin-top:2px;display: inline-block;float:right;margin-right:15px;border-width: 0px;border-radius: 3px; background:#7C73E9;cursor: pointer; outline: none;color:white"/><span id="aa' + i + monitorSensorsCount + '" style="width:80px;display: none;float:right;margin-right:15px;text-align: center"></span>' + "</p>");
                     }
                 }
                 winfowText += '<h3 style="background-color: #66CD00;color:white;margin-bottom: 1px">������������������</h3>';
@@ -433,7 +433,7 @@
                                 var prop1 = sensorsMap[key];
                             }
                         }
-                        winfowText += ("<p style='height: 22px;line-height: 22px'>" + prop1 + "���" + flyingDataResult[prop] + '<input id="c' + i + flyingSensorsCount + '" class="' + i + '" type="button" value="���������" onclick="showFlyingMinOrMax(this,sensorInfoMin,flyingDataMin,flyingParameters)" onmousemove="moveChangeColor(this)" onmouseout="outChangeColor(this)" style="width:80px;height:18px;margin-top:2px;display: inline-block;position: absolute;right:120px;border-width: 0px;border-radius: 3px; background:#7C73E9;cursor: pointer; outline: none;color:white"/><span id="cc' + i + flyingSensorsCount + '" style="width:80px;display: none;position: absolute;right:120px;text-align: center"></span><input id="d' + i + flyingSensorsCount + '" class="' + i + '" type="button" value="���������" onclick="showFlyingMinOrMax(this,sensorInfoMax,flyingDataMax,flyingParameters)" onmousemove="moveChangeColor(this)" onmouseout="outChangeColor(this)" style="width:80px;height:18px;margin-top:2px;display: inline-block;position: absolute;right:25px;border-width: 0px;border-radius: 3px; background:#7C73E9;cursor: pointer; outline: none;color:white"/><span id="dd' + i + flyingSensorsCount + '" style="width:80px;display: none;position: absolute;right:25px;text-align: center"></span>' + "</p>");
+                        winfowText += ("<p style='height: 22px;line-height: 22px'>" + prop1 + "���" + flyingDataResult[prop] + '<input id="d' + i + flyingSensorsCount + '" class="' + i + '" type="button" value="���������" onclick="showFlyingMinOrMax(this,sensorInfoMax,flyingDataMax,flyingParameters)" onmousemove="moveChangeColor(this)" onmouseout="outChangeColor(this)" style="width:80px;height:18px;margin-top:2px;display: inline-block;float:right;margin-right:15px;border-width: 0px;border-radius: 3px; background:#7C73E9;cursor: pointer; outline: none;color:white"/><span id="dd' + i + flyingSensorsCount + '" style="width:80px;display: none;float:right;margin-right:15px;text-align: center"></span><input id="c' + i + flyingSensorsCount + '" class="' + i + '" type="button" value="���������" onclick="showFlyingMinOrMax(this,sensorInfoMin,flyingDataMin,flyingParameters)" onmousemove="moveChangeColor(this)" onmouseout="outChangeColor(this)" style="width:80px;height:18px;margin-top:2px;display: inline-block;float:right;margin-right:15px;border-width: 0px;border-radius: 3px; background:#7C73E9;cursor: pointer; outline: none;color:white"/><span id="cc' + i + flyingSensorsCount + '" style="width:80px;display: none;float:right;margin-right:15px;text-align: center"></span>' + "</p>");
                     }
                 }
                 winfowText += "</div>";
@@ -467,7 +467,7 @@
                 var monitorDataCoincide = monitorDataSort(sensorInfo[e.id], monitorData, monitorParameters);
                 var flyingDataCoincide = flyingDataSort(sensorInfo[e.id], flyingData, flyingParameters);
                 var winfowText1 =
-                    '<div style="min-height:20px;overflow:auto;max-height:400px;" >';
+                    '<div style="min-height:20px;overflow:auto;max-height:330px;" >';
                 winfowText1 += '<h3 style="background-color: #CD5C5C;color:white;margin-bottom: 1px">������������������</h3>';
                 var monitorSensorsCoincideCount = -1;
                 var flyingSensorsCoincideCount = -1;
@@ -483,7 +483,7 @@
                                 var prop1 = sensorsMap[key];
                             }
                         }
-                        winfowText1 += ("<p style='height: 22px;line-height: 22px'>" + prop1 + "���" + monitorDataCoincide[prop] + '<input id="e' + e.id + monitorSensorsCoincideCount + '" class="' + e.id + '" type="button" value="���������" onclick="showMonitorMinOrMax(this,sensorInfoMin,monitorDataMin,monitorParameters)" onmousemove="moveChangeColor(this)" onmouseout="outChangeColor(this)" style="width:80px;height:18px;margin-top:2px;display: inline-block;position: absolute;right:120px;border-width: 0px;border-radius: 3px; background:#7C73E9;cursor: pointer; outline: none;color:white "/><span id="ee' + e.id + monitorSensorsCoincideCount + '" style="width:80px;display: none;position: absolute;right:120px;text-align: center"></span><input id="f' + e.id + monitorSensorsCoincideCount + '" class="' + e.id + '" type="button" value="���������" onclick="showMonitorMinOrMax(this,sensorInfoMax,monitorDataMax,monitorParameters)" onmousemove="moveChangeColor(this)" onmouseout="outChangeColor(this)" style="width:80px;height:18px;margin-top:2px;display: inline-block;position: absolute;right:25px;border-width: 0px;border-radius: 3px; background:#7C73E9;cursor: pointer; outline: none;color:white"/><span id="ff' + e.id + monitorSensorsCoincideCount + '" style="width:80px;display: none;position: absolute;right:25px;text-align: center"></span>' + "</p>");
+                        winfowText1 += ("<p style='height: 22px;line-height: 22px'>" + prop1 + "���" + monitorDataCoincide[prop] + '<input id="f' + e.id + monitorSensorsCoincideCount + '" class="' + e.id + '" type="button" value="���������" onclick="showMonitorMinOrMax(this,sensorInfoMax,monitorDataMax,monitorParameters)" onmousemove="moveChangeColor(this)" onmouseout="outChangeColor(this)" style="width:80px;height:18px;margin-top:2px;display: inline-block;float:right;margin-right:15px;border-width: 0px;border-radius: 3px; background:#7C73E9;cursor: pointer; outline: none;color:white"/><span id="ff' + e.id + monitorSensorsCoincideCount + '" style="width:80px;display: none;float:right;margin-right:15px;text-align: center"></span><input id="e' + e.id + monitorSensorsCoincideCount + '" class="' + e.id + '" type="button" value="���������" onclick="showMonitorMinOrMax(this,sensorInfoMin,monitorDataMin,monitorParameters)" onmousemove="moveChangeColor(this)" onmouseout="outChangeColor(this)" style="width:80px;height:18px;margin-top:2px;display: inline-block;float:right;margin-right:15px;border-width: 0px;border-radius: 3px; background:#7C73E9;cursor: pointer; outline: none;color:white "/><span id="ee' + e.id + monitorSensorsCoincideCount + '" style="width:80px;display: none;float:right;margin-right:15px;text-align: center"></span>' + "</p>");
                     }
                 }
                 winfowText1 += '<h3 style="background-color: #66CD00;color:white;margin-bottom: 1px">������������������</h3>';
@@ -499,7 +499,7 @@
                                 var prop1 = sensorsMap[key];
                             }
                         }
-                        winfowText1 += ("<p style='height: 22px;line-height: 22px'>" + prop1 + "���" + flyingDataCoincide[prop] + '<input id="g' + e.id + flyingSensorsCoincideCount + '" class="' + e.id + '" type="button" value="���������" onclick="showFlyingMinOrMax(this,sensorInfoMin,flyingDataMin,flyingParameters)" onmousemove="moveChangeColor(this)" onmouseout="outChangeColor(this)" style="width:80px;height:18px;margin-top:2px;display: inline-block;position: absolute;right:120px;border-width: 0px;border-radius: 3px; background:#7C73E9;cursor: pointer; outline: none;color:white "/><span id="gg' + e.id + flyingSensorsCoincideCount + '" style="width:80px;display: none;position: absolute;right:120px;text-align: center"></span><input id="h' + e.id + flyingSensorsCoincideCount + '" class="' + e.id + '" type="button" value="���������" onclick="showFlyingMinOrMax(this,sensorInfoMax,flyingDataMax,flyingParameters)" onmousemove="moveChangeColor(this)" onmouseout="outChangeColor(this)" style="width:80px;height:18px;margin-top:2px;display: inline-block;position: absolute;right:25px;border-width: 0px;border-radius: 3px; background:#7C73E9;cursor: pointer; outline: none;color:white"/><span id="hh' + e.id + flyingSensorsCoincideCount + '" style="width:80px;display: none;position: absolute;right:25px;text-align: center"></span>' + "</p>");
+                        winfowText1 += ("<p style='height: 22px;line-height: 22px'>" + prop1 + "���" + flyingDataCoincide[prop] + '<input id="h' + e.id + flyingSensorsCoincideCount + '" class="' + e.id + '" type="button" value="���������" onclick="showFlyingMinOrMax(this,sensorInfoMax,flyingDataMax,flyingParameters)" onmousemove="moveChangeColor(this)" onmouseout="outChangeColor(this)" style="width:80px;height:18px;margin-top:2px;display: inline-block;float:right;margin-right:15px;border-width: 0px;border-radius: 3px; background:#7C73E9;cursor: pointer; outline: none;color:white"/><span id="hh' + e.id + flyingSensorsCoincideCount + '" style="width:80px;display: none;float:right;margin-right:15px;text-align: center"></span><input id="g' + e.id + flyingSensorsCoincideCount + '" class="' + e.id + '" type="button" value="���������" onclick="showFlyingMinOrMax(this,sensorInfoMin,flyingDataMin,flyingParameters)" onmousemove="moveChangeColor(this)" onmouseout="outChangeColor(this)" style="width:80px;height:18px;margin-top:2px;display: inline-block;float:right;margin-right:15px;border-width: 0px;border-radius: 3px; background:#7C73E9;cursor: pointer; outline: none;color:white "/><span id="gg' + e.id + flyingSensorsCoincideCount + '" style="width:80px;display: none;float:right;margin-right:15px;text-align: center"></span>' + "</p>");
                     }
                 }
                 winfowText1 += "</div>";

--
Gitblit v1.8.0