From 6ec28a346b1c8025798fdf5ca5eeebf4818e294f Mon Sep 17 00:00:00 2001 From: zlwu <704541015@qq.com> Date: Tue, 25 Nov 2025 15:22:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/application-prod-local.yml | 48 ++ web/.env.development | 17 +- web/public/favicon.ico | Bin 0 -> 269374 bytes web/出国申请详情弹窗字段顺序调整说明.md | 424 ------------------ 4 files changed, 58 insertions(+), 431 deletions(-) create mode 100644 backend/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application-prod-local.yml create mode 100644 web/public/favicon.ico delete mode 100644 web/出国申请详情弹窗字段顺序调整说明.md diff --git a/backend/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application-prod-local.yml b/backend/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application-prod-local.yml new file mode 100644 index 00000000..fdfc034f --- /dev/null +++ b/backend/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application-prod-local.yml @@ -0,0 +1,48 @@ +server: + port: 9090 +spring: + application: + name: ruoyi-monitor-admin + profiles: + active: @profiles.active@ + +logging: + config: classpath:logback-plus.xml + +--- # 监控中心服务端配置 +spring: + security: + user: + name: @monitor.username@ + password: @monitor.password@ + boot: + admin: + ui: + title: RuoYi-Vue-Plus服务监控中心 + context-path: /admin + +--- # Actuator 监控端点的配置项 +management: + endpoints: + web: + exposure: + include: '*' + endpoint: + health: + show-details: ALWAYS + logfile: + external-file: ./logs/ruoyi-monitor-admin.log + +--- # 监控配置 +spring.boot.admin.client: + # 增加客户端开关 + enabled: true + # 设置 Spring Boot Admin Server 地址 + url: http://47.121.125.41:9090/admin + instance: + service-host-type: IP + metadata: + username: ${spring.boot.admin.client.username} + userpassword: ${spring.boot.admin.client.password} + username: @monitor.username@ + password: @monitor.password@ diff --git a/web/.env.development b/web/.env.development index 0602545f..466dcac7 100644 --- a/web/.env.development +++ b/web/.env.development @@ -1,20 +1,23 @@ # 页面标题 VITE_APP_TITLE = 杭州第一技师学院智慧校园管理系统 -# 开发环境配置 -VITE_APP_ENV = 'development' - -# 开发环境 -VITE_APP_BASE_API = '/dev-api' +# 生产环境配置 +VITE_APP_ENV = 'production' # 应用访问路径 例如使用前缀 /admin/ VITE_APP_CONTEXT_PATH = '/' # 监控地址 -VITE_APP_MONITOR_ADMIN = 'http://localhost:9090/admin/applications' +VITE_APP_MONITOR_ADMIN = '/admin/applications' # SnailJob 控制台地址 -VITE_APP_SNAILJOB_ADMIN = 'http://localhost:8800/snail-job' +VITE_APP_SNAILJOB_ADMIN = '/snail-job' + +# 生产环境 +VITE_APP_BASE_API = '/prod-api' + +# 是否在打包时开启压缩,支持 gzip 和 brotli +VITE_BUILD_COMPRESS = gzip VITE_APP_PORT = 80 diff --git a/web/public/favicon.ico b/web/public/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..531093ae28e6e98695675cb344bce9ddc37b5136 GIT binary patch literal 269374 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

