训计修改

@@ -45,5 +45,10 @@ export const SupersetsApi = {
   // 导出超级组 Excel
   // 导出超级组 Excel
   exportSupersetsExcel: async (params: any) => {
   exportSupersetsExcel: async (params: any) => {
     return await request.download({ url: `/motion/supersets/export-excel`, params })
     return await request.download({ url: `/motion/supersets/export-excel`, params })
+  },
+
+  // 获得超级组列表
+  getSupersetList: () => {
+    return request.get({ url: '/motion/supersets/supersets-simple-list' })
   }
   }
 }
 }

@@ -85,5 +85,9 @@ export const ExercisesApi = {
       url: '/motion/exercises/export-excel',
       url: '/motion/exercises/export-excel',
       params
       params
     })
     })
+  },
+  // 获取动作分类下拉列表
+  getExercisesList: () => {
+    return request.get({ url: '/motion/supersets/simple-list' })
   }
   }
 }
 }

@@ -50,5 +50,9 @@ export const TrainingTemplatesApi = {
     return await request.get({
     return await request.get({
       url: `/templates/selectGroup`
       url: `/templates/selectGroup`
     })
     })
+  },
+  // 获取模板下拉列表
+  getTemplateList: () => {
+    return request.get({ url: '/templates/simple-list' })
   }
   }
 }
 }

