From be9f3ad87b059e5ddf25a7f8f8672293aecf6302 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期三, 07 四月 2021 14:32:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/helpers/BasemapHelper.js | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/components/helpers/BasemapHelper.js b/src/components/helpers/BasemapHelper.js
index 8105721..49af53e 100644
--- a/src/components/helpers/BasemapHelper.js
+++ b/src/components/helpers/BasemapHelper.js
@@ -1,7 +1,6 @@
/* eslint-disable no-debugger */
import AjaxUtils from '@/utils/AjaxUtils'
import * as utils from '../../utils/utils'
-
/**
* 搴曞浘绠＄悊鍔╂墜锛岃礋璐ｅ簳鍥惧垱寤哄強寮�鍏�
*/
@@ -20,7 +19,7 @@
* @param map
* @param defBasemapName 鍒濆鍖栧畬鎴愬悗锛岄粯璁ゆ樉绀虹殑鍥惧眰
*/
- initBasemap = (config, isIntranet) => {
+ initBasemap =async (config, isIntranet) => {
if (isIntranet) { // 鍐呯綉
this._getToken(config) // 鑾峰彇token鍚庯紝骞舵寜閰嶇疆鍔犺浇鍦板浘
} else { // 澶栫綉
@@ -104,11 +103,10 @@
// 鍐呯綉鍦板浘鍒涘缓閮ㄥ垎
// 鑾峰彇鍐呯綉鍦板浘token锛屽苟鍔犺浇鍒板湴鍥句腑
- _getToken = (config) => {
+ _getToken = async (config) => {
const params = config.TokenConfig
- AjaxUtils.GetDataAsynByUrl(params.url, params.option, (token) => {
- this._showTDT(token, config)
- })
+ const token = await AjaxUtils.GetDataAsynByUrl(params.url, params.option)
+ this._showTDT(token, config)
}
// 鍐呯綉鍦板浘鍔犺浇锛屽苟鍔犺浇鍒板湴鍥�
@@ -116,8 +114,8 @@
const intranetBasemaps = config.mapConfig.IntranetBaseMaps
for (let i = 0, len = intranetBasemaps.length; i < len; ++i) {
const basemapConfig = intranetBasemaps[i]
- const basemapLayer = this.L.tileLayer(basemapConfig.map.url, basemapConfig.map.option)
- const basemapAnnotationLayer = this.L.tileLayer(basemapConfig.annotation.url, basemapConfig.annotation.option)
+ const basemapLayer = this.L.tileLayer(basemapConfig.map.url + '&token=' + token, basemapConfig.map.option)
+ const basemapAnnotationLayer = this.L.tileLayer(basemapConfig.annotation.url + '&token=' + token, basemapConfig.annotation.option)
const basemap = {
code: basemapConfig.code,
--
Gitblit v1.8.0