From a3edf279a91d6b1791221ea9d3a69e43409915af Mon Sep 17 00:00:00 2001
From: zhaoxing <zhaoxing@shsening.com>
Date: 星期五, 21 十月 2022 15:19:35 +0800
Subject: [PATCH] 添加黑地图，轨迹查询自动变成车号，车辆出上海边界不显示
---
js/function.js | 2 +-
widgetsTS/widget_search/widget.js | 6 +++---
js/changable_params.js | 8 +++++++-
widgetsTS/taxiRouteReplay/view.js | 8 ++++++--
js/function_1004.js | 3 ---
widgetsTS/taxiRouteReplay/widget.js | 7 +++++--
config/config.json | 8 ++++++++
widgetsTS/widget_summary/widget.js | 6 +++---
8 files changed, 33 insertions(+), 15 deletions(-)
diff --git a/config/config.json b/config/config.json
index 92e5486..8f7d8bc 100644
--- a/config/config.json
+++ b/config/config.json
@@ -85,6 +85,14 @@
{ "name": "搴曞浘", "type": "tdt", "layer": "vec_d", "key": ["51915011aa0997aa2ddd7e38504fa8bc"] }
],
"zIndex": 0
+ },
+ {
+ "pid": 10,
+ "name": "榛戣壊搴曞浘",
+ "icon": "/img/basemaps/bd-c-dark.png",
+ "type": "tencent",
+ "layer": "custom",
+ "style": "4"
}
],
"layers": [
diff --git a/js/changable_params.js b/js/changable_params.js
index 1b9a2d1..468c86e 100644
--- a/js/changable_params.js
+++ b/js/changable_params.js
@@ -57,15 +57,21 @@
var default_grid_camerview = {grid5000:{"lat":30.367931,"lng":121.518409,"alt":128482,"heading":2,"pitch":-57},grid3000:{"lat":30.902475,"lng":121.487751,"alt":38716,"heading":2,"pitch":-57},grid1000:{"lat":31.066346,"lng":121.462529,"alt":10026,"heading":2,"pitch":-57},grid500:{"lat":31.112561,"lng":121.458433,"alt":2483,"heading":2,"pitch":-57}};
function bindPopupFunction(event) {
-
let layerid = event.layer.options.id;
let item = event.graphic?.attr;
let qindex = event.layer.options.style_selected;
+ console.log(item["datatime"],"poup.item")
// console.log(event)
if (!item) {
return "";
}
item = changeNullAndundefinedToEmpty(item);
+ let item_time = item["datatime"].split(" ")
+ console.log(item_time,"poup.item")
+ if(item_time[1] === "00:00:00"){
+ item["datatime"] = item_time[0]
+ }
+ console.log(item["datatime"],"after")
if (layerid == 1001) {
return "绔欑偣缂栧彿锛�" +
item["code"] +
diff --git a/js/function.js b/js/function.js
index 216a207..02a414a 100644
--- a/js/function.js
+++ b/js/function.js
@@ -241,7 +241,7 @@
color: "rgb(2,26,79)",
outline: true,
outlineColor: "#39E09B",
- outlineWidth: 8,
+ outlineWidth: 3,
outlineOpacity: 0.8,
arcType: Cesium.ArcType.GEODESIC,
clampToGround: true,
diff --git a/js/function_1004.js b/js/function_1004.js
index 8ef63ca..3ac319b 100644
--- a/js/function_1004.js
+++ b/js/function_1004.js
@@ -229,13 +229,10 @@
if(regionCode == 0){
$.getJSON("./data/shanghai.json", (result2) => {
polygon_Points = result2.features[0].geometry.coordinates[0][0]
- console.log(polygon_Points,"涓婃捣杈圭晫")
for (var i = 0, len = result.data.result.length; i < len; i++) {
let item = result.data.result[i];
- console.log(item.lon,item.lat,polygon_Points)
let isIn = isInPolygon([item.lon,item.lat],polygon_Points)
if(isIn){
- console.log("杩涙潵浜�")
tmpPositionProperty.addSample(Cesium.JulianDate.fromDate(new Date(item["datatime"])), Cesium.Cartesian3.fromDegrees(item["lon"], item["lat"], 0.2))
}
}
diff --git a/widgetsTS/taxiRouteReplay/view.js b/widgetsTS/taxiRouteReplay/view.js
index 8b60d05..e60c850 100644
--- a/widgetsTS/taxiRouteReplay/view.js
+++ b/widgetsTS/taxiRouteReplay/view.js
@@ -52,10 +52,11 @@
//寮�濮嬫煡璇㈣建杩�
$("#startQueryTaxiData").click(function () {
+ console.log(thisWidget.taxi_sn,"姹借溅缂栧彿")
haoutil.loading.show();
thisWidget.appDateHourStart = $("#appDateHourStart").val()
thisWidget.appDateHourEnd = $("#appDateHourEnd").val()
- if(!$("#taxisn").val() || $("#taxisn").val()=='') {$("#taxisn").val(thisWidget.taxi_sn)}
+ if($("#taxisn").val() || $("#taxisn").val()=='') {$("#taxisn").val(thisWidget.taxi_sn)}
$.getJSON(thisWidget.nodejs_url_predix + "dataapi/Bdata?bid=get_1004_single_path&siteid=" + $("#taxisn").val(), {
// $.getJSON(thisWidget.nodejs_url_predix + "dataapi/Bdata?bid=get_1004_single_path&siteid=" + thisWidget.taxi_sn, {
datatime1: thisWidget.appDateHourStart,
@@ -132,7 +133,10 @@
}
function resetStartQueryTaxiDataText(taxi) {
- $("#startQueryTaxiDataText").text("杞ㄨ抗鏌ヨ(" + taxi + ")");
+ console.log(taxi,"taxi缂栧彿")
+ $("#taxisn").val(taxi)
+ // $("#startQueryTaxiDataText").text("杞ㄨ抗鏌ヨ(" + taxi + ")");
+
$("#route_box").hide();
}
diff --git a/widgetsTS/taxiRouteReplay/widget.js b/widgetsTS/taxiRouteReplay/widget.js
index 2784a61..ef35981 100644
--- a/widgetsTS/taxiRouteReplay/widget.js
+++ b/widgetsTS/taxiRouteReplay/widget.js
@@ -13,8 +13,10 @@
}
reloadData(new_taxi_sn) {
- this.viewWindow.resetStartQueryTaxiDataText(new_taxi_sn);
+ console.log(new_taxi_sn,"reload")
this.taxi_sn = new_taxi_sn;
+ this.viewWindow.resetStartQueryTaxiDataText(this.taxi_sn);
+
if (this.startGraphic) {
this.startGraphic.remove();
@@ -75,7 +77,7 @@
position2 = Cesium.Cartesian3.fromDegrees(lng2, lat2);
}
item = changeNullAndundefinedToEmpty(item)
- console.log(item,"璺嚎item",item[this.qindex])
+ // console.log(item,"璺嚎item",item[this.qindex])
let graphic = new mars3d.graphic.PolylineEntity({
positions: [position,position2],
style: {
@@ -218,6 +220,7 @@
//姣忎釜绐楀彛鍒涘缓瀹屾垚鍚庤皟鐢�
winCreateOK(opt, result) {
this.viewWindow = result;
+ console.log(this.config.params,"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;
diff --git a/widgetsTS/widget_search/widget.js b/widgetsTS/widget_search/widget.js
index e16196a..7ffd704 100644
--- a/widgetsTS/widget_search/widget.js
+++ b/widgetsTS/widget_search/widget.js
@@ -163,12 +163,12 @@
var road = new mars3d.graphic.CorridorPrimitive({
positions: positions,
style: {
- width: 80,
- opacity: 0.75,
+ width: 150,
+ opacity: 1,
//closure: true,
height: 0,
cornerType: Cesium.CornerType.MITERED,
- diffHeight: qindex == "co" ? 1000 * attr[qindex] : attr[qindex] || attr[qindex] == "/" ? 3000 : attr[qindex], //楂樺害
+ diffHeight: qindex == "co" ? 500 * attr[qindex] : attr[qindex] || attr[qindex] == "/" ? 2000 : attr[qindex], //楂樺害
color: this.winPage.getLayerPointColorByQindexandValue(layerid, qindex, attr[qindex] || "#C0C0C0"),
// material: mars3d.MaterialUtil.createMaterial(mars3d.MaterialType.LineFlow, {
// //鍔ㄧ敾绾挎潗璐�
diff --git a/widgetsTS/widget_summary/widget.js b/widgetsTS/widget_summary/widget.js
index 53ffcda..f85755b 100644
--- a/widgetsTS/widget_summary/widget.js
+++ b/widgetsTS/widget_summary/widget.js
@@ -173,12 +173,12 @@
var road = new mars3d.graphic.CorridorPrimitive({
positions: positions,
style: {
- width: 80,
- opacity: 0.75,
+ width: 150,
+ opacity: 1,
//closure: true,
height: 0,
cornerType: Cesium.CornerType.MITERED,
- diffHeight: qindex == "co" ? 1000 * attr[qindex] : attr[qindex] || attr[qindex] == "/" ? 3000 : attr[qindex],//楂樺害
+ diffHeight: qindex == "co" ? 500 * attr[qindex] : attr[qindex] || attr[qindex] == "/" ? 2000 : attr[qindex],//楂樺害
color: this.winPage.getLayerPointColorByQindexandValue(layerid, qindex, attr[qindex]),
// material: mars3d.MaterialUtil.createMaterial(mars3d.MaterialType.LineFlow, {
// //鍔ㄧ敾绾挎潗璐�
--
Gitblit v1.9.1