diff --git a/.env.development b/.env.development index 330efcc..e26a9f6 100644 --- a/.env.development +++ b/.env.development @@ -1,4 +1,8 @@ # 变量必须以 VITE_ 为前缀才能暴露给外部读取 NODE_ENV = 'development' VITE_APP_TITLE = '无糖运营平台' -VITE_APP_BASE_API = 'http://127.0.0.1:8080' \ No newline at end of file +<<<<<<< HEAD +VITE_APP_BASE_API = 'http://127.0.0.1:8008' +======= +VITE_APP_BASE_API = 'http://39.106.16.162:8080' +>>>>>>> 991fa5ab08c56c84c5a276226f8fbc2ec78f859a diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 517f898..0fa7399 100644 --- 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: diff --git a/src/api/courseChaptersApi.ts b/src/api/courseChaptersApi.ts index 5f6022b..51d0c75 100644 --- a/src/api/courseChaptersApi.ts +++ b/src/api/courseChaptersApi.ts @@ -96,8 +96,20 @@ export const deleteCourse = (params: any) => { // 获取详情 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/assets/images/100.png b/src/assets/images/100.png new file mode 100644 index 0000000..7228b29 Binary files /dev/null and b/src/assets/images/100.png differ diff --git a/src/assets/images/101.jpg b/src/assets/images/101.jpg new file mode 100644 index 0000000..607f4e9 Binary files /dev/null and b/src/assets/images/101.jpg differ diff --git a/src/assets/images/102.jpg b/src/assets/images/102.jpg new file mode 100644 index 0000000..2f884ad Binary files /dev/null and b/src/assets/images/102.jpg differ diff --git a/src/assets/images/103.jpg b/src/assets/images/103.jpg new file mode 100644 index 0000000..4d57b1b Binary files /dev/null and b/src/assets/images/103.jpg differ diff --git a/src/assets/images/104.jpg b/src/assets/images/104.jpg new file mode 100644 index 0000000..a4fad67 Binary files /dev/null and b/src/assets/images/104.jpg differ diff --git a/src/assets/images/105.jpg b/src/assets/images/105.jpg new file mode 100644 index 0000000..2d5b294 Binary files /dev/null and b/src/assets/images/105.jpg differ diff --git a/src/assets/images/106.jpg b/src/assets/images/106.jpg new file mode 100644 index 0000000..5fc9337 Binary files /dev/null and b/src/assets/images/106.jpg differ diff --git a/src/assets/images/107.jpg b/src/assets/images/107.jpg new file mode 100644 index 0000000..c05e1be Binary files /dev/null and b/src/assets/images/107.jpg differ diff --git a/src/assets/images/108.jpg b/src/assets/images/108.jpg new file mode 100644 index 0000000..2981ff0 Binary files /dev/null and b/src/assets/images/108.jpg differ diff --git a/src/assets/images/109.jpg b/src/assets/images/109.jpg new file mode 100644 index 0000000..f2318ca Binary files /dev/null and b/src/assets/images/109.jpg differ diff --git a/src/assets/images/110.jpg b/src/assets/images/110.jpg new file mode 100644 index 0000000..0d5499c Binary files /dev/null and b/src/assets/images/110.jpg differ diff --git a/src/assets/images/141.png b/src/assets/images/141.png new file mode 100644 index 0000000..4132030 Binary files /dev/null and b/src/assets/images/141.png differ diff --git a/src/assets/images/142.png b/src/assets/images/142.png new file mode 100644 index 0000000..0f43095 Binary files /dev/null and b/src/assets/images/142.png differ diff --git a/src/assets/images/4c.jpeg b/src/assets/images/4c.jpeg new file mode 100644 index 0000000..3dc8b48 Binary files /dev/null and b/src/assets/images/4c.jpeg differ diff --git a/src/assets/images/R-C.png b/src/assets/images/R-C.png new file mode 100644 index 0000000..9b2a69b Binary files /dev/null and b/src/assets/images/R-C.png differ diff --git a/src/assets/images/a.png b/src/assets/images/a.png new file mode 100644 index 0000000..3375a9d Binary files /dev/null and b/src/assets/images/a.png differ diff --git a/src/assets/images/o.jpg b/src/assets/images/o.jpg new file mode 100644 index 0000000..78d00bc Binary files /dev/null and b/src/assets/images/o.jpg differ diff --git a/src/assets/images/screen (1).png b/src/assets/images/screen (1).png new file mode 100644 index 0000000..89ad605 Binary files /dev/null and b/src/assets/images/screen (1).png differ diff --git a/src/assets/images/screen.png b/src/assets/images/screen.png new file mode 100644 index 0000000..609ac94 Binary files /dev/null and b/src/assets/images/screen.png differ diff --git a/src/assets/images/yt.png b/src/assets/images/yt.png new file mode 100644 index 0000000..f46b966 Binary files /dev/null and b/src/assets/images/yt.png differ diff --git a/src/assets/images/zstp.jpg b/src/assets/images/zstp.jpg new file mode 100644 index 0000000..bb0b6eb Binary files /dev/null and b/src/assets/images/zstp.jpg differ diff --git a/src/router/routers.ts b/src/router/routers.ts index bd49659..6724cb7 100644 --- a/src/router/routers.ts +++ b/src/router/routers.ts @@ -299,4 +299,14 @@ export const constantRoute: any = [ }, ], }, + { + path: '/curriculumCenter/largeScreen', + component: () => import('@/views/course/largeScreen.vue'), + name: 'LargeScreen', // name 要与权限一致 + meta: { + title: '课程图谱', + hidden: true, + icon: 'Notebook', + }, + } ] diff --git a/src/views/course/CourseObjectives.vue b/src/views/course/CourseObjectives.vue index 7ec2965..2e1fc03 100644 --- 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 diff --git a/src/views/course/largeScreen.vue b/src/views/course/largeScreen.vue new file mode 100644 index 0000000..67b66e0 --- /dev/null +++ b/src/views/course/largeScreen.vue @@ -0,0 +1,430 @@ + + + + + + \ No newline at end of file diff --git a/src/views/portal/LearningPathRecommendations.vue b/src/views/portal/LearningPathRecommendations.vue index 1226daf..696d9de 100644 --- a/src/views/portal/LearningPathRecommendations.vue +++ b/src/views/portal/LearningPathRecommendations.vue @@ -1,586 +1,682 @@ - + + \ No newline at end of file