From cae9c78b7181cfffc99ff1567faa8761e5696009 Mon Sep 17 00:00:00 2001
From: Bunny <1319900154@qq.com>
Date: Sat, 19 Oct 2024 03:20:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=A7=A9=20=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7ID=E6=97=A0=E6=B3=95=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/configuration/emailTemplate/index.vue |  8 ++++++--
 src/views/configuration/emailUsers/index.vue    |  8 ++++++--
 src/views/configuration/menuIcon/index.vue      |  8 ++++++--
 src/views/i18n/i18n-setting/index.vue           |  8 ++++++--
 src/views/i18n/i18n-type-setting/index.vue      |  8 ++++++--
 src/views/monitor/files/index.vue               |  8 ++++++--
 src/views/monitor/schedulerExecuteLog/index.vue |  8 ++++++--
 src/views/monitor/userLoginLog/index.vue        |  8 ++++++--
 src/views/monitor/userLoginLog/utils/columns.ts |  2 +-
 src/views/scheduler/schedulers/index.vue        |  8 ++++++--
 src/views/scheduler/schedulersGroup/index.vue   | 11 +++++++----
 src/views/system/adminUser/index.vue            | 10 ++++++----
 src/views/system/adminUser/utils/columns.tsx    |  4 ++--
 src/views/system/dept/index.vue                 |  8 ++++++--
 src/views/system/menu/index.vue                 |  8 ++++++--
 src/views/system/power/index.vue                |  8 ++++++--
 src/views/system/role/index.vue                 |  8 ++++++--
 17 files changed, 94 insertions(+), 37 deletions(-)

