正在显示
4 个修改的文件
包含
40 行增加
和
31 行删除
| 1 | -node_modules | 1 | +.DS_Store |
| 2 | -dist | 2 | +node_modules/ |
| 3 | -build | 3 | +build/ |
| 4 | -package-lock.json | 4 | +/dist/ |
| 5 | +npm-debug.log* | ||
| 6 | +yarn-debug.log* | ||
| 7 | +yarn-error.log* | ||
| 8 | + | ||
| 9 | +# Editor directories and files | ||
| 10 | +.idea | ||
| 11 | +.vscode | ||
| 12 | +*.suo | ||
| 13 | +*.ntvs* | ||
| 14 | +*.njsproj | ||
| 15 | +*.sln | ||
| 5 | package-lock.json | 16 | package-lock.json | ... | ... |
| ... | @@ -54,11 +54,11 @@ | ... | @@ -54,11 +54,11 @@ |
| 54 | }, | 54 | }, |
| 55 | "dependencies": { | 55 | "dependencies": { |
| 56 | "axios": "^0.18.0", | 56 | "axios": "^0.18.0", |
| 57 | - "element-ui": "^2.6.3", | 57 | + "element-ui": "^2.8.0", |
| 58 | "nedb": "^1.8.0", | 58 | "nedb": "^1.8.0", |
| 59 | "vue": "^2.6.10", | 59 | "vue": "^2.6.10", |
| 60 | "vue-electron": "^1.0.6", | 60 | "vue-electron": "^1.0.6", |
| 61 | - "vue-router": "^3.0.2", | 61 | + "vue-router": "^3.0.6", |
| 62 | "vuex": "^3.1.0", | 62 | "vuex": "^3.1.0", |
| 63 | "vuex-electron": "^1.0.3" | 63 | "vuex-electron": "^1.0.3" |
| 64 | }, | 64 | }, |
| ... | @@ -82,7 +82,7 @@ | ... | @@ -82,7 +82,7 @@ |
| 82 | "css-loader": "^0.28.11", | 82 | "css-loader": "^0.28.11", |
| 83 | "del": "^3.0.0", | 83 | "del": "^3.0.0", |
| 84 | "devtron": "^1.4.0", | 84 | "devtron": "^1.4.0", |
| 85 | - "electron": "^4.1.1", | 85 | + "electron": "^4.1.5", |
| 86 | "electron-builder": "^20.39.0", | 86 | "electron-builder": "^20.39.0", |
| 87 | "electron-debug": "^2.1.0", | 87 | "electron-debug": "^2.1.0", |
| 88 | "electron-devtools-installer": "^2.2.4", | 88 | "electron-devtools-installer": "^2.2.4", |
| ... | @@ -91,7 +91,7 @@ | ... | @@ -91,7 +91,7 @@ |
| 91 | "eslint-friendly-formatter": "^4.0.1", | 91 | "eslint-friendly-formatter": "^4.0.1", |
| 92 | "eslint-loader": "^2.0.0", | 92 | "eslint-loader": "^2.0.0", |
| 93 | "eslint-plugin-html": "^4.0.3", | 93 | "eslint-plugin-html": "^4.0.3", |
| 94 | - "eslint-plugin-import": "^2.12.0", | 94 | + "eslint-plugin-import": "^2.17.2", |
| 95 | "eslint-plugin-node": "^6.0.1", | 95 | "eslint-plugin-node": "^6.0.1", |
| 96 | "eslint-plugin-promise": "^3.8.0", | 96 | "eslint-plugin-promise": "^3.8.0", |
| 97 | "eslint-plugin-standard": "^3.1.0", | 97 | "eslint-plugin-standard": "^3.1.0", |
| ... | @@ -120,9 +120,9 @@ | ... | @@ -120,9 +120,9 @@ |
| 120 | "vue-loader": "^15.2.4", | 120 | "vue-loader": "^15.2.4", |
| 121 | "vue-style-loader": "^4.1.0", | 121 | "vue-style-loader": "^4.1.0", |
| 122 | "vue-template-compiler": "^2.6.10", | 122 | "vue-template-compiler": "^2.6.10", |
| 123 | - "webpack": "^4.15.1", | 123 | + "webpack": "^4.30.0", |
| 124 | - "webpack-cli": "^3.3.0", | 124 | + "webpack-cli": "^3.3.1", |
| 125 | - "webpack-dev-server": "^3.1.4", | 125 | + "webpack-dev-server": "^3.3.1", |
| 126 | "webpack-hot-middleware": "^2.22.2", | 126 | "webpack-hot-middleware": "^2.22.2", |
| 127 | "webpack-merge": "^4.1.3" | 127 | "webpack-merge": "^4.1.3" |
| 128 | } | 128 | } | ... | ... |
| ... | @@ -69,25 +69,25 @@ export default { | ... | @@ -69,25 +69,25 @@ export default { |
| 69 | deledata(){ | 69 | deledata(){ |
| 70 | // dialog为electron实例,data则是显示需要的参数,fun是需要执行的函数,此选项不是为必选的 | 70 | // dialog为electron实例,data则是显示需要的参数,fun是需要执行的函数,此选项不是为必选的 |
| 71 | const dialog = this.$electron.remote.dialog | 71 | const dialog = this.$electron.remote.dialog |
| 72 | - const data = { | ||
| 73 | - title:'清除数据', | ||
| 74 | - buttons:['OK', 'Cancel'], | ||
| 75 | - message:'此操作会清空本地数据库中的所有数据,是否继续?' | ||
| 76 | - } | ||
| 77 | - const fun = this.$db.deleall({name:'yyy'}) | ||
| 78 | - api.MessageBox(dialog,data,fun).then(res=>{ | ||
| 79 | - this.getdata() | ||
| 80 | - this.$message({ | ||
| 81 | - showClose: true, | ||
| 82 | - message: '成功删除'+res+'条', | ||
| 83 | - type: 'success' | ||
| 84 | - }); | ||
| 85 | - }) | ||
| 86 | // const data = { | 72 | // const data = { |
| 87 | - // title:'发生致命错误', | 73 | + // title:'清除数据', |
| 88 | - // message:'?' | 74 | + // buttons:['OK', 'Cancel'], |
| 75 | + // message:'此操作会清空本地数据库中的所有数据,是否继续?' | ||
| 89 | // } | 76 | // } |
| 90 | - // api.ErrorMessageBox(dialog,data) | 77 | + // const fun = this.$db.deleall({name:'yyy'}) |
| 78 | + // api.MessageBox(dialog,data,fun).then(res=>{ | ||
| 79 | + // this.getdata() | ||
| 80 | + // this.$message({ | ||
| 81 | + // showClose: true, | ||
| 82 | + // message: '成功删除'+res+'条', | ||
| 83 | + // type: 'success' | ||
| 84 | + // }); | ||
| 85 | + // }) | ||
| 86 | + const data = { | ||
| 87 | + title:'发生致命错误', | ||
| 88 | + message:'?' | ||
| 89 | + } | ||
| 90 | + api.ErrorMessageBox(dialog,data) | ||
| 91 | }, | 91 | }, |
| 92 | } | 92 | } |
| 93 | }; | 93 | }; | ... | ... |
| ... | @@ -8,9 +8,7 @@ export default new Router({ | ... | @@ -8,9 +8,7 @@ export default new Router({ |
| 8 | { | 8 | { |
| 9 | path: '/', | 9 | path: '/', |
| 10 | name: 'landing-page', | 10 | name: 'landing-page', |
| 11 | - // component: require('@/components/LandingPage').default | 11 | + component: () => import('@/components/LandingPage') |
| 12 | - // component: () => import('@/components/LandingPage') | ||
| 13 | - component: resolve => require(['@/components/LandingPage'], resolve) | ||
| 14 | }, | 12 | }, |
| 15 | { | 13 | { |
| 16 | path: '*', | 14 | path: '*', | ... | ... |
-
请 注册 或 登录 后发表评论