From 1fa628054c0fa70f82b441eb1f2548ab52e13e02 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 31 Jul 2018 17:17:56 +0800
Subject: [PATCH] 卫星云图，修复
---
src/main/webapp/view/map.jsp | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/main/webapp/view/map.jsp b/src/main/webapp/view/map.jsp
index 24d95aa..60b70ab 100644
--- a/src/main/webapp/view/map.jsp
+++ b/src/main/webapp/view/map.jsp
@@ -13,6 +13,7 @@
<title></title>
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=rER1sgBIcQxkfNSlm2wmBGZGgEERrooM"></script>
<script type="text/javascript" src="/js/jquery.min.js"></script>
+ <script type="text/javascript" src="/js/utils.js"></script>
<script type="text/javascript">
if(typeof (JSON) == 'undefined'){
$.getScript("js/json2.js");
@@ -299,8 +300,13 @@
var moralMap = window.moralMap;
var params = $.parseJSON($("#mapParams").html());
moralMap['params'] = params;
+ var mapType = getUrlParam("mapType");
+ var mapOption = {};
+ if(!!mapType && !!eval(mapType)) {
+ mapOption["mapType"] = eval(mapType);
+ }
//������������������������������
- moralMap.mapInit(params["regionName"]);
+ moralMap.mapInit(params["regionName"],mapOption);
//������������
var listView =moralMap.initListView({id: "#equ_list",pageSize:12});
window["listView"] = listView;
@@ -390,10 +396,10 @@
if(window["console"]!=undefined){
console.log(equStr);
}
- if(!!window['external']&&window['external']['callWin']){
+ if(!!window['external']&&!!window['external']['callWin']){
window['external'].callWin(equStr);
}else
- if(!!window['external']&&window['external']['showMonitorInfo']){
+ if(!!window['external']&&!!window['external']['showMonitorInfo']){
window['external'].showMonitorInfo(equStr);
}else{
alert(equStr);
@@ -480,10 +486,10 @@
var obj = {};
obj['methodName'] = 'showChart';
var objStr = JSON.stringify(obj);
- if(!!window['external']&&window['external']['callWin']){
+ if(!!window['external']&&!!window['external']['callWin']){
window['external'].callWin(objStr);
}else
- if(!!window['external']&&window['external']['showChartInfo']){
+ if(!!window['external']&&!!window['external']['showChartInfo']){
window['external'].showChartInfo("");
}else{
alert(objStr);
--
Gitblit v1.8.0