From ce7407a97a7d47d1ee9d7f62dc902c90e1f2f3aa Mon Sep 17 00:00:00 2001
From: zuohuaijun <zuohuaijun@163.com>
Date: Tue, 6 Aug 2024 03:48:48 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=98=8E1=E3=80=81=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=BF=AE=E6=94=B9=E5=90=8E=E5=88=B7=E6=96=B0?=
 =?UTF-8?q?=E6=B5=8F=E8=A7=88=E5=99=A8=20=202=E3=80=81=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=88=86=E5=89=B2=E5=B8=83=E5=B1=80=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Web/src/views/login/component/account.vue  |  2 +-
 Web/src/views/system/infoSetting/index.vue | 17 ++++++++++-------
 Web/src/views/system/org/index.vue         |  4 ++--
 Web/src/views/system/region/index.vue      |  4 ++--
 Web/src/views/system/user/index.vue        |  6 +++---
 5 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/Web/src/views/login/component/account.vue b/Web/src/views/login/component/account.vue
index b53e4336..2142a500 100644
--- a/Web/src/views/login/component/account.vue
+++ b/Web/src/views/login/component/account.vue
@@ -146,7 +146,7 @@ onMounted(async () => {
 	}
 
 	// 获取登录配置
-	state.secondVerEnabled = themeConfig.value.secondVer ?? true;
+	state.secondVerEnabled = themeConfig.value.secondVer ?? false;
 	state.captchaEnabled = themeConfig.value.captcha ?? true;
 
 	// 获取验证码
diff --git a/Web/src/views/system/infoSetting/index.vue b/Web/src/views/system/infoSetting/index.vue
index 9454010c..0f7038e5 100644
--- a/Web/src/views/system/infoSetting/index.vue
+++ b/Web/src/views/system/infoSetting/index.vue
@@ -37,14 +37,14 @@
 				<el-descriptions-item label="ICP地址">
 					<el-input v-model="state.formData.sysIcpUrl" />
 				</el-descriptions-item>
-				<el-descriptions-item label="登录二次验证">
-					<el-radio-group v-model="state.formData.sysSecondVer">
+				<el-descriptions-item label="图形验证码">
+					<el-radio-group v-model="state.formData.sysCaptcha">
 						<el-radio :value="true">启用</el-radio>
 						<el-radio :value="false">禁用</el-radio>
 					</el-radio-group>
 				</el-descriptions-item>
-				<el-descriptions-item label="图形验证码">
-					<el-radio-group v-model="state.formData.sysCaptcha">
+				<el-descriptions-item label="登录二次验证">
+					<el-radio-group v-model="state.formData.sysSecondVer">
 						<el-radio :value="true">启用</el-radio>
 						<el-radio :value="false">禁用</el-radio>
 					</el-radio-group>
@@ -81,8 +81,8 @@ const state = reactive({
 		sysCopyright: '',
 		sysIcp: '',
 		sysIcpUrl: '',
-		sysSecondVer: undefined,
-		sysCaptcha: undefined,
+		sysSecondVer: false,
+		sysCaptcha: true,
 	},
 });
 
@@ -123,8 +123,11 @@ const onSave = async () => {
 
 		// 清空 file 变量
 		state.file = undefined;
-		await loadData();
+		// await loadData();
 		ElMessage.success('保存成功');
+
+		// 刷新浏览器
+		window.location.reload();
 	} finally {
 		nextTick(() => {
 			state.isLoading = false;
diff --git a/Web/src/views/system/org/index.vue b/Web/src/views/system/org/index.vue
index 411ffab7..a1178058 100644
--- a/Web/src/views/system/org/index.vue
+++ b/Web/src/views/system/org/index.vue
@@ -1,10 +1,10 @@
 <template>
 	<div class="sys-org-container">
 		<splitpanes class="default-theme">
-			<pane size="15" style="display: flex; flex: 1">
+			<pane size="15" style="display: flex">
 				<OrgTree ref="orgTreeRef" @node-click="handleNodeChange" />
 			</pane>
-			<pane size="85">
+			<pane size="85" style="display: flex; flex-direction: column">
 				<el-card shadow="hover" :body-style="{ padding: '5px 5px 0 5px', display: 'flex', width: '100%', height: '100%', alignItems: 'start' }">
 					<el-form :model="state.queryParams" ref="queryForm" :show-message="false" :inlineMessage="true" label-width="auto" style="flex: 1 1 0%">
 						<el-row :gutter="10">
diff --git a/Web/src/views/system/region/index.vue b/Web/src/views/system/region/index.vue
index e953a97b..884ee362 100644
--- a/Web/src/views/system/region/index.vue
+++ b/Web/src/views/system/region/index.vue
@@ -1,10 +1,10 @@
 <template>
 	<div class="sys-region-container">
 		<splitpanes class="default-theme">
-			<pane size="20" style="display: flex; flex: 1">
+			<pane size="20" style="display: flex">
 				<RegionTree ref="regionTreeRef" @node-click="handleNodeChange" />
 			</pane>
-			<pane size="80">
+			<pane size="80" style="display: flex; flex-direction: column">
 				<el-card shadow="hover" :body-style="{ padding: '5px 5px 0 5px', display: 'flex', width: '100%', height: '100%', alignItems: 'start' }">
 					<el-form :model="state.queryParams" ref="queryForm" :show-message="false" :inlineMessage="true" label-width="auto" style="flex: 1 1 0%">
 						<el-row :gutter="10">
diff --git a/Web/src/views/system/user/index.vue b/Web/src/views/system/user/index.vue
index 2d9ce7a1..9ffa027e 100644
--- a/Web/src/views/system/user/index.vue
+++ b/Web/src/views/system/user/index.vue
@@ -1,10 +1,10 @@
 <template>
 	<div class="sys-user-container">
 		<splitpanes class="default-theme">
-			<pane size="15" style="display: flex; flex: 1">
+			<pane size="15" style="display: flex">
 				<OrgTree ref="orgTreeRef" @node-click="handleNodeChange" />
 			</pane>
-			<pane size="85">
+			<pane size="85" style="display: flex; flex-direction: column">
 				<el-card shadow="hover" :body-style="{ padding: '5px 5px 0 5px', display: 'flex', width: '100%', height: '100%', alignItems: 'start' }">
 					<el-form :model="state.queryParams" ref="queryForm" :show-message="false" :inlineMessage="true" label-width="auto" style="flex: 1 1 0%">
 						<el-row :gutter="10">
@@ -43,7 +43,7 @@
 					</el-row>
 				</el-card>
 
-				<el-card class="full-table" shadow="hover" style="margin-top: 5px">
+				<el-card class="full-table" shadow="hover" style="margin-top: 5px; flex: 1">
 					<vxe-grid ref="xGrid" class="xGrid-style" v-bind="options" v-on="gridEvents">
 						<template #toolbar_buttons>
 							<el-button type="primary" icon="ele-Plus" @click="handleAdd" v-auth="'sysUser/add'"> 新增 </el-button>