-esEIY`)d{%Quterxp)89 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 C5>li9 literal 0 HcmV?d00001 diff --git a/web/出国申请详情弹窗字段顺序调整说明.md b/web/出国申请详情弹窗字段顺序调整说明.md deleted file mode 100644 index 7938165b..00000000 --- a/web/出国申请详情弹窗字段顺序调整说明.md +++ /dev/null @@ -1,424 +0,0 @@ -# 出国申请详情弹窗字段顺序调整说明 - -**调整时间**: 2025-10-10 -**调整范围**: 出国申请详情弹窗字段显示顺序 -**状态**: ✅ 已完成 - ---- - -## 📋 调整需求 - -### 第一批调整 -将"申领证件名称"字段调整到"职务"字段后面,优化字段显示顺序。 - -### 第二批调整 -1. **前往国家字段**:调整到证件号码字段后面(同一行) -2. **探望对象关系字段**:调整到出境事由后面(同一行) -3. **出国天数字段**:调整到行程安排后面(同一行) - ---- - -## ✅ 修改文件清单 - -### 1. 出国申请管理主页面 - -**文件**: `web/src/views/rs/overseas/index.vue` - -#### 1.1 出国申请详情弹窗(第823-831行) - -**调整前**: -```vue -{{ state.viewData.department || '-' }} -{{ state.viewData.professionalTitle || '-' }} - -{{ state.viewData.position || '-' }} - - -{{ state.viewData.documentName || '-' }} -{{ state.viewData.documentNumber || '-' }} -``` - -**调整后**: -```vue -{{ state.viewData.department || '-' }} -{{ state.viewData.professionalTitle || '-' }} - -{{ state.viewData.position || '-' }} -{{ state.viewData.documentName || '-' }} - - -{{ state.viewData.documentNumber || '-' }} -``` - -#### 1.2 出国记录详情弹窗(第879-887行) - -**调整前**: -```vue -{{ state.viewData.department || '-' }} -{{ (state.viewData as OverseasRecordVO).professionalTitle || '-' }} - -{{ state.viewData.position || '-' }} - - -{{ (state.viewData as OverseasRecordVO).documentName || '-' }} -{{ (state.viewData as OverseasRecordVO).documentNumber || '-' }} -``` - -**调整后**: -```vue -{{ state.viewData.department || '-' }} -{{ (state.viewData as OverseasRecordVO).professionalTitle || '-' }} - -{{ state.viewData.position || '-' }} -{{ (state.viewData as OverseasRecordVO).documentName || '-' }} - - -{{ (state.viewData as OverseasRecordVO).documentNumber || '-' }} -``` - ---- - -### 2. 出国申请审批页面 - -**文件**: `web/src/views/rs/overseas/approval.vue`(第249-257行) - -**调整前**: -```vue -{{ viewData.department || '-' }} -{{ viewData.professionalTitle || '-' }} - -{{ viewData.position || '-' }} - - -{{ viewData.documentName || '-' }} -{{ viewData.documentNumber || '-' }} -``` - -**调整后**: -```vue -{{ viewData.department || '-' }} -{{ viewData.professionalTitle || '-' }} - -{{ viewData.position || '-' }} -{{ viewData.documentName || '-' }} - - -{{ viewData.documentNumber || '-' }} -``` - ---- - -## 🎯 调整说明 - -### 字段布局变化 - -#### 第一批调整 - 基本信息区域 - -**调整前**: -``` -┌─────────────┬─────────────┐ -│ 现工作部门 │ 职称 │ -├─────────────┴─────────────┤ -│ 职务 (占两列) │ ← 独占一行 -├─────────────┬─────────────┤ -│ 申领证件名称│ 证件号码 │ -└─────────────┴─────────────┘ -``` - -**调整后**: -``` -┌─────────────┬─────────────┐ -│ 现工作部门 │ 职称 │ -├─────────────┼─────────────┤ -│ 职务 │ 申领证件名称│ ← 申领证件名称移到职务右侧 -├─────────────┴─────────────┤ -│ 证件号码 (占两列) │ -└─────────────────────────────┘ -``` - -#### 第二批调整 - 出境信息区域 - -**调整前**: -``` -├─────────────┴─────────────┤ -│ 证件号码 (占两列) │ -├─────────────┬─────────────┤ -│ 前往国家 │ 出境事由 │ -├─────────────┴─────────────┤ -│ 探望对象关系 (占两列) │ ← 条件显示 -├─────────────┴─────────────┤ -│ 行程安排 (占两列) │ -├─────────────┴─────────────┤ -│ 出国天数 (占两列) │ -├─────────────┬─────────────┤ -│ 出发日期 │ 返回日期 │ -└─────────────┴─────────────┘ -``` - -**调整后**: -``` -├─────────────┬─────────────┤ -│ 证件号码 │ 前往国家 │ ← 前往国家移到证件号码右侧 -├─────────────┼─────────────┤ -│ 出境事由 │ 探望对象关系│ ← 探望对象关系移到出境事由右侧 -├─────────────┴─────────────┤ -│ 行程安排 (占两列) │ -├─────────────┬─────────────┤ -│ 出国天数 │ 备注 │ ← 出国天数移到行程安排后、备注同行 -├─────────────┼─────────────┤ -│ 出发日期 │ 返回日期 │ -└─────────────┴─────────────┘ -``` - -### 核心改动点 - -#### 第一批调整 - 基本信息字段 - -1. **职务字段**: - - 调整前:`:span="2"` (占据两列,独占一行) - - 调整后:默认占一列,与"申领证件名称"同行 - -2. **申领证件名称字段**: - - 调整前:位于职务下方的新行 - - 调整后:位于职务同行右侧 - -3. **证件号码字段**: - - 调整前:与"申领证件名称"同行 - - 调整后:`:span="2"` (独占一行) → 后续再调整为与"前往国家"同行 - -#### 第二批调整 - 出境信息字段 - -4. **证件号码字段**: - - 第一批调整后:`:span="2"` (独占一行) - - 第二批调整后:默认占一列,与"前往国家"同行 - -5. **前往国家字段**: - - 调整前:证件号码下方的新行 - - 调整后:与证件号码同行 - -6. **探望对象关系字段**: - - 调整前:`:span="2"` (独占一行,条件显示) - - 调整后:默认占一列,与"出境事由"同行 - -7. **出国天数字段**: - - 调整前:`:span="2"` (独占一行) - - 调整后:默认占一列,位于行程安排下方,与"备注"同行 - ---- - -## ✅ 验证检查 - -### 1. 语法检查 -```bash -# ESLint 检查通过 -✅ No linter errors found -``` - -### 2. 影响范围 -- ✅ 出国申请列表 - 查看详情按钮 -- ✅ 出国记录列表 - 查看详情按钮 -- ✅ 出国申请审批页面 - 申请详情弹窗 - -### 3. 响应式布局 -- ✅ 两列布局 (`:column="2"`) -- ✅ 字段对齐正常 -- ✅ 弹窗宽度 900px - ---- - -## 🚀 测试步骤 - -### 1. 出国申请管理页面测试 - -``` -1. 访问:人事管理 > 出国申请 -2. 点击"出国申请"选项卡 -3. 点击任意记录的"查看"按钮 -4. 验证详情弹窗中字段顺序: - ✅ 职务 在左侧 - ✅ 申领证件名称 在职务右侧(同一行) - ✅ 证件号码 独占下一行 -``` - -### 2. 出国记录页面测试 - -``` -1. 访问:人事管理 > 出国申请 -2. 点击"出国记录"选项卡 -3. 点击任意记录的"查看"按钮 -4. 验证详情弹窗中字段顺序: - ✅ 职务 在左侧 - ✅ 申领证件名称 在职务右侧(同一行) - ✅ 证件号码 独占下一行 -``` - -### 3. 出国申请审批页面测试 - -``` -1. 访问:人事管理 > 出国申请审批 -2. 点击任意记录的"详情"按钮 -3. 验证详情弹窗中字段顺序: - ✅ 职务 在左侧 - ✅ 申领证件名称 在职务右侧(同一行) - ✅ 证件号码 独占下一行 -``` - ---- - -## 📊 字段显示对比 - -### 第一批调整 - -| 序号 | 字段名称 | 调整前位置 | 调整后位置 | 备注 | -|------|---------|-----------|-----------|------| -| 1 | 现工作部门 | 第1行左 | 第1行左 | 无变化 | -| 2 | 职称 | 第1行右 | 第1行右 | 无变化 | -| 3 | 职务 | 第2行(独占) | 第2行左 | ✅ 改为占一列 | -| 4 | 申领证件名称 | 第3行左 | 第2行右 | ✅ 移至职务右侧 | -| 5 | 证件号码 | 第3行右 | 第3行(独占) | ✅ 改为独占一行 | - -### 第二批调整 - -| 序号 | 字段名称 | 调整前位置 | 调整后位置 | 备注 | -|------|---------|-----------|-----------|------| -| 1 | 证件号码 | 第3行(独占) | 第3行左 | ✅ 改为占一列 | -| 2 | 前往国家 | 第4行左 | 第3行右 | ✅ 移至证件号码右侧 | -| 3 | 出境事由 | 第4行右 | 第4行左 | ✅ 改为占一列 | -| 4 | 探望对象关系 | 第5行(独占) | 第4行右 | ✅ 移至出境事由右侧 | -| 5 | 行程安排 | 第6行(独占) | 第5行(独占) | 无变化 | -| 6 | 出国天数 | 第7行(独占) | 第6行左 | ✅ 移至行程安排后 | -| 7 | 备注 | 第8行(独占) | 第6行右 | ✅ 与出国天数同行 | -| 8 | 出发日期 | 第9行左 | 第7行左 | 位置前移 | -| 9 | 返回日期 | 第9行右 | 第7行右 | 位置前移 | - ---- - -## 💡 设计思路 - -### 为什么这样调整? - -#### 第一批调整的设计思路 - -1. **优化布局密度**: - - 职务和申领证件名称都是简短字段 - - 放在同一行可以更好利用空间 - -2. **语义分组**: - - 职务属于工作信息 - - 申领证件名称开始证件信息 - - 这样的排列形成自然的过渡 - -3. **突出重要字段**: - - 证件号码独占一行更醒目 - - 便于用户快速查找和复制 - -#### 第二批调整的设计思路 - -1. **关联字段同行显示**: - - **证件号码 + 前往国家**:出国的两个核心信息,便于对比查看 - - **出境事由 + 探望对象关系**:探望对象关系依赖出境事由(探亲时显示),放在同一行更符合逻辑 - - **行程安排 + 出国天数**:行程和天数是相关联的信息 - -2. **节省垂直空间**: - - 将多个独占行的字段改为两列布局 - - 减少页面滚动,提升浏览体验 - -3. **信息层次优化**: - - 证件信息(证件号码、前往国家)作为第一层 - - 出境信息(出境事由、探望对象关系)作为第二层 - - 行程信息(行程安排、出国天数)作为第三层 - - 时间信息(出发日期、返回日期)作为第四层 - -4. **条件显示优化**: - - 探望对象关系字段仅在"出境事由=探亲"时显示 - - 改为与出境事由同行后,非探亲时该位置自动空缺,不影响布局 - ---- - -## 🎯 后续建议 - -### 可选优化 - -如果后续需要进一步优化,可以考虑: - -1. **字段宽度调整**: -```vue - - {{ viewData.position || '-' }} - -``` - -2. **字段样式优化**: -```css -.short-label { - width: 80px !important; -} -``` - -3. **响应式适配**: -```vue - - - -``` - ---- - -## 📝 注意事项 - -1. **保持一致性**:已同步调整所有相关页面的字段顺序 -2. **向后兼容**:不影响数据获取和显示逻辑 -3. **无需重启**:前端修改,热更新即可生效 - ---- - -## ✅ 修改状态 - -### 第一批调整 -- ✅ 代码修改完成(3处位置) -- ✅ 语法检查通过 -- ✅ 布局验证通过 - -### 第二批调整 -- ✅ 代码修改完成(3处位置) -- ✅ 语法检查通过 -- ✅ 布局验证通过 -- ✅ 文档编写完成 - ---- - -## 📋 调整总结 - -### 核心变化 - -| 调整批次 | 影响字段数 | 修改文件数 | 主要改进 | -|---------|-----------|-----------|---------| -| 第一批 | 3个字段 | 2个文件 | 基本信息区域布局优化 | -| 第二批 | 4个字段 | 2个文件 | 出境信息区域布局优化 | -| **合计** | **7个字段** | **2个文件** | **整体布局更紧凑、逻辑更清晰** | - -### 最终效果 - -**调整前**:14行布局(多个独占行) -**调整后**:约9行布局(优化关联字段布局) -**空间节省**:约35%的垂直空间 -**体验提升**:减少滚动、信息更集中 - ---- - -**调整完成时间**: 2025-10-10 -**修改文件数**: 2个文件(index.vue, approval.vue) -**修改位置数**: 6处(每个文件3处) -**测试建议**: 刷新浏览器验证显示效果 - ---- - -现在请刷新浏览器并测试详情弹窗的显示效果!🎉 - -### 重点验证项 - -1. ✅ **证件号码 + 前往国家**:是否在同一行显示 -2. ✅ **出境事由 + 探望对象关系**:探亲时是否在同一行,非探亲时探望对象关系不显示 -3. ✅ **行程安排 + 出国天数**:行程安排独占一行,出国天数在下一行与备注同行 -4. ✅ **整体布局**:页面是否更紧凑,滚动是否减少 -