From beb95fb5fc166804056abafd70fc01ac27de7621 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Mon, 26 Jan 2026 09:11:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/permissionManage/permissionUser/FormDiaLog.vue | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/applications/drone-command/src/views/permissionManage/permissionUser/FormDiaLog.vue b/applications/drone-command/src/views/permissionManage/permissionUser/FormDiaLog.vue
index 9f920ea..0aca836 100644
--- a/applications/drone-command/src/views/permissionManage/permissionUser/FormDiaLog.vue
+++ b/applications/drone-command/src/views/permissionManage/permissionUser/FormDiaLog.vue
@@ -1,5 +1,6 @@
<template>
- <el-dialog class="command-page-view-dialog" v-model="visible" :title="dialogTitle" @closed="handleClosed" destroy-on-close>
+ <el-dialog class="command-page-view-dialog" v-model="visible" :title="dialogTitle" @closed="handleClosed" destroy-on-close
+ :close-on-click-modal="false">
<div class="detail-container" v-if="dialogReadonly">
<div class="detail-title">用户详情</div>
<el-row>
@@ -63,7 +64,7 @@
</div>
<el-form class="dialog-form" v-else ref="formRef" :model="formData" :rules="rules" label-width="110px">
- <el-divider content-position="left">基础信息</el-divider>
+ <div class="detail-title">基础信息</div>
<el-row :gutter="16">
<el-col :span="12">
<el-form-item label="登录账号" prop="account">
@@ -98,7 +99,7 @@
</el-col>
</el-row>
- <el-divider content-position="left">详细信息</el-divider>
+ <div class="detail-title">详细信息</div>
<el-row :gutter="16">
<el-col :span="12">
<el-form-item label="用户姓名" prop="realName">
@@ -140,7 +141,7 @@
</el-col>
</el-row>
- <el-divider content-position="left">职责信息</el-divider>
+ <div class="detail-title">职责信息</div>
<el-row :gutter="16">
<el-col :span="12">
<el-form-item label="用户编号" prop="code">
@@ -179,7 +180,7 @@
</el-col>
</el-row>
- <el-divider content-position="left">登录限制</el-divider>
+ <div class="detail-title">登录限制</div>
<el-row :gutter="16">
<el-col :span="12">
<el-form-item label="到期时间" prop="expireTime">
@@ -230,7 +231,7 @@
</el-form>
<template #footer>
- <el-button color="#2B2B4C" @click="handleCancel">{{ dialogReadonly ? '关闭' : '取消' }}</el-button>
+ <el-button v-if="dialogMode != 'view'" color="#2B2B4C" @click="handleCancel">{{ dialogReadonly ? '关闭' : '取消' }}</el-button>
<el-button color="#284FE3" v-if="!dialogReadonly" type="primary" :loading="submitting" :disabled="submitting" @click="handleSubmit">
保存
</el-button>
@@ -245,6 +246,8 @@
import { getDeptTree } from '@/api/system/dept'
import { getRoleTree } from '@/api/system/role'
import func from '@/utils/func'
+import { saveOperationLog } from '@ztzf/apis'
+import { useRoute } from 'vue-router'
const initForm = () => ({
account: '',
@@ -288,6 +291,7 @@
})
const roleTree = ref([])
const deptTree = ref([])
+const route = useRoute()
const validatePass = (rule, value, callback) => {
if (value === '') {
@@ -362,8 +366,18 @@
submitData.name = submitData.realName
if (dialogMode.value === 'add') {
await add(submitData)
+ saveOperationLog({
+ requestUri: route.path,
+ title: `${route.name || '用户管理'}-新增`,
+ type: 1
+ })
} else {
await update(submitData)
+ saveOperationLog({
+ requestUri: route.path,
+ title: `${route.name || '用户管理'}-编辑`,
+ type: 1
+ })
}
ElMessage.success(dialogMode.value === 'add' ? '新增成功' : '更新成功')
visible.value = false
--
Gitblit v1.9.3