From 0ffe772345e76f165bfe9933b539efb8a4165771 Mon Sep 17 00:00:00 2001
From: xy <2115269706@qq.com>
Date: Fri, 21 Jun 2024 18:16:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/courseChaptersApi.ts          | 14 +-------------
 src/views/course/CourseObjectives.vue | 14 ++------------
 2 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/src/api/courseChaptersApi.ts b/src/api/courseChaptersApi.ts
index 51d0c75..ccfebcf 100644
--- a/src/api/courseChaptersApi.ts
+++ b/src/api/courseChaptersApi.ts
@@ -92,24 +92,12 @@ export const deleteCourse = (params: any) => {
     method: 'DELETE',
   })
 }
-// /api/objective_contents/
+// /objective_contents/
 // 获取详情
 export const getCourseInfo = (params: any) => {
   return request({
-<<<<<<< HEAD
-    url: '/objective_contents/' + params.id,
-    method: 'get',
-    // params
-=======
-<<<<<<< HEAD
-    url: '/api/objective_contents/' + params.id,
-    method: 'get',
-    params,
-=======
     url: '/objective_contents/' + params.id,
     method: "get",
     // params
->>>>>>> 1a620e19de970965f426e07348b1dbc4be900eaf
->>>>>>> 991fa5ab08c56c84c5a276226f8fbc2ec78f859a
   })
 }
diff --git a/src/views/course/CourseObjectives.vue b/src/views/course/CourseObjectives.vue
index 2e1fc03..485a28d 100644
--- a/src/views/course/CourseObjectives.vue
+++ b/src/views/course/CourseObjectives.vue
@@ -3,12 +3,9 @@ import { ref, onMounted } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { id } from 'element-plus/es/locales.mjs'
 import * as echarts from 'echarts'
-<<<<<<< HEAD
+
 // import { useRoute } from 'vue-router'
-=======
-<<<<<<< HEAD
-import { useRoute } from 'vue-router'
->>>>>>> 991fa5ab08c56c84c5a276226f8fbc2ec78f859a
+
 import {
   getCourseList,
   addCourse,
@@ -16,14 +13,7 @@ import {
   deleteCourse,
   getCourseInfo,
 } from '@/api/courseChaptersApi'
-<<<<<<< HEAD
 import { useRoute, useRouter } from 'vue-router'
-=======
-=======
-import { useRoute ,useRouter} from 'vue-router'
-import { getCourseList, addCourse, editCourse, deleteCourse, getCourseInfo } from '@/api/courseChaptersApi'
->>>>>>> 1a620e19de970965f426e07348b1dbc4be900eaf
->>>>>>> 991fa5ab08c56c84c5a276226f8fbc2ec78f859a
 const route = useRoute()
 const router = useRouter()
 // id ： 分目标id