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

Merge remote-tracking branch 'origin/develop'

Browse Source 
Former-commit-id: 8b5e26e73635d05ba5b434361049fa95c64c093b [formerly 8b5e26e73635d05ba5b434361049fa95c64c093b [formerly 8b5e26e73635d05ba5b434361049fa95c64c093b [formerly 8b5e26e73635d05ba5b434361049fa95c64c093b [formerly be9a399f2205fbc720e07b41091ddadd5595fc56 [formerly 20ad0f165fbffa16265ebae508143a598b3413d2]]]]]
Former-commit-id: fcac4289d4cdbe0ebdd4b0745bc677c27e6de779
Former-commit-id: 096a4f6707c40035f14dcc9f6c0c9d8f674482dd
Former-commit-id: 8ed814d291fad05e706ce7c3616376730854100a [formerly 0dfffa884dafae04e9dbadc64f43072cdae13fb1]
Former-commit-id: 5ab7ff7a264bea5009f314a1cdcf3bd38f87842b
Former-commit-id: ae511b4318de261f6bb938ec6dd433ed982d00f9
Former-commit-id: 622f33d707c04d9178e66919ee970995ce2708d6
Former-commit-id: 8ebf2cca72916b458f2eb1b2dda83ea54be2ae1c
Former-commit-id: 8c1635fc0e400a8149389b4f2e58da7b0e46b588
This commit is contained in:
liyang
2018-09-12 14:34:43 +08:00
parent b11c9a5c37 77f8135178
commit a297e2ae84
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