From eb0fd11a5ab15d7ee8ec10b6b91807a11c3d5b0f Mon Sep 17 00:00:00 2001
From: cshenfu <men883234@gmail.com>
Date: 星期一, 31 十月 2022 15:45:18 +0800
Subject: [PATCH] beformerge

---
 js/changable_params.js             |    6 ------
 widgetsTS/taxiRouteReplay2/view.js |    2 +-
 widgetsTS/taxiRouteReplay/view.js  |    1 +
 js/function_1004.js                |    3 ++-
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/js/changable_params.js b/js/changable_params.js
index 7584c9f..70fe29b 100644
--- a/js/changable_params.js
+++ b/js/changable_params.js
@@ -57,22 +57,17 @@
 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) {
-  console.log(this,event,"杩欐槸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"] +
@@ -150,7 +145,6 @@
         grid = array[3]
       }
     }
-    console.log(grid,"grid")
     return grid + "绫崇綉鏍� <br/><br /> grid_id锛�"+item["grid_id"]+
       "<br />鏁版嵁鏃堕棿锛�" + 
       item["datatime"] + 
diff --git a/js/function_1004.js b/js/function_1004.js
index b509c80..f950a46 100644
--- a/js/function_1004.js
+++ b/js/function_1004.js
@@ -36,7 +36,6 @@
 }
 
 function getTaxiListFromServerByUserId(tmpLayer) {
-  // debugger;
   setTaxiLayerMapClock();
   $.getJSON(mars3d.global_variables.nodejs_url_predix + "dataapi/Bdata?bid=get_1004_list_by_userid&regionCode="+mars3d.global_variables.regionCode+"&userid=" + mars3d.global_variables.userid, (result) => {
     data_list_1004 = result.data.result;
@@ -65,10 +64,12 @@
       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();
         changeTaxiLayerStyleAndAttr_Single(getFormattedDateTime(current_date));
       }
     } else if (map.getLayerById(1004).options.show) {
+      console.log("current_data ==")
       var current_date = new Date(Cesium.JulianDate.toDate(event._currentTime));
       if (current_date.getSeconds() != last_time_second) {
         last_time_second = current_date.getSeconds();
diff --git a/widgetsTS/taxiRouteReplay/view.js b/widgetsTS/taxiRouteReplay/view.js
index 69217e7..f71ad92 100644
--- a/widgetsTS/taxiRouteReplay/view.js
+++ b/widgetsTS/taxiRouteReplay/view.js
@@ -52,6 +52,7 @@
 
   //寮�濮嬫煡璇㈣建杩�
   $("#startQueryTaxiData").click(function () {
+    console.log(thisWidget,"thisWidget")
     haoutil.loading.show();
     thisWidget.appDateHourStart = $("#appDateHourStart").val()
     thisWidget.appDateHourEnd = $("#appDateHourEnd").val()
diff --git a/widgetsTS/taxiRouteReplay2/view.js b/widgetsTS/taxiRouteReplay2/view.js
index 29dd0dd..66cd621 100644
--- a/widgetsTS/taxiRouteReplay2/view.js
+++ b/widgetsTS/taxiRouteReplay2/view.js
@@ -149,7 +149,7 @@
     {
       bootcssVer: 3,  //bootstrap-datetimepicker锛媌ootstrap v3锛屼絾杩欎釜鎻掍欢浣跨敤鐨勬椂鍊欙紝骞舵病鏈夊拰V3鐩稿尮閰嶏紝浠嶇劧璋冪敤鐨勬槸bootstrap V2鐨勫浘鏍� 鎶奲ootcssVer鐨勫�肩洿鎺ヨ涓�3锛屽惁鍒檇atetimepicker涓嶄細鏄剧ず鍑轰笂銆佷笅涓湀鐨勭澶�
       format: 'yyyy-mm-dd hh:ii:00',
-      minView: 'day',//璁剧疆鏃堕棿閫夋嫨涓哄勾鏈堟棩 鍘绘帀鏃跺垎绉掗�夋嫨
+      // minView: 'day',//璁剧疆鏃堕棿閫夋嫨涓哄勾鏈堟棩 鍘绘帀鏃跺垎绉掗�夋嫨
       todayBtn: true, //濡傛灉姝ゅ�间负true 鎴� "linked"锛屽垯鍦ㄦ棩鏈熸椂闂撮�夋嫨鍣ㄧ粍浠剁殑搴曢儴鏄剧ず涓�涓� "Today" 鎸夐挳鐢ㄤ互閫夋嫨褰撳墠鏃ユ湡銆傚鏋滄槸true鐨勮瘽锛�"Today" 鎸夐挳浠呬粎灏嗚鍥捐浆鍒板綋澶╃殑鏃ユ湡锛屽鏋滄槸"linked"锛屽綋澶╂棩鏈熷皢浼氳閫変腑銆�
       clearBtn: true,
       language: 'zh-CN',

--
Gitblit v1.9.1