From 5ae8cf726c5997a6028b63ac73f6fd0612d42954 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A5=9E=E7=A0=81-=E6=96=B9=E6=99=93=E8=BE=89?=
 <fangxh2013@qq.com>
Date: Mon, 2 Feb 2026 16:18:27 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=9F=BA=E7=A1=80?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=A1=B5=E9=9D=A2API=E8=B7=AF=E5=BE=84?=
 =?UTF-8?q?=E5=92=8C=E5=AD=97=E6=AE=B5=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 修复所有页面的删除API路径：/api/xxx → /business/xxx
2. 修复年级管理页面字段名：
   - name → gradeName
   - code → gradeCode
   - sort → orderNum
   - id → gradeId
3. 修复班级管理页面字段名：className, classCode, classId
4. 修复学科管理页面字段名：subjectName, subjectCode, subjectId
5. 修复区域管理页面字段名：regionName, regionCode, regionId

@author pangu
---
 .../src/views/business/application/index.vue  |   4 +-
 .../src/views/business/base/class/index.vue   |  16 +--
 .../src/views/business/base/grade/index.vue   |  36 +++---
 .../src/views/business/base/region/index.vue  | 109 +++++++++++-------
 .../src/views/business/base/subject/index.vue |  16 +--
 .../src/views/business/member/index.vue       |   2 +-
 .../src/views/business/school/index.vue       |   2 +-
 .../src/views/business/student/index.vue      |   2 +-
 8 files changed, 107 insertions(+), 80 deletions(-)

