From a64cd79a2b4e3e97fcd8f942e776383ff8ccdb89 Mon Sep 17 00:00:00 2001
From: SHICHAO <17568097882@163.com>
Date: Sat, 24 Jun 2023 15:29:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E6=8E=A5=E5=8F=A3=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 index.html      | 13 ++++---------
 js/authcheck.js |  2 +-
 js/index.js     |  4 ++--
 js/wg.js        | 13 ++++++++-----
 login.html      |  2 +-
 5 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/index.html b/index.html
index e58030e..de3497c 100644
--- a/index.html
+++ b/index.html
@@ -18,15 +18,10 @@
   <meta name="apple-mobile-web-app-title" content=" MarsGIS" />
   <!-- Win8标题栏及ICON图标 -->
   <meta name="msapplication-TileColor" content="#62a8ea" />
-
-  <script type="text/javascript" src="/lib/jquery/jquery-2.1.4.min.js"></script>
-
-
-
-
-
   <!-- URL配置信息 -->
   <script src="js/config.js"></script>
+  <script type="text/javascript" src="/lib/jquery/jquery-2.1.4.min.js"></script>
+
 
   <link href="css/style.css" rel="stylesheet" />
   <!-- 网格化 -->
@@ -191,9 +186,9 @@
     </div>
     <!-- <div class="peizhi" id="peizibtn"> 配置 </div> -->
 
-    <!-- <div class="peizhi" id="wg-show" > 网格化管理 </div> -->
+    <div class="peizhi" id="wg-show" > 网格化管理 </div>
 
-    <div class="peizhi" id="luxian"> 路线规划 </div>
+    <div class="luxian" id="luxian"> 路线规划 </div>
     <!-- <div class="findroad" id="findroad"> 自动寻路 </div> -->
     <!-- 底部样式 -->
     <div class="bottom"></div>
diff --git a/js/authcheck.js b/js/authcheck.js
index 6f8ed3a..82656bd 100644
--- a/js/authcheck.js
+++ b/js/authcheck.js
@@ -1,4 +1,4 @@
-const BASE_API = "http://60.213.14.14:6093"
+const BASE_API = netBASE_URL
 
 // 登录
 function loginSystem(username, password) {
diff --git a/js/index.js b/js/index.js
index b76a19a..f008cd5 100644
--- a/js/index.js
+++ b/js/index.js
@@ -1752,10 +1752,10 @@ function bindShowTilesParts() {
 
       let name = null;
       
-      name = event.graphic.entity.id ? event.graphic.entity.id : null;
+      name = event.graphic.entity ? event.graphic.entity.id : null;
 
       // 判断点击是否是无人机
-      if (name.match("UAV")) {
+      if (name &&name.match("UAV")) {
         loadVideo(event.graphic.entity.name);
       }
     }
diff --git a/js/wg.js b/js/wg.js
index 74d7b2b..b0f1b55 100644
--- a/js/wg.js
+++ b/js/wg.js
@@ -1,12 +1,15 @@
 
+// const URL = 'http://123.132.248.154:9223'
+let URL = netBASE_URL
 
 $(document).ready(function () {
+
     //测试地址
     $.ajax({
-        url: "http://123.132.248.154:9223/api/Grid/LoadGridXZ",
+        url: URL + "/api/Grid/LoadGridXZ",
         type: 'GET',
         headers: {
-            "X-Token": "aabec9cc"
+            "X-Token":localStorage.getItem("Token"),
         },
         success: function (data) {
             let result = data.data
@@ -120,16 +123,16 @@ function wgTreeAnimation() {
 function showWgDetail(id) {
     // /api/Grid/LoadChildGridUser
     $.ajax({
-        url: `http://123.132.248.154:9223/api/Grid/LoadChildGridUser?id=${id}`,
+        url: `${URL}/api/Grid/LoadChildGridUser?id=${id}`,
         type: 'GET',
         headers: {
-            "X-Token": "aabec9cc",
+            "X-Token":localStorage.getItem("Token"),
         },
         success: function (data) {
             let res = data.data
             $('#wg-ri-card').empty()
             $("#show-wg-img").attr("data-url",res.imaUrl);
-            $("#wg-ri-image-card").find("img").attr("src","http://123.132.248.154:9223/"+res.imaUrl);
+            $("#wg-ri-image-card").find("img").attr("src",URL+"/"+res.imaUrl);
             res.dataInfo.forEach((item) => {
                 let html = `
                     <ul class="wg-ri-item">
diff --git a/login.html b/login.html
index e301ee1..722b57c 100644
--- a/login.html
+++ b/login.html
@@ -260,7 +260,7 @@
 
 <script src="./lib/jquery/common.min.js"></script>
 </body>
-
+<script src="./js/config.js"></script>
 <script src="./js/authcheck.js"></script>
 <script src="./js/login.js"></script>
 </html>
\ No newline at end of file