From 974394f7a0496fa8e37dd326b6f9313e14caa708 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Thu, 26 Jun 2025 17:35:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/all_setting_styles' into all_setting_styles

---
 src/main.js |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main.js b/src/main.js
index 29b2367..58ae120 100644
--- a/src/main.js
+++ b/src/main.js
@@ -30,6 +30,8 @@
 import avueUeditor from 'avue-plugin-ueditor'
 import basicBlock from 'components/basic-block/main.vue'
 import basicContainer from 'components/basic-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'
@@ -47,9 +49,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 +88,8 @@
     app.component(key, component)
 }
 app.component('basicContainer', basicContainer)
+app.component('basicMainContent', basicMainContent)
+
 app.component('basicBlock', basicBlock)
 app.component('thirdRegister', thirdRegister)
 app.component('flowDesign', flowDesign)

--
Gitblit v1.9.3