diff --git a/index_1.html b/index_1.html
deleted file mode 100644
index ff236cc..0000000
--- a/index_1.html
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
- 教学一体化后师生后台
-
-
-
-
-
-
-
-
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 517f898..81b380a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1,8 +1,11 @@
lockfileVersion: '6.0'
+<<<<<<< HEAD
settings:
autoInstallPeers: true
excludeLinksFromLockfile: false
+=======
+>>>>>>> 1a620e19de970965f426e07348b1dbc4be900eaf
dependencies:
3d-force-graph:
diff --git a/src/api/courseChaptersApi.ts b/src/api/courseChaptersApi.ts
index 885a247..c922c94 100644
--- a/src/api/courseChaptersApi.ts
+++ b/src/api/courseChaptersApi.ts
@@ -96,8 +96,14 @@ export const deleteCourse = (params: any) => {
// 获取详情
export const getCourseInfo = (params: any) => {
return request({
+<<<<<<< HEAD
url: '/api/objective_contents/' + params.id,
method: 'get',
params,
+=======
+ url: '/objective_contents/' + params.id,
+ method: "get",
+ // params
+>>>>>>> 1a620e19de970965f426e07348b1dbc4be900eaf
})
}
diff --git a/src/views/course/CourseObjectives.vue b/src/views/course/CourseObjectives.vue
index 5993373..a631b1b 100644
--- a/src/views/course/CourseObjectives.vue
+++ b/src/views/course/CourseObjectives.vue
@@ -3,6 +3,7 @@ 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'
import {
getCourseList,
@@ -11,7 +12,12 @@ import {
deleteCourse,
getCourseInfo,
} from '@/api/courseChaptersApi'
+=======
+import { useRoute ,useRouter} from 'vue-router'
+import { getCourseList, addCourse, editCourse, deleteCourse, getCourseInfo } from '@/api/courseChaptersApi'
+>>>>>>> 1a620e19de970965f426e07348b1dbc4be900eaf
const route = useRoute()
+const router = useRouter()
// id ： 分目标id
// targetId ： 选中的分类
@@ -154,6 +160,9 @@ const getList = async () => {
const data = ref({})
const courseId = ref(0)
onMounted(async () => {
+ if (!Object.keys(route.query).length){
+ return router.push('/curriculumCenter/basicCourseInformation')
+ }
courseId.value = route.query.id
console.log(courseId.value)
getList()
@@ -162,40 +171,146 @@ onMounted(async () => {
let myChart = echarts.init(chartDom)
let option
option = {
- title: {
- text: '分目标',
- },
- legend: {
- data: ['Allocated Budget', 'Actual Spending'],
+ radar: [{
+ nameGap: 20,
+ indicator: [{
+ text: '目标一\n',
+ max: 100
+ }, {
+ text: '目标五\n\n',
+ max: 100
+ }, {
+ text: '目标四\n\n',
+ max: 100
+ }, {
+ text: '目标三\n\n',
+ max: 100
+ }, {
+ text: '目标二\n\n',
+ max: 100
+ }],
+ center: ['50%', '50%'],
+ radius: 100,
+ startAngle: 90,
+ splitNumber: 6,
+ shape: 'circle',
+ name: {
+ formatter: '{value}',
+ textStyle: {
+ color: '#333333',
+ fontSize: 20,
+ },
+ gap: 60
+ },
+ splitArea: {
+ areaStyle: {
+ color: ['transparent',
+ 'transparent', 'rgba(114, 172, 209, 0)',
+ 'transparent', 'rgba(114, 172, 209, 0)'
+ ],
+ }
+ },
+ // 设置雷达图中间射线的颜色
+ axisLine: {
+ lineStyle: {
+ color: '#C8D9FF'
+ }
+ },
+ splitLine: {
+ lineStyle: {
+ color: '#DADADA',
+ width: 3,
+ type: 'dashed', //dashed solid dotted 射线类型【实线 虚线】
+ }
+ },
},
- radar: {
- // shape: 'circle',
- indicator: [
- { name: 'Sales', max: 6500 },
- { name: 'Administration', max: 16000 },
- { name: 'Information Technology', max: 30000 },
- { name: 'Customer Support', max: 38000 },
- { name: 'Development', max: 52000 },
- { name: 'Marketing', max: 25000 },
- ],
+ {
+
+ nameGap: 20,
+ indicator: [{
+ text: '达成度',
+ max: 100
+ }, {
+ text: '达成度',
+ max: 100
+ }, {
+ text: '达成度',
+ max: 100
+ }, {
+ text: '达成度',
+ max: 100
+ }, {
+ text: '达成度',
+ max: 100
+ }],
+
+ center: ['50%', '50%'],
+ radius: 100,
+ startAngle: 90,
+ splitNumber: 1,
+ shape: 'circle',
+ splitArea: {
+ show: false,
+ },
+ axisLine: {
+ show: false
+ },
+ name: {
+ formatter: '{value}',
+ textStyle: {
+ color: 'rgba(0,0,0,0.4)',
+ fontSize: 18,
+ },
+ },
+ splitLine: {
+ lineStyle: {
+ color: '#6093FF',
+ type: 'solid',
+ width: 8
+ }
+ },
},
+ ],
series: [
{
- name: 'Budget vs spending',
type: 'radar',
+ emphasis: {
+ lineStyle: {
+ width: 50
+ }
+ },
+ symbol: 'none',
data: [
{
- value: [4200, 3000, 20000, 35000, 50000, 18000],
- name: 'Allocated Budget',
- },
+ value: [74, 60, 80, 60, 74],
+ name: 'Data C',
+ areaStyle: {
+ color: '#DBE4F9'
+ }
+ }
+ ]
+ },
+ {
+ type: 'radar',
+ emphasis: {
+ lineStyle: {
+ width: 50
+ }
+ },
+ symbol: 'none',
+ data: [
{
- value: [5000, 14000, 28000, 26000, 42000, 21000],
- name: 'Actual Spending',
+ value: [74, 60, 80, 40, 74],
+ name: 'Data B',
+ areaStyle: {
+ color: '#0052FF'
+ }
},
- ],
+ ]
},
- ],
- }
+
+ ]
+ };
option && myChart.setOption(option)
})
@@ -332,7 +447,7 @@ const li