From 2ca94de8ede18ac07ccfd8dec7b6f6a707adde9b Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Mon, 01 Sep 2025 11:20:24 +0800
Subject: [PATCH] Merge branch 'refs/heads/feature/v5.0/5.0.5' into patch_management
---
src/main.js | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/src/main.js b/src/main.js
index 8cf6a23..886400b 100644
--- a/src/main.js
+++ b/src/main.js
@@ -4,9 +4,9 @@
* @LastEditors: shuishen 1109946754@qq.com
* @LastEditTime: 2025-04-10 12:19:47
* @FilePath: \drone-web-manage\src\main.js
- * @Description:
- *
- * Copyright (c) 2025 by shuishen, All Rights Reserved.
+ * @Description:
+ *
+ * Copyright (c) 2025 by shuishen, All Rights Reserved.
*/
import { createApp } from 'vue'
import website from './config/website'
@@ -30,6 +30,9 @@
import avueUeditor from 'avue-plugin-ueditor'
import basicBlock from 'components/basic-block/main.vue'
import basicContainer from 'components/basic-container/main.vue'
+import welContainer from 'components/wel-container/main.vue'
+import basicMainContent from 'components/basic-main-content/main.vue'
+
import thirdRegister from './components/third-register/main.vue'
import NfDesignBase from '@saber/nf-design-base-elp'
import flowDesign from './components/flow-design/main.vue'
@@ -37,6 +40,8 @@
import 'animate.css'
import dayjs from 'dayjs'
import 'styles/common.scss'
+import * as Cesium from 'cesium'
+
// 业务组件
import tenantPackage from './views/system/tenantpackage.vue'
// 地图依赖
@@ -45,6 +50,11 @@
import * as DC from '@dvgis/dc-sdk'
import '@dvgis/dc-sdk/dist/dc.min.css'
window.DC = Object.create(DC)
+import { onResize } from '@/utils/rem'
+onResize()
+const { VITE_APP_BASE, VITE_APP_CESIUM_TOKEN } = import.meta.env
+window.CESIUM_BASE_URL = `${VITE_APP_BASE}/cesiumPu`
+Cesium.Ion.defaultAccessToken = VITE_APP_CESIUM_TOKEN
// 获取url中是否存在token
const urlParams = getUrlParams(window.location.href)
@@ -54,10 +64,6 @@
setStore('saber-token', urlParams.token)
setToken(urlParams.token)
setRefreshToken(urlParams.token)
-
- const cdxurl = window.location.pathname.replace(/^.*?\/manage\/(.*)$/, '/$1')
- localStorage.setItem('cdx', cdxurl + '?orderNumber=' + urlParams.orderNumber)
-
// 设置用户信息,把大屏用户信息保存到localStorage
let obj = {}
obj = localStorage.getItem("bs_userInfo")
@@ -83,6 +89,9 @@
app.component(key, component)
}
app.component('basicContainer', basicContainer)
+app.component('welContainer', welContainer)
+app.component('basicMainContent', basicMainContent)
+
app.component('basicBlock', basicBlock)
app.component('thirdRegister', thirdRegister)
app.component('flowDesign', flowDesign)
@@ -92,6 +101,9 @@
app.config.globalProperties.$dayjs = dayjs
app.config.globalProperties.website = website
app.config.globalProperties.getScreen = getScreen
+app.config.globalProperties.pxToVh = height => height / 10.8 + 'vh'
+app.config.globalProperties.pxToRem = width => width * 0.1 + 'rem'
+
app.use(error)
app.use(i18n)
app.use(store)
--
Gitblit v1.9.3