From 6ef0b98edd9915b321566801a17376a45ef145c4 Mon Sep 17 00:00:00 2001
From: qinbo <qinbo@shsening.com>
Date: 星期二, 28 九月 2021 17:59:46 +0800
Subject: [PATCH] Merge branch 'master' of http://www.shsening.com:10000/r/template/shanghai
---
js/function.js | 88 ++--------
data/getLayerListByUserid.json | 8
widgetsTS/dataTime/widget.js | 8
js/function_wind.js | 11 +
widgets/manageLayers_style/view.js | 2
js/function_1001.js | 219 +++++++++++++++++++++++----
js/function_1004.js | 97 ++++++++++-
js/index.js | 2
8 files changed, 309 insertions(+), 126 deletions(-)
diff --git a/data/getLayerListByUserid.json b/data/getLayerListByUserid.json
index 7f14744..1bdcd5d 100644
--- a/data/getLayerListByUserid.json
+++ b/data/getLayerListByUserid.json
@@ -20,7 +20,7 @@
"geoname_prefix":"vis_weizhan_",
"style_prefix":"point_weizhan_",
"style_selected":"pm25",
- "styleoptions": ["pm25", "pm10", "no", "no2", "nox", "co"],
+ "styleoptions": ["pm25", "pm10","no2", "co"],
"show":false
},
{
@@ -30,8 +30,8 @@
"type": "wms",
"geoname_prefix":"vis_jiance_",
"style_prefix":"point_jiance_",
- "style_selected":"pm25",
- "styleoptions": ["pm25", "pm10", "no", "no2", "nox", "co"],
+ "style_selected":"tsp",
+ "styleoptions": ["tsp"],
"show":false
},
{
@@ -43,7 +43,7 @@
"style_prefix":"",
"style_selected":"pm25",
"styleoptions": ["pm25", "pm10", "no", "no2", "nox", "co"],
- "show":false
+ "show":true
},
{
"id": 1005,
diff --git a/js/function.js b/js/function.js
index 440288f..b2d5b02 100644
--- a/js/function.js
+++ b/js/function.js
@@ -45,6 +45,9 @@
mars3d.global_variables.queryDataTStart = getDefaultDateTime();
mars3d.global_variables.queryDataTStartGeo = getDefaultDateTimeGeo();
mars3d.global_variables.queryDataTEnd = getDefaultDateTimeEnd();
+// for tmp hight light graphic and
+//mars3d.global_variables.tmpHighlightGraphic;
+//mars3d.global_variables.tmpHighlightGraphicLayer;
@@ -52,6 +55,8 @@
//addMaskShanghai();
addTDTAnnoLayer();
+ addHighlightLayerClearButton();
+ addTmpHighlightGraphicLayer();
//TODO
$.getJSON("data/getLayerListByUserid.json", { userid: mars3d.global_variables.userid }, (result) => {
@@ -71,71 +76,7 @@
}
-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 + ";datatime:" + mars3d.global_variables.queryDataTStartGeo
- },
- center: { "lat": 30.487351, "lng": 121.613269, "alt": 54033, "heading": 359, "pitch": -40 },
- noCenter: true,
- maxLength: 35000,
- getFeatureInfoParameters: {
- feature_count: 10
- },
- //鍗曞嚮楂樹寒鍙婂叾鏍峰紡
- 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,
- }),
- },
- popup: "all",
- show: item.show,
- geoname_prefix: item.geoname_prefix,
- style_prefix: item.style_prefix,
- style_selected:item.style_selected,
- style_options: item.styleoptions,
- flyTo: false
- });
-
- //鍗曞嚮浜嬩欢
- wmsLyer.on(mars3d.EventType.click, function (event) {
- console.log("鍗曞嚮浜嗙煝閲忔暟鎹紝鍏�" + event.features.length + "鏉�", event);
- console.log(event.layer.options.style_selected);
-
-
- console.log(event.graphic);
- /*
- event.graphic.style.diffHeight =
-
- diffHeight: 300,
- material: mars3d.MaterialUtil.createMaterial(mars3d.MaterialType.LineFlow, {
- image: "img/textures/fence.png",
- color: "#ffff00",
- speed: 10, //閫熷害锛屽缓璁彇鍊艰寖鍥�1-100
- axisY: true,
- }),
- */
- });
-
- map.addLayer(wmsLyer);
-
-}
function reLoadLayers() {
var layers = map.getLayers({ layers: true });
@@ -156,8 +97,8 @@
var tmpTaxi = map.getLayerById(1004);
tmpTaxi.clear(true);
setTaxiLayerMapClock();
- for (var i = 0, len = taxi_data_list.length; i < len; i++) {
- addTaxiPathToLayer(taxi_data_list[i], tmpTaxi);
+ for (var i = 0, len = data_list_1004.length; i < len; i++) {
+ getTaxiPathFromServerbySN(data_list_1004[i], tmpTaxi);
}
}
@@ -168,7 +109,22 @@
function refreshWidgets() {
}
+function addGraphictoHighlightLayer() {
+ mars3d.global_variables.tmpHighlightGraphicLayer.addGraphic(mars3d.global_variables.tmpHighlightGraphic);
+
+}
+function addHighlightLayerClearButton() {
+ let clearButton = new mars3d.control.ToolButton({
+ title: "clearHighlightLayer",
+ icon: "fa fa-crop",
+ insertIndex: 1, //鎻掑叆鐨勪綅缃『搴�, 1鏄痟ome鎸夐挳鍚庨潰
+ click: (event) => {
+ mars3d.global_variables.tmpHighlightGraphicLayer.clear(true);
+ },
+ });
+ map.addControl(clearButton);
+}
function showDetail(layerid, itemCode) {
haoutil.msg('鍗曞嚮浜嗭細' + layerid + ',' + itemCode);
diff --git a/js/function_1001.js b/js/function_1001.js
index 6097328..1b07f7b 100644
--- a/js/function_1001.js
+++ b/js/function_1001.js
@@ -1,36 +1,96 @@
"use script"; //寮�鍙戠幆澧冨缓璁紑鍚弗鏍兼ā寮�
//绯荤粺 鍔熻兘鍏ュ彛
-var guokong_color_list = ['#0EE839', '#FEFE23', '#FD9D00', '#F70F0D', '#8A0B73', '#88041E'];
-var guokong_color_nodata = '#C0C0C0';
-var guokong_qindex_color_list = { '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 guokong_data_list;
+
+var allLayer_color_nodata = '#C0C0C0';
+var color_list_1001 = ['#0EE839', '#FEFE23', '#FD9D00', '#F70F0D', '#8A0B73', '#88041E'];
+var color_list_1002 = ['#0EE839', '#FEFE23', '#F70F0D'];
+var color_list_1003 = ['#0dd4f7', '#078901', '#FFFF00', '#fe7c23', '#F70F0D', '#88041E'];
+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 = { 'tsp': [0.2, 0.5] };
+var qindex_range_list_1003 = { '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_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] };
+// for change color locally.
+var data_list_1001;
-function addGuokongLayerDIV(item) {
+function addWMSLayer(item) {
- var guokongLayer = new mars3d.layer.DivLayer({
+ var wmsLyer = new mars3d.layer.WmsLayer({
id: item.id,
- pid: item.pid, //鍥惧眰绠＄悊 涓娇鐢紝鐖惰妭鐐筰d
+ 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 + ";datatime:" + mars3d.global_variables.queryDataTStartGeo
+ },
+ center: { "lat": 30.487351, "lng": 121.613269, "alt": 54033, "heading": 359, "pitch": -40 },
+ noCenter: true,
+ maxLength: 35000,
+ getFeatureInfoParameters: {
+ feature_count: 10
+ },
+ //鍗曞嚮楂樹寒鍙婂叾鏍峰紡
+ 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,
- show: item.show
+ flyTo: false
});
- map.addLayer(guokongLayer);
+ wmsLyer.bindPopup(bindPopupFunction);
- guokongLayer.on(mars3d.EventType.click, function (event) {
- console.log("鐩戝惉layer锛屽崟鍑讳簡鐭㈤噺瀵硅薄", event);
- console.log(event.graphic?.attr)
- var item = event.graphic?.attr;
- //haoutil.msg('鍗曞嚮浜嗭細' + item['楂樻牎鍚嶇О'])
+ //鍗曞嚮浜嬩欢
+ 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;
});
- guokongLayer.bindPopup(function (event) {
- let item = event.graphic?.attr;
- //console.log(item);
- var html =
- "绔欑偣缂栧彿锛�" +
+ map.addLayer(wmsLyer);
+
+}
+
+function bindPopupFunction(event) {
+
+ let layerid = event.layer.options.id;
+ let item = event.graphic?.attr;
+ if (!item) {
+ return "";
+ }
+ if (layerid == 1001) {
+ return "绔欑偣缂栧彿锛�" +
item["code"] +
"<br />绔欑偣鍚嶇О锛�" +
item["name"] +
@@ -46,16 +106,93 @@
item["CO"] + "ug/m3" +
"<br />SO2:" +
item["SO2"] + "ug/m3" +
- "<br /><br /><p><a href='#' onclick='javascript:showDetail(1001,\"" + item["code"] + "\")' >璇︾粏淇℃伅</a></p>";
- return html;
+ "<br /><br /><p><a href='#' onclick='javascript:showDetail(1001,\"" + item["code"] + "\")' >璇︾粏淇℃伅</a><a href='#' onclick='javascript:addGraphictoHighlightLayer()' >淇濇寔楂樹寒鏄剧ず</a></p>";
+ } else if (layerid == 1002) {
+ return "绔欑偣缂栧彿锛�" +
+ item["code"] +
+ "<br />绔欑偣鍚嶇О锛�" +
+ item["name"] +
+ "<br />鏁版嵁鏃堕棿锛�" +
+ item["datatime"] +
+ "<br />PM2.5:" +
+ item["PM25"] + "ug/m3" +
+ "<br />PM10:" +
+ item["PM10"] + "ug/m3" +
+ "<br />NO2:" +
+ item["NO2"] + "ug/m3" +
+ "<br />CO:" +
+ item["CO"] + "ug/m3" +
+ "<br />SO2:" +
+ item["SO2"] + "ug/m3" +
+ "<br /><br /><p><a href='#' onclick='javascript:showDetail(1002,\"" + item["code"] + "\")' >璇︾粏淇℃伅</a><a href='#' onclick='javascript:addGraphictoHighlightLayer()' >淇濇寔楂樹寒鏄剧ず</a></p>";
+
+ } else if (layerid == 1003) {
+ return "绔欑偣缂栧彿锛�" +
+ item["code"] +
+ "<br />绔欑偣鍚嶇О锛�" +
+ item["name"] +
+ "<br />鏁版嵁鏃堕棿锛�" +
+ item["datatime"] +
+ "<br />PM2.5:" +
+ item["PM25"] + "ug/m3" +
+ "<br />PM10:" +
+ item["PM10"] + "ug/m3" +
+ "<br />NO2:" +
+ item["NO2"] + "ug/m3" +
+ "<br />CO:" +
+ item["CO"] + "ug/m3" +
+ "<br />SO2:" +
+ item["SO2"] + "ug/m3" +
+ "<br /><br /><p><a href='#' onclick='javascript:showDetail(1003,\"" + item["code"] + "\")' >璇︾粏淇℃伅</a><a href='#' onclick='javascript:addGraphictoHighlightLayer()' >淇濇寔楂樹寒鏄剧ず</a></p>";
+
+ } else {
+
+ return "绔欑偣缂栧彿锛�" +
+ item["code"] +
+ "<br />绔欑偣鍚嶇О锛�" +
+ item["name"] +
+ "<br />鏁版嵁鏃堕棿锛�" +
+ item["datatime"] +
+ "<br />PM2.5:" +
+ item["PM25"] + "ug/m3" +
+ "<br />PM10:" +
+ item["PM10"] + "ug/m3" +
+ "<br />NO2:" +
+ item["NO2"] + "ug/m3" +
+ "<br />CO:" +
+ item["CO"] + "ug/m3" +
+ "<br />SO2:" +
+ item["SO2"] + "ug/m3" +
+ "<br /><br /><p><a href='#' onclick='javascript:showDetail(" + layerid + ",\"" + item["code"] + "\")' >璇︾粏淇℃伅</a><a href='#' onclick='javascript:addGraphictoHighlightLayer()' >淇濇寔楂樹寒鏄剧ず</a></p>";
+ }
+
+
+}
+
+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?.attr)
+ var item = event.graphic?.attr;
+ //haoutil.msg('鍗曞嚮浜嗭細' + item['楂樻牎鍚嶇О'])
});
+ guokongLayer.bindPopup(bindPopupFunction);
+
guokongLayer.changeColor = function () {
-
guokongLayer.clear(true);
-
- addGuokongPointResutToLayer(this, guokong_data_list);
-
+ addGuokongPointResutToLayer(this, data_list_1001);
}
// add 鍥芥帶鐐�
getGuokongPointFromServer(guokongLayer);
@@ -65,7 +202,7 @@
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) => {
- guokong_data_list = result.data.result;
+ data_list_1001 = result.data.result;
addGuokongPointResutToLayer(tmplayer, result.data.result);
});
@@ -76,7 +213,7 @@
var item = items[i];
var jd = item.lon;
var wd = item.lat;
- var clr = getGuokongPointColor(tmplayer.options.style_selected, item[(tmplayer.options.style_selected).toUpperCase()]);
+ var clr = getLayerPointColorByQindexandValue(tmplayer.options.id, tmplayer.options.style_selected, item[(tmplayer.options.style_selected).toUpperCase()]);
var graphic = new mars3d.graphic.DivLightPoint({
position: Cesium.Cartesian3.fromDegrees(jd, wd),
style: {
@@ -102,19 +239,31 @@
}
-
-function getGuokongPointColor(qindex, value) {
+function getLayerPointColorByQindexandValue(layerid, qindex, value) {
if (!value || value == null || value == 'null') {
- return guokong_color_nodata;
+ return allLayer_color_nodata;
}
- for (var key in guokong_qindex_color_list) {
- if (key == qindex) {
- for (let i = guokong_qindex_color_list[key].length; i > -1; i--) {
- if (value > guokong_qindex_color_list[key][i]) {
- return guokong_color_list[i + 1];
+ 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 allLayer_color_nodata;
}
\ No newline at end of file
diff --git a/js/function_1004.js b/js/function_1004.js
index 696cdcb..eb75b95 100644
--- a/js/function_1004.js
+++ b/js/function_1004.js
@@ -1,19 +1,22 @@
"use script"; //寮�鍙戠幆澧冨缓璁紑鍚弗鏍兼ā寮�
//绯荤粺 鍔熻兘鍏ュ彛
-var taxi_data_list;
+var data_list_1004;
+var data_list_1004_paths = new Map();
+var taxi_layer;
+
function addTaxiLayer(item) {
- var taxi_layer = new mars3d.layer.GraphicLayer({
+ taxi_layer = new mars3d.layer.GraphicLayer({
id: item.id,
name: item.name,
pid: item.pid, //鍥惧眰绠＄悊 涓娇鐢紝鐖惰妭鐐筰d
center: { "lat": 30.62156, "lng": 121.44918, "alt": 48716, "heading": 359, "pitch": -40 },
noCenter: true,
- style_selected:item.style_selected,
+ style_selected: item.style_selected,
style_options: item.styleoptions,
- show: true,
+ show: item.show,
onWidget: "widgetsTS/taxi_layer_setting/widget.js",
});
map.addLayer(taxi_layer);
@@ -49,17 +52,17 @@
return html;
});
- getTaxiListByUserId(taxi_layer);
+ getTaxiListFromServerByUserId(taxi_layer);
}
-function getTaxiListByUserId(tmpLayer) {
+function getTaxiListFromServerByUserId(tmpLayer) {
setTaxiLayerMapClock();
$.getJSON(mars3d.global_variables.nodejs_url_predix + "dataapi/Bdata?bid=get_1004_list_by_userid&userid=" + mars3d.global_variables.userid, (result) => {
- taxi_data_list = result.data.result;
+ data_list_1004 = result.data.result;
for (var i = 0, len = result.data.result.length; i < len; i++) {
let item = result.data.result[i];
- addTaxiPathToLayer(item, tmpLayer);
+ getTaxiPathFromServerbySN(item, tmpLayer);
}
});
@@ -70,10 +73,58 @@
map.clock.startTime = Cesium.JulianDate.fromDate(new Date(mars3d.global_variables.queryDataTStart));
map.clock.currentTime = Cesium.JulianDate.fromDate(new Date(mars3d.global_variables.queryDataTStart));
map.clock.stopTime = Cesium.JulianDate.fromDate(new Date(mars3d.global_variables.queryDataTEnd));
- map.clock.multiplier = 5.0;
+ map.clock.multiplier = 2.0;
map.clock.clockRange = Cesium.ClockRange.LOOP_STOP;
+
+ var last_time_second = 0;
+
+
+ map.on(mars3d.EventType.clockTick, function (event) {
+
+ var current_date = new Date(Cesium.JulianDate.toDate(event._currentTime));
+
+ if (current_date.getSeconds() != last_time_second) {
+ last_time_second = current_date.getSeconds();
+ changeTaxiLayerStyleAndAttr(getFormattedDateTime(current_date));
+
+ }
+
+ });
}
-function addTaxiPathToLayer(item, target_layer) {
+
+function changeTaxiLayerStyleAndAttr(current_date) {
+
+ var tmpattr;
+ //current_date = "2021-07-01 00:00:32";
+ taxi_layer.eachGraphic(function (item) {
+ tmpattr = getTaxiAttrFromTimeListData(current_date, data_list_1004_paths.get(item.options.id));
+ //console.log(tmpattr);
+ if (tmpattr && tmpattr != null) {
+ //item.options.attr = tmpattr;
+
+ item.setOptions({
+ attr: tmpattr,
+ style: {
+ label: {
+ color: getLayerPointColorByQindexandValue(1004, item._layer.options.style_selected, tmpattr[item._layer.options.style_selected]),
+ }
+ }
+ })
+ //item.options.style.label.color = getLayerPointColorByQindexandValue(1004, item._layer.options.style_selected, tmpattr[item._layer.options.style_selected]);
+ //console.log('color has been changed.' + item.options.id);
+ }
+
+ });
+}
+function getTaxiAttrFromTimeListData(datetime, datalist) {
+ for (var i = 0; i < datalist.length; i++) {
+ if (datalist[i]["datatime"] == datetime) {
+ return datalist[i];
+ }
+ }
+}
+
+function getTaxiPathFromServerbySN(item, target_layer) {
$.getJSON(mars3d.global_variables.nodejs_url_predix + "dataapi/Bdata?bid=get_1004_single_path&siteid=" + item["code"], {
datatime1: mars3d.global_variables.queryDataTStart,
@@ -81,6 +132,8 @@
}, (result) => {
if (result.data.result.length > 0) {
+ // 淇濆瓨涓存椂鏁版嵁锛屼负鍚庣画鏇挎崲棰滆壊鍋氬噯澶囥��
+ data_list_1004_paths.set(result.data.result[0].code, result.data.result);
var tmpPositionProperty = new Cesium.SampledPositionProperty();
for (var i = 0, len = result.data.result.length; i < len; i++) {
let item = result.data.result[i];
@@ -89,9 +142,10 @@
}
let graphic = new mars3d.graphic.ModelEntity({
+ id: result.data.result[0].code,
attr: result.data.result[0],
style: {
- url: "gltf/" + (item["code"]).substring(0, 2) + ".gltf",
+ url: "gltf/" + (result.data.result[0]["code"]).substring(0, 2) + ".gltf",
scale: 0.5,
minimumPixelSize: 20,
highlight: {
@@ -102,7 +156,7 @@
},
label: {
//涓嶉渶瑕佹枃瀛楁椂锛屽幓鎺塴abel閰嶇疆鍗冲彲
- text: item["code"],
+ text: result.data.result[0]["code"],
font_size: 16,
// TODO need to be changed according to qindex color.
color: "#ff00ff",
@@ -111,7 +165,7 @@
pixelOffsetY: -20,
distanceDisplayCondition: true,
distanceDisplayCondition_far: 50000,
- distanceDisplayCondition_near: 0,
+ distanceDisplayCondition_near: 100,
},
},
});
@@ -119,4 +173,21 @@
target_layer.addGraphic(graphic);
}
});
+}
+
+function getFormattedDateTime(date) {
+
+ var year = date.getFullYear();//骞�
+ var month = date.getMonth();//鏈�
+ var day = date.getDate();//鏃�
+ var hours = date.getHours();//鏃�
+ var mins = date.getMinutes();//鍒�
+ var seconds = date.getSeconds();//绉�
+
+ return date.getFullYear() + "-" +
+ ((month + 1) > 9 ? (month + 1) : "0" + (month + 1)) + "-" +
+ (day > 9 ? day : ("0" + day)) + " " +
+ (hours > 9 ? hours : ("0" + hours)) + ":" +
+ (mins > 9 ? mins : ("0" + mins)) + ":" +
+ (seconds > 9 ? seconds : ("0" + seconds));
}
\ No newline at end of file
diff --git a/js/function_wind.js b/js/function_wind.js
index 0e3500f..2a2ca64 100644
--- a/js/function_wind.js
+++ b/js/function_wind.js
@@ -108,7 +108,16 @@
Vec_annoTileLayer.pid = 50;
map.addLayer(Vec_annoTileLayer);
}
-
+function addTmpHighlightGraphicLayer() {
+ mars3d.global_variables.tmpHighlightGraphicLayer = new mars3d.layer.GraphicLayer({
+ name: "涓存椂楂樹寒鍥惧眰",
+ pid: 50, //鍥惧眰绠＄悊 涓娇鐢紝鐖惰妭鐐筰d
+ noCenter: true,
+ popup: "all",
+ show: true
+ });
+ map.addLayer(mars3d.global_variables.tmpHighlightGraphicLayer);
+}
function addMaskShanghai() {
//geojson 鍚堣偉杈圭晫绾�
geoJsonLayer = new mars3d.layer.GeoJsonLayer({
diff --git a/js/index.js b/js/index.js
index 59efba6..1b60270 100644
--- a/js/index.js
+++ b/js/index.js
@@ -18,6 +18,8 @@
request = $.extend(request, haoutil.system.getRequest(window.top));
}
+ mars3d.global_variables.userid = request?.userid || 2;
+
var configfile = "config/config.json"; //榛樿鍦板潃
if (request.config) {
//url浼犲叆鍦板潃
diff --git a/widgets/manageLayers_style/view.js b/widgets/manageLayers_style/view.js
index 214c1f8..0126e36 100644
--- a/widgets/manageLayers_style/view.js
+++ b/widgets/manageLayers_style/view.js
@@ -299,6 +299,8 @@
}else if (layer.options.id =1001){
layer.options.style_selected = this.value;
layer.changeColor();
+ }else if (layer.options.id =1004){
+ layer.options.style_selected = this.value;
}
//TODO
});
diff --git a/widgetsTS/dataTime/widget.js b/widgetsTS/dataTime/widget.js
index ad28934..81b2b71 100644
--- a/widgetsTS/dataTime/widget.js
+++ b/widgetsTS/dataTime/widget.js
@@ -54,13 +54,7 @@
create() {
this.defaultDate = getDefaultDateLocal();
this.defaultDateTime = getDefaultDateTimeLocal();
- // 鍒濆鍖� 鍙傛暟
- let request = haoutil.system.getRequest();
-
- if (window.top) {
- request = $.extend(request, haoutil.system.getRequest(window.top));
- }
- mars3d.global_variables.userid = request?.userid || 2;
+
}
//姣忎釜绐楀彛鍒涘缓瀹屾垚鍚庤皟鐢�
--
Gitblit v1.9.1