remove tenant

src/plugins/download.js

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

src/utils/request.js

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

src/views/login.vue

@@ -6,7 +6,7 @@
         <h2 class="title">若依后台管理系统</h2>
         <!--   副标题     -->
         <p class="sub-title">前后端分离的后台管理系统架构</p>
-        <el-image class="banner-image" :src="loginLeftBanner" />
+        <el-image class="banner-image" :src="loginLeftBanner"/>
       </div>
       <el-form
           ref="loginRef"
@@ -15,27 +15,6 @@
           class="login-form"
       >
         <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-input
               v-model="loginForm.username"
@@ -45,7 +24,7 @@
               type="text"
           >
             <template #prefix>
-              <svg-icon class="el-input__icon input-icon" icon-class="user" />
+              <svg-icon class="el-input__icon input-icon" icon-class="user"/>
             </template>
           </el-input>
         </el-form-item>
@@ -66,7 +45,7 @@
             </template>
           </el-input>
         </el-form-item>
-        <el-form-item v-if="captchaEnabled && loginForm.tenant" prop="code">
+        <el-form-item v-if="captchaEnabled" prop="code">
           <el-input
               v-model="loginForm.code"
               auto-complete="off"
@@ -83,7 +62,7 @@
             </template>
           </el-input>
           <div class="login-code">
-            <img :src="codeUrl" class="login-code-img" @click="getCode" />
+            <img :src="codeUrl" class="login-code-img" @click="getCode"/>
           </div>
         </el-form-item>
         <el-checkbox
@@ -120,19 +99,18 @@
 
 <script setup>
 import loginLeftBanner from "@/assets/images/login-left-banner.png";
-import { getCodeImg, getTenantNormalList } from "@/api/login";
+import {getCodeImg, getTenantNormalList} from "@/api/login";
 import Cookies from "js-cookie";
-import { decrypt, encrypt } from "@/utils/jsencrypt";
+import {decrypt, encrypt} from "@/utils/jsencrypt";
 import useUserStore from "@/store/modules/user";
 import PagedSelect from "@/components/InfiniteSelect";
-import { getCurrentInstance, ref, watchEffect } from "vue";
+import {getCurrentInstance, ref, watchEffect} from "vue";
 
 const userStore = useUserStore();
 const router = useRouter();
-const { proxy } = getCurrentInstance();
+const {proxy} = getCurrentInstance();
 
 const loginForm = ref({
-  tenant: "",
   username: "admin",
   password: "admin123",
   rememberMe: false,
@@ -141,12 +119,10 @@ const loginForm = ref({
 });
 
 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 loading = ref(false);
 // 验证码开关
@@ -161,15 +137,13 @@ function handleLogin() {
       loading.value = true;
       // 勾选了需要记住密码设置在 cookie 中设置记住用户名和密码
       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), {
           expires: 30,
         });
-        Cookies.set("rememberMe", loginForm.value.rememberMe, { expires: 30 });
+        Cookies.set("rememberMe", loginForm.value.rememberMe, {expires: 30});
       } else {
         // 否则移除
-        Cookies.remove("tenant");
         Cookies.remove("username");
         Cookies.remove("password");
         Cookies.remove("rememberMe");
@@ -178,7 +152,7 @@ function handleLogin() {
       userStore
           .login(loginForm.value)
           .then(() => {
-          router.push({ path: redirect.value || "/" });
+            router.push({path: redirect.value || "/"});
           })
           .catch(() => {
             loading.value = false;
@@ -212,36 +186,12 @@ function getCookie() {
     password:
         password === undefined ? loginForm.value.password : decrypt(password),
     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();
-defaultTenantNamt.value = useUserStore().tempTenantName;
 </script>
 
 <style lang="scss" scoped>
@@ -250,8 +200,7 @@ defaultTenantNamt.value = useUserStore().tempTenantName;
   justify-content: center;
   align-items: center;
   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;
 }