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 | 76 +++++++++++++++++++++++++++++++++++--
1 files changed, 71 insertions(+), 5 deletions(-)
diff --git a/src/main/webapp/view/map.jsp b/src/main/webapp/view/map.jsp
index eaf7569..6fc278f 100644
--- a/src/main/webapp/view/map.jsp
+++ b/src/main/webapp/view/map.jsp
@@ -2,7 +2,7 @@
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
<%@page isELIgnored="false" %>
<%
- String version ="1.000003";
+ String version ="1.000004";
response.setHeader("Cache-Control","no-store");
response.setHeader("Pragrma","no-cache");
response.setDateHeader("Expires",0);
@@ -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;
@@ -105,7 +115,8 @@
float: right;
width: 70px;
height: 28px;
- line-height: 28px
+ line-height: 28px;
+ cursor:pointer;
}
.list {
@@ -236,9 +247,36 @@
.equ-data-box .equ-data-list li .grade01{color:#282828;background:url(/img/list_num_yellow.png) left top no-repeat}
.equ-data-box .equ-data-list li .grade02{background:url(/img/list_num_orange.png) left top no-repeat}
.equ-data-box .equ-data-list li .grade03{background:url(/img/list_num_red.png) left top no-repeat}
+.tools_box{
+ position: absolute;
+ height: 120px;
+ width: 400px;
+ right: 1px;
+ top: 20px;
+ z-index: 1;
+}
+ .tools_box .charts_btn {
+ position: relative;
+ float: right;
+ margin: 0;
+ border: 0;
+ height: 85px;
+ width: 85px;
+ 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-size: 70%;
+ }
</style>
<body>
<div class="main_body">
+ <div class="tools_box">
+ <div class="charts_btn">
+ </div>
+ </div>
<div class="search_box">
<button id="searchBtn" type="button">������</button>
<input id="searchParam"/>
@@ -268,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");
@@ -333,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);
@@ -417,7 +462,28 @@
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) {
+ 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(objStr);
+ }
+ }
+ );
//������������
})(jQuery);
--
Gitblit v1.8.0