From 1ea73a67ca086251de921642c10b328e7631144a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 03 十一月 2021 13:58:45 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
---
ruoyi-ui/src/utils/ruoyi.js | 4 ++--
ruoyi-ui/src/api/login.js | 8 +++++++-
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/ruoyi-ui/src/api/login.js b/ruoyi-ui/src/api/login.js
index abd49c7..0327e6f 100644
--- a/ruoyi-ui/src/api/login.js
+++ b/ruoyi-ui/src/api/login.js
@@ -10,6 +10,9 @@
}
return request({
url: '/login',
+ headers: {
+ isToken: false
+ },
method: 'post',
data: data
})
@@ -47,7 +50,10 @@
export function getCodeImg() {
return request({
url: '/captchaImage',
+ headers: {
+ isToken: false
+ },
method: 'get',
timeout: 20000
})
-}
\ No newline at end of file
+}
diff --git a/ruoyi-ui/src/utils/ruoyi.js b/ruoyi-ui/src/utils/ruoyi.js
index 63bd379..440bf4c 100644
--- a/ruoyi-ui/src/utils/ruoyi.js
+++ b/ruoyi-ui/src/utils/ruoyi.js
@@ -85,8 +85,8 @@
var temp = value.split(currentSeparator);
Object.keys(value.split(currentSeparator)).some((val) => {
Object.keys(datas).some((key) => {
- if (datas[key].dictValue == ('' + temp[val])) {
- actions.push(datas[key].dictLabel + currentSeparator);
+ if (datas[key].value == ('' + temp[val])) {
+ actions.push(datas[key].label + currentSeparator);
}
})
})
--
Gitblit v1.9.3