Selaa lähdekoodia

修复部分界面渲染问题

pm 1 kuukausi sitten
vanhempi
sitoutus
b717ea45af
4 muutettua tiedostoa jossa 58 lisäystä ja 4 poistoa
  1. 2 2
      .env
  2. 4 2
      src/components/DepartmentManagement.tsx
  3. 26 0
      src/locales/en.json
  4. 26 0
      src/locales/zh.json

+ 2 - 2
.env

@@ -4,8 +4,8 @@ VITE_APP_TITLE=能量隔离系统
 # 项目本地运行端口号
 VITE_PORT=81
 # 请求路径
-VITE_BASE_URL='http://192.168.0.10:48080'
-# VITE_BASE_URL='http://120.27.232.27:9292'
+# VITE_BASE_URL='http://192.168.0.10:48080'
+VITE_BASE_URL='http://120.27.232.27:9292'
 # open 运行 npm run dev 时自动打开浏览器
 VITE_OPEN=true
 

+ 4 - 2
src/components/DepartmentManagement.tsx

@@ -282,6 +282,7 @@ export default function DepartmentManagement() {
                 )}
               </div>
             </TableCell>
+            <TableCell className="text-center">{node.id}</TableCell>
             <TableCell className="text-sm text-gray-600 text-center">{getLeaderName((node as any).leaderUserId) || '-'}</TableCell>
             <TableCell className="text-center">{(node as any).sort || 0}</TableCell>
             <TableCell className="text-center">
@@ -484,6 +485,7 @@ export default function DepartmentManagement() {
                 >
                   {t('table.departmentName')}
                 </TableHead>
+                <TableHead className="w-[100px] text-center">部门id</TableHead>
                 <TableHead className="w-[150px] text-center">{t('table.leader')}</TableHead>
                 <TableHead className="w-[80px] text-center">{t('table.sort')}</TableHead>
                 <TableHead className="w-[100px] text-center">{t('table.status')}</TableHead>
@@ -494,13 +496,13 @@ export default function DepartmentManagement() {
             <TableBody>
               {loading ? (
                 <TableRow>
-                  <TableCell colSpan={6} className="text-center py-8 text-gray-500">
+                  <TableCell colSpan={7} className="text-center py-8 text-gray-500">
                     {t('common.loading')}
                   </TableCell>
                 </TableRow>
               ) : list.length === 0 ? (
                 <TableRow>
-                  <TableCell colSpan={6} className="text-center py-8 text-gray-500">
+                  <TableCell colSpan={7} className="text-center py-8 text-gray-500">
                     {t('common.noData')}
                   </TableCell>
                 </TableRow>

+ 26 - 0
src/locales/en.json

@@ -582,6 +582,32 @@
     "data": "Data"
   },
   "form": {
+    "resetPasswordTitle": "Reset Password",
+    "resetPasswordPrompt": "Please enter a new password for user",
+    "resetPasswordNewPassword": ":",
+    "resetPasswordPlaceholder": "Please enter new password",
+    "resetPasswordSuccess": "Modified successfully, new password is:",
+    "userImport": "User Import",
+    "uploadDragText": "Drag file here or click to upload",
+    "updateExistingUser": "Update existing user data",
+    "onlyAllowImportFormat": "Only xls and xlsx format files are allowed.",
+    "downloadTemplate": "Download Template",
+    "userImportTemplateFileName": "User Import Template.xls",
+    "templateDownloadSuccess": "Template downloaded successfully",
+    "templateDownloadFailed": "Template download failed",
+    "fileFormatError": "Only xls and xlsx format files are allowed",
+    "pleaseUploadFile": "Please upload a file",
+    "uploadFailed": "Upload failed, please try again!",
+    "importResult": "Import Result",
+    "uploadSuccessCount": "Upload success count:",
+    "updateSuccessCount": "Update success count:",
+    "updateFailedCount": "Update failed count:",
+    "exportUserConfirm": "Confirm Export",
+    "exportUserConfirmText": "Are you sure you want to export user data?",
+    "exportUserConfirmButton": "Confirm Export",
+    "exportUserSuccess": "Export successful",
+    "exportUserFailed": "Export failed",
+    "userDataFileName": "User Data.xls",
     "menuName": "Menu Name",
     "menuNamePlaceholder": "Please enter menu name",
     "parentMenu": "Parent Menu",

+ 26 - 0
src/locales/zh.json

@@ -584,6 +584,32 @@
     "data": "数据"
   },
   "form": {
+    "resetPasswordTitle": "重置密码",
+    "resetPasswordPrompt": "请输入用户",
+    "resetPasswordNewPassword": "的新密码:",
+    "resetPasswordPlaceholder": "请输入新密码",
+    "resetPasswordSuccess": "修改成功,新密码是:",
+    "userImport": "用户导入",
+    "uploadDragText": "将文件拖到此处,或点击上传",
+    "updateExistingUser": "是否更新已经存在的用户数据",
+    "onlyAllowImportFormat": "仅允许导入 xls、xlsx 格式文件。",
+    "downloadTemplate": "下载模板",
+    "userImportTemplateFileName": "用户导入模版.xls",
+    "templateDownloadSuccess": "模板下载成功",
+    "templateDownloadFailed": "下载模板失败",
+    "fileFormatError": "仅允许导入 xls、xlsx 格式文件",
+    "pleaseUploadFile": "请上传文件",
+    "uploadFailed": "上传失败,请您重新上传!",
+    "importResult": "导入结果",
+    "uploadSuccessCount": "上传成功数量:",
+    "updateSuccessCount": "更新成功数量:",
+    "updateFailedCount": "更新失败数量:",
+    "exportUserConfirm": "确认导出",
+    "exportUserConfirmText": "确定要导出用户数据吗?",
+    "exportUserConfirmButton": "确定导出",
+    "exportUserSuccess": "导出成功",
+    "exportUserFailed": "导出失败",
+    "userDataFileName": "用户数据.xls",
     "menuName": "菜单名称",
     "menuNamePlaceholder": "请输入菜单名称",
     "parentMenu": "上级菜单",