From 93fd50d4705b441125a05439b20a8531a2e453f7 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Wed, 10 Dec 2025 09:05:15 +0800
Subject: [PATCH] Merge branch 'refs/heads/feature/v9.0/9.0.1' into feature/v9.0/9.0.2
---
src/main.js | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/src/main.js b/src/main.js
index 29b2367..686b50e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -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'
@@ -39,6 +42,10 @@
import 'styles/common.scss'
import * as Cesium from 'cesium'
+// 视频回放
+import 'video.js/dist/video-js.css'
+import "videojs-markers/dist/videojs.markers.css"
+
// 业务组件
import tenantPackage from './views/system/tenantpackage.vue'
// 地图依赖
@@ -47,9 +54,10 @@
import * as DC from '@dvgis/dc-sdk'
import '@dvgis/dc-sdk/dist/dc.min.css'
window.DC = Object.create(DC)
-
-const { VITE_APP_BASE,VITE_APP_CESIUM_TOKEN } = import.meta.env
-window.CESIUM_BASE_URL = `${VITE_APP_BASE}cesiumPu`
+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
@@ -85,6 +93,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)
@@ -94,6 +105,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