From fca9a405c53caeec1541f4b12865de2af319ee47 Mon Sep 17 00:00:00 2001
From: cshenfu <men883234@gmail.com>
Date: 星期四, 27 十月 2022 16:40:24 +0800
Subject: [PATCH] 更改15分钟提示
---
js/function.js | 1 +
data/getLayerListByUserid.json | 6 +++---
widgetsTS/dataTime/widget.js | 3 +++
js/changable_params.js | 1 +
js/function_1001.js | 3 +--
widgetsTS/taxiRouteReplay/view.js | 7 +------
js/function_1004.js | 2 ++
mobile/js/dataTime.js | 1 +
widgetsTS/taxi_layer_setting/widget.js | 1 +
widgetsTS/widget_grid/widget.js | 3 +++
widgetsTS/taxiRouteReplay/widget.js | 3 ++-
widgetsTS/widget_grid/view.js | 2 ++
12 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/data/getLayerListByUserid.json b/data/getLayerListByUserid.json
index 6872ed1..0ee1dff 100644
--- a/data/getLayerListByUserid.json
+++ b/data/getLayerListByUserid.json
@@ -231,7 +231,7 @@
"style_selected":"pm25",
"styleoptions": ["pm25", "pm10", "no", "no2", "nox", "co"],
"regiontype":"00",
- "minimumLevel":11,
+ "minimumLevel":8,
"maximumLevel":12,
"show":false,
"zIndex":6
@@ -247,8 +247,8 @@
"style_selected":"pm25",
"styleoptions": ["pm25", "pm10", "no", "no2", "nox", "co"],
"regiontype":"00",
- "minimumLevel":8,
- "maximumLevel":10,
+ "minimumLevel":6,
+ "maximumLevel":7,
"show":false,
"zIndex":7
diff --git a/js/changable_params.js b/js/changable_params.js
index 7d6d62d..cc589d3 100644
--- a/js/changable_params.js
+++ b/js/changable_params.js
@@ -149,6 +149,7 @@
grid = array[3]
}
}
+ console.log(grid,"grid")
return grid + "绫崇綉鏍� <br/><br /> grid_id锛�"+item["grid_id"]+
"<br />鏁版嵁鏃堕棿锛�" +
item["datatime"] +
diff --git a/js/function.js b/js/function.js
index ae05ce8..647b7a9 100644
--- a/js/function.js
+++ b/js/function.js
@@ -189,6 +189,7 @@
function addGraphictoHighlightLayer() {
mars3d.global_variables.tmpHighlightGraphics.forEach((item) => {
mars3d.global_variables.tmpHighlightGraphicLayer.addGraphic(item);
+ console.log(item,"楂樹寒")
});
}
diff --git a/js/function_1001.js b/js/function_1001.js
index c18d1ab..47f5818 100644
--- a/js/function_1001.js
+++ b/js/function_1001.js
@@ -7,6 +7,7 @@
function addWMSLayer(item) {
+ console.log(item,"鏌ョ湅griditem")
var wmsLyer = new mars3d.layer.WmsLayer({
id: item.id,
@@ -214,8 +215,6 @@
}
}
function timetype_change3(){
- console.log(mars3d,"mars3d");
- debugger;
if(mars3d.global_variables.timetype == "min"){
$(".menu3").attr('onclick'," "); //$("#鍚嶇О").attr("灞炴�у悕","灞炴�у��");
haoutil.msg("璇峰垏鎹㈣嚦澶╂垨鏃舵煡鐪嬫暟鎹紒锛侊紒");
diff --git a/js/function_1004.js b/js/function_1004.js
index f677a8e..f4686b6 100644
--- a/js/function_1004.js
+++ b/js/function_1004.js
@@ -12,6 +12,7 @@
function addTaxiLayer(item) {
+
taxi_layer = new mars3d.layer.GraphicLayer({
id: item.id,
name: item.name,
@@ -49,6 +50,7 @@
}
function setTaxiLayerMapClock() {
+ console.log(mars3d.global_variables.queryDataTStartTaxi,mars3d.global_variables.queryDataTEnd,"鏃堕棿")
map.clock.shouldAnimate = true;
map.clock.startTime = Cesium.JulianDate.fromDate(new Date(mars3d.global_variables.queryDataTStartTaxi));
map.clock.currentTime = Cesium.JulianDate.fromDate(new Date(mars3d.global_variables.queryDataTStartTaxi));
diff --git a/mobile/js/dataTime.js b/mobile/js/dataTime.js
index 38c2e83..24a16ad 100644
--- a/mobile/js/dataTime.js
+++ b/mobile/js/dataTime.js
@@ -120,6 +120,7 @@
//reLoadLayers();
//refreshWidgets();
});
+ console.log(this,"this setDate")
$("#appDateHour").datetimepicker("setDate", new Date(getDefaultDateTimeLocal()));
$('#appDateHour').datetimepicker('setEndDate', new Date(this.defaultDateTime));
}
diff --git a/widgetsTS/dataTime/widget.js b/widgetsTS/dataTime/widget.js
index 5a035a9..7935baa 100644
--- a/widgetsTS/dataTime/widget.js
+++ b/widgetsTS/dataTime/widget.js
@@ -102,6 +102,7 @@
mars3d.global_variables.queryDataTStartGeo = tmpDatetime;
mars3d.global_variables.queryDataType = value;
mars3d.global_variables.timetype = "hour";
+ console.log(mars3d.global_variables.queryDataTStart,"start",mars3d.global_variables.queryDataTEnd,"end",mars3d.global_variables.DefaultDateTimeStart,"涓�澶╃殑鏃堕棿")
reLoadLayers();
refreshWidgets();
timetype_change1();
@@ -115,6 +116,7 @@
$('#appDateHour').hide()
$('#appDate').show()
var tmpDatetime = $('#appDate').val() + " 00:00:00";
+
tmpDatetime = tmpDatetime.replace(/\:/g,"").replace(/-/g,"").replace(/\s+/g,"");
mars3d.global_variables.queryDataTStart = $('#appDate').val() + " 00:00:00";
mars3d.global_variables.queryDataTEnd = $('#appDate').val()+ " 00:15:00";
@@ -122,6 +124,7 @@
mars3d.global_variables.queryDataTStartGeo = tmpDatetime;
mars3d.global_variables.queryDataType = value;
mars3d.global_variables.timetype = "day";
+ console.log(tmpDatetime,mars3d.global_variables.queryDataTStart,mars3d.global_variables.queryDataTEnd ,mars3d.global_variables.DefaultDateTimeStart,"涓�澶╃殑鏃堕棿")
reLoadLayers();
refreshWidgets();
timetype_change1();
diff --git a/widgetsTS/taxiRouteReplay/view.js b/widgetsTS/taxiRouteReplay/view.js
index f8d3272..207c5b8 100644
--- a/widgetsTS/taxiRouteReplay/view.js
+++ b/widgetsTS/taxiRouteReplay/view.js
@@ -7,6 +7,7 @@
thisWidget = _thisWidget;
DatePicker("#appDateHourStart", '#appDateHourEnd');
+ console.log($("#appDateHourStart").val(),$('#appDateHourEnd').val(),"rywsjbh")
$("#appDateHourStart").datetimepicker("setDate", new Date(thisWidget.appDateHourStart));
$('#appDateHourEnd').datetimepicker('setDate', new Date(thisWidget.appDateHourEnd));
$("#taxisn").val(thisWidget.taxi_sn);
@@ -163,12 +164,6 @@
ev.stopPropagation();
var startTime = ev.date;
$(endSelector).datetimepicker('setStartDate',startTime);
- // $(endSelector).val("");
- // if (ev.date) {
- // $(endSelector).datetimepicker('setStartDate', new Date(ev.date.valueOf()))
- // } else {
- // $(endSelector).datetimepicker('setStartDate', null);
- // }
thisWidget.appDateHourStart = $(beginSelector).val();
})
$(endSelector).datetimepicker(
diff --git a/widgetsTS/taxiRouteReplay/widget.js b/widgetsTS/taxiRouteReplay/widget.js
index f9aa56d..7bfa563 100644
--- a/widgetsTS/taxiRouteReplay/widget.js
+++ b/widgetsTS/taxiRouteReplay/widget.js
@@ -220,7 +220,7 @@
//姣忎釜绐楀彛鍒涘缓瀹屾垚鍚庤皟鐢�
winCreateOK(opt, result) {
this.viewWindow = result;
- console.log(this.config.params,"this.taxi_sn")
+ console.log(this,"this.taxi_sn")
this.appDateHourStart = mars3d.global_variables.queryDataTStartTaxi;
this.appDateHourEnd = mars3d.global_variables.queryDataTEnd;
this.nodejs_url_predix = mars3d.global_variables.nodejs_url_predix;
@@ -230,6 +230,7 @@
}
//鎵撳紑婵�娲�
activate() {
+ console.log(this,"this detail")
this.map.addLayer(this.groupLayer);
this.map.clock.shouldAnimate = false;
this.old_map_clock_startTime = this.map.clock.startTime;
diff --git a/widgetsTS/taxi_layer_setting/widget.js b/widgetsTS/taxi_layer_setting/widget.js
index c80d2a8..ca82ad9 100644
--- a/widgetsTS/taxi_layer_setting/widget.js
+++ b/widgetsTS/taxi_layer_setting/widget.js
@@ -15,6 +15,7 @@
}
//鎵撳紑婵�娲�
activate() {
+ haoutil.oneMsg("绉诲姩鐩戞祴鐐瑰彧鍙煡璇㈠崄浜斿垎閽熻溅杈嗘暟鎹紒 锛� 锛�");
console.log(map,"mapmapmap")
map.viewer.animation.container.style.display = "block";
}
diff --git a/widgetsTS/widget_grid/view.js b/widgetsTS/widget_grid/view.js
index 72b7a6c..51512e9 100644
--- a/widgetsTS/widget_grid/view.js
+++ b/widgetsTS/widget_grid/view.js
@@ -65,6 +65,7 @@
$("#style_radio2 label").eq(5).html('<input type="radio" name="style_option2" value="co">CO');
$('input[type=radio][name=style_option]').change(function () {
+ console.log(this.value,"this.value grid")
thisWidget.update_grid_style(this.value);
});
$('input[type=radio][name=style_option2]').change(function () {
@@ -155,6 +156,7 @@
}
function addImageToMap(grid_item) {
+ console.log(grid_item,"grid_item")
if (grid_item.layer == null) {
grid_item.layer = new mars3d.layer.ImageLayer({
diff --git a/widgetsTS/widget_grid/widget.js b/widgetsTS/widget_grid/widget.js
index 07e79b4..91c675a 100644
--- a/widgetsTS/widget_grid/widget.js
+++ b/widgetsTS/widget_grid/widget.js
@@ -18,6 +18,7 @@
}
//鍒濆鍖朳浠呮墽琛�1娆
create() {
+
this.grid_500 = this.map.getLayerById(3000);
this.grid_1000 = this.map.getLayerById(3001);
this.grid_3000 = this.map.getLayerById(3002);
@@ -28,12 +29,14 @@
this.nodejs_url_predix = mars3d.global_variables.nodejs_url_predix;
this.heatmapGroupLayer = new mars3d.layer.GroupLayer({ id: 5000, pid: 50, name: "", show: false });
this.map.addLayer(this.heatmapGroupLayer);
+ console.log(this.grid_500,this.grid_5000,this.grid_3000,this,"grid this")
}
//姣忎釜绐楀彛鍒涘缓瀹屾垚鍚庤皟鐢�
winCreateOK(opt, result) {
+ console.log(this.map,"this.map.grid")
//this.grid_500.show = true;
//this.grid_1000.show = true;
//this.grid_3000.show = true;
--
Gitblit v1.9.1