From 3748cbf0a42798c6fd9e27eecd7355871f99687d Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Fri, 28 Mar 2025 10:38:05 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/drone/command-center-dashboard

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

diff --git a/src/main.js b/src/main.js
index 7285c76..e4cf81b 100644
--- a/src/main.js
+++ b/src/main.js
@@ -35,8 +35,8 @@
 // import formSetting from './views/tool/formsetting.vue';
 // import tenantPackage from './views/system/tenantpackage.vue';
 // import tenantDatasource from './views/system/tenantdatasource.vue';
-import './utils/rem'
-import { hToV, wToR } from '@/utils/pxConver';
+import { onResize, pxToRem } from '@/utils/rem';
+onResize()
 import 'virtual:svg-icons-register'
 window.$crudCommon = crudCommon;
 debug();
@@ -61,8 +61,7 @@
 app.config.globalProperties.$dayjs = dayjs;
 app.config.globalProperties.website = website;
 app.config.globalProperties.getScreen = getScreen;
-app.config.globalProperties.wToR = wToR;
-app.config.globalProperties.hToV = hToV;
+app.config.globalProperties.pxToRem = pxToRem;
 
 app.use(error);
 app.use(i18n);

--
Gitblit v1.9.3