Merge branch 'dev' into test

src/types/components.d.ts

@@ -40,13 +40,13 @@ declare module 'vue' {
     ElImage: typeof import('element-plus/es')['ElImage']
     ElInput: typeof import('element-plus/es')['ElInput']
     ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
-    ElLink: typeof import('element-plus/es')['ElLink']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']
     ElPagination: typeof import('element-plus/es')['ElPagination']
     ElPopover: typeof import('element-plus/es')['ElPopover']
     ElRadio: typeof import('element-plus/es')['ElRadio']
+    ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
     ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
     ElRow: typeof import('element-plus/es')['ElRow']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
@@ -70,7 +70,6 @@ declare module 'vue' {
     IconSelect: typeof import('./../components/IconSelect/index.vue')['default']
     IEpCaretBottom: typeof import('~icons/ep/caret-bottom')['default']
     IEpCaretTop: typeof import('~icons/ep/caret-top')['default']
-    IEpUploadFilled: typeof import('~icons/ep/upload-filled')['default']
     IFrame: typeof import('./../components/iFrame/index.vue')['default']
     ImagePreview: typeof import('./../components/ImagePreview/index.vue')['default']
     ImageUpload: typeof import('./../components/ImageUpload/index.vue')['default']

src/views/login.vue

@@ -6,10 +6,10 @@
         <lang-select />
       </div> -->
       <el-form-item v-if="tenantEnabled" prop="tenantId">
-        <el-select v-model="loginForm.tenantId" filterable :placeholder="proxy.$t('login.selectPlaceholder')" style="width: 100%">
+<!--        <el-select v-model="loginForm.tenantId" filterable :placeholder="proxy.$t('login.selectPlaceholder')" style="width: 100%">-->
-          <el-option v-for="item in tenantList" :key="item.tenantId" :label="item.companyName" :value="item.tenantId"></el-option>
+<!--          <el-option v-for="item in tenantList" :key="item.tenantId" :label="item.companyName" :value="item.tenantId"></el-option>-->
-          <template #prefix><svg-icon icon-class="company" class="el-input__icon input-icon" /></template>
+<!--          <template #prefix><svg-icon icon-class="company" class="el-input__icon input-icon" /></template>-->
-        </el-select>
+<!--        </el-select>-->
       </el-form-item>
       <el-form-item prop="username">
         <el-input v-model="loginForm.username" type="text" size="large" auto-complete="off" :placeholder="proxy.$t('login.username')">
@@ -87,8 +87,8 @@ const { t } = useI18n();
 
 const loginForm = ref<LoginData>({
   tenantId: '111111',
-  username: 'admin',
+  username: 'fishery',
-  password: 'admin123',
+  password: 'fishery@123',
   rememberMe: false,
   code: '',
   uuid: ''
@@ -216,7 +216,7 @@ const doSocialLogin = (type: string) => {
 
 onMounted(() => {
   getCode();
-  initTenantList();
+  // initTenantList();
   getLoginData();
 });
 </script>
@@ -301,7 +301,7 @@ onMounted(() => {
   backdrop-filter: blur(2px);
   text-shadow: 1px 1px 3px rgba(0, 0, 0, 0.8);
   z-index: 2;
-  
+
   span {
     padding: 5px 15px;
     border-radius: 15px;
@@ -309,12 +309,12 @@ onMounted(() => {
     backdrop-filter: blur(5px);
     border: 1px solid rgba(255, 255, 255, 0.1);
   }
-  
+
   a {
     color:rgb(255, 255, 255) !important;
     text-decoration: none;
     transition: color 0.3s ease;
-    
+
     &:hover {
       color: #66b1ff !important;
       text-shadow: 0 0 5px rgba(64, 158, 255, 0.5);