From b8b1ab26d7079deeb006f40b6066b89e4476adfd Mon Sep 17 00:00:00 2001 From: smallchill Date: Sat, 1 Jun 2019 12:35:07 +0800 Subject: [PATCH] :tada: 2.0.3.RELEASE --- package.json | 2 +- src/api/system/dept.js | 4 ++-- src/api/system/role.js | 4 ++-- src/api/user.js | 6 +++--- src/lang/en.js | 2 +- src/lang/zh.js | 2 +- src/page/login/userlogin.vue | 12 ++++++------ src/store/modules/user.js | 2 +- src/views/system/dept.vue | 4 ++-- src/views/system/role.vue | 4 ++-- src/views/system/tenant.vue | 6 +++--- src/views/system/user.vue | 16 ++++++++-------- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/package.json b/package.json index d38b899..e925926 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "saber-admin", - "version": "2.0.2", + "version": "2.0.3", "private": true, "scripts": { "serve": "vue-cli-service serve", diff --git a/src/api/system/dept.js b/src/api/system/dept.js index df1a538..4cc2d4e 100644 --- a/src/api/system/dept.js +++ b/src/api/system/dept.js @@ -46,12 +46,12 @@ export const getDept = (id) => { } }) } -export const getDeptTree = (tenantCode) => { +export const getDeptTree = (tenantId) => { return request({ url: '/api/blade-system/dept/tree', method: 'get', params: { - tenantCode, + tenantId, } }) } diff --git a/src/api/system/role.js b/src/api/system/role.js index b4773ed..2e677c5 100644 --- a/src/api/system/role.js +++ b/src/api/system/role.js @@ -66,12 +66,12 @@ export const getRole = (roleIds) => { }) } -export const getRoleTree = (tenantCode) => { +export const getRoleTree = (tenantId) => { return request({ url: '/api/blade-system/role/tree', method: 'get', params: { - tenantCode, + tenantId, } }) } diff --git a/src/api/user.js b/src/api/user.js index 16da399..7ff9106 100644 --- a/src/api/user.js +++ b/src/api/user.js @@ -1,14 +1,14 @@ import request from '@/router/axios'; import { baseUrl } from '@/config/env'; -export const loginByUsername = (tenantCode, username, password, type) => request({ +export const loginByUsername = (tenantId, username, password, type) => request({ url: '/api/blade-auth/oauth/token', method: 'post', headers: { - 'Tenant-Code': tenantCode + 'Tenant-Code': tenantId }, params: { - tenantCode, + tenantId, username, password, grant_type: "password", diff --git a/src/lang/en.js b/src/lang/en.js index 99df88f..98ff77f 100644 --- a/src/lang/en.js +++ b/src/lang/en.js @@ -66,7 +66,7 @@ export default { login: { title: 'Login ', info: 'Enterprise Development Platform', - tenantCode: 'Please input tenantCode', + tenantId: 'Please input tenantId', username: 'Please input username', password: 'Please input a password', wechat: 'Wechat', diff --git a/src/lang/zh.js b/src/lang/zh.js index e97c4f5..5e67fad 100644 --- a/src/lang/zh.js +++ b/src/lang/zh.js @@ -66,7 +66,7 @@ export default { login: { title: '登录 ', info: 'BladeX 企业级开发平台', - tenantCode: '请输入租户编号', + tenantId: '请输入租户ID', username: '请输入账号', password: '请输入密码', wechat: '微信', diff --git a/src/page/login/userlogin.vue b/src/page/login/userlogin.vue index c42834f..ad99ff3 100644 --- a/src/page/login/userlogin.vue +++ b/src/page/login/userlogin.vue @@ -5,12 +5,12 @@ ref="loginForm" :model="loginForm" label-width="0"> - + + :placeholder="$t('login.tenantId')"> @@ -58,14 +58,14 @@ export default { return { tenantMode: website.tenantMode, loginForm: { - tenantCode: "000000", + tenantId: "000000", username: "admin", password: "admin", type: "account" }, loginRules: { - tenantCode: [ - { required: false, message: "请输入租户编号", trigger: "blur" } + tenantId: [ + { required: false, message: "请输入租户ID", trigger: "blur" } ], username: [ { required: true, message: "请输入用户名", trigger: "blur" } diff --git a/src/store/modules/user.js b/src/store/modules/user.js index bd79d7a..e38857b 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -44,7 +44,7 @@ const user = { //根据用户名登录 LoginByUsername({ commit }, userInfo) { return new Promise((resolve) => { - loginByUsername(userInfo.tenantCode, userInfo.username, userInfo.password, userInfo.type).then(res => { + loginByUsername(userInfo.tenantId, userInfo.username, userInfo.password, userInfo.type).then(res => { const data = res.data; if (data.error_description) { Message({ diff --git a/src/views/system/dept.vue b/src/views/system/dept.vue index 88497fc..793efbb 100644 --- a/src/views/system/dept.vue +++ b/src/views/system/dept.vue @@ -70,7 +70,7 @@ }, { label: "所属租户", - prop: "tenantCode", + prop: "tenantId", type: "tree", dicUrl: "/api/blade-system/tenant/select", addDisplay: false, @@ -79,7 +79,7 @@ span: 24, props: { label: "tenantName", - value: "tenantCode" + value: "tenantId" }, hide: !website.tenantMode, search: website.tenantMode, diff --git a/src/views/system/role.vue b/src/views/system/role.vue index bab3997..5036665 100644 --- a/src/views/system/role.vue +++ b/src/views/system/role.vue @@ -105,7 +105,7 @@ export default { }, { label: "所属租户", - prop: "tenantCode", + prop: "tenantId", type: "tree", dicUrl: "/api/blade-system/tenant/select", addDisplay: false, @@ -114,7 +114,7 @@ export default { span: 24, props: { label: "tenantName", - value: "tenantCode" + value: "tenantId" }, hide: !website.tenantMode, search: website.tenantMode, diff --git a/src/views/system/tenant.vue b/src/views/system/tenant.vue index 3376a9a..554c621 100644 --- a/src/views/system/tenant.vue +++ b/src/views/system/tenant.vue @@ -52,15 +52,15 @@ dialogHeight: 400, column: [ { - label: "租户编号", - prop: "tenantCode", + label: "租户ID", + prop: "tenantId", search: true, addDisplay: false, editDisplay: false, span: 24, rules: [{ required: true, - message: "请输入租户编号", + message: "请输入租户ID", trigger: "blur" }] }, diff --git a/src/views/system/user.vue b/src/views/system/user.vue index a3c2031..b525318 100644 --- a/src/views/system/user.vue +++ b/src/views/system/user.vue @@ -109,12 +109,12 @@ }, { label: "所属租户", - prop: "tenantCode", + prop: "tenantId", type: "tree", dicUrl: "/api/blade-system/tenant/select", props: { label: "tenantName", - value: "tenantCode" + value: "tenantId" }, hide: !website.tenantMode, addDisplay: website.tenantMode, @@ -245,13 +245,13 @@ }; }, watch: { - 'form.tenantCode'() { - if (this.form.tenantCode !== '') { - getDeptTree(this.form.tenantCode).then(res => { + 'form.tenantId'() { + if (this.form.tenantId !== '') { + getDeptTree(this.form.tenantId).then(res => { const index = this.$refs.crud.findColumnIndex("deptId"); this.option.column[index].dicData = res.data.data; }); - getRoleTree(this.form.tenantCode).then(res => { + getRoleTree(this.form.tenantId).then(res => { const index = this.$refs.crud.findColumnIndex("roleId"); this.option.column[index].dicData = res.data.data; }); @@ -404,11 +404,11 @@ this.page.total = data.total; this.data = data.records; }); - getDeptTree(this.form.tenantCode).then(res => { + getDeptTree(this.form.tenantId).then(res => { const index = this.$refs.crud.findColumnIndex("deptId"); this.option.column[index].dicData = res.data.data; }); - getRoleTree(this.form.tenantCode).then(res => { + getRoleTree(this.form.tenantId).then(res => { const index = this.$refs.crud.findColumnIndex("roleId"); this.option.column[index].dicData = res.data.data; });