From 5309f0aae4dc789cee92a8d7de4985c22d6ce259 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 19 三月 2024 17:32:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/src/main.js b/src/main.js
index 402f115..9ede569 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,7 +1,7 @@
 import Vue from 'vue'
 
 import Cookies from 'js-cookie'
-
+import { getToken } from "@/utils/auth";
 import Element from 'element-ui'
 import './assets/styles/element-variables.scss'
 
@@ -38,6 +38,12 @@
 // 瀛楀吀鏁版嵁缁勪欢
 import DictData from '@/components/DictData'
 
+// 澶у睆
+import VScaleScreen from 'v-scale-screen'
+import dataV from '@jiaminghi/data-view'
+
+
+
 // 鍏ㄥ眬鏂规硶鎸傝浇
 Vue.prototype.getDicts = getDicts
 Vue.prototype.getConfigKey = getConfigKey
@@ -48,6 +54,7 @@
 Vue.prototype.selectDictLabels = selectDictLabels
 Vue.prototype.download = download
 Vue.prototype.handleTree = handleTree
+Vue.prototype.getToken = getToken
 
 // 鍏ㄥ眬缁勪欢鎸傝浇
 Vue.component('DictTag', DictTag)
@@ -61,6 +68,8 @@
 Vue.use(directive)
 Vue.use(plugins)
 Vue.use(VueMeta)
+Vue.use(VScaleScreen)
+Vue.use(dataV)
 DictData.install()
 
 /**

--
Gitblit v1.8.0