From ca72da809fdf68f2d6833ed77ad92c9aadc0663d Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 22 May 2018 09:30:20 +0800
Subject: [PATCH] 地图 增加 监控点入口
---
src/main/webapp/view/map.jsp | 47 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 39 insertions(+), 8 deletions(-)
diff --git a/src/main/webapp/view/map.jsp b/src/main/webapp/view/map.jsp
index 0982be2..6fc278f 100644
--- a/src/main/webapp/view/map.jsp
+++ b/src/main/webapp/view/map.jsp
@@ -48,7 +48,17 @@
padding:0;
list-style:none;
}
-
+a{
+ color: #1900c6;
+ text-decoration: none;
+ cursor: pointer;
+ font-size: 14px;
+ font-weight: 300;
+}
+a:hover {
+ text-decoration: underline;
+ color: #e60012;
+}
#popup_box {
top: 75px;
left: 20px;
@@ -241,7 +251,8 @@
position: absolute;
height: 120px;
width: 400px;
- right: 1%;
+ right: 1px;
+ top: 20px;
z-index: 1;
}
.tools_box .charts_btn {
@@ -251,11 +262,13 @@
border: 0;
height: 85px;
width: 85px;
- background:url(/img/charts_btn_bg_1.png) left top no-repeat
+ background:url(/img/charts_btn_bg_1.png) left top no-repeat;
+ background-size: 70%;
}
.tools_box .charts_btn:hover {
cursor:pointer;
- background:url(/img/charts_btn_bg_2.png) left top no-repeat
+ background:url(/img/charts_btn_bg_2.png) left top no-repeat;
+ background-size: 70%;
}
</style>
<body>
@@ -293,8 +306,10 @@
window["listView"] = listView;
//���������������������click������������
function showEqus(obj) {
+
var params = moralMap['params'];
var mpoint = obj.currentTarget.getOption();
+ $("#searchParam").val(mpoint['name']);
var url = 'get-devices-by-mid-oid?mpId=' + mpoint['id'] + "&orgId=" + params['orgId'];
listView.load(url);
moralMap.showPopupbox("#popup_box");
@@ -358,17 +373,22 @@
return;
}
var equ = {
+ methodName : 'showDeviceMonitor',
name: _obj['name'],
mac: (_obj['mac']).toLowerCase(),
longitude: _obj['longitude'],
latitude: _obj['latitude'],
+ monitorPointId: _obj['monitorPointId'],
version:_obj['deviceVersion']['version']
}
var equStr = JSON.stringify(equ);
if(window["console"]!=undefined){
console.log(equStr);
}
- if(window['external']&&window['external']['showMonitorInfo']){
+ if(!!window['external']&&window['external']['callWin']){
+ window['external'].callWin(equStr);
+ }else
+ if(!!window['external']&&window['external']['showMonitorInfo']){
window['external'].showMonitorInfo(equStr);
}else{
alert(equStr);
@@ -442,14 +462,25 @@
var url = 'get-devices-for-popup?name=' + param + "&orgId=" + params['orgId'];
listView.load(url);
}
- )
+ );
+ $("#searchParam").keydown(function (event) {
+ if(event.keyCode ==13) {
+ $("#searchBtn").trigger("click");
+ }
+ })
//������������������������������
$(".charts_btn").click(
function (e) {
- if(window['external']&&window['external']['showChartInfo']){
+ var obj = {};
+ obj['methodName'] = 'showChart';
+ var objStr = JSON.stringify(obj);
+ if(!!window['external']&&window['external']['callWin']){
+ window['external'].callWin(objStr);
+ }else
+ if(!!window['external']&&window['external']['showChartInfo']){
window['external'].showChartInfo("");
}else{
- alert("");
+ alert(objStr);
}
}
);
--
Gitblit v1.8.0