From a633d467f4e7d4e0f10a5b9ba626cf8d642faf61 Mon Sep 17 00:00:00 2001
From: wangrong <wangrong@shsening.com>
Date: 星期五, 17 十二月 2021 17:02:27 +0800
Subject: [PATCH] 修复移动端地图加载
---
mobile/road_show.html | 5
/dev/null | 189 -----------------------------------------------
mobile/js/widget_search_view.js | 8 +-
mobile/road_search.html | 10 +-
js/index.js | 1
5 files changed, 10 insertions(+), 203 deletions(-)
diff --git a/js/index.js b/js/index.js
index 0403a83..b4de46c 100644
--- a/js/index.js
+++ b/js/index.js
@@ -17,7 +17,6 @@
//鏈夌埗绾�
request = $.extend(request, haoutil.system.getRequest(window.top));
}
-
try {
var jwtstr = request.JWT;
var strs_ = jwtstr.split('.');
diff --git a/mobile/js/changable_params.js b/mobile/js/changable_params.js
deleted file mode 100644
index 1f0cca5..0000000
--- a/mobile/js/changable_params.js
+++ /dev/null
@@ -1,53 +0,0 @@
-"use script"; //寮�鍙戠幆澧冨缓璁紑鍚弗鏍兼ā寮�
-//绯荤粺 鍔熻兘鍏ュ彛
-
-
-var allLayer_color_nodata = '#C0C0C0';
-var color_list_1001 = ['#0EE839', '#FEFE23', '#FD9D00', '#F70F0D', '#8A0B73', '#88041E'];
-var color_list_1002 = ['#0dd4f7', '#078901', '#FFFF00', '#fe7c23', '#F70F0D', '#88041E'];
-var color_list_1003 = ['#0EE839', '#FEFE23', '#F70F0D'];
-var color_list_1004_and_other = ['#0dd4f7', '#23fe9f', '#078901', '#d4fe23', '#FFFF00', '#febf23', '#fe7c23', '#F70F0D', '#8A0B73', '#88041E'];
-
-var qindex_range_list_1001 = { 'pm25': [35, 75, 115, 150, 250], 'pm10': [50, 150, 250, 350, 420], 'no2': [100, 200, 700, 1200, 2340], 'co': [5, 10, 35, 60, 90] };
-var qindex_range_list_1002 = { 'pm25': [10, 20, 50, 80, 100], 'pm10': [20, 50, 80, 150, 200], 'no2': [25, 50, 100, 150, 300], 'co': [0.5, 0.6, 0.8, 1, 1.5] };
-var qindex_range_list_1003 = { ' ': [1, 2], 'tsp': [0.2, 0.5] };
-var qindex_range_list_1004_and_other = { 'pm25': [15, 35, 50, 75, 150, 250, 350, 500, 700], 'pm10': [20, 50, 100, 150, 200, 300, 500, 800, 1000], 'no': [10, 30, 60, 100, 200, 500, 1000, 2000, 3500], 'no2': [20, 80, 110, 150, 200, 250, 300, 400, 500], 'nox': [80, 110, 130, 150, 200, 500, 1000, 2000, 5000], 'co': [0.2, 0.4, 0.6, 0.8, 1, 1.5, 2.5, 4, 6] };
-
-var all_layer_legends = {
- 1001: ['pm25', 'pm10', 'no2', 'co', 'so2']
- , 1002: ['pm25', 'pm10', 'no2', 'co', 'so2']
- , 1003: ['', 'tsp']
- , 1004: ['pm25', 'pm10', 'no2', 'co', 'no', 'nox']
- , 1005: ['pm25', 'pm10', 'no2', 'co', 'no', 'nox']
- , 1006: ['pm25', 'pm10', 'no2', 'co', 'no', 'nox']
- , 3001: ['pm25', 'pm10', 'no2', 'co', 'no', 'nox']
- , 3002: ['pm25', 'pm10', 'no2', 'co', 'no', 'nox']
- , 3003: ['pm25', 'pm10', 'no2', 'co', 'no', 'nox']
-}
-
-var echart_lines_color_list =
-{
- 1001: ['#00EE00', '#FF9F7F', '#FFD700', '#ff6600', '#ff0066']
- , 1002: ['#00EE00', '#FF9F7F', '#FFD700', '#ff6600', '#ff0066']
- , 1003: ['#00EE00']
- , 1004: ['#00EE00', '#FF9F7F', '#FFD700', '#ff6600', '#ff0066', '#ff6666']
- , 1005: ['#00EE00', '#FF9F7F', '#FFD700', '#ff6600', '#ff0066', '#ff6666']
- , 1006: ['#00EE00', '#FF9F7F', '#FFD700', '#ff6600', '#ff0066', '#ff6666']
- , 100600: ['#00EE00', '#FF9F7F', '#FFD700', '#ff6600', '#ff0066', '#ff6666']
- , 100601: ['#00EE00', '#FF9F7F', '#FFD700', '#ff6600', '#ff0066', '#ff6666']
- , 100602: ['#00EE00', '#FF9F7F', '#FFD700', '#ff6600', '#ff0066', '#ff6666']
- , 100603: ['#00EE00', '#FF9F7F', '#FFD700', '#ff6600', '#ff0066', '#ff6666']
- , 100604: ['#00EE00', '#FF9F7F', '#FFD700', '#ff6600', '#ff0066', '#ff6666']
- , 100605: ['#00EE00', '#FF9F7F', '#FFD700', '#ff6600', '#ff0066', '#ff6666']
- , 100607: ['#00EE00', '#FF9F7F', '#FFD700', '#ff6600', '#ff0066', '#ff6666']
- , 100610: ['#00EE00', '#FF9F7F', '#FFD700', '#ff6600', '#ff0066', '#ff6666']
- , 100611: ['#00EE00', '#FF9F7F', '#FFD700', '#ff6600', '#ff0066', '#ff6666']
- , 3001: ['#00EE00', '#FF9F7F', '#FFD700', '#ff6600', '#ff0066', '#ff6666']
- , 3002: ['#00EE00', '#FF9F7F', '#FFD700', '#ff6600', '#ff0066', '#ff6666']
- , 3003: ['#00EE00', '#FF9F7F', '#FFD700', '#ff6600', '#ff0066', '#ff6666']
-}
-
-var default_system_params = { geoserver_url_predix: 'http://58.246.27.194:7011/', nodejs_url_predix: 'http://58.246.27.194:7012/', userid: 2, queryDataType: 'hour', weathercitycode: '101020100', wind360: 0, windSpeed: 10, is_single_taxi_replaying: false,summary_topN_count :50};
-var default_grid_camerview = {grid5000:{"lat":30.306622,"lng":121.251151,"alt":180451,"heading":2,"pitch":-61},grid3000:{"lat":31.076898,"lng":121.418675,"alt":36483,"heading":2,"pitch":-61},grid1000:{"lat":31.216173,"lng":121.350382,"alt":8883,"heading":2,"pitch":-60}};
-
-
diff --git a/mobile/js/function_1001.js b/mobile/js/function_1001.js
deleted file mode 100644
index 3b718ea..0000000
--- a/mobile/js/function_1001.js
+++ /dev/null
@@ -1,189 +0,0 @@
-"use script"; //寮�鍙戠幆澧冨缓璁紑鍚弗鏍兼ā寮�
-//绯荤粺 鍔熻兘鍏ュ彛
-
-
-// for change color locally.
-var data_list_1001;
-
-
-function addWMSLayer(item) {
-
- var wmsLyer = new mars3d.layer.WmsLayer({
- id: item.id,
- pid: item.pid,
- name: item.name,
- type: "wms",
- url: mars3d.global_variables.geoserver_url_predix + "/geoserver/konglu_58/wms",
- layers: "konglu_58:" + item.geoname_prefix + mars3d.global_variables.queryDataType,
- crs: "EPSG:4326",
- parameters: {
- "styles": item.style_prefix + item.style_selected,
- "transparent": "true",
- "format": "image/png",
- "viewparams": "userid:" + mars3d.global_variables.userid +";regiontype:" + item.regiontype + ";datetime:" + mars3d.global_variables.queryDataTStartGeo
- },
- getFeatureInfoParameters: {
- feature_count: 10,
- "viewparams": "userid:" + mars3d.global_variables.userid +";regiontype:" + item.regiontype + ";datetime:" + mars3d.global_variables.queryDataTStartGeo
- },
- center: { "lat": 30.487351, "lng": 121.613269, "alt": 54033, "heading": 359, "pitch": -40 },
- noCenter: true,
- maxLength: 35000,
- //鍗曞嚮楂樹寒鍙婂叾鏍峰紡
- highlight: {
- type: "wallP",
- diffHeight: 300,
- material: mars3d.MaterialUtil.createMaterial(mars3d.MaterialType.LineFlow, {
- image: "img/textures/fence.png",
- color: "#ffff00",
- speed: 10, //閫熷害锛屽缓璁彇鍊艰寖鍥�1-100
- axisY: true,
- }),
- },
- show: item.show,
- geoname_prefix: item.geoname_prefix,
- style_prefix: item.style_prefix,
- style_selected: item.style_selected,
- style_options: item.styleoptions,
- regiontype:item.regiontype,
- flyTo: false
- });
-
-
- if (item.minimumLevel !=undefined){
- wmsLyer.options.minimumLevel = item.minimumLevel;
- wmsLyer.options.minimumTerrainLevel = item.minimumLevel;
- }
- if (item.maximumLevel !=undefined){
- wmsLyer.options.maximumLevel = item.maximumLevel;
- wmsLyer.options.maximumTerrainLevel = item.maximumLevel;
- }
-
-
- wmsLyer.bindPopup(bindPopupFunction);
-
- //鍗曞嚮浜嬩欢
- wmsLyer.on(mars3d.EventType.click, function (event) {
- console.log("鍗曞嚮浜嗙煝閲忔暟鎹紝鍏�" + event.features.length + "鏉�", event);
- var id = event.layer.options.id;
- var qindex = event.layer.options.style_selected;
- event.graphic.style.diffHeight = qindex == 'co' ? 10 * event.graphic.attr[qindex] : event.graphic.attr[qindex];
- //console.log(id, qindex, event.graphic.attr[qindex]);
- //console.log(getLayerPointColorByQindexandValue(id, qindex, event.graphic.attr[qindex]));
- //console.log(Cesium.Color.fromCssColorString(getLayerPointColorByQindexandValue(id, qindex, event.graphic.attr[qindex])))
- //event.graphic.style.material.uniforms.color = getLayerPointColorByQindexandValue(id, qindex, event.graphic.attr[qindex]);
- //event.graphic.style.material.uniforms.color = getLayerPointColorByQindexandValue(id, qindex, event.graphic.attr[qindex]);
- event.graphic.style.material = new mars3d.MaterialUtil.createMaterial(mars3d.MaterialType.LineFlow, {
- image: "img/textures/fence.png",
- color: getLayerPointColorByQindexandValue(id, qindex, event.graphic.attr[qindex]),
- speed: 10, //閫熷害锛屽缓璁彇鍊艰寖鍥�1-100
- axisY: true,
- })
- mars3d.global_variables.tmpHighlightGraphic = event.graphic;
- });
-
- map.addLayer(wmsLyer);
-
-}
-
-function addGuokongLayerDIV(item) {
-
- var guokongLayer = new mars3d.layer.DivLayer({
- id: item.id,
- pid: item.pid, //鍥惧眰绠＄悊 涓娇鐢紝鐖惰妭鐐筰d
- name: item.name,
- style_selected: item.style_selected,
- style_options: item.styleoptions,
- show: item.show,
- });
- map.addLayer(guokongLayer);
-
- guokongLayer.on(mars3d.EventType.click, function (event) {
- console.log("鐩戝惉layer锛屽崟鍑讳簡鐭㈤噺瀵硅薄", event);
- console.log(event.graphic)
- var item = event.graphic?.attr;
- //haoutil.msg('鍗曞嚮浜嗭細' + item['楂樻牎鍚嶇О'])
- mars3d.global_variables.tmpHighlightGraphic = event.graphic;
-
- });
-
- guokongLayer.bindPopup(bindPopupFunction);
-
- guokongLayer.changeColor = function () {
- guokongLayer.clear(true);
- addGuokongPointResutToLayer(this, data_list_1001);
- }
- // add 鍥芥帶鐐�
- getGuokongPointFromServer(guokongLayer);
-
-}
-
-function getGuokongPointFromServer(tmplayer) {
-
- $.getJSON(mars3d.global_variables.nodejs_url_predix + "dataapi/Bdata?bid=get_1001_list&datatype=" + mars3d.global_variables.queryDataType + "&datatime=" + mars3d.global_variables.queryDataTStart + "&qindex=pm25&pageno=1&pagesize=1000", (result) => {
- data_list_1001 = result.data.result;
- addGuokongPointResutToLayer(tmplayer, result.data.result);
- });
-
-}
-
-function addGuokongPointResutToLayer(tmplayer, items) {
- for (var i = 0, len = items.length; i < len; i++) {
- var item = items[i];
- var jd = item.lon;
- var wd = item.lat;
- var clr = getLayerPointColorByQindexandValue(tmplayer.options.id, tmplayer.options.style_selected, item[tmplayer.options.style_selected]);
- var graphic = new mars3d.graphic.DivLightPoint({
- position: Cesium.Cartesian3.fromDegrees(jd, wd),
- style: {
- color: clr,
- heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
- highlight: {
- type: "circleP",
- style: {
- radius: 2000,
- material: mars3d.MaterialUtil.createMaterial(mars3d.MaterialType.ScanLine, {
- color: new Cesium.Color(1.0, 1.0, 0.0, 1.0),
- speed: 10,
- }),
- clampToGround: true, //鏄惁璐村湴
- }
- }
- },
- show: true,
- attr: item,
- });
- tmplayer.addGraphic(graphic);
- }
-}
-
-
-
-function getLayerPointColorByQindexandValue(layerid, qindex, value) {
-
- if (!value || value == null || value == 'null') {
- return allLayer_color_nodata;
- }
- if (layerid == 1001) {
- return getColorByListandValue(qindex_range_list_1001, color_list_1001, qindex, value);
- } else if (layerid == 1002) {
- return getColorByListandValue(qindex_range_list_1002, color_list_1002, qindex, value);
- } else if (layerid == 1003) {
- return getColorByListandValue(qindex_range_list_1003, color_list_1003, qindex, value);
- } else {
- return getColorByListandValue(qindex_range_list_1004_and_other, color_list_1004_and_other, qindex, value);
- }
-}
-
-function getColorByListandValue(rangList, colorList, tmpQindex, tmpValue) {
- for (var key in rangList) {
- if (key == tmpQindex) {
- for (let i = rangList[key].length; i > -1; i--) {
- if (tmpValue > rangList[key][i]) {
- return colorList[i + 1];
- }
- }
- }
- }
- return colorList[0];
-}
\ No newline at end of file
diff --git a/mobile/js/widget_search_view.js b/mobile/js/widget_search_view.js
index fdbed7d..83ed7ef 100644
--- a/mobile/js/widget_search_view.js
+++ b/mobile/js/widget_search_view.js
@@ -90,8 +90,8 @@
datatime_ = document.getElementById("appDateHour").value;
querytype_ = 'hour';
}
- var backend_url = default_system_params.nodejs_url_predix + "dataapi/Bdata?bid=get_" + current_selected_monitor_type + "_list_keyword&datatype=" + querytype_ + "&datatime=" + datatime_ + "&qindex=" + current_selected_monitor_qindex + "&keyword=" + current_selected_monitor_keyword + "&pageno=1&pagesize=10";
var avgnam = 50; //姣忛〉鏄剧ず涓暟
+ var backend_url = default_system_params.nodejs_url_predix + "dataapi/Bdata?bid=get_" + current_selected_monitor_type + "_list_keyword&datatype=" + querytype_ + "&datatime=" + datatime_ + "&qindex=" + current_selected_monitor_qindex + "&keyword=" + current_selected_monitor_keyword + "&pageno="+page+"&pagesize="+avgnam;
$.ajax({
type: "GET",
url: backend_url,
@@ -110,11 +110,11 @@
haoutil.msg("鏃犳煡璇㈢粨鏋滐紝璇锋洿鎹㈡煡璇㈡潯浠讹紒")
return;
}
- var newsTotalNum = data.data.result.length; //璁板綍鐨勬�绘潯鏁�
+ var newsTotalNum = data.data.counter.counter; //璁板綍鐨勬�绘潯鏁�
var pageNum = Math.ceil(newsTotalNum / avgnam); //鍒嗛〉鐨勬�婚〉鏁�
- for (var i = ((page - 1) * 50); i < (page * 50) && i < newsTotalNum; i++) {
- var j = i + 1;
+ for (var i = 0; i < avgnam; i++) {
+ var j = (page-1)*avgnam + i + 1;
var topObj = tableData[i];
for (var key in topObj) {
if (topObj[key] == null || topObj[key] == 'null' || topObj[key] == undefined || topObj[key] == 'undefined') {
diff --git a/mobile/road_search.html b/mobile/road_search.html
index 52d514f..3bf84d1 100644
--- a/mobile/road_search.html
+++ b/mobile/road_search.html
@@ -21,8 +21,7 @@
<meta name="apple-mobile-web-app-title" content="鐏槦绉戞妧 MarsGIS" />
<!--绗笁鏂筶ib-->
- <script type="text/javascript" src="../lib/include-lib.js?time=20210803" libpath="../lib/"
- include="jquery,jquery.range,bootstrap,bootstrap-checkbox,font-awesome,web-icons,layer,haoutil,localforage,nprogress,toastr,admui,turf,mars3d,mars3d-widget,mars3d-wind"></script>
+ <script type="text/javascript" src="../lib/include-lib.js?time=20210803" libpath="../lib/" include="jquery,jquery.range,bootstrap,bootstrap-checkbox,font-awesome"></script>
<link href="../css/style.css" rel="stylesheet" />
<link href="../lib/bootstrap/css/bootstrap.min.css" rel="stylesheet" />
<link href="../lib/bootstrap/bootstrap-datepicker/bootstrap-datetimepicker.css" rel="stylesheet" />
@@ -32,9 +31,10 @@
<link href="css/dataTime.css" rel="stylesheet" />
<link href="css/widget_search.css" rel="stylesheet" />
- <script type="text/javascript" src="js/changable_params.js"></script>
-
+ <script type="text/javascript" src="../js/changable_params.js"></script>
<script type="text/javascript" src="js/widget_search.js"></script>
+ <script type="text/javascript" src="../js/function_1001.js"></script>
+
<style>
.datetimepicker {
right: 0;
@@ -81,8 +81,6 @@
<!--閫夋嫨鏃堕棿 缁撴潫-->
<!--閬撹矾鏌ヨ 寮�濮�-->
- <script type="text/javascript" src="js/changable_params.js"></script>
- <script type="text/javascript" src="js/function_1001.js"></script>
<div id="searchDiv" class="searchDiv">
<span style="color: #fff;">鍏抽敭瀛楋細</span>
<input style="flex: 1;" type="text" id="search" class="input_keyword" placeholder="璇疯緭鍏ュ叧閿瓧锛屽彲涓虹┖">
diff --git a/mobile/road_show.html b/mobile/road_show.html
index b7b074a..a04557e 100644
--- a/mobile/road_show.html
+++ b/mobile/road_show.html
@@ -18,7 +18,7 @@
<link rel="icon" sizes="192x192" href="img/favicon/apple-touch-icon.png" />
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="black" />
- <meta name="apple-mobile-web-app-title" content="鐏槦绉戞妧 MarsGIS" />
+ <meta name="apple-mobile-web-app-title" content="MarsGIS" />
<!--绗笁鏂筶ib-->
<script type="text/javascript" src="../lib/include-lib.js?time=20210803" libpath="../lib/"
@@ -32,7 +32,7 @@
<link rel="stylesheet" href="css/ol.css" type="text/css">
<link href="css/dataTime.css" rel="stylesheet" />
- <script type="text/javascript" src="js/changable_params.js"></script>
+ <script type="text/javascript" src="../js/changable_params.js"></script>
<style>
* {
padding: 0;
@@ -263,7 +263,6 @@
</style>
<script src="js/ol.js" type="text/javascript"></script>
- <script src="js/changable_params.js" type="text/javascript"></script>
</head>
--
Gitblit v1.9.1