From 9eb8bb59b802ceef1f52d334c8e577f2bf02c90e Mon Sep 17 00:00:00 2001 From: 张含笑 <zhx18749296735@163.com> Date: Wed, 21 Jan 2026 15:12:02 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- applications/drone-command/src/views/permissionManage/permissionUser/FormDiaLog.vue | 53 +++++++++++++++++++++++++++-------------------------- 1 files changed, 27 insertions(+), 26 deletions(-) diff --git a/applications/drone-command/src/views/permissionManage/permissionUser/FormDiaLog.vue b/applications/drone-command/src/views/permissionManage/permissionUser/FormDiaLog.vue index 8b51128..62957b1 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="ztzf-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,17 +64,17 @@ </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"> - <el-input class="ztzf-data-cockpit-search-input" v-model="formData.account" maxlength="50" placeholder="请输入" clearable /> + <el-input class="command-input" v-model="formData.account" maxlength="50" placeholder="请输入" clearable /> </el-form-item> </el-col> <el-col :span="12" v-if="dialogMode === 'add'"> <el-form-item label="密码" prop="password"> <el-input - class="ztzf-data-cockpit-search-input" + class="command-input" v-model="formData.password" type="password" maxlength="50" @@ -86,7 +87,7 @@ <el-col :span="12" v-if="dialogMode === 'add'"> <el-form-item label="确认密码" prop="password2"> <el-input - class="ztzf-data-cockpit-search-input" + class="command-input" v-model="formData.password2" type="password" maxlength="50" @@ -98,26 +99,26 @@ </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"> - <el-input class="ztzf-data-cockpit-search-input" v-model="formData.realName" maxlength="50" placeholder="请输入" clearable /> + <el-input class="command-input" v-model="formData.realName" maxlength="50" placeholder="请输入" clearable /> </el-form-item> </el-col> <el-col :span="12"> <el-form-item label="手机号" prop="phone"> - <el-input class="ztzf-data-cockpit-search-input" v-model="formData.phone" maxlength="20" placeholder="请输入" clearable /> + <el-input class="command-input" v-model="formData.phone" maxlength="20" placeholder="请输入" clearable /> </el-form-item> </el-col> <el-col :span="12"> <el-form-item label="电子邮箱" prop="email"> - <el-input class="ztzf-data-cockpit-search-input" v-model="formData.email" maxlength="50" placeholder="请输入" clearable /> + <el-input class="command-input" v-model="formData.email" maxlength="50" placeholder="请输入" clearable /> </el-form-item> </el-col> <el-col :span="12"> <el-form-item label="用户性别" prop="sex"> - <el-select class="ztzf-data-cockpit-select" popper-class="ztzf-data-cockpit-select-popper" v-model="formData.sex" placeholder="请选择" clearable> + <el-select class="command-select" popper-class="command-select-popper" v-model="formData.sex" placeholder="请选择" clearable> <el-option label="男" :value="1" /> <el-option label="女" :value="2" /> <el-option label="未知" :value="3" /> @@ -127,8 +128,8 @@ <el-col :span="12"> <el-form-item label="用户生日" prop="birthday"> <el-date-picker - class="ztzf-data-cockpit-date-picker" - popper-class="ztzf-data-cockpit-date-picker-popper" + class="command-date-picker" + popper-class="command-date-picker-popper" v-model="formData.birthday" type="datetime" placeholder="请选择" @@ -140,18 +141,18 @@ </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"> - <el-input class="ztzf-data-cockpit-search-input" v-model="formData.code" maxlength="50" placeholder="请输入" clearable /> + <el-input class="command-input" v-model="formData.code" maxlength="50" placeholder="请输入" clearable /> </el-form-item> </el-col> <el-col :span="12"> <el-form-item label="所属角色" prop="roleId"> <el-tree-select - class="ztzf-data-cockpit-select" - popper-class="ztzf-data-cockpit-tree-select-popper" + class="command-select" + popper-class="command-tree-select-popper" v-model="formData.roleId" :data="roleTree" :props="treeProps" @@ -165,8 +166,8 @@ <el-col :span="12"> <el-form-item label="所属部门" prop="deptId"> <el-tree-select - class="ztzf-data-cockpit-select" - popper-class="ztzf-data-cockpit-tree-select-popper" + class="command-select" + popper-class="command-tree-select-popper" v-model="formData.deptId" :data="deptTree" :props="deptTreeSelectProps" @@ -179,13 +180,13 @@ </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"> <el-date-picker - class="ztzf-data-cockpit-date-picker" - popper-class="ztzf-data-cockpit-date-picker-popper" + class="command-date-picker" + popper-class="command-date-picker-popper" v-model="formData.expireTime" type="datetime" placeholder="请选择" @@ -197,14 +198,14 @@ </el-col> <el-col :span="12"> <el-form-item label="次数限制" prop="maxLoginNum"> - <el-input class="ztzf-data-cockpit-search-input" v-model="formData.maxLoginNum" placeholder="请输入" clearable /> + <el-input class="command-input" v-model="formData.maxLoginNum" placeholder="请输入" clearable /> </el-form-item> </el-col> <el-col :span="12"> <el-form-item label="飞行开始时间" prop="flightStartTime"> <el-time-picker - class="ztzf-data-cockpit-date-picker" - popper-class="ztzf-data-cockpit-date-picker-popper" + class="command-date-picker" + popper-class="command-date-picker-popper" v-model="formData.flightStartTime" placeholder="请选择" format="HH:mm" @@ -216,8 +217,8 @@ <el-col :span="12"> <el-form-item label="飞行结束时间" prop="flightEndTime"> <el-time-picker - class="ztzf-data-cockpit-date-picker" - popper-class="ztzf-data-cockpit-date-picker-popper" + class="command-date-picker" + popper-class="command-date-picker-popper" v-model="formData.flightEndTime" placeholder="请选择" format="HH:mm" -- Gitblit v1.9.3