diff --git a/README-zh.md b/README-zh.md index eecdd8d..de54718 100644 --- a/README-zh.md +++ b/README-zh.md @@ -83,3 +83,6 @@ ## License Copyright (c) 2019-present WangXiaoying + + +###注意: mars3d-cesium@1.94 diff --git a/README-zh.md b/README-zh.md index eecdd8d..de54718 100644 --- a/README-zh.md +++ b/README-zh.md @@ -83,3 +83,6 @@ ## License Copyright (c) 2019-present WangXiaoying + + +###注意: mars3d-cesium@1.94 diff --git a/package.json b/package.json index e687665..dd45e5b 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "js-md5": "^0.7.3", "jsencrypt": "^3.0.0-rc.1", "lodash": "^4.17.15", - "mars3d": "^3.0.25", + "mars3d-cesium": "^1.94.3", "mars3d-echarts": "^3.0.3", "mars3d-heatmap": "^3.0.6", "mars3d-mapv": "^3.0.3", diff --git a/README-zh.md b/README-zh.md index eecdd8d..de54718 100644 --- a/README-zh.md +++ b/README-zh.md @@ -83,3 +83,6 @@ ## License Copyright (c) 2019-present WangXiaoying + + +###注意: mars3d-cesium@1.94 diff --git a/package.json b/package.json index e687665..dd45e5b 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "js-md5": "^0.7.3", "jsencrypt": "^3.0.0-rc.1", "lodash": "^4.17.15", - "mars3d": "^3.0.25", + "mars3d-cesium": "^1.94.3", "mars3d-echarts": "^3.0.3", "mars3d-heatmap": "^3.0.6", "mars3d-mapv": "^3.0.3", diff --git a/src/api/system/user.js b/src/api/system/user.js index 91e7aa7..e60d4e8 100644 --- a/src/api/system/user.js +++ b/src/api/system/user.js @@ -113,3 +113,12 @@ } }) } + +// 单点登录获取token +export function fetchToken(params) { + return request({ + url: 'platform/checkZFToken', + method: 'get', + params + }) +} diff --git a/README-zh.md b/README-zh.md index eecdd8d..de54718 100644 --- a/README-zh.md +++ b/README-zh.md @@ -83,3 +83,6 @@ ## License Copyright (c) 2019-present WangXiaoying + + +###注意: mars3d-cesium@1.94 diff --git a/package.json b/package.json index e687665..dd45e5b 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "js-md5": "^0.7.3", "jsencrypt": "^3.0.0-rc.1", "lodash": "^4.17.15", - "mars3d": "^3.0.25", + "mars3d-cesium": "^1.94.3", "mars3d-echarts": "^3.0.3", "mars3d-heatmap": "^3.0.6", "mars3d-mapv": "^3.0.3", diff --git a/src/api/system/user.js b/src/api/system/user.js index 91e7aa7..e60d4e8 100644 --- a/src/api/system/user.js +++ b/src/api/system/user.js @@ -113,3 +113,12 @@ } }) } + +// 单点登录获取token +export function fetchToken(params) { + return request({ + url: 'platform/checkZFToken', + method: 'get', + params + }) +} diff --git a/src/components/Map/MarsMap.vue b/src/components/Map/MarsMap.vue index c400842..893e665 100644 --- a/src/components/Map/MarsMap.vue +++ b/src/components/Map/MarsMap.vue @@ -9,7 +9,7 @@