~admin/screen_api_v2.git

			@@ -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;

			@@ -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>

	src/main/webapp/img/icoWind00.png	patch \| view \| raw \| blame \| history
	src/main/webapp/js/newmoralmap.js	18 ●●●●● patch \| view \| raw \| blame \| history
	src/main/webapp/view/newmap.jsp	35 ●●●●● patch \| view \| raw \| blame \| history