diff --git a/frontend/ruoyi-ui/src/views/business/application/index.vue b/frontend/ruoyi-ui/src/views/business/application/index.vue
index 0526e09..a258400 100644
--- a/frontend/ruoyi-ui/src/views/business/application/index.vue
+++ b/frontend/ruoyi-ui/src/views/business/application/index.vue
@@ -156,7 +156,7 @@ const handleResetSecret = async (row) => {
     cancelButtonText: '取消',
     type: 'warning'
   }).then(async () => {
-    const res = await request.put(`/api/application/resetSecret/${row.id}`)
+    const res = await request.put(`/business/application/resetSecret/${row.id}`)
     if (res.code === 200) {
       ElMessage.success('重置成功')
       secretDialogRef.value?.open(res.data)
@@ -171,7 +171,7 @@ const handleDelete = (row) => {
     cancelButtonText: '取消',
     type: 'warning'
   }).then(async () => {
-    const res = await request.delete(`/api/application/${row.id}`)
+    const res = await request.delete(`/business/application/${row.id}`)
     if (res.code === 200) {
       ElMessage.success('删除成功')
       getList()
diff --git a/frontend/ruoyi-ui/src/views/business/base/class/index.vue b/frontend/ruoyi-ui/src/views/business/base/class/index.vue
index 26b15a6..ff317a6 100644
--- a/frontend/ruoyi-ui/src/views/business/base/class/index.vue
+++ b/frontend/ruoyi-ui/src/views/business/base/class/index.vue
@@ -30,7 +30,7 @@
       <el-table v-loading="loading" :data="tableData" border stripe :header-cell-style="{ background: '#f5f7fa', color: '#606266' }" style="width: 100%">
         <el-table-column prop="className" label="班级名称" min-width="150" />
         <el-table-column prop="classCode" label="班级编码" width="120" />
-        <el-table-column prop="sort" label="排序" width="80" align="center" />
+        <el-table-column prop="orderNum" label="排序" width="80" align="center" />
         <el-table-column prop="status" label="状态" width="80" align="center">
           <template #default="{ row }">
             <el-tag :type="row.status === '0' ? 'success' : 'danger'">
@@ -69,8 +69,8 @@
         <el-form-item label="班级编码" prop="classCode">
           <el-input v-model="form.classCode" placeholder="自动生成" disabled />
         </el-form-item>
-        <el-form-item label="排序" prop="sort">
-          <el-input-number v-model="form.sort" :min="0" :max="999" />
+        <el-form-item label="排序" prop="orderNum">
+          <el-input-number v-model="form.orderNum" :min="0" :max="999" />
         </el-form-item>
         <el-form-item label="状态" prop="status">
           <el-switch v-model="form.status" active-value="0" inactive-value="1" active-text="正常" inactive-text="停用" />
@@ -110,10 +110,10 @@ const dialogVisible = ref(false)
 const dialogTitle = ref('')
 const formRef = ref()
 const form = ref({
-  id: null,
+  classId: null,
   className: '',
   classCode: '',
-  sort: 0,
+  orderNum: 0,
   status: '0'
 })
 
@@ -150,7 +150,7 @@ const resetQuery = () => {
 // 新增
 const handleAdd = () => {
   dialogTitle.value = '新增班级'
-  form.value = { id: null, className: '', classCode: 'C' + Date.now(), sort: 0, status: '0' }
+  form.value = { classId: null, className: '', classCode: '', orderNum: 0, status: '0' }
   dialogVisible.value = true
 }
 
@@ -164,7 +164,7 @@ const handleEdit = (row) => {
 // 提交
 const handleSubmit = async () => {
   await formRef.value?.validate()
-  const isEdit = !!form.value.id
+  const isEdit = !!form.value.classId
   const res = isEdit
     ? await request.put('/business/class', form.value)
     : await request.post('/business/class', form.value)
@@ -182,7 +182,7 @@ const handleDelete = (row) => {
     cancelButtonText: '取消',
     type: 'warning'
   }).then(async () => {
-    const res = await request.delete(`/api/class/${row.id}`)
+    const res = await request.delete(`/business/class/${row.classId}`)
     if (res.code === 200) {
       ElMessage.success('删除成功')
       getList()
diff --git a/frontend/ruoyi-ui/src/views/business/base/grade/index.vue b/frontend/ruoyi-ui/src/views/business/base/grade/index.vue
index 42fe9a1..9b0d12f 100644
--- a/frontend/ruoyi-ui/src/views/business/base/grade/index.vue
+++ b/frontend/ruoyi-ui/src/views/business/base/grade/index.vue
@@ -28,9 +28,9 @@
       </el-row>
 
       <el-table v-loading="loading" :data="tableData" border stripe :header-cell-style="{ background: '#f5f7fa', color: '#606266' }" style="width: 100%">
-        <el-table-column prop="name" label="年级名称" min-width="150" />
-        <el-table-column prop="code" label="年级编码" width="120" />
-        <el-table-column prop="sort" label="排序" width="80" align="center" />
+        <el-table-column prop="gradeName" label="年级名称" min-width="150" />
+        <el-table-column prop="gradeCode" label="年级编码" width="120" />
+        <el-table-column prop="orderNum" label="排序" width="80" align="center" />
         <el-table-column prop="status" label="状态" width="80" align="center">
           <template #default="{ row }">
             <el-tag :type="row.status === '0' ? 'success' : 'danger'">
@@ -63,14 +63,14 @@
     <!-- 新增/编辑弹窗 -->
     <el-dialog v-model="dialogVisible" :title="dialogTitle" width="500px" :close-on-click-modal="false" destroy-on-close>
       <el-form ref="formRef" :model="form" :rules="rules" label-width="100px">
-        <el-form-item label="年级名称" prop="name">
-          <el-input v-model="form.name" placeholder="请输入年级名称" />
+        <el-form-item label="年级名称" prop="gradeName">
+          <el-input v-model="form.gradeName" placeholder="请输入年级名称" />
         </el-form-item>
-        <el-form-item label="年级编码" prop="code">
-          <el-input v-model="form.code" placeholder="自动生成" disabled />
+        <el-form-item label="年级编码" prop="gradeCode">
+          <el-input v-model="form.gradeCode" placeholder="自动生成" disabled />
         </el-form-item>
-        <el-form-item label="排序" prop="sort">
-          <el-input-number v-model="form.sort" :min="0" :max="999" />
+        <el-form-item label="排序" prop="orderNum">
+          <el-input-number v-model="form.orderNum" :min="0" :max="999" />
         </el-form-item>
         <el-form-item label="状态" prop="status">
           <el-switch v-model="form.status" active-value="0" inactive-value="1" active-text="正常" inactive-text="停用" />
@@ -110,15 +110,15 @@ const dialogVisible = ref(false)
 const dialogTitle = ref('')
 const formRef = ref()
 const form = ref({
-  id: null,
-  name: '',
-  code: '',
-  sort: 0,
+  gradeId: null,
+  gradeName: '',
+  gradeCode: '',
+  orderNum: 0,
   status: '0'
 })
 
 const rules = {
-  name: [{ required: true, message: '请输入年级名称', trigger: 'blur' }]
+  gradeName: [{ required: true, message: '请输入年级名称', trigger: 'blur' }]
 }
 
 // 获取年级列表
@@ -150,7 +150,7 @@ const resetQuery = () => {
 // 新增
 const handleAdd = () => {
   dialogTitle.value = '新增年级'
-  form.value = { id: null, name: '', code: '', sort: 0, status: '0' }
+  form.value = { gradeId: null, gradeName: '', gradeCode: '', orderNum: 0, status: '0' }
   dialogVisible.value = true
 }
 
@@ -164,7 +164,7 @@ const handleEdit = (row) => {
 // 提交
 const handleSubmit = async () => {
   await formRef.value?.validate()
-  const isEdit = !!form.value.id
+  const isEdit = !!form.value.gradeId
   const res = isEdit
     ? await request.put('/business/grade', form.value)
     : await request.post('/business/grade', form.value)
@@ -177,12 +177,12 @@ const handleSubmit = async () => {
 
 // 删除
 const handleDelete = (row) => {
-  ElMessageBox.confirm(`确定要删除年级"${row.name}"吗？`, '提示', {
+  ElMessageBox.confirm(`确定要删除年级"${row.gradeName}"吗？`, '提示', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
     type: 'warning'
   }).then(async () => {
-    const res = await request.delete(`/api/grade/${row.id}`)
+    const res = await request.delete(`/business/grade/${row.gradeId}`)
     if (res.code === 200) {
       ElMessage.success('删除成功')
       getList()
diff --git a/frontend/ruoyi-ui/src/views/business/base/region/index.vue b/frontend/ruoyi-ui/src/views/business/base/region/index.vue
index 0093016..946eca8 100644
--- a/frontend/ruoyi-ui/src/views/business/base/region/index.vue
+++ b/frontend/ruoyi-ui/src/views/business/base/region/index.vue
@@ -15,7 +15,7 @@
         <el-form-item>
           <el-button type="primary" :icon="Search" @click="handleQuery">搜索</el-button>
           <el-button :icon="Refresh" @click="resetQuery">重置</el-button>
-          <el-button type="info" :icon="Sort" @click="toggleExpand">{{ isExpand ? '折叠' : '展开' }}</el-button>
+          <el-button type="info" :icon="Sort" @click="toggleExpandAll">展开/折叠</el-button>
         </el-form-item>
       </el-form>
     </el-card>
@@ -29,18 +29,27 @@
       </el-row>
 
       <el-table
+        v-if="refreshTable"
         v-loading="loading"
         :data="tableData"
-        row-key="id"
-        border
-        :default-expand-all="isExpand"
+        row-key="regionId"
+        :default-expand-all="isExpandAll"
         :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+        border
+        stripe
         :header-cell-style="{ background: '#f5f7fa', color: '#606266' }"
         style="width: 100%"
       >
         <el-table-column prop="regionName" label="区域名称" min-width="200" />
         <el-table-column prop="regionCode" label="区域编码" width="120" />
-        <el-table-column prop="sort" label="排序" width="80" align="center" />
+        <el-table-column prop="level" label="层级" width="80" align="center">
+          <template #default="{ row }">
+            <el-tag :type="['', 'primary', 'success', 'warning'][row.level] || 'info'">
+              {{ ['', '省', '市', '区/县'][row.level] || row.level }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="orderNum" label="排序" width="80" align="center" />
         <el-table-column prop="status" label="状态" width="80" align="center">
           <template #default="{ row }">
             <el-tag :type="row.status === '0' ? 'success' : 'danger'">
@@ -51,7 +60,7 @@
         <el-table-column prop="createTime" label="创建时间" width="160" />
         <el-table-column label="操作" width="200" fixed="right" align="center">
           <template #default="{ row }">
-            <el-button type="primary" link :icon="Plus" @click="handleAdd(row)">新增</el-button>
+            <el-button type="primary" link :icon="Plus" @click="handleAdd(row)">新增下级</el-button>
             <el-button type="primary" link :icon="Edit" @click="handleEdit(row)">编辑</el-button>
             <el-button type="danger" link :icon="Delete" @click="handleDelete(row)">删除</el-button>
           </template>
@@ -65,10 +74,11 @@
         <el-form-item label="上级区域" prop="parentId">
           <el-tree-select
             v-model="form.parentId"
-            :data="regionTreeOptions"
-            :props="{ value: 'id', label: 'regionName', children: 'children' }"
+            :data="regionOptions"
+            :props="{ value: 'regionId', label: 'regionName', children: 'children' }"
+            value-key="regionId"
+            placeholder="选择上级区域"
             check-strictly
-            placeholder="请选择上级区域"
             clearable
             style="width: 100%"
           />
@@ -76,11 +86,8 @@
         <el-form-item label="区域名称" prop="regionName">
           <el-input v-model="form.regionName" placeholder="请输入区域名称" />
         </el-form-item>
-        <el-form-item label="区域编码" prop="regionCode">
-          <el-input v-model="form.regionCode" placeholder="请输入区域编码" />
-        </el-form-item>
-        <el-form-item label="排序" prop="sort">
-          <el-input-number v-model="form.sort" :min="0" :max="999" />
+        <el-form-item label="排序" prop="orderNum">
+          <el-input-number v-model="form.orderNum" :min="0" :max="999" />
         </el-form-item>
         <el-form-item label="状态" prop="status">
           <el-switch v-model="form.status" active-value="0" inactive-value="1" active-text="正常" inactive-text="停用" />
@@ -101,13 +108,14 @@
  */
 import { Delete, Edit, Plus, Refresh, Search, Sort } from '@element-plus/icons-vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { onMounted, ref } from 'vue'
+import { nextTick, onMounted, ref } from 'vue'
 import request from '@/utils/request'
 
 const loading = ref(false)
 const tableData = ref([])
-const isExpand = ref(true)
-const regionTreeOptions = ref([])
+const regionOptions = ref([])
+const refreshTable = ref(true)
+const isExpandAll = ref(true)
 
 const queryParams = ref({
   regionName: '',
@@ -119,34 +127,58 @@ const dialogVisible = ref(false)
 const dialogTitle = ref('')
 const formRef = ref()
 const form = ref({
-  id: null,
-  parentId: null,
+  regionId: null,
+  parentId: 0,
   regionName: '',
-  regionCode: '',
-  sort: 0,
+  orderNum: 0,
   status: '0'
 })
 
 const rules = {
-  regionName: [{ required: true, message: '请输入区域名称', trigger: 'blur' }],
-  regionCode: [{ required: true, message: '请输入区域编码', trigger: 'blur' }]
+  regionName: [{ required: true, message: '请输入区域名称', trigger: 'blur' }]
 }
 
-// 获取区域列表
+// 获取区域列表（树形）
 const getList = async () => {
   loading.value = true
   try {
     const res = await request.get('/business/region/list', { params: queryParams.value })
     if (res.code === 200) {
-      tableData.value = res.data
-      // 构建树形选择器的数据
-      regionTreeOptions.value = [{ id: 0, regionName: '根节点', children: res.data }]
+      tableData.value = buildTree(res.data || [])
     }
   } finally {
     loading.value = false
   }
 }
 
+// 获取区域树选项（用于下拉选择）
+const getRegionOptions = async () => {
+  const res = await request.get('/business/region/list')
+  if (res.code === 200) {
+    regionOptions.value = [{ regionId: 0, regionName: '顶级区域', children: buildTree(res.data || []) }]
+  }
+}
+
+// 构建树形结构
+const buildTree = (data, parentId = 0) => {
+  return data
+    .filter(item => item.parentId === parentId)
+    .map(item => ({
+      ...item,
+      children: buildTree(data, item.regionId)
+    }))
+    .filter(item => item.children.length > 0 || data.some(d => d.regionId === item.regionId))
+}
+
+// 展开/折叠
+const toggleExpandAll = () => {
+  refreshTable.value = false
+  isExpandAll.value = !isExpandAll.value
+  nextTick(() => {
+    refreshTable.value = true
+  })
+}
+
 // 搜索
 const handleQuery = () => {
   getList()
@@ -158,23 +190,17 @@ const resetQuery = () => {
   getList()
 }
 
-// 展开/折叠
-const toggleExpand = () => {
-  isExpand.value = !isExpand.value
-  getList()
-}
-
 // 新增
 const handleAdd = (row) => {
-  dialogTitle.value = '新增区域'
+  dialogTitle.value = row ? '新增下级区域' : '新增区域'
   form.value = {
-    id: null,
-    parentId: row ? row.id : 0,
+    regionId: null,
+    parentId: row ? row.regionId : 0,
     regionName: '',
-    regionCode: '',
-    sort: 0,
+    orderNum: 0,
     status: '0'
   }
+  getRegionOptions()
   dialogVisible.value = true
 }
 
@@ -182,13 +208,14 @@ const handleAdd = (row) => {
 const handleEdit = (row) => {
   dialogTitle.value = '编辑区域'
   form.value = { ...row }
+  getRegionOptions()
   dialogVisible.value = true
 }
 
 // 提交
 const handleSubmit = async () => {
   await formRef.value?.validate()
-  const isEdit = !!form.value.id
+  const isEdit = !!form.value.regionId
   const res = isEdit
     ? await request.put('/business/region', form.value)
     : await request.post('/business/region', form.value)
@@ -201,12 +228,12 @@ const handleSubmit = async () => {
 
 // 删除
 const handleDelete = (row) => {
-  ElMessageBox.confirm(`确定要删除区域"${row.regionName}"吗？删除后子区域也将被删除。`, '提示', {
+  ElMessageBox.confirm(`确定要删除区域"${row.regionName}"吗？`, '提示', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
     type: 'warning'
   }).then(async () => {
-    const res = await request.delete(`/api/region/${row.id}`)
+    const res = await request.delete(`/business/region/${row.regionId}`)
     if (res.code === 200) {
       ElMessage.success('删除成功')
       getList()
diff --git a/frontend/ruoyi-ui/src/views/business/base/subject/index.vue b/frontend/ruoyi-ui/src/views/business/base/subject/index.vue
index 63853c0..831ebcc 100644
--- a/frontend/ruoyi-ui/src/views/business/base/subject/index.vue
+++ b/frontend/ruoyi-ui/src/views/business/base/subject/index.vue
@@ -30,7 +30,7 @@
       <el-table v-loading="loading" :data="tableData" border stripe :header-cell-style="{ background: '#f5f7fa', color: '#606266' }" style="width: 100%">
         <el-table-column prop="subjectName" label="学科名称" min-width="150" />
         <el-table-column prop="subjectCode" label="学科编码" width="120" />
-        <el-table-column prop="sort" label="排序" width="80" align="center" />
+        <el-table-column prop="orderNum" label="排序" width="80" align="center" />
         <el-table-column prop="status" label="状态" width="80" align="center">
           <template #default="{ row }">
             <el-tag :type="row.status === '0' ? 'success' : 'danger'">
@@ -69,8 +69,8 @@
         <el-form-item label="学科编码" prop="subjectCode">
           <el-input v-model="form.subjectCode" placeholder="自动生成" disabled />
         </el-form-item>
-        <el-form-item label="排序" prop="sort">
-          <el-input-number v-model="form.sort" :min="0" :max="999" />
+        <el-form-item label="排序" prop="orderNum">
+          <el-input-number v-model="form.orderNum" :min="0" :max="999" />
         </el-form-item>
         <el-form-item label="状态" prop="status">
           <el-switch v-model="form.status" active-value="0" inactive-value="1" active-text="正常" inactive-text="停用" />
@@ -110,10 +110,10 @@ const dialogVisible = ref(false)
 const dialogTitle = ref('')
 const formRef = ref()
 const form = ref({
-  id: null,
+  subjectId: null,
   subjectName: '',
   subjectCode: '',
-  sort: 0,
+  orderNum: 0,
   status: '0'
 })
 
@@ -150,7 +150,7 @@ const resetQuery = () => {
 // 新增
 const handleAdd = () => {
   dialogTitle.value = '新增学科'
-  form.value = { id: null, subjectName: '', subjectCode: 'S' + Date.now(), sort: 0, status: '0' }
+  form.value = { subjectId: null, subjectName: '', subjectCode: '', orderNum: 0, status: '0' }
   dialogVisible.value = true
 }
 
@@ -164,7 +164,7 @@ const handleEdit = (row) => {
 // 提交
 const handleSubmit = async () => {
   await formRef.value?.validate()
-  const isEdit = !!form.value.id
+  const isEdit = !!form.value.subjectId
   const res = isEdit
     ? await request.put('/business/subject', form.value)
     : await request.post('/business/subject', form.value)
@@ -182,7 +182,7 @@ const handleDelete = (row) => {
     cancelButtonText: '取消',
     type: 'warning'
   }).then(async () => {
-    const res = await request.delete(`/api/subject/${row.id}`)
+    const res = await request.delete(`/business/subject/${row.subjectId}`)
     if (res.code === 200) {
       ElMessage.success('删除成功')
       getList()
diff --git a/frontend/ruoyi-ui/src/views/business/member/index.vue b/frontend/ruoyi-ui/src/views/business/member/index.vue
index 729771f..f2513a0 100644
--- a/frontend/ruoyi-ui/src/views/business/member/index.vue
+++ b/frontend/ruoyi-ui/src/views/business/member/index.vue
@@ -210,7 +210,7 @@ const handleDelete = (row) => {
     cancelButtonText: '取消',
     type: 'warning'
   }).then(async () => {
-    const res = await request.delete(`/api/member/${row.id}`)
+    const res = await request.delete(`/business/member/${row.id}`)
     if (res.code === 200) {
       ElMessage.success('删除成功')
       getList()
diff --git a/frontend/ruoyi-ui/src/views/business/school/index.vue b/frontend/ruoyi-ui/src/views/business/school/index.vue
index 7164c83..e533f0e 100644
--- a/frontend/ruoyi-ui/src/views/business/school/index.vue
+++ b/frontend/ruoyi-ui/src/views/business/school/index.vue
@@ -216,7 +216,7 @@ const handleDelete = (row) => {
     cancelButtonText: '取消',
     type: 'warning'
   }).then(async () => {
-    const res = await request.delete(`/api/school/${row.id}`)
+    const res = await request.delete(`/business/school/${row.id}`)
     if (res.code === 200) {
       ElMessage.success('删除成功')
       getList()
diff --git a/frontend/ruoyi-ui/src/views/business/student/index.vue b/frontend/ruoyi-ui/src/views/business/student/index.vue
index 9f14aa1..2502cb0 100644
--- a/frontend/ruoyi-ui/src/views/business/student/index.vue
+++ b/frontend/ruoyi-ui/src/views/business/student/index.vue
@@ -235,7 +235,7 @@ const handleDelete = (row) => {
     cancelButtonText: '取消',
     type: 'warning'
   }).then(async () => {
-    const res = await request.delete(`/api/student/${row.id}`)
+    const res = await request.delete(`/business/student/${row.id}`)
     if (res.code === 200) {
       ElMessage.success('删除成功')
       getList()