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

.env.development

@@ -1,4 +1,4 @@
 # 变量必须以 VITE_ 为前缀才能暴露给外部读取
 NODE_ENV = 'development'
 VITE_APP_TITLE = '无糖运营平台'
-VITE_APP_BASE_API = 'http://39.106.16.162:8080'
+VITE_APP_BASE_API = 'http://127.0.0.1:8080'

src/api/courseChaptersApi.ts

@@ -98,6 +98,6 @@ export const getCourseInfo = (params: any) => {
   return request({
     url: '/api/objective_contents/' + params.id,
     method: 'get',
-    params,
+    // params
   })
 }

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,
@@ -11,7 +11,9 @@ import {
   deleteCourse,
   getCourseInfo,
 } from '@/api/courseChaptersApi'
+import { useRoute, useRouter } from 'vue-router'
 const route = useRoute()
+const router = useRouter()
 // id ： 分目标id
 // targetId ： 选中的分类
 
@@ -154,6 +156,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,35 +167,155 @@ onMounted(async () => {
   let myChart = echarts.init(chartDom)
   let option
   option = {
-    title: {
+    radar: [
-      text: '分目标',
+      {
-    },
+        nameGap: 20,
-    legend: {
+        indicator: [
-      data: ['Allocated Budget', 'Actual Spending'],
+          {
-    },
+            text: '目标一\n',
-    radar: {
+            max: 100,
-      // shape: 'circle',
+          },
-      indicator: [
+          {
-        { name: 'Sales', max: 6500 },
+            text: '目标五\n\n',
-        { name: 'Administration', max: 16000 },
+            max: 100,
-        { name: 'Information Technology', max: 30000 },
+          },
-        { name: 'Customer Support', max: 38000 },
+          {
-        { name: 'Development', max: 52000 },
+            text: '目标四\n\n',
-        { name: 'Marketing', max: 25000 },
+            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 射线类型【实线 虚线】
+          },
+        },
+      },
+      {
+        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],
+            value: [74, 60, 80, 60, 74],
-            name: 'Allocated Budget',
+            name: 'Data C',
+            areaStyle: {
+              color: '#DBE4F9',
+            },
+          },
+        ],
+      },
+      {
+        type: 'radar',
+        emphasis: {
+          lineStyle: {
+            width: 50,
           },
+        },
+        symbol: 'none',
+        data: [
           {
-            value: [5000, 14000, 28000, 26000, 42000, 21000],
+            value: [74, 60, 80, 40, 74],
-            name: 'Actual Spending',
+            name: 'Data B',
+            areaStyle: {
+              color: '#0052FF',
+            },
           },
         ],
       },
@@ -332,7 +457,7 @@ const li
 
 <style lang="scss" scoped>
 #main {
-  padding: 15px;
+  padding: 10px;
   width: 100%;
   height: 100%;
 }

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

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)
 // 绑定图片
@@ -175,8 +178,8 @@ const onSubmit = async () => {
     ElMessage.success('添加成功')
     // 传递关闭抽屉事件
     emit('CloseCouresNameChange')
-    emit('ClosecreditChange')
+    // emit('ClosecreditChange')
-    emit('CloseclasshoursChange')
+    // emit('CloseclasshoursChange')
   }
   formModel.value = { ...defaultForm }
   imgUrl.value = ''
@@ -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()">
           确认