Merge remote-tracking branch 'origin/master'

张含笑

2026-01-21 9eb8bb59b802ceef1f52d334c8e577f2bf02c90e

 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">