From 712a73114593e64ae3126f9bb531d968f3581394 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Tue, 30 Jun 2020 10:31:23 +0800
Subject: [PATCH] update
---
src/main/webapp/img/icoWind00.png | 0
src/main/webapp/js/newmoralmap.js | 18 +++++++++---------
src/main/webapp/view/newmap.jsp | 35 +++++++++++++++++++++++++++++++++--
3 files changed, 42 insertions(+), 11 deletions(-)
diff --git a/src/main/webapp/img/icoWind00.png b/src/main/webapp/img/icoWind00.png
new file mode 100644
index 0000000..994b975
--- /dev/null
+++ b/src/main/webapp/img/icoWind00.png
Binary files differ
diff --git a/src/main/webapp/js/newmoralmap.js b/src/main/webapp/js/newmoralmap.js
index b7842a8..95a4695 100644
--- a/src/main/webapp/js/newmoralmap.js
+++ b/src/main/webapp/js/newmoralmap.js
@@ -705,10 +705,10 @@
function _getWindIcon(speedLevel) {
speedLevel = speedLevel == null ? 0 : speedLevel;
- var icon = _option["icon"];
- var url = icon["url"] + speedLevel + ".png";
- return new BMap.Icon(url, new BMap.Size(icon["width"], icon["height"]), {
- imageSize: new BMap.Size(icon["width"], icon["height"])
+ var windIcon = _option["windIcon"];
+ var windUrl = windIcon["url"] + speedLevel + ".png";
+ return new BMap.Icon(windUrl, new BMap.Size(windIcon["width"], windIcon["height"]), {
+ imageSize: new BMap.Size(windIcon["width"], windIcon["height"])
});
}
@@ -863,11 +863,11 @@
}
}
}
- var icon = {};
- icon["url"] = "/img/icoWind0";
- icon["width"] = 25;
- icon["height"] = 25;
- option["icon"] = icon;
+ var windIcon = {};
+ windIcon["url"] = "/img/icoWind0";
+ windIcon["width"] = 25;
+ windIcon["height"] = 25;
+ option["windIcon"] = windIcon;
var windMarker = new moralMap.WindMarker(option, moralMap);
moralMap.putDevice(option['mac'], windMarker);
var refreshWindMarker = windMarker.refreshWindDir;
diff --git a/src/main/webapp/view/newmap.jsp b/src/main/webapp/view/newmap.jsp
index 7c0c892..205811d 100644
--- a/src/main/webapp/view/newmap.jsp
+++ b/src/main/webapp/view/newmap.jsp
@@ -317,8 +317,8 @@
.tools_box {
position: absolute;
- height: 120px;
- width: 400px;
+ height: 90px;
+ width: 90px;
right: 1px;
top: 20px;
z-index: 1;
@@ -340,6 +340,25 @@
background: url(/img/charts_btn_bg_2.png) left top no-repeat;
background-size: 70%;
}
+ .wind_explain{
+ position: absolute;
+ height: 200px;
+ width: 110px;
+ right: 1px;
+ top: 110px;
+ z-index: 1;
+ }
+ .wind_explain li{
+ height: 25px;
+ }
+ .wind_explain li span{
+ display: inline-block;
+ height: 25px;
+ line-height: 25px;
+ }
+ .wind_explain li img{
+ vertical-align: top;
+ }
</style>
<body>
<div class="main_body">
@@ -347,6 +366,18 @@
<div class="charts_btn">
</div>
</div>
+ <div class="wind_explain">
+ <ul>
+ <li><img src="/img/icoWind01.png" width="25" height="25"><span>1������</span></li>
+ <li><img src="/img/icoWind02.png" width="25" height="25"><span>2������</span></li>
+ <li><img src="/img/icoWind03.png" width="25" height="25"><span>3������</span></li>
+ <li><img src="/img/icoWind04.png" width="25" height="25"><span>4������</span></li>
+ <li><img src="/img/icoWind05.png" width="25" height="25"><span>5������</span></li>
+ <li><img src="/img/icoWind06.png" width="25" height="25"><span>6������</span></li>
+ <li><img src="/img/icoWind07.png" width="25" height="25"><span>7������</span></li>
+ <li><img src="/img/icoWind08.png" width="25" height="25"><span>8���������������</span></li>
+ </ul>
+ </div>
<%-- <div class="search_box">
<button id="searchBtn" type="button">������</button>
<textarea style="width: 300px;height:400px;" id="searchParam"></textarea>
--
Gitblit v1.8.0