From 5e31517f1d8866e23004d688fd7162104a1bc797 Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Fri, 23 Sep 2022 13:33:41 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E6=8E=A7=E5=88=B6=E5=8F=B0--?=
 =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/public/config/basicConfig.js  | 7 ++++---
 front/src/supermap/advance-init.js | 2 +-
 front/src/supermap/map-init.js     | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/back/public/config/basicConfig.js b/back/public/config/basicConfig.js
index f6fc0a52..e2f5b5f3 100644
--- a/back/public/config/basicConfig.js
+++ b/back/public/config/basicConfig.js
@@ -7,8 +7,8 @@
  */
 var _global = {}
 var CONFIGITEM = {
-  version: 'qingdao', // 青岛
-  // version: 'xihaian', // 西海岸
+  // version: 'qingdao', // 青岛
+  version: 'xihaian', // 西海岸
   // version: 'test', // 测试
   // version: 'frp', // 内网穿透
   // version: 'dev', // 开发
@@ -23,7 +23,8 @@ var CONFIGITEM = {
     // 西海岸大数据局
     xihaian: {
       previewUrl: 'http://10.134.135.9:9796/',
-      apiURL: 'http://10.134.135.9:8888/renren-admin',
+      // apiURL: 'http://10.134.135.9:8888/renren-admin',
+      apiURL: 'http://10.16.5.35:8888/renren-admin', // 李志成
       websocketURL: 'ws://10.134.135.9:8888/renren-admin/websocket'
     },
     // 测试
diff --git a/front/src/supermap/advance-init.js b/front/src/supermap/advance-init.js
index 0be17a7a..f0841cf8 100644
--- a/front/src/supermap/advance-init.js
+++ b/front/src/supermap/advance-init.js
@@ -60,7 +60,7 @@ export function MapFun(mapObj) {
   /**
    * 定义地物编辑服务
    */
-  const featureService = L.supermap.featureService(
+  const featureService = L.supermap && L.supermap.featureService && L.supermap.featureService(
     _mapConfig.config.EDITORDATA_URL
   )
 
diff --git a/front/src/supermap/map-init.js b/front/src/supermap/map-init.js
index fc90354b..3f4b6c3e 100644
--- a/front/src/supermap/map-init.js
+++ b/front/src/supermap/map-init.js
@@ -123,7 +123,7 @@ export function HieimpMap() {
     // debugger;
 
     // 获取图层信息
-    L.supermap
+    L.supermap && L.supermap.layerInfoService && L.supermap
       .layerInfoService(_mapConfig.config.QUERY_URL)
       .getLayersInfo(function (result) {
         // doSomething