From 70223b3ef4df02622869425fed4ba9b290e1aa74 Mon Sep 17 00:00:00 2001
From: fei.wang <wf18701153496@163.com>
Date: 星期二, 16 四月 2024 14:07:59 +0800
Subject: [PATCH] V定制1.0 1：对讲功能 2：计算经纬度控制器systemcontrollen
---
src/main/webapp/HouTai/ChaXunGuiJi/ChaXunGuiJiJs/ChaXunGuiJiJs.js | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/src/main/webapp/HouTai/ChaXunGuiJi/ChaXunGuiJiJs/ChaXunGuiJiJs.js b/src/main/webapp/HouTai/ChaXunGuiJi/ChaXunGuiJiJs/ChaXunGuiJiJs.js
index 03abfbf..5abdeb0 100644
--- a/src/main/webapp/HouTai/ChaXunGuiJi/ChaXunGuiJiJs/ChaXunGuiJiJs.js
+++ b/src/main/webapp/HouTai/ChaXunGuiJi/ChaXunGuiJiJs/ChaXunGuiJiJs.js
@@ -161,6 +161,16 @@
var id = $("#tagid").val();
var time = $("#FanWei").val();
+ var zuobiaoxi = "";
+ //浠庢暟鎹簱鏌ヨ褰撳墠閫夋嫨鐨勪粈涔堢郴鍧愭爣
+ $.ajax({
+ url: "/hxzkuwb/findbaidumapList",
+ type: "GET",
+ async: false,
+ success: function(data) {
+ zuobiaoxi = data[0].zhuanhuan
+ }
+ });
var data = "tagid=" + id + "&time=" + time
$.ajax({
url: "/hxzkuwb/findBaiDuGuiJi",
@@ -212,10 +222,17 @@
// 澶勭悊鍚屾璇锋眰杩斿洖鐨勬暟鎹�
for (var i = 0; i < data.length; i++) {
var c = new Convertor();
- var rr1 = c.WGS2BD09({
- lng: parseFloat(data[i].gspJingdu),
- lat: parseFloat(data[i].gpsWeidu)
- });
+ if (zuobiaoxi == "鐧惧害"){
+ var rr1 = c.WGS2BD09({
+ lng: parseFloat(data[i].gspJingdu),
+ lat: parseFloat(data[i].gpsWeidu)
+ });
+ }else{
+ var rr1 = {
+ lng: parseFloat(data[i].gspJingdu),
+ lat: parseFloat(data[i].gpsWeidu)
+ };
+ }
dts.push(rr1)
dtlist.push(rr1)
}
--
Gitblit v1.10.0