Merge branch 'dev' of http://222.212.85.86:8222/bdzl2/bxztApp into dev
This commit is contained in:
commit
c4b5e700cc
@ -2,4 +2,4 @@
|
|||||||
|
|
||||||
# 开发环境
|
# 开发环境
|
||||||
VITE_API_BASE_URL=http://localhost:3000/api
|
VITE_API_BASE_URL=http://localhost:3000/api
|
||||||
VITE_CESIUM_ION_TOKEN=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiI3ZWYyYWYyZi05YmQxLTQzODQtYTIyZi1mMTg2NTAxZGY4NGIiLCJpZCI6MTgzNTU5LCJpYXQiOjE3MDIyMTA3NDZ9.ngQ_4Jd-HsbK_MpofsFs9lUnpRcYCdOcObRVqoOS56U
|
VITE_CESIUM_ION_TOKEN=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiIyMGE2MTYzOS02OTA3LTRhZDEtYmFmYi01YWZmNDJmZGRlODgiLCJpZCI6MTEwNDE2LCJpYXQiOjE3NjY3MTE5MzR9.MtiUq510xS8C3Wm1rgHCloJqv0dlxIL0CfOIHj4uHBY
|
||||||
|
|||||||
@ -2,4 +2,4 @@
|
|||||||
|
|
||||||
# 生产环境
|
# 生产环境
|
||||||
VITE_API_BASE_URL=https://api.example.com
|
VITE_API_BASE_URL=https://api.example.com
|
||||||
VITE_CESIUM_ION_TOKEN=
|
VITE_CESIUM_ION_TOKEN=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiIyMGE2MTYzOS02OTA3LTRhZDEtYmFmYi01YWZmNDJmZGRlODgiLCJpZCI6MTEwNDE2LCJpYXQiOjE3NjY3MTE5MzR9.MtiUq510xS8C3Wm1rgHCloJqv0dlxIL0CfOIHj4uHBY
|
||||||
|
|||||||
@ -20,10 +20,7 @@ const mapStore = useMapStore()
|
|||||||
const route = useRoute()
|
const route = useRoute()
|
||||||
let viewer = null
|
let viewer = null
|
||||||
|
|
||||||
const ionToken = import.meta.env.VITE_CESIUM_ION_TOKEN
|
Cesium.Ion.defaultAccessToken = import.meta.env.VITE_CESIUM_ION_TOKEN || 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiIyMGE2MTYzOS02OTA3LTRhZDEtYmFmYi01YWZmNDJmZGRlODgiLCJpZCI6MTEwNDE2LCJpYXQiOjE3NjY3MTE5MzR9.MtiUq510xS8C3Wm1rgHCloJqv0dlxIL0CfOIHj4uHBY'
|
||||||
if (ionToken) {
|
|
||||||
Cesium.Ion.defaultAccessToken = ionToken
|
|
||||||
}
|
|
||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
initViewer()
|
initViewer()
|
||||||
|
|||||||
@ -12,10 +12,8 @@ import { useMapStore } from '../../../../map/index.js'
|
|||||||
const emit = defineEmits()
|
const emit = defineEmits()
|
||||||
const mapStore = useMapStore()
|
const mapStore = useMapStore()
|
||||||
|
|
||||||
const ionToken = import.meta.env.VITE_CESIUM_ION_TOKEN
|
Cesium.Ion.defaultAccessToken = import.meta.env.VITE_CESIUM_ION_TOKEN || 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiIyMGE2MTYzOS02OTA3LTRhZDEtYmFmYi01YWZmNDJmZGRlODgiLCJpZCI6MTEwNDE2LCJpYXQiOjE3NjY3MTE5MzR9.MtiUq510xS8C3Wm1rgHCloJqv0dlxIL0CfOIHj4uHBY'
|
||||||
if (ionToken) {
|
|
||||||
Cesium.Ion.defaultAccessToken = ionToken
|
|
||||||
}
|
|
||||||
const mapContainer = ref(null);
|
const mapContainer = ref(null);
|
||||||
const viewerRef = ref(null);
|
const viewerRef = ref(null);
|
||||||
|
|
||||||
|
|||||||
@ -45,7 +45,7 @@ const resolveCliBase = () => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export default defineConfig(({ command, mode }) => {
|
export default defineConfig(({ command, mode }) => {
|
||||||
const env = loadEnv(mode, process.cwd(), '')
|
const env = loadEnv(mode, resolve(__dirname, '../..'), '')
|
||||||
const baseCandidate =
|
const baseCandidate =
|
||||||
command === 'build'
|
command === 'build'
|
||||||
? resolveCliBase() ??
|
? resolveCliBase() ??
|
||||||
@ -59,6 +59,7 @@ export default defineConfig(({ command, mode }) => {
|
|||||||
const cesiumBaseUrl = resolvedBase === '/' ? '/cesium' : `/cesium`
|
const cesiumBaseUrl = resolvedBase === '/' ? '/cesium' : `/cesium`
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
envDir: resolve(__dirname, '../..'),
|
||||||
base: resolvedBase,
|
base: resolvedBase,
|
||||||
plugins: [
|
plugins: [
|
||||||
vue(),
|
vue(),
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user