From ce59cac766bd4f0fb70555bff1c08875181e03bf Mon Sep 17 00:00:00 2001
From: 黄何裕 <1053952480@qq.com>
Date: 星期一, 22 七月 2024 09:14:42 +0800
Subject: [PATCH] 处理冲突
---
src/main.js | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 53 insertions(+), 2 deletions(-)
diff --git a/src/main.js b/src/main.js
index 13c6cf2..7baf4cc 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,15 @@
// 瀛楀吀鏁版嵁缁勪欢
import DictData from '@/components/DictData'
+// 澶у睆
+import VScaleScreen from 'v-scale-screen'
+import dataV from '@jiaminghi/data-view'
+
+import gsap from 'gsap';
+import { formatNumber } from './utils/format';
+
+
+
// 鍏ㄥ眬鏂规硶鎸傝浇
Vue.prototype.getDicts = getDicts
Vue.prototype.getConfigKey = getConfigKey
@@ -48,6 +57,8 @@
Vue.prototype.selectDictLabels = selectDictLabels
Vue.prototype.download = download
Vue.prototype.handleTree = handleTree
+Vue.prototype.getToken = getToken
+Vue.prototype.$uploadUrl = process.env.VUE_APP_BASE_API + "/common/upload"
// 鍏ㄥ眬缁勪欢鎸傝浇
Vue.component('DictTag', DictTag)
@@ -61,7 +72,12 @@
Vue.use(directive)
Vue.use(plugins)
Vue.use(VueMeta)
+Vue.use(VScaleScreen)
+Vue.use(dataV)
DictData.install()
+
+// websocket
+Vue.prototype.$websocket = null;
/**
* If you don't want to use mock-server
@@ -76,7 +92,42 @@
size: Cookies.get('size') || 'medium' // set element-ui default size
})
-Vue.config.productionTip = false
+Vue.config.productionTip = true
+
+
+// 鍏ㄥ眬鎸囦护
+Vue.directive('roll', {
+ inserted: (el, binding) => {
+ let target = {
+ count: 0
+ };
+ let finalNumber = el.innerText;
+ gsap.to(target, {
+ count: finalNumber,
+ duration: 1,
+ ease: "power2.out",
+ onUpdate: () => {
+ el.innerText = formatNumber(target.count.toFixed(0));
+ }
+ })
+
+ },
+ update: (el, binding) => {
+ let target = {
+ count: el.innerText
+ };
+ let finalNumber = el.getAttribute('value');
+ gsap.to(target, {
+ count: finalNumber,
+ duration: 1,
+ ease: "power2.out",
+ onUpdate: () => {
+ el.innerText = formatNumber(target.count.toFixed(0));
+ }
+ })
+ }
+})
+
new Vue({
el: '#app',
--
Gitblit v1.8.0