admin/lx-admin-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

Browse Source 
 Conflicts:
	README.md
	ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/UUID.java
	ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
	ruoyi-ui/src/api/login.js
	ruoyi-ui/src/views/index.vue
This commit is contained in:
疯狂的狮子li 2021-11-03 13:58:45 +08:00
commit 1ea73a67ca
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-ui/src/api/login.js
View File

@ -10,6 +10,9 @@ export function login(username, password, code, uuid) {
} }
return request({ return request({
url: '/login', url: '/login',
headers: {
isToken: false
},
method: 'post', method: 'post',
data: data data: data
}) })
@ -47,7 +50,10 @@ export function logout() {
export function getCodeImg() { export function getCodeImg() {
return request({ return request({
url: '/captchaImage', url: '/captchaImage',
headers: {
isToken: false
},
method: 'get', method: 'get',
timeout: 20000 timeout: 20000
}) })
} }

4
ruoyi-ui/src/utils/ruoyi.js
View File

@ -85,8 +85,8 @@ export function selectDictLabels(datas, value, separator) {
var temp = value.split(currentSeparator); var temp = value.split(currentSeparator);
Object.keys(value.split(currentSeparator)).some((val) => { Object.keys(value.split(currentSeparator)).some((val) => {
Object.keys(datas).some((key) => { Object.keys(datas).some((key) => {
if (datas[key].dictValue == ('' + temp[val])) { if (datas[key].value == ('' + temp[val])) {
actions.push(datas[key].dictLabel + currentSeparator); actions.push(datas[key].label + currentSeparator);
} }
}) })
}) })