diff --git a/src/views/configuration/emailTemplate/index.vue b/src/views/configuration/emailTemplate/index.vue
index a182e34..8fd8e46 100644
--- a/src/views/configuration/emailTemplate/index.vue
+++ b/src/views/configuration/emailTemplate/index.vue
@@ -112,11 +112,15 @@ onMounted(() => {
 					</template>
 
 					<template #createUser="{ row }">
-						<el-button link type="primary" @click="selectUserinfo(row.createUser)">{{ $t('table.createUser') }} </el-button>
+						<el-button v-show="row.createUser" link type="primary" @click="selectUserinfo(row.createUser)">
+							{{ $t('table.createUser') }}
+						</el-button>
 					</template>
 
 					<template #updateUser="{ row }">
-						<el-button link type="primary" @click="selectUserinfo(row.updateUser)">{{ $t('table.updateUser') }} </el-button>
+						<el-button v-show="row.updateUser" link type="primary" @click="selectUserinfo(row.updateUser)">
+							{{ $t('table.updateUser') }}
+						</el-button>
 					</template>
 
 					<template #operation="{ row }">
diff --git a/src/views/configuration/emailUsers/index.vue b/src/views/configuration/emailUsers/index.vue
index e18a943..7980ef1 100644
--- a/src/views/configuration/emailUsers/index.vue
+++ b/src/views/configuration/emailUsers/index.vue
@@ -128,11 +128,15 @@ onMounted(() => {
 					</template>
 
 					<template #createUser="{ row }">
-						<el-button link type="primary" @click="selectUserinfo(row.createUser)">{{ $t('table.createUser') }} </el-button>
+						<el-button v-show="row.createUser" link type="primary" @click="selectUserinfo(row.createUser)">
+							{{ $t('table.createUser') }}
+						</el-button>
 					</template>
 
 					<template #updateUser="{ row }">
-						<el-button link type="primary" @click="selectUserinfo(row.updateUser)">{{ $t('table.updateUser') }} </el-button>
+						<el-button v-show="row.updateUser" link type="primary" @click="selectUserinfo(row.updateUser)">
+							{{ $t('table.updateUser') }}
+						</el-button>
 					</template>
 
 					<template #operation="{ row }">
diff --git a/src/views/configuration/menuIcon/index.vue b/src/views/configuration/menuIcon/index.vue
index 7382597..c827f6e 100644
--- a/src/views/configuration/menuIcon/index.vue
+++ b/src/views/configuration/menuIcon/index.vue
@@ -111,11 +111,15 @@ onMounted(() => {
 					</template>
 
 					<template #createUser="{ row }">
-						<el-button link type="primary" @click="selectUserinfo(row.createUser)">{{ $t('table.createUser') }} </el-button>
+						<el-button v-show="row.createUser" link type="primary" @click="selectUserinfo(row.createUser)">
+							{{ $t('table.createUser') }}
+						</el-button>
 					</template>
 
 					<template #updateUser="{ row }">
-						<el-button link type="primary" @click="selectUserinfo(row.updateUser)">{{ $t('table.updateUser') }} </el-button>
+						<el-button v-show="row.updateUser" link type="primary" @click="selectUserinfo(row.updateUser)">
+							{{ $t('table.updateUser') }}
+						</el-button>
 					</template>
 
 					<template #operation="{ row }">
diff --git a/src/views/i18n/i18n-setting/index.vue b/src/views/i18n/i18n-setting/index.vue
index 449bb72..8f1136c 100644
--- a/src/views/i18n/i18n-setting/index.vue
+++ b/src/views/i18n/i18n-setting/index.vue
@@ -108,11 +108,15 @@ onMounted(() => {
 					@page-current-change="onCurrentPageChange"
 				>
 					<template #createUser="{ row }">
-						<el-button link type="primary" @click="selectUserinfo(row.createUser)">{{ $t('table.createUser') }} </el-button>
+						<el-button v-show="row.createUser" link type="primary" @click="selectUserinfo(row.createUser)">
+							{{ $t('table.createUser') }}
+						</el-button>
 					</template>
 
 					<template #updateUser="{ row }">
-						<el-button link type="primary" @click="selectUserinfo(row.updateUser)">{{ $t('table.updateUser') }} </el-button>
+						<el-button v-show="row.updateUser" link type="primary" @click="selectUserinfo(row.updateUser)">
+							{{ $t('table.updateUser') }}
+						</el-button>
 					</template>
 
 					<template #operation="{ row }">
diff --git a/src/views/i18n/i18n-type-setting/index.vue b/src/views/i18n/i18n-type-setting/index.vue
index 64968d1..d33dbe8 100644
--- a/src/views/i18n/i18n-type-setting/index.vue
+++ b/src/views/i18n/i18n-type-setting/index.vue
@@ -71,11 +71,15 @@ onMounted(() => {
 					</template>
 
 					<template #createUser="{ row }">
-						<el-button link type="primary" @click="selectUserinfo(row.createUser)">{{ $t('table.createUser') }} </el-button>
+						<el-button v-show="row.createUser" link type="primary" @click="selectUserinfo(row.createUser)">
+							{{ $t('table.createUser') }}
+						</el-button>
 					</template>
 
 					<template #updateUser="{ row }">
-						<el-button link type="primary" @click="selectUserinfo(row.updateUser)">{{ $t('table.updateUser') }} </el-button>
+						<el-button v-show="row.updateUser" link type="primary" @click="selectUserinfo(row.updateUser)">
+							{{ $t('table.updateUser') }}
+						</el-button>
 					</template>
 
 					<template #operation="{ row }">
diff --git a/src/views/monitor/files/index.vue b/src/views/monitor/files/index.vue
index 1d5027f..1f95aaf 100644
--- a/src/views/monitor/files/index.vue
+++ b/src/views/monitor/files/index.vue
@@ -106,11 +106,15 @@ onMounted(() => {
 					@page-current-change="onCurrentPageChange"
 				>
 					<template #createUser="{ row }">
-						<el-button link type="primary" @click="selectUserinfo(row.createUser)">{{ $t('table.createUser') }} </el-button>
+						<el-button v-show="row.createUser" link type="primary" @click="selectUserinfo(row.createUser)">
+							{{ $t('table.createUser') }}
+						</el-button>
 					</template>
 
 					<template #updateUser="{ row }">
-						<el-button link type="primary" @click="selectUserinfo(row.updateUser)">{{ $t('table.updateUser') }} </el-button>
+						<el-button v-show="row.updateUser" link type="primary" @click="selectUserinfo(row.updateUser)">
+							{{ $t('table.updateUser') }}
+						</el-button>
 					</template>
 
 					<template #operation="{ row }">
diff --git a/src/views/monitor/schedulerExecuteLog/index.vue b/src/views/monitor/schedulerExecuteLog/index.vue
index f15675a..6eae185 100644
--- a/src/views/monitor/schedulerExecuteLog/index.vue
+++ b/src/views/monitor/schedulerExecuteLog/index.vue
@@ -114,11 +114,15 @@ onMounted(() => {
 					@page-current-change="onCurrentPageChange"
 				>
 					<template #createUser="{ row }">
-						<el-button link type="primary" @click="selectUserinfo(row.createUser)">{{ $t('table.createUser') }} </el-button>
+						<el-button v-show="row.createUser" link type="primary" @click="selectUserinfo(row.createUser)">
+							{{ $t('table.createUser') }}
+						</el-button>
 					</template>
 
 					<template #updateUser="{ row }">
-						<el-button link type="primary" @click="selectUserinfo(row.updateUser)">{{ $t('table.updateUser') }} </el-button>
+						<el-button v-show="row.updateUser" link type="primary" @click="selectUserinfo(row.updateUser)">
+							{{ $t('table.updateUser') }}
+						</el-button>
 					</template>
 
 					<template #operation="{ row }">
diff --git a/src/views/monitor/userLoginLog/index.vue b/src/views/monitor/userLoginLog/index.vue
index 036242a..f372d1e 100644
--- a/src/views/monitor/userLoginLog/index.vue
+++ b/src/views/monitor/userLoginLog/index.vue
@@ -151,11 +151,15 @@ onMounted(() => {
 					@page-current-change="onCurrentPageChange"
 				>
 					<template #createUser="{ row }">
-						<el-button link type="primary" @click="selectUserinfo(row.createUser)">{{ $t('table.createUser') }} </el-button>
+						<el-button v-show="row.createUser" link type="primary" @click="selectUserinfo(row.createUser)">
+							{{ $t('table.createUser') }}
+						</el-button>
 					</template>
 
 					<template #updateUser="{ row }">
-						<el-button link type="primary" @click="selectUserinfo(row.updateUser)">{{ $t('table.updateUser') }} </el-button>
+						<el-button v-show="row.updateUser" link type="primary" @click="selectUserinfo(row.updateUser)">
+							{{ $t('table.updateUser') }}
+						</el-button>
 					</template>
 
 					<template #operation="{ row }">
diff --git a/src/views/monitor/userLoginLog/utils/columns.ts b/src/views/monitor/userLoginLog/utils/columns.ts
index 6dfc777..22e62dc 100644
--- a/src/views/monitor/userLoginLog/utils/columns.ts
+++ b/src/views/monitor/userLoginLog/utils/columns.ts
@@ -16,7 +16,7 @@ export const columns: TableColumnList = [
 	// 登录时代理
 	{ label: $t('userLoginLog_userAgent'), prop: 'userAgent', width: 200 },
 	// 操作类型
-	{ label: $t('userLoginLog_type'), prop: 'type', width: 90 },
+	{ label: $t('userLoginLog_type'), prop: 'type', width: 130 },
 	// 标识客户端是否是通过Ajax发送请求的
 	{ label: $t('userLoginLog_xRequestedWith'), prop: 'xRequestedWith', width: 150 },
 	// 用户代理的品牌和版本
diff --git a/src/views/scheduler/schedulers/index.vue b/src/views/scheduler/schedulers/index.vue
index 7f7d86e..00506b0 100644
--- a/src/views/scheduler/schedulers/index.vue
+++ b/src/views/scheduler/schedulers/index.vue
@@ -103,11 +103,15 @@ onMounted(() => {
 					@page-current-change="onCurrentPageChange"
 				>
 					<template #createUser="{ row }">
-						<el-button link type="primary" @click="selectUserinfo(row.createUser)">{{ $t('table.createUser') }} </el-button>
+						<el-button v-show="row.createUser" link type="primary" @click="selectUserinfo(row.createUser)">
+							{{ $t('table.createUser') }}
+						</el-button>
 					</template>
 
 					<template #updateUser="{ row }">
-						<el-button link type="primary" @click="selectUserinfo(row.updateUser)">{{ $t('table.updateUser') }} </el-button>
+						<el-button v-show="row.updateUser" link type="primary" @click="selectUserinfo(row.updateUser)">
+							{{ $t('table.updateUser') }}
+						</el-button>
 					</template>
 
 					<template #operation="{ row }">
diff --git a/src/views/scheduler/schedulersGroup/index.vue b/src/views/scheduler/schedulersGroup/index.vue
index 9796e85..8436905 100644
--- a/src/views/scheduler/schedulersGroup/index.vue
+++ b/src/views/scheduler/schedulersGroup/index.vue
@@ -105,18 +105,21 @@ onMounted(() => {
 					@page-current-change="onCurrentPageChange"
 				>
 					<template #createUser="{ row }">
-						<el-button link type="primary" @click="selectUserinfo(row.createUser)">{{ $t('table.createUser') }} </el-button>
+						<el-button v-show="row.createUser" link type="primary" @click="selectUserinfo(row.createUser)">
+							{{ $t('table.createUser') }}
+						</el-button>
 					</template>
 
 					<template #updateUser="{ row }">
-						<el-button link type="primary" @click="selectUserinfo(row.updateUser)">{{ $t('table.updateUser') }} </el-button>
+						<el-button v-show="row.updateUser" link type="primary" @click="selectUserinfo(row.updateUser)">
+							{{ $t('table.updateUser') }}
+						</el-button>
 					</template>
 
 					<template #operation="{ row }">
 						<el-button :icon="useRenderIcon(EditPen)" :size="size" class="reset-margin" link type="primary" @click="onUpdate(row)"> {{ $t('modify') }} </el-button>
 						<el-button :icon="useRenderIcon(AddFill)" :size="size" class="reset-margin" link type="primary" @click="onAdd"> {{ $t('add_new') }} </el-button>
-						<!-- TODO 待完成 -->
-						<el-popconfirm :title="`${$t('delete')}${row.email}?`" @confirm="onDelete(row)">
+						<el-popconfirm :title="`${$t('delete')}${row.groupName}?`" @confirm="onDelete(row)">
 							<template #reference>
 								<el-button :icon="useRenderIcon(Delete)" :size="size" class="reset-margin" link type="primary">
 									{{ $t('delete') }}
diff --git a/src/views/system/adminUser/index.vue b/src/views/system/adminUser/index.vue
index c5b9565..6ad684c 100644
--- a/src/views/system/adminUser/index.vue
+++ b/src/views/system/adminUser/index.vue
@@ -199,14 +199,16 @@ onMounted(() => {
 							</el-tag>
 						</template>
 
-						<!-- 创建用户 -->
 						<template #createUser="{ row }">
-							<el-button link type="primary" @click="selectUserinfo(row.createUser)">{{ $t('table.createUser') }} </el-button>
+							<el-button v-show="row.createUser" link type="primary" @click="selectUserinfo(row.createUser)">
+								{{ $t('table.createUser') }}
+							</el-button>
 						</template>
 
-						<!-- 更新用户 -->
 						<template #updateUser="{ row }">
-							<el-button link type="primary" @click="selectUserinfo(row.updateUser)">{{ $t('table.updateUser') }} </el-button>
+							<el-button v-show="row.updateUser" link type="primary" @click="selectUserinfo(row.updateUser)">
+								{{ $t('table.updateUser') }}
+							</el-button>
 						</template>
 
 						<template #operation="{ row }">
diff --git a/src/views/system/adminUser/utils/columns.tsx b/src/views/system/adminUser/utils/columns.tsx
index b23092e..0740a0b 100644
--- a/src/views/system/adminUser/utils/columns.tsx
+++ b/src/views/system/adminUser/utils/columns.tsx
@@ -25,9 +25,9 @@ export const columns: TableColumnList = [
 	// 个人描述
 	{ label: $t('adminUser_summary'), prop: 'summary', width: 460 },
 	// 登录的IP地址
-	{ label: $t('lastLoginIp'), prop: 'lastLoginIp', width: 130 },
+	{ label: $t('lastLoginIp'), prop: 'ipAddress', width: 130 },
 	// IP地区
-	{ label: $t('lastLoginIpAddress'), prop: 'lastLoginIpAddress', width: 130 },
+	{ label: $t('lastLoginIpAddress'), prop: 'ipRegion', width: 130 },
 	{ label: $t('table.updateTime'), prop: 'updateTime', sortable: true, width: 160 },
 	{ label: $t('table.createTime'), prop: 'createTime', sortable: true, width: 160 },
 	{ label: $t('table.updateUser'), prop: 'updateUser', slot: 'updateUser', width: 90, fixed: 'right' },
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index bf76345..ddf5cf5 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -108,11 +108,15 @@ onMounted(() => {
 					@selection-change="onSelectionChange"
 				>
 					<template #createUser="{ row }">
-						<el-button link type="primary" @click="selectUserinfo(row.createUser)">{{ $t('table.createUser') }} </el-button>
+						<el-button v-show="row.createUser" link type="primary" @click="selectUserinfo(row.createUser)">
+							{{ $t('table.createUser') }}
+						</el-button>
 					</template>
 
 					<template #updateUser="{ row }">
-						<el-button link type="primary" @click="selectUserinfo(row.updateUser)">{{ $t('table.updateUser') }} </el-button>
+						<el-button v-show="row.updateUser" link type="primary" @click="selectUserinfo(row.updateUser)">
+							{{ $t('table.updateUser') }}
+						</el-button>
 					</template>
 
 					<template #operation="{ row }">
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 4ddc80a..e678252 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -90,11 +90,15 @@ onMounted(() => {
 					</template>
 
 					<template #createUser="{ row }">
-						<el-button link type="primary" @click="selectUserinfo(row.createUser)">{{ $t('table.createUser') }} </el-button>
+						<el-button v-show="row.createUser" link type="primary" @click="selectUserinfo(row.createUser)">
+							{{ $t('table.createUser') }}
+						</el-button>
 					</template>
 
 					<template #updateUser="{ row }">
-						<el-button link type="primary" @click="selectUserinfo(row.updateUser)">{{ $t('table.updateUser') }} </el-button>
+						<el-button v-show="row.updateUser" link type="primary" @click="selectUserinfo(row.updateUser)">
+							{{ $t('table.updateUser') }}
+						</el-button>
 					</template>
 
 					<template #operation="{ row }">
diff --git a/src/views/system/power/index.vue b/src/views/system/power/index.vue
index ae7c05c..c35b490 100644
--- a/src/views/system/power/index.vue
+++ b/src/views/system/power/index.vue
@@ -122,11 +122,15 @@ onMounted(() => {
 					@selection-change="onSelectionChange"
 				>
 					<template #createUser="{ row }">
-						<el-button link type="primary" @click="selectUserinfo(row.createUser)">{{ $t('table.createUser') }} </el-button>
+						<el-button v-show="row.createUser" link type="primary" @click="selectUserinfo(row.createUser)">
+							{{ $t('table.createUser') }}
+						</el-button>
 					</template>
 
 					<template #updateUser="{ row }">
-						<el-button link type="primary" @click="selectUserinfo(row.updateUser)">{{ $t('table.updateUser') }} </el-button>
+						<el-button v-show="row.updateUser" link type="primary" @click="selectUserinfo(row.updateUser)">
+							{{ $t('table.updateUser') }}
+						</el-button>
 					</template>
 
 					<template #operation="{ row }">
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 812648d..e3f571b 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -113,11 +113,15 @@ onMounted(() => {
 						@selection-change="onSelectionChange"
 					>
 						<template #createUser="{ row }">
-							<el-button link type="primary" @click="selectUserinfo(row.createUser)">{{ $t('table.createUser') }} </el-button>
+							<el-button v-show="row.createUser" link type="primary" @click="selectUserinfo(row.createUser)">
+								{{ $t('table.createUser') }}
+							</el-button>
 						</template>
 
 						<template #updateUser="{ row }">
-							<el-button link type="primary" @click="selectUserinfo(row.updateUser)">{{ $t('table.updateUser') }} </el-button>
+							<el-button v-show="row.updateUser" link type="primary" @click="selectUserinfo(row.updateUser)">
+								{{ $t('table.updateUser') }}
+							</el-button>
 						</template>
 
 						<template #operation="{ row }">