更新依赖版本,删除lock文件,支持 nodejs 12+

dev
smallchill 6 years ago
parent 7f1a25f3fa
commit d1957e1964
  1. 1
      .gitignore
  2. 12391
      package-lock.json
  3. 3
      package.json
  4. 2
      src/permission.js
  5. 2
      src/views/desk/notice.vue
  6. 8724
      yarn.lock

1
.gitignore vendored

@ -22,3 +22,4 @@ yarn-error.log*
*.njsproj
*.sln
*.sw*
*.lock

12391
package-lock.json generated

File diff suppressed because it is too large Load Diff

@ -19,6 +19,7 @@
"js-base64": "^2.5.1",
"js-cookie": "^2.2.0",
"mockjs": "^1.0.1-beta3",
"node-gyp": "^5.0.6",
"nprogress": "^0.2.0",
"script-loader": "^0.7.2",
"portfinder": "^1.0.23",
@ -33,7 +34,7 @@
"@vue/cli-plugin-eslint": "^3.1.5",
"@vue/cli-service": "^3.1.4",
"chai": "^4.1.2",
"node-sass": "^4.10.0",
"node-sass": "^4.12.0",
"sass-loader": "^7.0.1",
"vue-template-compiler": "^2.5.17",
"webpack-bundle-analyzer": "^3.0.3"

@ -15,7 +15,7 @@ router.beforeEach((to, from, next) => {
const isMenu = meta.menu === undefined ? to.query.menu : meta.menu;
store.commit('SET_IS_MENU', isMenu === undefined);
if (getToken()) {
if (store.getters.isLock && to.path != lockPage) { //如果系统激活锁屏,全部跳转到锁屏页
if (store.getters.isLock && to.path !== lockPage) { //如果系统激活锁屏,全部跳转到锁屏页
next({path: lockPage})
} else if (to.path === '/login') { //如果登录成功访问登录页跳转到主页
next({path: '/'})

@ -123,7 +123,7 @@
rules: [{
required: true,
message: "请输入通知日期",
trigger: "blur"
trigger: "click"
}]
},
{

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save