From 5c239e2491da67614a39e4085c6062254a7e84f1 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 27 Jun 2025 10:03:34 +0800
Subject: [PATCH] Merge branch 'all_setting_styles' of http://139.196.74.78:10010/r/drone/drone-web-manage into all_setting_styles

---
 src/main.js |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/src/main.js b/src/main.js
index 58ae120..886400b 100644
--- a/src/main.js
+++ b/src/main.js
@@ -30,6 +30,7 @@
 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'
@@ -88,6 +89,7 @@
     app.component(key, component)
 }
 app.component('basicContainer', basicContainer)
+app.component('welContainer', welContainer)
 app.component('basicMainContent', basicMainContent)
 
 app.component('basicBlock', basicBlock)
@@ -99,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