sheng/mes-ui-d2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

no message

Browse Source 
Former-commit-id: 8a424d295312bf1154777074f1271af95a9d1578 [formerly ccfdfd36400457e84594580948e3c5355c9db091] [formerly 8a424d295312bf1154777074f1271af95a9d1578 [formerly ccfdfd36400457e84594580948e3c5355c9db091] [formerly 8a424d295312bf1154777074f1271af95a9d1578 [formerly ccfdfd36400457e84594580948e3c5355c9db091] [formerly ccfdfd36400457e84594580948e3c5355c9db091 [formerly 89c5461833870418cb49d07d79fbf7355f1168a9 [formerly 8231ddc6cbf28ee6ad65c3d0c2c85ec25a8ed7c0]]]]]
Former-commit-id: 0d665db00e641a0d5b47f92982b605b70bddcee6
Former-commit-id: 03efb83a0c5ced877571d44af58586a1ff21310e
Former-commit-id: 9d53ca9270c241e5c9880607f3dd6195e0d1bd7d [formerly 9a8cb92a91755eb225600ef6de8d53d4f11b867e]
Former-commit-id: 9eb8290d9afc7f06a2769c780fd380547aa458a9
Former-commit-id: 49b9912929f90a76df0ce9b66e7f83e2d4a898e3
Former-commit-id: 8b2f5063c50168ed963be9d6db727da72be5e179
Former-commit-id: 637f48bdf51ba7598945b0b1ae550f1169617263
Former-commit-id: 4bd3e8a686a83c481b6eef3d02e5ce2dd4a7b321
This commit is contained in:
liyang
2018-09-12 14:32:49 +08:00
parent b1fd7e4c17
commit 77f8135178
5 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package-lock.json.REMOVED.git-id
View File

@@ -1 +1 @@
12048ef98cbc909b11ea70298ee10637ece9fe87 4d463a54f93007210c2e07a05d8f012c386a0023

3
package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "d2-admin", "name": "d2-admin",
"version": "1.3.0", "version": "1.4.1",
"private": true, "private": true,
"scripts": { "scripts": {
"serve": "vue-cli-service serve --open", "serve": "vue-cli-service serve --open",
@@ -31,6 +31,7 @@
"lowdb": "^1.0.0", "lowdb": "^1.0.0",
"marked": "^0.3.9", "marked": "^0.3.9",
"mockjs": "^1.0.1-beta3", "mockjs": "^1.0.1-beta3",
"nprogress": "^0.2.0",
"papaparse": "^4.3.6", "papaparse": "^4.3.6",
"particles.js": "^2.0.0", "particles.js": "^2.0.0",
"quill": "^1.3.4", "quill": "^1.3.4",

8
src/assets/style/fixed/n-progress.scss Normal file
View File

@@ -0,0 +1,8 @@
#nprogress {
.bar {
background: $color-primary !important;
}
.peg {
box-shadow: 0 0 10px $color-primary, 0 0 5px $color-primary !important;
}
}

2
src/assets/style/public-class.scss
View File

@@ -6,6 +6,8 @@
@import '~@/assets/style/fixed/element.scss'; @import '~@/assets/style/fixed/element.scss';
// 补丁 markdown // 补丁 markdown
@import '~@/assets/style/fixed/markdown.scss'; @import '~@/assets/style/fixed/markdown.scss';
// 补丁 n-progress
@import '~@/assets/style/fixed/n-progress.scss';
// 补丁 vue-splitpane // 补丁 vue-splitpane
@import '~@/assets/style/fixed/vue-splitpane.scss'; @import '~@/assets/style/fixed/vue-splitpane.scss';
// 补丁 vue-grid-layout // 补丁 vue-grid-layout

8
src/router/index.js
View File

@@ -1,6 +1,10 @@
import Vue from 'vue' import Vue from 'vue'
import VueRouter from 'vue-router' import VueRouter from 'vue-router'
// 进度条
import NProgress from 'nprogress'
import 'nprogress/nprogress.css'
import store from '@/store/index' import store from '@/store/index'
import util from '@/libs/util.js' import util from '@/libs/util.js'
@@ -20,6 +24,8 @@ const router = new VueRouter({
* 权限验证 * 权限验证
*/ */
router.beforeEach((to, from, next) => { router.beforeEach((to, from, next) => {
// 进度条
NProgress.start()
// 关闭搜索面板 // 关闭搜索面板
store.commit('d2admin/search/set', false) store.commit('d2admin/search/set', false)
// 验证当前路由所有的匹配中是否需要有登录验证的 // 验证当前路由所有的匹配中是否需要有登录验证的
@@ -45,6 +51,8 @@ router.beforeEach((to, from, next) => {
}) })
router.afterEach(to => { router.afterEach(to => {
// 进度条
NProgress.done()
// 需要的信息 // 需要的信息
const app = router.app const app = router.app
const { name, params, query } = to const { name, params, query } = to