gitgit Merge branch 'develoop' of http://182.92.169.222:3000/dlsx/Teaching_integration_platform_admin_template into develoop

5 months ago · 00d1c46e62
parent cccf2de390 991fa5ab08
commit 00d1c46e62
6 changed files with 43 additions and 21 deletions
--- a/.env.development
+++ b/.env.development
@ -1,4 +1,8 @@
 # 变量必须以 VITE_ 为前缀才能暴露给外部读取
 NODE_ENV = 'development'
 VITE_APP_TITLE = '无糖运营平台'
+<<<<<<< HEAD
 VITE_APP_BASE_API = 'http://127.0.0.1:8008'
+=======
+VITE_APP_BASE_API = 'http://39.106.16.162:8080'
+>>>>>>> 991fa5ab08c56c84c5a276226f8fbc2ec78f859a
--- a/dist.zip
+++ b/dist.zip
--- a/index_1.html
+++ b/index_1.html
@ -1,15 +0,0 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>教学一体化后师生后台</title>
-  </head>
-  <body>
-    <div id="app"></div>
-    <script type="module" src="/src/main.ts"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/three.js/r134/three.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/vanta@latest/dist/vanta.globe.min.js"></script>
-  </body>
-</html>
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@ -1,8 +1,17 @@
 lockfileVersion: '6.0'
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+>>>>>>> 991fa5ab08c56c84c5a276226f8fbc2ec78f859a

 settings:
  autoInstallPeers: true
  excludeLinksFromLockfile: false
+<<<<<<< HEAD
+=======
+=======
+>>>>>>> 1a620e19de970965f426e07348b1dbc4be900eaf
+>>>>>>> 991fa5ab08c56c84c5a276226f8fbc2ec78f859a

 dependencies:
  3d-force-graph:
--- a/src/api/courseChaptersApi.ts
+++ b/src/api/courseChaptersApi.ts
@ -65,14 +65,14 @@ export function getOrogramObjectiveApi() {
 // 获取课程列表
 export const getCourseList = (params: any) => {
  return request({
-    url: '/course_objectives/list/' + params.id,
+    url: '/api/course_objectives/list/' + params.id,
    params,
  })
 }
 // 添加分目标
 export const addCourse = (data: any) => {
  return request({
-    url: '/objective_contents/addcontent',
+    url: '/api/objective_contents/addcontent',
    method: 'POST',
    data,
  })
@ -80,7 +80,7 @@ export const addCourse = (data: any) => {
 // 编辑目标
 export const editCourse = (data: any) => {
  return request({
-    url: '/objective_contents/update',
+    url: '/api/objective_contents/update',
    method: 'PUT',
    data,
  })
@ -88,16 +88,28 @@ export const editCourse = (data: any) => {
 //删除课程目标
 export const deleteCourse = (params: any) => {
  return request({
-    url: '/objective_contents/' + params.id,
+    url: '/api/objective_contents/' + params.id,
    method: 'DELETE',
  })
 }
-// /objective_contents/
+// /api/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
  })
 }
--- a/src/views/course/CourseObjectives.vue
+++ b/src/views/course/CourseObjectives.vue
@ -3,7 +3,12 @@ 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,
@ -11,7 +16,14 @@ 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