From e9ab53b5bcb031ac7e6b1dcb596eb7d21ff8d1ad Mon Sep 17 00:00:00 2001
From: cshenfu <men883234@gmail.com>
Date: 星期四, 03 十一月 2022 09:26:42 +0800
Subject: [PATCH] 修改汽车图层接口
---
js/function_1004.js | 5 --
js/index.js | 60 +++++++++++++++---------------
2 files changed, 31 insertions(+), 34 deletions(-)
diff --git a/js/function_1004.js b/js/function_1004.js
index f134e23..17536b9 100644
--- a/js/function_1004.js
+++ b/js/function_1004.js
@@ -64,9 +64,7 @@
mars3d.global_variables.singleTaxiReplayData
var current_date = new Date(Cesium.JulianDate.toDate(event._currentTime));
if (current_date.getSeconds() != last_time_second) {
- console.log("current_data != ")
last_time_second = current_date.getSeconds();
- console.log(current_date,"current_data data")
changeTaxiLayerStyleAndAttr_Single(getFormattedDateTime(current_date));
}
} else if (map.getLayerById(1004).options.show) {
@@ -150,7 +148,6 @@
}
tmpattr = getTaxiAttrFromTimeListData(current_date, mars3d.global_variables.singleTaxiReplayData);
if (tmpattr && tmpattr != null) {
- console.log("杩涘叆绗簩涓猧f")
let tmpTaxiColor = getLayerPointColorByQindexandValue(1004, taxi_qindex, tmpattr[taxi_qindex]);
let tmpTaxigltfurl = "gltf/" + (tmpattr["code"]).substring(0, 2) + tmpTaxiColor.substring(1) + ".gltf";
single_taxi.setOptions({
@@ -221,7 +218,7 @@
}
function getTaxiPathFromServerbySN(taxi_mn, target_layer) {
- $.getJSON(mars3d.global_variables.nodejs_url_predix + "dataapi/Bdata?bid=get_1004_single_path&siteid=" + taxi_mn["code"], {
+ $.getJSON(mars3d.global_variables.nodejs_url_predix + "dataapi/Bdata?bid=get_1004_real&siteid=" + taxi_mn["code"], {
datatime1: mars3d.global_variables.queryDataTStartTaxi,
datatime2: mars3d.global_variables.queryDataTEnd
}, (result) => {
diff --git a/js/index.js b/js/index.js
index 359dc8f..0a9134b 100644
--- a/js/index.js
+++ b/js/index.js
@@ -19,37 +19,37 @@
request = $.extend(request, haoutil.system.getRequest(window.top));
}
- try {
- var jwtstr = request.JWT;
- var strs_ = jwtstr.split('.');
- var jwt_header_ = new buffer.Buffer(strs_[0].toString('base64'), 'base64').toString();
- var jwt_payload_ = new buffer.Buffer(strs_[1].toString('base64'), 'base64').toString();
- var payload_ = JSON.parse(jwt_payload_);
- mars3d.global_variables.userid = payload_.userid;
- mars3d.global_variables.regionCode = payload_.divcode;
- var hash = CryptoJS.HmacSHA256(strs_[0] + '.' + strs_[1], "sxyd");
- var hashInBase64 = base64UrlEncode(hash);
+ // try {
+ // var jwtstr = request.JWT;
+ // var strs_ = jwtstr.split('.');
+ // var jwt_header_ = new buffer.Buffer(strs_[0].toString('base64'), 'base64').toString();
+ // var jwt_payload_ = new buffer.Buffer(strs_[1].toString('base64'), 'base64').toString();
+ // var payload_ = JSON.parse(jwt_payload_);
+ // mars3d.global_variables.userid = payload_.userid;
+ // mars3d.global_variables.regionCode = payload_.divcode;
+ // var hash = CryptoJS.HmacSHA256(strs_[0] + '.' + strs_[1], "sxyd");
+ // var hashInBase64 = base64UrlEncode(hash);
- var reg = RegExp(strs_[2]);
- if (!reg.exec(hashInBase64)) {
- // verification failed, go back
- window.top.location = mars3d.global_variables.un_authorization_url;
- }
- payload_ = JSON.parse(jwt_payload_);
- if (!payload_ || !payload_.expires) {
- // verification error ,go back
- window.top.location = mars3d.global_variables.un_authorization_url;
- }
- var date1 = new Date(payload_.expires);
- var date2 = new Date();
- if (date1 < date2) {
- // expire, go back
- window.top.location = mars3d.global_variables.un_authorization_url;
- }
- }
- catch (err) {
- window.top.location = mars3d.global_variables.un_authorization_url;
- }
+ // var reg = RegExp(strs_[2]);
+ // if (!reg.exec(hashInBase64)) {
+ // // verification failed, go back
+ // window.top.location = mars3d.global_variables.un_authorization_url;
+ // }
+ // payload_ = JSON.parse(jwt_payload_);
+ // if (!payload_ || !payload_.expires) {
+ // // verification error ,go back
+ // window.top.location = mars3d.global_variables.un_authorization_url;
+ // }
+ // var date1 = new Date(payload_.expires);
+ // var date2 = new Date();
+ // if (date1 < date2) {
+ // // expire, go back
+ // window.top.location = mars3d.global_variables.un_authorization_url;
+ // }
+ // }
+ // catch (err) {
+ // window.top.location = mars3d.global_variables.un_authorization_url;
+ // }
if(!mars3d.global_variables.userid) {
mars3d.global_variables.userid = 2;
--
Gitblit v1.9.1