From 2880679fef10a83dbbd41bf59d4e0cdf5e9807ee Mon Sep 17 00:00:00 2001
From: xy <2115269706@qq.com>
Date: Wed, 19 Jun 2024 18:06:44 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development             | 2 +-
 src/api/courseChaptersApi.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.env.development b/.env.development
index a24f4fd..330efcc 100644
--- a/.env.development
+++ b/.env.development
@@ -1,4 +1,4 @@
 # 变量必须以 VITE_ 为前缀才能暴露给外部读取
 NODE_ENV = 'development'
 VITE_APP_TITLE = '无糖运营平台'
-VITE_APP_BASE_API = 'http://39.106.16.162:8080'
\ No newline at end of file
+VITE_APP_BASE_API = 'http://127.0.0.1:8080'
\ No newline at end of file
diff --git a/src/api/courseChaptersApi.ts b/src/api/courseChaptersApi.ts
index ae9997c..b6362f4 100644
--- a/src/api/courseChaptersApi.ts
+++ b/src/api/courseChaptersApi.ts
@@ -101,6 +101,6 @@ export const getCourseInfo = (params: any) => {
   return request({
     url: '/objective_contents/' + params.id,
     method: "get",
-    params
+    // params
   })
 }
\ No newline at end of file

From 70148923861b541216a5c935b9fb2a1826062e3e Mon Sep 17 00:00:00 2001
From: lijiaqi <1205620597@qq.com>
Date: Fri, 21 Jun 2024 15:00:29 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/course/basicCourseInformation.vue | 6 +++++-
 src/views/course/components/courseEdit.vue  | 5 ++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/views/course/basicCourseInformation.vue b/src/views/course/basicCourseInformation.vue
index 03aacbf..c9968f6 100644
--- a/src/views/course/basicCourseInformation.vue
+++ b/src/views/course/basicCourseInformation.vue
@@ -33,6 +33,7 @@ const total = ref(0)
 const params = ref({
   pageNo: 1,
   pageSize: 7,
+  // username: 'qiuqiu',
   username: userStore.userName,
   assessmenttype: '',
   category: '',
@@ -43,7 +44,10 @@ const loading = ref(false)
 // 获取课程列表
 const getCourseList = async () => {
   loading.value = true
-  console.log(params.value, '11')
+  // console.log(params.value, '11')
+  if (userStore.userInfo.roleId === 2) {
+    params.value.pageSize = 8
+  }
 
   const res = await getCourseListApi(params.value)
   courseList.value = res.data.list
diff --git a/src/views/course/components/courseEdit.vue b/src/views/course/components/courseEdit.vue
index f7e2c34..e192963 100644
--- a/src/views/course/components/courseEdit.vue
+++ b/src/views/course/components/courseEdit.vue
@@ -7,6 +7,9 @@ import { addCourseApi } from '../../../api/user/crouse'
 import { getCourseListApi, getCourseDetailApi } from '../../../api/user/crouse'
 import request from '../../../utils/request'
 import { tool, client } from '../../../utils/alioss.js'
+import useUserStore from '@/store/modules/user'
+// import { useRoute } from 'vue-router'
+const userStore = useUserStore()
 // 绑定弹框
 const visibleDrawer = ref(false)
 // 绑定图片
@@ -382,7 +385,7 @@ const upload = async (option: any) => {
     </el-form>
 
     <template #footer>
-      <span class="dialog-footer">
+      <span class="dialog-footer" v-if="userStore.userInfo.roleId === 1">
         <el-button @click="handleClose" size="large">取消</el-button>
         <el-button type="primary" size="large" @click="onSubmit()">
           确认

From 84f64d54192b42a10c8c52baf2f7ed84fb3d0dd4 Mon Sep 17 00:00:00 2001
From: xy <2115269706@qq.com>
Date: Fri, 21 Jun 2024 15:58:04 +0800
Subject: [PATCH 3/6] =?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/views/course/CourseObjectives.vue | 162 +++++++++++++++++++++-----
 1 file changed, 136 insertions(+), 26 deletions(-)

diff --git a/src/views/course/CourseObjectives.vue b/src/views/course/CourseObjectives.vue
index 23f10a8..ffe0644 100644
--- a/src/views/course/CourseObjectives.vue
+++ b/src/views/course/CourseObjectives.vue
@@ -3,9 +3,10 @@ import { ref, onMounted } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { id } from 'element-plus/es/locales.mjs'
 import * as echarts from 'echarts'
-import { useRoute } from 'vue-router'
+import { useRoute ,useRouter} from 'vue-router'
 import { getCourseList, addCourse, editCourse, deleteCourse, getCourseInfo } from '@/api/courseChaptersApi'
 const route = useRoute()
+const router = useRouter()
 // id ： 分目标id
 // targetId ： 选中的分类
 
@@ -144,6 +145,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()
@@ -152,40 +156,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)
 })
@@ -295,7 +405,7 @@ const li
 
 <style lang="scss" scoped>
 #main {
-  padding: 15px;
+  padding: 10px;
   width: 100%;
   height: 100%;
 }

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

---
 pnpm-lock.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 961ae36..be622ff 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1,4 +1,4 @@
-lockfileVersion: '9.0'
+lockfileVersion: '6.0'
 
 dependencies:
   3d-force-graph:

From a1dda3e08a1ed65a6f38022f280e931503863db7 Mon Sep 17 00:00:00 2001
From: lijiaqi <1205620597@qq.com>
Date: Fri, 21 Jun 2024 16:24:31 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/course/components/courseEdit.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/course/components/courseEdit.vue b/src/views/course/components/courseEdit.vue
index e192963..818aee1 100644
--- a/src/views/course/components/courseEdit.vue
+++ b/src/views/course/components/courseEdit.vue
@@ -178,8 +178,8 @@ const onSubmit = async () => {
     ElMessage.success('添加成功')
     // 传递关闭抽屉事件
     emit('CloseCouresNameChange')
-    emit('ClosecreditChange')
-    emit('CloseclasshoursChange')
+    // emit('ClosecreditChange')
+    // emit('CloseclasshoursChange')
   }
   formModel.value = { ...defaultForm }
   imgUrl.value = ''

From e03d6e2f6932f7ed2492a2afb20a2f8272b9c43d Mon Sep 17 00:00:00 2001
From: lijiaqi <1205620597@qq.com>
Date: Fri, 21 Jun 2024 16:42:28 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/course/CourseObjectives.vue | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/views/course/CourseObjectives.vue b/src/views/course/CourseObjectives.vue
index ebc9d28..7ec2965 100644
--- a/src/views/course/CourseObjectives.vue
+++ b/src/views/course/CourseObjectives.vue
@@ -3,7 +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'
-import { useRoute } from 'vue-router'
+// import { useRoute } from 'vue-router'
 import {
   getCourseList,
   addCourse,
@@ -12,13 +12,6 @@ import {
   getCourseInfo,
 } from '@/api/courseChaptersApi'
 import { useRoute, useRouter } from 'vue-router'
-import {
-  getCourseList,
-  addCourse,
-  editCourse,
-  deleteCourse,
-  getCourseInfo,
-} from '@/api/courseChaptersApi'
 const route = useRoute()
 const router = useRouter()
 // id ： 分目标id