diff --git a/package.json b/package.json index ce688939..660b4570 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ "dependencies": { "@babel/runtime": "^7.3.4", "@fortawesome/fontawesome-free": "^5.7.2", + "@tweenjs/tween.js": "^17.3.0", "admin-lte": "^2.4.10", "echarts": "^4.1.0", "element-theme-chalk": "^2.6.3", diff --git a/resources/assets/src/element.scss b/resources/assets/src/element.scss index edd80ddb..def6ace3 100644 --- a/resources/assets/src/element.scss +++ b/resources/assets/src/element.scss @@ -1,2 +1,4 @@ +@import '~element-theme-chalk/src/button.scss'; @import '~element-theme-chalk/src/message.scss'; @import '~element-theme-chalk/src/message-box.scss'; +@import '~element-theme-chalk/src/progress.scss'; diff --git a/resources/assets/src/js/element.js b/resources/assets/src/js/element.js index eabb582c..46837ed8 100644 --- a/resources/assets/src/js/element.js +++ b/resources/assets/src/js/element.js @@ -1,15 +1,16 @@ import Vue from 'vue' +import Button from 'element-ui/lib/button' import Message from 'element-ui/lib/message' import MessageBox from 'element-ui/lib/message-box' +Vue.use(Button) + Vue.prototype.$message = Message Vue.prototype.$msgbox = MessageBox Vue.prototype.$alert = MessageBox.alert Vue.prototype.$confirm = MessageBox.confirm Vue.prototype.$prompt = MessageBox.prompt -window.MessageBox = MessageBox - export { Message, MessageBox, diff --git a/resources/assets/src/views/user/Dashboard.vue b/resources/assets/src/views/user/Dashboard.vue index bed41245..e7ab1bc9 100644 --- a/resources/assets/src/views/user/Dashboard.vue +++ b/resources/assets/src/views/user/Dashboard.vue @@ -7,66 +7,85 @@
- {{ score }} + {{ animatedScore }}