remove tenant

This commit is contained in:
quantulr
2023-08-10 13:54:19 +08:00
parent 22a9b5696c
commit 4d928cb019
4 changed files with 70 additions and 121 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 58 KiB

View File

@ -22,7 +22,7 @@ export default {
responseType: "blob", responseType: "blob",
headers: { headers: {
Authorization: "Bearer " + getToken(), Authorization: "Bearer " + getToken(),
tenant: useUserStore().tenant, // tenant: useUserStore().tenant,
}, },
}).then((res) => { }).then((res) => {
const isBlob = blobValidate(res.data); const isBlob = blobValidate(res.data);
@ -45,7 +45,7 @@ export default {
responseType: "blob", responseType: "blob",
headers: { headers: {
Authorization: "Bearer " + getToken(), Authorization: "Bearer " + getToken(),
tenant: useUserStore().tenant, // tenant: useUserStore().tenant,
}, },
}).then((res) => { }).then((res) => {
const isBlob = blobValidate(res.data); const isBlob = blobValidate(res.data);
@ -65,7 +65,7 @@ export default {
responseType: "blob", responseType: "blob",
headers: { headers: {
Authorization: "Bearer " + getToken(), Authorization: "Bearer " + getToken(),
tenant: useUserStore().tenant, // tenant: useUserStore().tenant,
}, },
}).then((res) => { }).then((res) => {
const isBlob = blobValidate(res.data); const isBlob = blobValidate(res.data);

View File

@ -35,13 +35,13 @@ service.interceptors.request.use(
if (getToken() && !isToken) { if (getToken() && !isToken) {
config.headers["Authorization"] = "Bearer " + getToken(); // 让每个请求携带自定义token 请根据实际情况自行修改 config.headers["Authorization"] = "Bearer " + getToken(); // 让每个请求携带自定义token 请根据实际情况自行修改
} }
// if (useUserStore().tenant) {
if (config.url === "/captchaImage") { /*if (config.url === "/captchaImage") {
config.headers["tenant"] = useUserStore().tempTenant; config.headers["tenant"] = useUserStore().tempTenant;
} else { } else {
config.headers["tenant"] = useUserStore().tenant; config.headers["tenant"] = useUserStore().tenant;
} }*/
// }
// get请求映射params参数 // get请求映射params参数
if (config.method === "get" && config.params) { if (config.method === "get" && config.params) {
let url = config.url + "?" + tansParams(config.params); let url = config.url + "?" + tansParams(config.params);

View File

@ -15,27 +15,6 @@
class="login-form" class="login-form"
> >
<h3 class="title">若依后台管理系统</h3> <h3 class="title">若依后台管理系统</h3>
<el-form-item prop="tenant">
<paged-select
v-model="loginForm.tenant"
:default-label="defaultTenantNamt"
:prop="{
label: 'companyName',
value: 'tenantId',
}"
:query="{
page: 'pageNum',
size: 'pageSize',
searchKey: 'companyName',
}"
:remote-method="loadTenantOptions"
:width="350"
prefix-icon="OfficeBuilding"
size="large"
@change="handleTenantChange"
@confirm="handleTenantConfirm"
/>
</el-form-item>
<el-form-item prop="username"> <el-form-item prop="username">
<el-input <el-input
v-model="loginForm.username" v-model="loginForm.username"
@ -66,7 +45,7 @@
</template> </template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="captchaEnabled && loginForm.tenant" prop="code"> <el-form-item v-if="captchaEnabled" prop="code">
<el-input <el-input
v-model="loginForm.code" v-model="loginForm.code"
auto-complete="off" auto-complete="off"
@ -132,7 +111,6 @@ const router = useRouter();
const {proxy} = getCurrentInstance(); const {proxy} = getCurrentInstance();
const loginForm = ref({ const loginForm = ref({
tenant: "",
username: "admin", username: "admin",
password: "admin123", password: "admin123",
rememberMe: false, rememberMe: false,
@ -141,12 +119,10 @@ const loginForm = ref({
}); });
const loginRules = { const loginRules = {
tenant: [{ required: true, trigger: "change", message: "请选择租户" }],
username: [{required: true, trigger: "blur", message: "请输入您的账号"}], username: [{required: true, trigger: "blur", message: "请输入您的账号"}],
password: [{required: true, trigger: "blur", message: "请输入您的密码"}], password: [{required: true, trigger: "blur", message: "请输入您的密码"}],
code: [{required: true, trigger: "change", message: "请输入验证码"}], code: [{required: true, trigger: "change", message: "请输入验证码"}],
}; };
const defaultTenantNamt = ref("");
const codeUrl = ref(""); const codeUrl = ref("");
const loading = ref(false); const loading = ref(false);
// 验证码开关 // 验证码开关
@ -161,7 +137,6 @@ function handleLogin() {
loading.value = true; loading.value = true;
// 勾选了需要记住密码设置在 cookie 中设置记住用户名和密码 // 勾选了需要记住密码设置在 cookie 中设置记住用户名和密码
if (loginForm.value.rememberMe) { if (loginForm.value.rememberMe) {
Cookies.set("tenant", loginForm.value.tenant, { expires: 30 });
Cookies.set("username", loginForm.value.username, {expires: 30}); Cookies.set("username", loginForm.value.username, {expires: 30});
Cookies.set("password", encrypt(loginForm.value.password), { Cookies.set("password", encrypt(loginForm.value.password), {
expires: 30, expires: 30,
@ -169,7 +144,6 @@ function handleLogin() {
Cookies.set("rememberMe", loginForm.value.rememberMe, {expires: 30}); Cookies.set("rememberMe", loginForm.value.rememberMe, {expires: 30});
} else { } else {
// 否则移除 // 否则移除
Cookies.remove("tenant");
Cookies.remove("username"); Cookies.remove("username");
Cookies.remove("password"); Cookies.remove("password");
Cookies.remove("rememberMe"); Cookies.remove("rememberMe");
@ -212,36 +186,12 @@ function getCookie() {
password: password:
password === undefined ? loginForm.value.password : decrypt(password), password === undefined ? loginForm.value.password : decrypt(password),
rememberMe: rememberMe === undefined ? false : Boolean(rememberMe), rememberMe: rememberMe === undefined ? false : Boolean(rememberMe),
tenant: useUserStore().tempTenant ?? "",
}; };
} }
const loadTenantOptions = (query) =>
getTenantNormalList(query).then((resp) => resp.rows);
const handleTenantChange = (value) => { getCode()
console.log(value);
if (!value) {
useUserStore().setTempTenant({
tenantId: null,
companyName: null,
});
}
// useUserStore().setTempTenant(value)
};
const handleTenantConfirm = (option) => {
useUserStore().setTempTenant(option);
};
watchEffect(() => {
console.log(loginForm.value.tenant);
if (loginForm.value.tenant) {
console.log("getcode");
getCode();
}
});
getCookie(); getCookie();
defaultTenantNamt.value = useUserStore().tempTenantName;
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@ -250,8 +200,7 @@ defaultTenantNamt.value = useUserStore().tempTenantName;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
height: 100%; height: 100%;
background-image: url("https://php.likeadmin.cn/admin/assets/login_bg.2f630cea.png"); background-image: url("../assets/images/login_bg.png");
//background-image: url("../assets/images/login-background.jpg");
background-size: cover; background-size: cover;
} }