From d278dbf724190700d19abf135a7ffae05c17ded9 Mon Sep 17 00:00:00 2001 From: Elune <201507802@qq.com> Date: Mon, 23 Dec 2019 16:09:22 +0800 Subject: [PATCH 1/2] =?UTF-8?q?:bookmark:=20v2.4=20=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=91=E5=B8=83=EF=BC=8C=E8=AF=A6=E6=83=85=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E5=8F=91=E8=A1=8C=E7=89=88=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/dept/index.vue | 2 +- src/views/system/menu/index.vue | 2 +- src/views/system/role/index.vue | 2 +- src/views/system/timing/index.vue | 2 +- src/views/system/user/index.vue | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue index 6597112..ef48628 100644 --- a/src/views/system/dept/index.vue +++ b/src/views/system/dept/index.vue @@ -123,7 +123,7 @@ export default { }, // 提交前的验证 [CRUD.HOOK.afterValidateCU]() { - if (!this.form.pid) { + if (!this.form.pid && this.form.id !== 1) { this.$message({ message: '上级部门不能为空', type: 'warning' diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue index 362bad9..3e2afe2 100644 --- a/src/views/system/menu/index.vue +++ b/src/views/system/menu/index.vue @@ -157,7 +157,7 @@ import udOperation from '@crud/UD.operation' // crud交由presenter持有 const defaultCrud = CRUD({ title: '菜单', url: 'api/menus', crudMethod: { ...crudMenu }}) -const defaultForm = { name: null, sort: 999, path: null, component: null, componentName: null, iframe: false, roles: [], pid: 0, icon: null, cache: false, hidden: false, type: 0, permission: null } +const defaultForm = { id: null, name: null, sort: 999, path: null, component: null, componentName: null, iframe: false, roles: [], pid: 0, icon: null, cache: false, hidden: false, type: 0, permission: null } export default { name: 'Menu', components: { Treeselect, IconSelect, crudOperation, rrOperation, udOperation }, diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue index a0ab4c4..7a83b80 100644 --- a/src/views/system/role/index.vue +++ b/src/views/system/role/index.vue @@ -135,7 +135,7 @@ import '@riophae/vue-treeselect/dist/vue-treeselect.css' // crud交由presenter持有 const defaultCrud = CRUD({ title: '角色', url: 'api/roles', sort: 'level,asc', crudMethod: { ...crudRoles }}) -const defaultForm = { name: null, depts: [], remark: null, dataScope: '全部', level: 3, permission: null } +const defaultForm = { id: null, name: null, depts: [], remark: null, dataScope: '全部', level: 3, permission: null } export default { name: 'Role', components: { Treeselect, pagination, crudOperation, rrOperation, udOperation }, diff --git a/src/views/system/timing/index.vue b/src/views/system/timing/index.vue index 044eecd..f812e66 100644 --- a/src/views/system/timing/index.vue +++ b/src/views/system/timing/index.vue @@ -119,7 +119,7 @@ import pagination from '@crud/Pagination' // crud交由presenter持有 const defaultCrud = CRUD({ title: '定时任务', url: 'api/jobs', crudMethod: { ...crudJob }}) -const defaultForm = { jobName: null, beanName: null, methodName: null, params: null, cronExpression: null, isPause: false, remark: null } +const defaultForm = { id: null, jobName: null, beanName: null, methodName: null, params: null, cronExpression: null, isPause: false, remark: null } export default { name: 'Timing', components: { Log, pagination, crudOperation, rrOperation }, diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 2498666..c38f4b0 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -211,7 +211,7 @@ import '@riophae/vue-treeselect/dist/vue-treeselect.css' let userRoles = [] // crud交由presenter持有 const defaultCrud = CRUD({ title: '用户', url: 'api/users', crudMethod: { ...crudUser }}) -const defaultForm = { username: null, nickName: null, sex: '男', email: null, enabled: 'false', roles: [], job: { id: null }, dept: { id: null }, phone: null } +const defaultForm = { id: null, username: null, nickName: null, sex: '男', email: null, enabled: 'false', roles: [], job: { id: null }, dept: { id: null }, phone: null } export default { name: 'User', components: { Treeselect, crudOperation, rrOperation, udOperation, pagination }, From f7c65d67cae7e04a0f9d2b1292a65efd78e02903 Mon Sep 17 00:00:00 2001 From: Elune <201507802@qq.com> Date: Tue, 24 Dec 2019 10:52:56 +0800 Subject: [PATCH 2/2] =?UTF-8?q?:bookmark:=20v2.4=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 5 +++-- src/views/monitor/online/index.vue | 5 ----- src/views/system/user/index.vue | 4 ---- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/.env.production b/.env.production index c841017..baec654 100644 --- a/.env.production +++ b/.env.production @@ -1,5 +1,6 @@ ENV = 'production' -# 接口地址 +# 接口地址，注意协议，如果你没有配置 ssl，需要将 https 改为 http VUE_APP_BASE_API = 'https://api.auauz.net' -VUE_APP_WS_API = 'ws://api.auauz.net' +# 如果接口是 http 形式， wss 需要改为 ws +VUE_APP_WS_API = 'wss://api.auauz.net' diff --git a/src/views/monitor/online/index.vue b/src/views/monitor/online/index.vue index cb735b6..9fad4d6 100644 --- a/src/views/monitor/online/index.vue +++ b/src/views/monitor/online/index.vue @@ -86,11 +86,6 @@ export default { } }, methods: { - // 获取数据前设置好接口地址 - beforeInit() { - this.url = 'auth/online' - return true - }, doDelete(datas) { this.$confirm(`确认强退选中的${datas.length}个用户?`, '提示', { confirmButtonText: '确定', diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index c38f4b0..1d0c471 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -308,10 +308,6 @@ export default { } }) }, - beforeInit() { - this.url = 'api/users' - return true - }, // 新增与编辑前做的操作 [CRUD.HOOK.afterToCU](crud, form) { this.getDepts()