【修改】 1、强制登出页面优化；2、系统token管理优化

src/views/Login/components/LoginForm.vue

@@ -81,6 +81,29 @@
           />
         </el-form-item>
       </el-col>
+      <el-col v-if="isTrueLoginForAdminPassWord" :span="24" style="padding-right: 10px; padding-left: 10px">
+        <el-form-item prop="password">
+          <el-input
+            v-model="adminPassword"
+            :placeholder="t('请输入管理员密码')"
+            :prefix-icon="iconLock"
+            show-password
+            type="password"
+            @keyup.enter="getCode()"
+          />
+        </el-form-item>
+      </el-col>
+      <el-col v-if="isTrueLoginForAdminPassWord" :span="24" style="padding-right: 10px; padding-left: 10px">
+        <el-form-item>
+          <XButton
+            :loading="loginLoading"
+            :title="t('使用管理员密码进行强制退出后，再点击登录按钮')"
+            class="w-[100%]"
+            type="primary"
+            @click="loginOutAdminPassword()"
+          />
+        </el-form-item>
+      </el-col>
       <Verify
         v-if="loginData.captchaEnable === 'true'"
         ref="verify"
@@ -149,39 +172,6 @@
 <!--      </el-col>-->
     </el-row>
   </el-form>
-  <el-dialog
-    v-model="isTrueLoginForAdmin"
-    title="提示"
-    width="500"
-    :before-close="handleClose"
-  >
-    <span>是否使用管理员密码强制退出该用户</span>
-    <template #footer>
-      <div class="dialog-footer">
-        <el-button @click="isTrueLoginForAdmin = false">取消</el-button>
-        <el-button type="primary" @click="openLoginForAdminPassWord()">
-          确定
-        </el-button>
-      </div>
-    </template>
-  </el-dialog>
-  <el-dialog
-    v-model="isTrueLoginForAdminPassWord"
-    title="提示"
-    width="500"
-    :before-close="handleClose"
-  >
-    <span>管理员密码：</span>
-    <el-input v-model="adminPassword" style="width: 240px" placeholder="请输入管理员密码" />
-    <template #footer>
-      <div class="dialog-footer">
-        <el-button @click="isTrueLoginForAdminPassWord = false">取消</el-button>
-        <el-button type="primary" @click="loginOutAdminPassword()">
-          确定
-        </el-button>
-      </div>
-    </template>
-  </el-dialog>
 </template>
 <script lang="ts" setup>
 import { ElLoading } from 'element-plus'
@@ -197,7 +187,6 @@ import { LoginStateEnum, useFormValid, useLoginState } from './useLogin'
 
 defineOptions({ name: 'LoginForm' })
 
-const isTrueLoginForAdmin = ref(false)
 const isTrueLoginForAdminPassWord = ref(false)
 const adminPassword = ref('')
 
@@ -273,7 +262,6 @@ const getTenantId = async () => {
 }
 // 使用管理员密码登出登录的账号
 const openLoginForAdminPassWord = () => {
-  isTrueLoginForAdmin.value = false
   isTrueLoginForAdminPassWord.value = true
 }
 const loginOutAdminPassword = async () => {
@@ -284,7 +272,6 @@ const loginOutAdminPassword = async () => {
   LoginApi.refreshLogout(data).then((res) => {
     if (res) {
       message.success(res)
-      isTrueLoginForAdmin.value = false
       isTrueLoginForAdminPassWord.value = false
     }
   }).catch((err) => {
@@ -353,7 +340,7 @@ const handleLogin = async (params: any) => {
     }
   } finally {
     // 弹出输入管理员密码并重新进行登录
-    isTrueLoginForAdmin.value = true
+    isTrueLoginForAdminPassWord.value = true
     loginLoading.value = false
     loading.value.close()
   }