@@ -143,9 +143,8 @@ const formRules = reactive({
 //加载肌肉列表
 //加载肌肉列表
 const loadMuscleList = async () => {
 const loadMuscleList = async () => {
   try {
   try {
-    const res = await MusclesApi.getMusclesPage({ pageNo: '1', pageSize: '100', name: '' })
-    const data = res.data || res
-    muscleList.value = data.list || []
+    const res = await await MusclesApi.getsubCategoriesList()
+    muscleList.value = res || []
     console.log('部位分类加载的肌肉列表：', muscleList.value)
     console.log('部位分类加载的肌肉列表：', muscleList.value)
   } catch (err) {
   } catch (err) {
     console.error('加载肌肉列表失败：', err)
     console.error('加载肌肉列表失败：', err)

@@ -2,7 +2,8 @@
   <div class="page-container">
   <div class="page-container">
     <!-- 搜索栏区域：芋道行内标准表单 -->
     <!-- 搜索栏区域：芋道行内标准表单 -->
     <ContentWrap>
     <ContentWrap>
-      <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="68px" class="-mb-15px">
+      <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="68px" class="-mb-15px"
+        @submit.prevent>
         <el-form-item label="动作名称" prop="name">
         <el-form-item label="动作名称" prop="name">
           <el-input v-model="queryParams.name" placeholder="请输入动作名称" clearable class="!w-240px"
           <el-input v-model="queryParams.name" placeholder="请输入动作名称" clearable class="!w-240px"
             @keyup.enter="handleQuery" />
             @keyup.enter="handleQuery" />
@@ -91,6 +92,7 @@ const queryParams = reactive({
 // 获取列表数据
 // 获取列表数据
 const getList = async () => {
 const getList = async () => {
   loading.value = true
   loading.value = true
+  console.log('搜索参数：', queryParams) // 新增这行
   try {
   try {
     const res = await ExercisesApi.getExercisesPage(queryParams)
     const res = await ExercisesApi.getExercisesPage(queryParams)
     list.value = res.list || []
     list.value = res.list || []
@@ -152,12 +154,12 @@ onMounted(() => {
   width: 100px;
   width: 100px;
   height: 50px;
   height: 50px;
   margin: 0 auto;
   margin: 0 auto;
+  overflow: hidden;
+  background-color: #f5f7fa;
   border: 1px solid #e4e7ed;
   border: 1px solid #e4e7ed;
   border-radius: 6px;
   border-radius: 6px;
   align-items: center;
   align-items: center;
   justify-content: center;
   justify-content: center;
-  overflow: hidden;
-  background-color: #f5f7fa;
 }
 }
 
 
 .cover-img {
 .cover-img {

@@ -161,17 +161,21 @@ const primaryMusclesText = computed(() => {
     arr.forEach(id => idSet.add(id))
     arr.forEach(id => idSet.add(id))
   })
   })
 
 
-  return Array.from(idSet).map(id => getMuscleName(id)).join('、')
+  return Array.from(idSet).map(id => (id)).join('、')
 })
 })
 
 
 const secondaryMusclesText = computed(() => {
 const secondaryMusclesText = computed(() => {
   if (!formData.exerciseIds.length) return ''
   if (!formData.exerciseIds.length) return ''
   const idSet = new Set()
   const idSet = new Set()
 
 
+  console.log('formData.exerciseIds=', formData.exerciseIds);
+
   formData.exerciseIds.forEach(exId => {
   formData.exerciseIds.forEach(exId => {
     const item = exercisesList.value.find(e => e.id === exId)
     const item = exercisesList.value.find(e => e.id === exId)
+    console.log('item=', item);
     if (!item) return
     if (!item) return
     const arr = parseMuscles(item.secondaryMuscles || '[]')
     const arr = parseMuscles(item.secondaryMuscles || '[]')
+    console.log('arr=', arr);
     arr.forEach(id => idSet.add(id))
     arr.forEach(id => idSet.add(id))
   })
   })
 
 
@@ -193,9 +197,9 @@ const formRules = reactive({
 //加载数据
 //加载数据
 const loadExercisesList = async () => {
 const loadExercisesList = async () => {
   try {
   try {
-    const res = await ExercisesApi.getExercisesPage({ pageNo: 1, pageSize: 100, name: '' })
-    const data = res.data || res
-    exercisesList.value = data.list || []
+    const res = await ExercisesApi.getExercisesList()
+
+    exercisesList.value = res || []
   } catch (err) {
   } catch (err) {
     console.error('加载动作列表失败：', err)
     console.error('加载动作列表失败：', err)
     ElMessage.error('加载动作列表失败')
     ElMessage.error('加载动作列表失败')
@@ -215,9 +219,8 @@ const loadExercisesList = async () => {
 
 
 const loadMuscleList = async () => {
 const loadMuscleList = async () => {
   try {
   try {
-    const res = await MusclesApi.getMusclesPage({ pageNo: 1, pageSize: 100, name: '' })
-    const data = res.data || res
-    muscleList.value = data.list || []
+    const res = await MusclesApi.getsubCategoriesList()
+    muscleList.value = res || []
   } catch (err) {
   } catch (err) {
     console.error('加载肌肉列表失败：', err)
     console.error('加载肌肉列表失败：', err)
     ElMessage.error('加载肌肉列表失败')
     ElMessage.error('加载肌肉列表失败')
@@ -237,6 +240,8 @@ const getList = async () => {
 
 
     tableData.value = list
     tableData.value = list
     total.value = resTotal
     total.value = resTotal
+    console.log('tableData.value', tableData.value);
+
   } catch (err) {
   } catch (err) {
     ElMessage.error('获取超级组列表失败')
     ElMessage.error('获取超级组列表失败')
     console.error(err)
     console.error(err)

@@ -120,9 +120,9 @@ const formRules = reactive({
 
 
 const loadtemplateList = async () => {
 const loadtemplateList = async () => {
   try {
   try {
-    const res = await TrainingTemplatesApi.getTrainingTemplatesPage({ pageNo: 1, pageSize: 100, name: '' })
-    const data = res.data || res
-    templateList.value = data.list || []
+    const res = await TrainingTemplatesApi.getTemplateList()
+
+    templateList.value = res || []
   } catch (err) {
   } catch (err) {
     console.error('加载模板列表失败：', err)
     console.error('加载模板列表失败：', err)
     ElMessage.error('加载模板列表失败')
     ElMessage.error('加载模板列表失败')

@@ -159,9 +159,8 @@ const rules = ref({
 //加载数据
 //加载数据
 const loadsuperGroupList = async () => {
 const loadsuperGroupList = async () => {
   try {
   try {
-    const res = await SupersetsApi.getSupersetsPage({ pageNo: 1, pageSize: 100, name: '' })
-    const data = res.data || res
-    superGroupList.value = data.list || []
+    const res = await SupersetsApi.getSupersetList()
+    superGroupList.value = res || []
   } catch (err) {
   } catch (err) {
     console.error('加载动作列表失败：', err)
     console.error('加载动作列表失败：', err)
     ElMessage.error('加载动作列表失败')
     ElMessage.error('加载动作列表失败')
@@ -171,9 +170,8 @@ const loadsuperGroupList = async () => {
 //加载数据
 //加载数据
 const loadExercisesList = async () => {
 const loadExercisesList = async () => {
   try {
   try {
-    const res = await ExercisesApi.getExercisesPage({ pageNo: 1, pageSize: 100, name: '' })
-    const data = res.data || res
-    exercisesList.value = data.list || []
+    const res = await ExercisesApi.getExercisesList()
+    exercisesList.value = res || []
   } catch (err) {
   } catch (err) {
     console.error('加载动作列表失败：', err)
     console.error('加载动作列表失败：', err)
     ElMessage.error('加载动作列表失败')
     ElMessage.error('加载动作列表失败')
@@ -489,7 +487,8 @@ const handleSubmit = async () => {
 
 
     console.log('接口返回结果：', res)
     console.log('接口返回结果：', res)
     ElMessage.success('模板保存成功！')
     ElMessage.success('模板保存成功！')
-    router.push('/training/templates/templatesForm')
+    // router.push('/training/templates/templatesForm')
+    router.back()
   } catch (err: any) {
   } catch (err: any) {
     // 👇 修复日志打印，避免undefined
     // 👇 修复日志打印，避免undefined
     console.error("【完整错误对象】", err);
     console.error("【完整错误对象】", err);

@@ -4,7 +4,7 @@
     <!-- 搜索栏 -->
     <!-- 搜索栏 -->
     <!-- <div class="search-bar"> -->
     <!-- <div class="search-bar"> -->
     <div class="search-item">
     <div class="search-item">
-      <label class="search-label">肌肉名称</label>
+      <label class="search-label">用具名称</label>
       <el-input v-model="searchForm.name" placeholder="请输入" style="width: 200px;" size="default"
       <el-input v-model="searchForm.name" placeholder="请输入" style="width: 200px;" size="default"
         @keyup.enter="handleSearch" />
         @keyup.enter="handleSearch" />
       <div class="search-buttons">
       <div class="search-buttons">