From 21e0ad0d13af9e41de4b37f0be751ae3a2ddf97d Mon Sep 17 00:00:00 2001
From: lijiaqi <1205620597@qq.com>
Date: Thu, 22 Aug 2024 16:44:44 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=9C=80=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |  4 +-
 src/views/course/basicCourseInformation.vue   | 62 +++++++------------
 src/views/course/components/course-brief.vue  | 39 +++++++-----
 src/views/course/components/course-object.vue |  6 +-
 src/views/course/components/courseEdit.vue    | 61 +++++++++---------
 5 files changed, 81 insertions(+), 91 deletions(-)

diff --git a/.env.development b/.env.development
index 600aee7..c8c89d1 100644
--- a/.env.development
+++ b/.env.development
@@ -1,5 +1,5 @@
 # 变量必须以 VITE_ 为前缀才能暴露给外部读取
 NODE_ENV = 'development'
 VITE_APP_TITLE = '无糖运营平台'
-VITE_APP_BASE_API = 'http://127.0.0.1:8080'
-# VITE_APP_BASE_API = 'http://39.106.16.162:8080'
+# VITE_APP_BASE_API = 'http://127.0.0.1:8080'
+VITE_APP_BASE_API = 'http://39.106.16.162:8080'
diff --git a/src/views/course/basicCourseInformation.vue b/src/views/course/basicCourseInformation.vue
index 3b5b9d5..9e4687d 100644
--- a/src/views/course/basicCourseInformation.vue
+++ b/src/views/course/basicCourseInformation.vue
@@ -209,11 +209,7 @@ const CloseCouresNameChangeEvent = () => {
         </el-form>
         <div class="course">
           <ul class="course_list">
-            <li
-              v-if="userStore.userInfo.roleId[0] === '1'"
-              @click="onAddCourse()"
-              class="add_course"
-            >
+            <li v-if="userStore.userInfo.roleId[0] === '1'" @click="onAddCourse()" class="add_course">
               <div class="plus">
                 <el-icon class="avatar-uploader-icon">
                   <Plus />
@@ -222,17 +218,8 @@ const CloseCouresNameChangeEvent = () => {
               <h2 class="course_name">{{ course_name }}</h2>
             </li>
             <li v-for="item in courseList" :key="item.id">
-              <img
-                title="点击查看课程详情"
-                :src="item.img"
-                alt=""
-                @click="onGetCourseObject(item.id)"
-              />
-              <h2
-                title="点击查看课程基本信息"
-                class="course_name"
-                @click="onEditCourse(item)"
-              >
+              <img title="点击查看课程详情" :src="item.img" alt="" @click="onGetCourseObject(item.id)" />
+              <h2 title="点击查看课程基本信息" class="course_name">
                 {{ item.name }}
               </h2>
               <p class="teacher_name">讲师：{{ item.teacher }}</p>
@@ -245,36 +232,22 @@ const CloseCouresNameChangeEvent = () => {
               <el-icon class="del" @click="onDeleteCourse(item.id)">
                 <Delete />
               </el-icon>
-              <el-button
-                class="object"
-                round
-                plain
-                @click="onGetCourseObject(item.id)"
-              >
-                查看课程详情
+              <el-button class="object" round plain @click="onGetCourseObject(item.id)">
+                详情
+              </el-button>
+              <el-button class="object1" round plain @click="onEditCourse(item)">
+                编辑
               </el-button>
             </li>
           </ul>
         </div>
-        <el-pagination
-          v-model:current-page="params.pageNo"
-          v-model:page-size="params.pageSize"
-          :page-sizes="[2, 5, 7, 10]"
-          :background="true"
-          layout="jumper,total, sizes, prev, pager, next "
-          :total="total"
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          style="margin-top: 10px; justify-content: center"
-        />
+        <el-pagination v-model:current-page="params.pageNo" v-model:page-size="params.pageSize"
+          :page-sizes="[2, 5, 7, 10]" :background="true" layout="jumper,total, sizes, prev, pager, next " :total="total"
+          @size-change="handleSizeChange" @current-change="handleCurrentChange"
+          style="margin-top: 10px; justify-content: center" />
       </div>
-      <course-edit
-        ref="drawer"
-        @success="onSuccess"
-        @couresNameChange="couresNameChangeEvent"
-        @CloseCouresNameChange="CloseCouresNameChangeEvent"
-        :flog="flog"
-      ></course-edit>
+      <course-edit ref="drawer" @success="onSuccess" @couresNameChange="couresNameChangeEvent"
+        @CloseCouresNameChange="CloseCouresNameChangeEvent" :flog="flog"></course-edit>
     </div>
   </div>
 </template>
@@ -320,6 +293,7 @@ const CloseCouresNameChangeEvent = () => {
 }
 
 .course {
+
   // display: flex;
   // flex: 0 0 25%;
   // justify-content: space-between;
@@ -399,6 +373,12 @@ const CloseCouresNameChangeEvent = () => {
     margin-left: 180px;
     margin-top: -29px;
   }
+
+  .object1 {
+    position: absolute;
+    margin-left: 250px;
+    margin-top: -29px;
+  }
 }
 
 .plus {
diff --git a/src/views/course/components/course-brief.vue b/src/views/course/components/course-brief.vue
index 53b487e..067c182 100644
--- a/src/views/course/components/course-brief.vue
+++ b/src/views/course/components/course-brief.vue
@@ -26,20 +26,25 @@ onMounted(() => {
 </script>
 <template>
   <div class="grid-content course-brief" style="height: 350px">
-    <h1 style="text-align:">课程基本信息</h1>
+    <h1 style="text-align:">
+
+      {{ courseDetails.name }}
+      <span>主讲教师：{{ courseDetails.teacher }}</span>
+
+    </h1>
     <div class="box">
       <div class="image">
         <img :src="courseDetails.img" alt="" />
       </div>
       <div class="text">
-        <h2 class="title">
+        <!-- <h2 class="title">
           {{ courseDetails.name }}
           <span>主讲教师：{{ courseDetails.teacher }}</span>
-        </h2>
+        </h2> -->
         <div>
           <h3>
             课程简介:
-            <el-scrollbar height="70px">
+            <el-scrollbar height="143px">
               <p class="pp">{{ courseDetails.description }}</p>
             </el-scrollbar>
             <!-- <textarea name="" id=""></textarea> -->
@@ -87,9 +92,16 @@ onMounted(() => {
     // display: block;
     padding-top: 20px;
     text-align: center;
-    font-size: 24px;
+    font-size: 26px;
     font-weight: 700;
     color: #333333ff;
+
+    span {
+      margin-left: 40px;
+      font-size: 18px;
+      line-height: 30px;
+      color: #8a8b99;
+    }
   }
 
   .box {
@@ -136,12 +148,7 @@ onMounted(() => {
         font-family: Inter, Inter;
         color: #333333ff;
 
-        span {
-          margin-left: 40px;
-          font-size: 18px;
-          line-height: 30px;
-          color: #8a8b99;
-        }
+
       }
 
       h3 {
@@ -161,23 +168,27 @@ onMounted(() => {
       .brief {
         border-radius: 4px;
         width: 100%;
-        height: 50%;
+        height: 80%;
 
         .ull {
           display: flex;
           flex-wrap: wrap;
           margin-top: 10px;
+          align-content: space-around;
+          justify-content: space-between;
         }
 
         li {
           // margin-top: 10px;
+          // padding-left: 10px;
+
           margin-right: 80px;
           font-size: 14px;
           text-align: center;
-          margin-bottom: 15px;
+          margin-bottom: 10px;
 
           p {
-            margin-top: 10px;
+            margin-top: 6px;
             font-size: 16px;
           }
 
diff --git a/src/views/course/components/course-object.vue b/src/views/course/components/course-object.vue
index 28375a8..8511e65 100644
--- a/src/views/course/components/course-object.vue
+++ b/src/views/course/components/course-object.vue
@@ -10,15 +10,15 @@ import {
   getObjectContent,
 } from '@/api/user/object'
 import { useRoute } from 'vue-router'
-import { ITEM_RENDER_EVT } from 'element-plus/es/components/virtual-list/src/defaults.mjs'
+// import { ITEM_RENDER_EVT } from 'element-plus/es/components/virtual-list/src/defaults.mjs'
 const route = useRoute()
 // const router = useRouter()
-const courseId = ref(0)
+const courseId = ref()
 // 各项目标
 const data = ref({})
 // 总目标
 const params = ref({
-  content: '',
+  content: '请添加整体目标',
   id: '',
   objectiveId: '',
 })
diff --git a/src/views/course/components/courseEdit.vue b/src/views/course/components/courseEdit.vue
index 71b25d7..64f26b8 100644
--- a/src/views/course/components/courseEdit.vue
+++ b/src/views/course/components/courseEdit.vue
@@ -127,6 +127,13 @@ const rules = {
       trigger: 'change',
     },
   ],
+  description: [
+    {
+      required: true,
+      message: '请输入课程简介',
+      trigger: 'blur',
+    },
+  ]
 }
 
 // 按钮禁用
@@ -243,20 +250,11 @@ const upload = async (option: any) => {
 </script>
 
 <template>
-  <el-drawer
-    :before-close="handleClose"
-    v-model="visibleDrawer"
-    direction="rtl"
-    :title="formModel.id ? '编辑课程' : '添加课程'"
-  >
+  <el-drawer :before-close="handleClose" v-model="visibleDrawer" direction="rtl"
+    :title="formModel.id ? '编辑课程' : '添加课程'">
     <el-form :model="formModel" :rules="rules" ref="formRef">
       <el-form-item label="课程封面" prop="img">
-        <el-upload
-          v-model="formModel.img"
-          class="avatar-uploader"
-          :http-request="upload"
-          :show-file-list="false"
-        >
+        <el-upload v-model="formModel.img" class="avatar-uploader" :http-request="upload" :show-file-list="false">
           <img v-if="imgUrl" :src="imgUrl" class="avatar" />
           <el-icon v-else class="avatar-uploader-icon">
             <Plus />
@@ -295,12 +293,8 @@ const upload = async (option: any) => {
         </el-upload> -->
       </el-form-item>
       <el-form-item label="课程名称" prop="name">
-        <el-input
-          :disabled="nameDisabled"
-          style="width: 200px"
-          v-model="formModel.name"
-          @input="courseNameInput"
-        ></el-input>
+        <el-input :disabled="nameDisabled" style="width: 200px" v-model="formModel.name"
+          @input="courseNameInput"></el-input>
       </el-form-item>
       <el-form-item label="课程类别" prop="category">
         <el-radio-group v-model="formModel.category">
@@ -316,25 +310,18 @@ const upload = async (option: any) => {
         </el-radio-group>
       </el-form-item>
       <el-form-item label="课程编码" prop="code">
-        <el-input
-          style="width: 200px"
-          v-model="formModel.code"
-          :disabled="codeDisabled"
-        ></el-input>
+        <el-input style="width: 200px" v-model="formModel.code" :disabled="codeDisabled"></el-input>
       </el-form-item>
       <el-form-item label="课程学分" prop="credit">
         <el-input style="width: 200px" v-model="formModel.credit"></el-input>
       </el-form-item>
       <el-form-item label="课程学时" prop="classhours">
-        <el-input
-          style="width: 200px"
-          v-model="formModel.classhours"
-        ></el-input>
+        <el-input style="width: 200px" v-model="formModel.classhours"></el-input>
       </el-form-item>
       <el-form-item label="考核类型" prop="assessmenttype">
         <el-radio-group v-model="formModel.assessmenttype">
           <el-radio value="1">考试</el-radio>
-          <el-radio value="2">考察</el-radio>
+          <el-radio value="2">考查</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item label="考核方式" prop="assessmentway">
@@ -344,14 +331,15 @@ const upload = async (option: any) => {
           <el-radio value="3">其他</el-radio>
         </el-radio-group>
       </el-form-item>
-      <el-form-item label="教学方法" prop="teachermethod">
+      <!-- <el-form-item label="教学方法" prop="teachermethod">
         <el-input type="textarea" v-model="formModel.teachermethod" />
       </el-form-item>
       <el-form-item label="教学方式" prop="teacherway">
         <el-input type="textarea" v-model="formModel.teacherway" />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="课程简介" prop="description">
-        <el-input type="textarea" v-model="formModel.description" />
+        <textarea name="" id="" v-model="formModel.description"></textarea>
+        <!-- <el-input class="brief_text" type="textarea" /> -->
       </el-form-item>
     </el-form>
 
@@ -367,6 +355,17 @@ const upload = async (option: any) => {
   </el-drawer>
 </template>
 <style lang="scss" scoped>
+textarea {
+  width: 400px;
+  height: 180px;
+  resize: none;
+  border: 1px solid #dcdfe6;
+  color: #606266;
+  line-height: 1.3;
+  letter-spacing: 1px;
+  border-radius: 6px;
+}
+
 .avatar-uploader {
   :deep() {
     .avatar {

From 74aabb14e2631f44fcf86ec7dceb7d5c44539b66 Mon Sep 17 00:00:00 2001
From: lijiaqi <1205620597@qq.com>
Date: Mon, 26 Aug 2024 11:29:18 +0800
Subject: [PATCH 2/6] 1

---
 .env.development                              |   4 +-
 src/api/user/chapter.js                       |   6 +-
 src/api/user/object.js                        |   6 +-
 src/layout/menu/index.vue                     |   4 +-
 src/router/routers.ts                         |  36 +--
 src/views/course/basicCourseInformation.vue   |   1 +
 src/views/course/components/course-brief.vue  |   4 -
 .../course/components/course-chapters.vue     |  39 +--
 src/views/course/components/course-object.vue | 239 +++++++++++-------
 src/views/course/components/courseEdit.vue    |   9 +-
 .../course/components/knowledge-statistic.vue | 199 +++++++++++----
 11 files changed, 347 insertions(+), 200 deletions(-)

diff --git a/.env.development b/.env.development
index c8c89d1..600aee7 100644
--- a/.env.development
+++ b/.env.development
@@ -1,5 +1,5 @@
 # 变量必须以 VITE_ 为前缀才能暴露给外部读取
 NODE_ENV = 'development'
 VITE_APP_TITLE = '无糖运营平台'
-# VITE_APP_BASE_API = 'http://127.0.0.1:8080'
-VITE_APP_BASE_API = 'http://39.106.16.162:8080'
+VITE_APP_BASE_API = 'http://127.0.0.1:8080'
+# VITE_APP_BASE_API = 'http://39.106.16.162:8080'
diff --git a/src/api/user/chapter.js b/src/api/user/chapter.js
index 7405f75..af516ec 100644
--- a/src/api/user/chapter.js
+++ b/src/api/user/chapter.js
@@ -1,11 +1,11 @@
 import request from '@/utils/request'
 // 获取课程章节列表
 export const getChaptersListApi = (params) => {
-  return request.get(`/chapter2/chapter?courseId=${params.id}`)
+  return request.get(`api/chapter2/chapter?courseId=${params.id}`)
 }
 // 添加课程章节
-export const addChaptersApi = (params) => request.post('/chapter2/add', params)
+export const addChaptersApi = (params) => request.post('api/chapter2/add', params)
 // 删除课程章节
 export const delChaptersApi = (id) => {
-  return request.delete(`/chapter2/delete/${id}`)
+  return request.delete(`api/chapter2/delete/${id}`)
 }
diff --git a/src/api/user/object.js b/src/api/user/object.js
index 80d6fa5..d8e55d1 100644
--- a/src/api/user/object.js
+++ b/src/api/user/object.js
@@ -1,6 +1,8 @@
 import request from '@/utils/request'
-// 获取目标类型
-export const getObjectType = () => request.get(`/api/objectives_type/list`)
+// 添加显示目标类型
+export const getObjectType = (id) => {
+  return request.get(`/api/course_objectives/objectiveslist/${id}`)
+}
 // 修改目标内容
 export const updateContents = (params) => {
   return request.put(`/api/objective_contents/update`, params)
diff --git a/src/layout/menu/index.vue b/src/layout/menu/index.vue
index 062b37b..77abaec 100644
--- a/src/layout/menu/index.vue
+++ b/src/layout/menu/index.vue
@@ -20,7 +20,7 @@
       </el-menu-item>
     </template>
     <!-- 有子路由但是只有一个子路由 -->
-    <template v-if="item.children && item.children.length === 1">
+    <template v-if="item.children && (item.children.length === 1||item.children.filter(o=>!o.meta.hidden).length==1)">
       <el-menu-item
         v-if="!item.children[0].meta.hidden"
         :index="item.children[0].path"
@@ -37,7 +37,7 @@
     <!-- 有子路由且有多个 -->
     <el-sub-menu
       :index="item.path"
-      v-if="item.children && item.children.length > 1"
+      v-if="item.children && item.children.length > 1&&item.children.filter(o=>!o.meta.hidden).length!=1"
     >
       <template #title>
         <el-icon>
diff --git a/src/router/routers.ts b/src/router/routers.ts
index 20703d8..afdef54 100644
--- a/src/router/routers.ts
+++ b/src/router/routers.ts
@@ -77,7 +77,7 @@ export const constantRoute: any = [
     name: 'CurriculumCenter',
     meta: {
       title: '课程',
-      hidden: false,
+      hidden: true,
       icon: 'HomeFilled', // 菜单图标
     },
     children: [
@@ -97,7 +97,7 @@ export const constantRoute: any = [
         name: 'CourseDetails',
         meta: {
           title: '课程详情',
-          hidden: false,
+          hidden: true,
           icon: 'Notebook',
         },
       },
@@ -107,7 +107,7 @@ export const constantRoute: any = [
         name: 'CourseObjectives',
         meta: {
           title: '课程目标',
-          hidden: false,
+          hidden: true,
           icon: 'Notebook',
         },
       },
@@ -117,7 +117,7 @@ export const constantRoute: any = [
         name: 'CourseChapters',
         meta: {
           title: '课程章节',
-          hidden: false,
+          hidden: true,
           icon: 'Notebook',
         },
       },
@@ -127,7 +127,7 @@ export const constantRoute: any = [
         name: 'KnowledgePoints', // name 要与权限一致
         meta: {
           title: '知识点',
-          hidden: false,
+          hidden: true,
           icon: 'Notebook',
         },
       },
@@ -137,7 +137,7 @@ export const constantRoute: any = [
         name: 'CurriculumMap', // name 要与权限一致
         meta: {
           title: '课程图谱',
-          hidden: false,
+          hidden: true,
           icon: 'Notebook',
         },
       },
@@ -188,8 +188,8 @@ export const constantRoute: any = [
       },
       {
         path: '/messageManagement/sendMessage',
-        component: ()=>import('@/views/message/components/sendMessage.vue'),
-        name:'SendMessage',
+        component: () => import('@/views/message/components/sendMessage.vue'),
+        name: 'SendMessage',
         meta: {
           title: '个人发出',
           hidden: true,
@@ -198,8 +198,8 @@ export const constantRoute: any = [
       },
       {
         path: '/messageContentList',
-        component:()=>import('@/views/message/components/indexContentList.vue'),
-        name:'MessageContentList',
+        component: () => import('@/views/message/components/indexContentList.vue'),
+        name: 'MessageContentList',
         meta: {
           title: '收到信息详情',
           hidden: true,
@@ -208,8 +208,8 @@ export const constantRoute: any = [
       },
       {
         path: '/sendMessageList',
-        component:()=>import('@/views/message/components/sendMessageList.vue'),
-        name:'SendMessageList',
+        component: () => import('@/views/message/components/sendMessageList.vue'),
+        name: 'SendMessageList',
         meta: {
           title: '发送信息详情',
           hidden: true,
@@ -222,7 +222,7 @@ export const constantRoute: any = [
     path: '/messageContent',
     component: () => import('@/views/message/components/messageContent.vue'),
     name: 'MessageContent',
-    meta:{
+    meta: {
       title: '写栈内信函',
       hidden: true,
       icon: 'EditPen',
@@ -231,7 +231,7 @@ export const constantRoute: any = [
   {
     path: '/news',
     component: () => import('@/layout/index.vue'),
-    name:'NewsManagement',
+    name: 'NewsManagement',
     meta: {
       title: '资讯',
       hidden: false,
@@ -240,8 +240,8 @@ export const constantRoute: any = [
     children: [
       {
         path: '/news/newsContent',
-        component:()=>import('@/views/news/index.vue'),
-        name:'NewsContent',
+        component: () => import('@/views/news/index.vue'),
+        name: 'NewsContent',
         meta: {
           title: '资讯管理',
           hidden: false,
@@ -250,8 +250,8 @@ export const constantRoute: any = [
       },
       {
         path: '/newsDetails',
-        component:()=>import('@/views/news/components/newsContent.vue'),
-        name:'NewsDetails',
+        component: () => import('@/views/news/components/newsContent.vue'),
+        name: 'NewsDetails',
         meta: {
           title: '新闻详情',
           hidden: true,
diff --git a/src/views/course/basicCourseInformation.vue b/src/views/course/basicCourseInformation.vue
index 9e4687d..669ba76 100644
--- a/src/views/course/basicCourseInformation.vue
+++ b/src/views/course/basicCourseInformation.vue
@@ -52,6 +52,7 @@ const getCourseList = async () => {
   const res = await getCourseListApi(params.value)
   courseList.value = res.data.list
   total.value = res.data.total
+  console.log(res, 'courseres')
   console.log(courseList.value, 'courseList.value')
   loading.value = false
   // console.log(userStore.userName, '1111')
diff --git a/src/views/course/components/course-brief.vue b/src/views/course/components/course-brief.vue
index 067c182..2c97fb5 100644
--- a/src/views/course/components/course-brief.vue
+++ b/src/views/course/components/course-brief.vue
@@ -27,10 +27,8 @@ onMounted(() => {
 <template>
   <div class="grid-content course-brief" style="height: 350px">
     <h1 style="text-align:">
-
       {{ courseDetails.name }}
       <span>主讲教师：{{ courseDetails.teacher }}</span>
-
     </h1>
     <div class="box">
       <div class="image">
@@ -147,8 +145,6 @@ onMounted(() => {
         margin-bottom: 20px;
         font-family: Inter, Inter;
         color: #333333ff;
-
-
       }
 
       h3 {
diff --git a/src/views/course/components/course-chapters.vue b/src/views/course/components/course-chapters.vue
index e7dbbcc..fe926fb 100644
--- a/src/views/course/components/course-chapters.vue
+++ b/src/views/course/components/course-chapters.vue
@@ -9,14 +9,15 @@ import {
   delChaptersApi,
 } from '@/api/user/chapter'
 import { onMounted } from 'vue'
-// const route = useRoute()
+const route = useRoute()
 // const router = useRouter()
-// const courseId = ref()
-const courseId = '719f91586a64413898253c5b7d046fd8'
+const courseId = ref()
+// const courseId = '719f91586a64413898253c5b7d046fd8'
 onMounted(() => {
-  // courseId.value = route.query.id
-  // courseId.value = '719f91586a64413898253c5b7d046fd8'
+  courseId.value = route.query.id
+  console.log(courseId.value, 'route.query.id');
 
+  // courseId.value = '719f91586a64413898253c5b7d046fd8'
   getChaptersList()
 })
 
@@ -106,7 +107,7 @@ const remove = async (node: Node, data: Tree) => {
     })
 }
 // 获取章节详情
-const getDetails = (id: any) => {}
+const getDetails = (id: any) => { }
 const dataSource = ref<Tree[]>([
   {
     id,
@@ -134,36 +135,18 @@ const dataSource = ref<Tree[]>([
     <h1>课程章节</h1>
     <!-- <button @click="getChaptersList">获取</button> -->
     <div class="custom-tree-container">
-      <el-tree
-        style="max-width: 600px"
-        :data="dataSource"
-        node-key="id"
-        default-expand-all
-        :expand-on-click-node="false"
-        empty-text="暂无章节"
-      >
+      <el-tree style="max-width: 600px" :data="dataSource" node-key="id" default-expand-all
+        :expand-on-click-node="false" empty-text="暂无章节">
         <template #default="{ node, data }">
           <span class="custom-tree-node">
             <span @click="getDetails(data.id)">{{ data.name }}</span>
             <span>
-              <el-button
-                @click="append(data)"
-                circle
-                size="small"
-                type="primary"
-                plain
-              >
+              <el-button @click="append(data)" circle size="small" type="primary" plain>
                 <el-icon :size="15">
                   <Plus />
                 </el-icon>
               </el-button>
-              <el-button
-                @click="remove(node, data)"
-                circle
-                size="small"
-                type="danger"
-                plain
-              >
+              <el-button @click="remove(node, data)" circle size="small" type="danger" plain>
                 <el-icon :size="15">
                   <Delete />
                 </el-icon>
diff --git a/src/views/course/components/course-object.vue b/src/views/course/components/course-object.vue
index 9b049b3..29a9e7a 100644
--- a/src/views/course/components/course-object.vue
+++ b/src/views/course/components/course-object.vue
@@ -8,9 +8,9 @@ import {
   delObjectContents,
   addObjectContents,
   getObjectContent,
+  getObjectType,
 } from '@/api/user/object'
 import { useRoute } from 'vue-router'
-// import { ITEM_RENDER_EVT } from 'element-plus/es/components/virtual-list/src/defaults.mjs'
 const route = useRoute()
 // const router = useRouter()
 const courseId = ref()
@@ -23,39 +23,52 @@ const params = ref({
   objectiveId: '',
 })
 // 获取目标列表
+const list = ref([])
 const getObject = async () => {
   const res = await getObjectList({ id: courseId.value })
   console.log(res, 'objectres')
   data.value = res.data[0].courseObjectivesTrees
-  params.value = res.data[0].contents[0]
-  console.log(params.value, 'params.value')
+  console.log(data, 'data');
+
+  console.log(res.data, 'res.data[0].contents[0]');
+
+  Object.assign(params.value, res.data[0].contents[0])
+  // params.value = res.data[0].contents[0]
+
+  list.value = data.value.map(item => item.contents).flat()
+  console.log(list.value, 'list.value ');
 
-  console.log(data.value, 'data.value')
   // content.value = res.data[0].contents[0].content
-}
+  // console.log(content.value, 'content.value')
 
+}
 // 获取目标类型
-// const type = ref({
-//   id: '',
-//   typeName: '',
-// })
-// const getType = async () => {
-//   const res = await getObjectType()
-//   type.value = res.data.slice(1, 5)
-//   console.log(type.value, 'typeres')
-// }
+const type = ref({
+  id: '',
+  name: '',
+})
+const getType = async () => {
+  console.log(courseId, 'typecourse')
+  const res = await getObjectType(courseId.value)
+
+  type.value = res.data
+  console.log(res, 'typeres')
+}
+
 onMounted(() => {
   courseId.value = route.query.id
   console.log(courseId.value, 'courseid.vlue')
   getObject()
+  getType()
 })
 // 修改目标内容
 const isEditing = ref(false)
+const content = ref('')
 const updateContent = () => {
   isEditing.value = true
   content.value = params.value.content
 }
-const content = ref('')
+
 // 保存修改
 const saveContent = async () => {
   console.log(params.value.content, ' params.value.content')
@@ -73,6 +86,9 @@ const saveContent = async () => {
   })
     .then(async () => {
       params.value.content = content.value
+
+
+
       const res = await updateContents({
         id: params.value.id,
         objectiveId: params.value.objectiveId,
@@ -81,8 +97,10 @@ const saveContent = async () => {
       console.log(res, 'res')
       ElMessage.success('保存成功！')
       isEditing.value = false
-    })
-    .catch(() => {
+
+
+
+    }, () => {
       // 点击取消后的操作
       ElMessage.info('您已取消操作')
     })
@@ -101,6 +119,9 @@ const delObject = async (id: any) => {
   await delObjectContents(id).then(() => {
     ElMessage.success('删除成功')
     getObject()
+  }).catch((err: any) => {
+    // console.log(id, 'id')
+    ElMessage.error(err.response.data.message)
   })
 }
 // 添加目标
@@ -126,7 +147,9 @@ const objectiveIds = ref(0)
 const addObject = (item: any) => {
   // console.log(id, 'id')
   dialogVisible.value = true
+
   flog.value = false
+  type.value.name = ''
   formData.value.description = ''
   // updateDisabledStatus()
   objectiveIds.value = item.id
@@ -157,6 +180,7 @@ const submit = async () => {
   } else {
     console.log(objectiveIds, 'objectiveIds')
     await addObjectContents({
+      // id: type.value.id,
       objectiveId: objectiveIds.value,
       content: formData.value.description,
     })
@@ -181,13 +205,7 @@ const submit = async () => {
             <template #header>
               <div class="card-header">
                 <span>整体目标</span>
-                <el-button
-                  type="primary"
-                  :icon="Edit"
-                  circle
-                  plain
-                  @click="updateContent"
-                ></el-button>
+                <el-button type="primary" :icon="Edit" circle plain @click="updateContent"></el-button>
               </div>
             </template>
             <div class="el-card__body" style="">
@@ -204,7 +222,7 @@ const submit = async () => {
         </div>
       </div>
       <div class="typeObject">
-        <ul v-for="item in data" :key="item.id">
+        <!-- <ul v-for="item in data" :key="item.id">
           <li>
             <div class="all">
               <div class="left">
@@ -243,24 +261,36 @@ const submit = async () => {
             </div>
             <el-divider style="margin: 0; width: 100%" />
           </li>
-        </ul>
-        <el-dialog
-          v-if="dialogVisible"
-          v-model="dialogVisible"
-          :title="flog ? '编辑' : '新增'"
-          width="500"
-          :before-close="handleClose"
-        >
-          <el-form
-            :model="formData"
-            label-width="auto"
-            style="max-width: 600px"
-          >
-            <el-form-item label="内容" prop="description">
-              <el-input
-                v-model="formData.description"
-                placeholder="请输入内容"
-              ></el-input>
+        </ul> -->
+        <el-scrollbar>
+          <li v-for="(obj, i) in list" :key="obj.id">
+            <span>目标{{ i + 1 }}：{{ obj.content }}</span>
+            <div class="icon">
+              <el-button type="primary" :icon="Edit" circle size="small" plain @click="updateObjectContent(obj.id)" />
+              <el-button type="danger" :icon="Delete" circle size="small" plain @click="delObject(obj.id)" />
+              <span>【{{ data.name }}】</span>
+            </div>
+
+          </li>
+        </el-scrollbar>
+        <el-button @click="addObject" circle size="small" type="primary" plain class="addbutton">
+          <el-icon :size="15">
+            <Plus />
+          </el-icon>
+        </el-button>
+        <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="flog ? '编辑' : '新增'" width="500"
+          :before-close="handleClose">
+          <el-form :model="type">
+            <el-form-item label="目标类别">
+              <el-select v-model="type.name" placeholder="请选择目标类别">
+                <el-option v-for="item in type" :key="item.id" :label="item.name" :value="item.name"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-form>
+
+          <el-form :model="formData" label-width="auto" style="max-width: 600px">
+            <el-form-item label="目标内容" prop="description">
+              <el-input v-model="formData.description" placeholder="请输入内容"></el-input>
             </el-form-item>
           </el-form>
           <template #footer>
@@ -268,6 +298,7 @@ const submit = async () => {
               <el-button @click="close">取消</el-button>
               <el-button type="primary" @click="submit">确定</el-button>
             </div>
+
           </template>
         </el-dialog>
       </div>
@@ -275,6 +306,10 @@ const submit = async () => {
   </div>
 </template>
 <style lang="scss" scoped>
+li {
+  list-style-type: none; //去掉标签默认的左边符号
+}
+
 .el-tabs__item {
   padding: 0 50px;
 }
@@ -367,65 +402,81 @@ const submit = async () => {
     }
 
     .typeObject {
-      width: 70%;
-      // height: 80%;
-      text-align: center;
+      width: 60%;
+      height: 80%;
+      // text-align: center;
+      border: 1px solid #dcdfe6;
+      margin-right: 35px;
+      padding: 20px;
+      position: relative;
 
-      // align-items: center;
-      ul:nth-child(-n + 3) {
-        border-bottom: none;
+      .icon {
+        margin-left: 700px;
+        // display: inline-block;
+        // position: absolute;
       }
 
-      ul {
-        width: 90%;
-        border: 1px solid #dcdfe6;
-
-        // box-shadow: 1px -5px 6px rgba(153, 150, 150, 0.5);
+      .addbutton {
+        position: absolute;
+        right: 20px;
+        bottom: 20px;
       }
 
-      .all {
-        display: flex;
-        width: 100%;
-        // box-shadow: 1px 1px 6px rgba(153, 150, 150, 0.5);
-        // align-content: center;
-
-        .left {
-          width: 20%;
-          display: flex;
-          justify-content: center;
-          border-right: 1px solid #dcdfe6;
-          flex-wrap: wrap;
-          align-content: center;
-          letter-spacing: 1px;
+      // align-items: center;
+      // ul:nth-child(-n + 3) {
+      //   border-bottom: none;
+      // }
 
-          .icon {
-            margin-left: 10px;
-          }
+      // ul {
+      //   width: 90%;
+      //   border: 1px solid #dcdfe6;
 
-          .icon:hover {
-            cursor: pointer;
-            color: red;
-          }
-        }
+      //   // box-shadow: 1px -5px 6px rgba(153, 150, 150, 0.5);
+      // }
 
-        .objectdetails {
-          padding-right: 20px;
-          width: 100%;
-          // border: 1px solid #8a8b99;
-
-          li {
-            width: 100%;
-            display: flex;
-            justify-content: space-between;
-            flex-wrap: wrap;
-            // align-content: center;
-            align-items: center;
-            line-height: 1;
-            margin-top: 2px;
-            letter-spacing: 1px;
-          }
-        }
-      }
+      // .all {
+      //   display: flex;
+      //   width: 100%;
+      //   // box-shadow: 1px 1px 6px rgba(153, 150, 150, 0.5);
+      //   // align-content: center;
+
+      //   .left {
+      //     width: 20%;
+      //     display: flex;
+      //     justify-content: center;
+      //     border-right: 1px solid #dcdfe6;
+      //     flex-wrap: wrap;
+      //     align-content: center;
+      //     letter-spacing: 1px;
+
+      //     .icon {
+      //       margin-left: 10px;
+      //     }
+
+      //     .icon:hover {
+      //       cursor: pointer;
+      //       color: red;
+      //     }
+      //   }
+
+      //   .objectdetails {
+      //     padding-right: 20px;
+      //     width: 100%;
+      //     // border: 1px solid #8a8b99;
+
+      //     li {
+      //       width: 100%;
+      //       display: flex;
+      //       justify-content: space-between;
+      //       flex-wrap: wrap;
+      //       // align-content: center;
+      //       align-items: center;
+      //       line-height: 1;
+      //       margin-top: 2px;
+      //       letter-spacing: 1px;
+      //     }
+      //   }
+      // }
     }
   }
 }
diff --git a/src/views/course/components/courseEdit.vue b/src/views/course/components/courseEdit.vue
index 64f26b8..d2c024c 100644
--- a/src/views/course/components/courseEdit.vue
+++ b/src/views/course/components/courseEdit.vue
@@ -28,13 +28,13 @@ const defaultForm = {
   teacher: userStore.data.id,
   img: '',
   name: '',
-  category: ref(0),
-  nature: ref(0),
+  category: '',
+  nature: '',
   code: '',
   credit: '',
   classhours: '',
-  assessmenttype: ref(0),
-  assessmentway: ref(0),
+  assessmenttype: '',
+  assessmentway: '',
   teachermethod: '',
   teacherway: '',
   description: '',
@@ -133,6 +133,7 @@ const rules = {
       message: '请输入课程简介',
       trigger: 'blur',
     },
+    { max: 500, message: '不能超过500个字符', trigger: 'blur' }
   ]
 }
 
diff --git a/src/views/course/components/knowledge-statistic.vue b/src/views/course/components/knowledge-statistic.vue
index 47877fe..a6f0fac 100644
--- a/src/views/course/components/knowledge-statistic.vue
+++ b/src/views/course/components/knowledge-statistic.vue
@@ -2,63 +2,174 @@
 import { ref, onMounted } from 'vue'
 import * as echarts from 'echarts'
 import 'echarts-liquidfill'
-const liquidechart3 = ref(null) // 第一个波浪水球图的引用
 const liquidechart1 = ref(null) // 第一个波浪水球图的引用
 const liquidechart2 = ref(null) // 第二个波浪水球图的引用
 
 onMounted(() => {
-  const myChart3 = echarts.init(liquidechart3.value) // 使用 ref
-  myChart3.setOption({
-    title: {
-      text: '目标完成度',
-      textStyle: {
-        color: '#888',
-        fontFamily: 'microsoft yahei',
-        fontSize: 24,
-        fontWeight: '400',
-        align: 'center',
-        verticalAlign: 'middle',
+  let chartDom = document.getElementById('main')
+  let myChart = echarts.init(chartDom)
+  let option
+  option = {
+    radar: [
+      {
+        nameGap: 10,
+        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%', '60%'],
+        // 半径
+        radius: 100,
+        // 圆角起始角度
+        startAngle: 90,
+        // 分割数
+        splitNumber: 5,
+        shape: 'circle',
+        name: {
+          formatter: '{value}',
+          textStyle: {
+            color: '#333333',
+            fontSize: 16,
+          },
+          gap: 10,
+        },
+        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: 2,
+            type: 'dashed', //dashed  solid dotted 射线类型【实线 虚线】
+          },
+        },
       },
-      left: 'center',
-      top: '20%',
-    },
-    series: [
       {
-        type: 'liquidFill',
-        radius: '95%',
-        waveAnimation: true,
-        data: [0.3], // 数据值需用数组
-        direction: 'left',
-        itemStyle: {
-          normal: {
-            color: '#1890ff',
+        nameGap: 10,
+        indicator: [
+          {
+            text: '达成度',
+            max: 100,
+          },
+          {
+            text: '达成度',
+            max: 100,
+          },
+          {
+            text: '达成度',
+            max: 100,
           },
+          {
+            text: '达成度',
+            max: 100,
+          },
+          {
+            text: '达成度',
+            max: 100,
+          },
+        ],
+
+        center: ['50%', '60%'],
+        radius: 100,
+        startAngle: 90,
+        splitNumber: 1,
+        shape: 'circle',
+        splitArea: {
+          show: false,
         },
-        outline: {
-          borderDistance: 3,
-          itemStyle: {
-            borderColor: '#4984ff',
-            borderWidth: 10,
+        axisLine: {
+          show: false,
+        },
+        name: {
+          formatter: '{value}',
+          textStyle: {
+            color: 'rgba(0,0,0,0.4)',
+            fontSize: 16,
           },
         },
-        itemStyle: {
-          opacity: 0.9,
+        splitLine: {
+          lineStyle: {
+            color: '#6093FF',
+            type: 'solid',
+            width: 8,
+          },
         },
-        backgroundStyle: {
-          color: '#fff',
+      },
+    ],
+    series: [
+      {
+        type: 'radar',
+        emphasis: {
+          lineStyle: {
+            width: 20,
+          },
         },
-        label: {
-          show: true,
-          color: '#000',
-          insideColor: '#fff',
-          fontSize: 24,
-          fontWeight: 400,
-          align: 'center',
-          verticalAlign: 'middle',
+        symbol: 'none',
+        data: [
+          {
+            value: [74, 60, 80, 60, 74],
+            name: 'Data C',
+            areaStyle: {
+              color: '#DBE4F9',
+            },
+          },
+        ],
+      },
+      {
+        type: 'radar',
+        emphasis: {
+          lineStyle: {
+            width: 20,
+          },
         },
+        symbol: 'none',
+        data: [
+          {
+            value: [74, 60, 80, 40, 74],
+            name: 'Data B',
+            areaStyle: {
+              color: '#0052FF',
+            },
+          },
+        ],
       },
     ],
-  })
+  }
+
+  option && myChart.setOption(option)
   const myChart1 = echarts.init(liquidechart1.value) // 使用 ref
   myChart1.setOption({
     title: {
@@ -170,7 +281,7 @@ onMounted(() => {
   <div class="grid-content knowledge-statistic" style="height: 300px">
     <!-- <h1>知识点统计</h1> -->
     <div class="box">
-      <div style="width: 300px; height: 250px" ref="liquidechart3"></div>
+      <div style="width: 300px; height: 250px" id="main" class="radarmap"></div>
       <div style="width: 300px; height: 250px" ref="liquidechart1"></div>
       <div style="width: 300px; height: 250px" ref="liquidechart2"></div>
     </div>
@@ -181,6 +292,8 @@ onMounted(() => {
 .knowledge-statistic {
   display: flex;
   align-content: center;
+  flex-direction: column;
+  align-items: center;
 
   .box {
     margin-top: 20px;

From 12f25f1689d9545efd09027881143457bbb3110c Mon Sep 17 00:00:00 2001
From: fwb <fwb>
Date: Mon, 26 Aug 2024 12:11:52 +0800
Subject: [PATCH 3/6] 'newschance'

---
 src/api/user/messag.js                        |  19 +-
 src/router/routers.ts                         |   2 +-
 .../message/components/messageContent.vue     |  23 +-
 src/views/message/components/sendMessage.vue  |  14 +-
 src/views/message/index.vue                   |  37 +++-
 src/views/news/index.vue                      | 206 +++++++++---------
 src/views/student/index.vue                   |   4 +-
 7 files changed, 173 insertions(+), 132 deletions(-)

diff --git a/src/api/user/messag.js b/src/api/user/messag.js
index efae69e..c239716 100644
--- a/src/api/user/messag.js
+++ b/src/api/user/messag.js
@@ -17,9 +17,22 @@ export const deleteSendMessageApi = (params) => {
         params,
     })
 }
+//一键已读
+function parseParams(params){
+    let str = '?'
+    try{
+        for (const paramsKey in params) {
+            str+=`${paramsKey}=${params[paramsKey]}&`
+        }
+        return str.slice(0,-1)
+    }catch (e) {
+        return ''
+    }
+}
+export const readMessagesBatch = (params) => {
+    return request.put(`/user-inbox/readmessagesbatch${parseParams(params)}`)
+}
 //发送邮件
 export const SendMessageApi = (params) => {
-    return request.post('/messages/addmessage', {
-        params,
-    })
+    return request.post(`/messages/addmessage${parseParams(params)}`)
 }
diff --git a/src/router/routers.ts b/src/router/routers.ts
index a7d8844..b05318e 100644
--- a/src/router/routers.ts
+++ b/src/router/routers.ts
@@ -234,7 +234,7 @@ export const constantRoute: any = [
     name:'NewsManagement',
     meta: {
       title: '资讯',
-      hidden: false,
+      hidden: true,
       icon: 'BellFilled'
     },
     children: [
diff --git a/src/views/message/components/messageContent.vue b/src/views/message/components/messageContent.vue
index 18c565f..350e78b 100644
--- a/src/views/message/components/messageContent.vue
+++ b/src/views/message/components/messageContent.vue
@@ -130,27 +130,28 @@ getStuList()
 const back= ()=>{
   router.push('/messageManagement/message')
 }
+//选择收件人
+const confirm = ()=>{
+  addPerson.value = false
+}
+//取消
+const disappoint = ()=>{
+  addPerson.value = false
+}
 //发送信息
-const send = async (id: any) => {
+const send = async () => {
   await ElMessageBox.confirm('您确定发送这条信息吗', '温馨提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
     type: 'warning',
   })
   await SendMessageApi({
-    messageIds:id,
+    receiverId:inputPerson.id,
+    title:inputText,
     content:textarea,
-    userId:userStore.userInfo.id
+    senderId:userStore.userInfo.id
   })
 }
-//选择收件人
-const confirm = ()=>{
-  addPerson.value = false
-}
-//取消
-const disappoint = ()=>{
-  addPerson.value = false
-}
 </script>
 <style scoped>
 
diff --git a/src/views/message/components/sendMessage.vue b/src/views/message/components/sendMessage.vue
index f8547ee..0689c6c 100644
--- a/src/views/message/components/sendMessage.vue
+++ b/src/views/message/components/sendMessage.vue
@@ -31,7 +31,7 @@
               <span class="sender">收件人:{{item.receiverName}}</span>
               <span class="read-status">阅读人数：{{item.readUserNum}}</span>
             </div>
-            <div class="message-time">{{item.sendTime}}</div>
+            <div class="message-time">发送时间：{{item.sendTime}}</div>
           </div>
           <!-- 删除按钮，默认不显示，hover时显示 -->
 <!--      <el-button v-if="hoveringOver === item.id" class="delete-btn" @click="deleteSendMessage(item.id)" type="danger" round >删除</el-button>-->
@@ -183,7 +183,6 @@ const handleClick = (item)=> {
   //带查询参数
   router.push({ path: '/sendMessageList', query: item })
 }
-
 </script>
 <style scoped>
 .container{
@@ -199,13 +198,10 @@ const handleClick = (item)=> {
   align-items: center; /* 垂直居中对齐子元素 */
   gap: 10px; /* 设置子元素之间的间距 */
 }
-
 .custom-checkbox {
   transform: scale(1.5); /* 将勾选框放大1.5倍 */
 }
-
 .selected-count {
-
 }
 .message-check{
   margin-right: 20px;
@@ -218,7 +214,6 @@ const handleClick = (item)=> {
   padding: 0 10px;
   box-sizing: border-box;
 }
-
 .message-icon {
   margin-right: 30px; /* 图标右侧间距 */
   font-size: 34px; /* 图标大小 */
@@ -232,32 +227,27 @@ li{
   justify-content: center; /* 标题和详情内容垂直居中 */
   flex: 1; /* 填充剩余空间 */
 }
-
 .message-title {
   line-height: 30px;
   font-size: 20px;
 }
-
 .message-details {
   display: flex;
   align-items: center; /* 细节内容水平居中 */
   margin-top: 10px; /* 与标题的间距 */
 }
-
 .sender {
   margin-right: 88px; /* 发件人和已读状态的间距 */
 }
-
 .read-status {
   color: #888; /* 已读状态的颜色 */
 }
-
 .message-time {
   margin-left: auto; /* 发送时间靠右显示 */
   font-size: 15px; /* 发送时间字体大小 */
   color: #666; /* 发送时间颜色 */
+  position: absolute;
 }
-
 .message-list-item {
   cursor: pointer; /* 鼠标悬停时显示手指形状，表示可点击 */
 }
diff --git a/src/views/message/index.vue b/src/views/message/index.vue
index db38970..240f09b 100644
--- a/src/views/message/index.vue
+++ b/src/views/message/index.vue
@@ -24,17 +24,23 @@
           <!-- 图标 -->
           <div class="message-icon">
             <el-icon><Comment /></el-icon>
+            <!-- 添加红色提示符 -->
+            <span v-if="!item.isRead" class="message-unread-indicator"></span>
           </div>
           <div class="message-content" @click="handleClick(item)">
             <h2 class="message-title">{{item.title}}</h2>
             <div class="message-details">
-              <span class="sender">发件人：{{item.sendPerson}}</span>
-              <span class="read-status">已读状态：{{item.isRead}}</span>
+              <span class="sender">发件人：{{item.senderName}}</span>
+              <span class="read-status" style="margin-right: 40px">是否已读：{{ item.isRead ? '已读' : '未读' }}</span>
+              <span class="read-status">已读人数：{{item.readUserNum}} / {{item.userNum}}</span>
             </div>
             <div class="message-time">发送时间：{{item.sendTime}}</div>
           </div>
           <!-- 删除按钮，默认不显示，hover时显示 -->
-          <el-button v-if="hoveringOver === item.id" class="delete-btn" @click="deleteMessage(item.id)" type="danger" round>删除</el-button>
+          <div v-if="!item.isRead" style="margin-right: 10px">
+            <el-button v-if="hoveringOver === item.id"  @click="readMessage(item.id)" type="warning" round>点击已读</el-button>
+          </div>
+          <el-button v-if="hoveringOver === item.id"  @click="deleteMessage(item.id)" type="danger" round>删除</el-button>
         </div>
         <el-divider/>
       </li>
@@ -58,7 +64,7 @@
 import { ref,computed,onMounted} from 'vue';
 import { useRouter } from 'vue-router';
 import useUserStore from "@/store/modules/user";
-import {getMessagesListApi,deleteSendMessageApi} from "@/api/user/messag";
+import {getMessagesListApi,deleteSendMessageApi,readMessagesBatch} from "@/api/user/messag";
 import { ElMessageBox, ElMessage } from 'element-plus'
 const userStore = useUserStore()
 const params = ref({
@@ -151,6 +157,15 @@ const deleteMessage = async (id: any) => {
 
   await getMessageList()
 }
+//一键已读
+const readMessage = async (id:any) =>{
+  console.log(id,userStore.userInfo.id,'dddddd')
+  await readMessagesBatch({
+    messageIds:id,
+    userId:userStore.userInfo.id
+  })
+  await getMessageList()
+}
 // 分页
 const handleSizeChange = (size: any) => {
   // loading.value = true
@@ -223,6 +238,7 @@ const handleClick = (item)=> {
 .message-icon {
   margin-right: 30px; /* 图标右侧间距 */
   font-size: 34px; /* 图标大小 */
+  position: relative;
 }
 li{
   list-style: none;
@@ -232,8 +248,19 @@ li{
   flex-direction: column;
   justify-content: center; /* 标题和详情内容垂直居中 */
   flex: 1; /* 填充剩余空间 */
+  position: relative;
+}
+/*未读消息加小红点*/
+.message-unread-indicator {
+  position: absolute;
+  top: -4px; /* 调整位置 */
+  right: -4px; /* 调整位置 */
+  width: 10px;
+  height: 10px;
+  border-radius: 50%;
+  background-color: red;
+  z-index: 1; /* 确保它在其他元素之上 */
 }
-
 .message-title {
   line-height: 30px;
   font-size: 20px;
diff --git a/src/views/news/index.vue b/src/views/news/index.vue
index d006122..9c88b04 100644
--- a/src/views/news/index.vue
+++ b/src/views/news/index.vue
@@ -2,26 +2,34 @@
   <div class="header_title">
     <span>资讯</span>
   </div>
-  <div>
-    <el-card shadow="always">
-      <div class="header-flex-container">
+  <div class="common-layout">
+    <el-container>
+      <el-aside>
+        <div class="header-flex-container">
         <ul class="header-list">
           <li v-for="item in column">
-            <el-dropdown placement="bottom">
-              <span @mouseenter="EssayList(item.id)">{{ item.categoryName }}</span> <!-- 使用span代替p -->
+            <el-dropdown placement="right">
+              <div class="header-column" type="primary">
+                <span @mouseenter="EssayList(item.id)">{{ item.categoryName }}</span> <!-- 使用span代替p -->
+              </div>
+<!--              当前栏目新闻管理-->
               <template #dropdown>
                 <el-dropdown-menu>
                   <el-dropdown-item>
-                      <ul>
-                        <li class="flex-container" @click="newViews(listObject)" v-for="listObject in essay" style="margin-bottom: 15px">
+                    <ul>
+                      <li class="flex-container" @click="newViews(listObject)" v-for="listObject in essay" style="margin-bottom: 15px">
+                        <el-tag type="info" size="large" style="height: 30px;font-size: 15px">
                           <p >{{listObject.title}}</p>
-                          <el-button type="danger" @click.stop="deleteNewsList(listObject.id)" round>删除</el-button>
-                          <el-button type="primary" @click.stop="editNewsDialogFormVisible = true; newViews(listObject)" round>编辑</el-button>
-                        </li>
-                      </ul>
+                        </el-tag>
+                        <div class="button-container">
+                          <el-button type="danger" @click.stop="deleteNewsList(listObject.id)" round plain>删除</el-button>
+                          <el-button type="primary" @click.stop="editNewsDialogFormVisible = true; newViews(listObject)" round plain>编辑</el-button>
+                        </div>
+                      </li>
+                    </ul>
                   </el-dropdown-item>
                   <div class="add-news-button">
-                    <el-button @click="addNewsDialogFormVisibleButton(item.id)" type="primary" plain round>添加当前栏目新闻</el-button>
+                    <el-button @click="addNewsDialogFormVisibleButton(item.id)" type="success" style="margin-bottom: 10px" plain round>添加当前栏目新闻</el-button>
                   </div>
                 </el-dropdown-menu>
               </template>
@@ -29,10 +37,43 @@
           </li>
         </ul>
         <div>
-          <el-button name="editColumnButton" @click="editHandle" round>栏目管理</el-button>
+          <el-button class="button-container_column" name="editColumnButton" @click="editHandle" round>栏目管理</el-button>
         </div>
       </div>
-    </el-card>
+      </el-aside>
+<!--      右侧-->
+      <el-main>
+        <div class="mainContainer">
+          <div class="card-header">
+            <el-card shadow="hover">
+              <div style="height:33px">
+                <span class="contentTitle">{{nowTimeNewsData.title}}</span>
+              </div>
+            </el-card>
+            <el-card shadow="hover">
+              <div class="news-flex-container">
+                <p>发布人：{{ nowTimeNewsData.userId }}</p>
+                <p>阅读数量：{{ nowTimeNewsData.readingNumber }}</p>
+                <p>发布日期：{{ nowTimeNewsData.publishTime }}</p>
+                <p>更新时间：{{nowTimeNewsData.updateTime}}</p>
+              </div>
+            </el-card>
+          </div>
+          <div style="text-align: center">
+            <el-input
+                v-model="nowTimeNewsData.content"
+                style="font-size: 20px"
+                :rows="18"
+                type="textarea"
+                readonly
+            />
+          </div>
+          <el-card style="text-align: center">
+            <el-link href="https://element-plus.org" target="_blank"  style="margin-right: 30px;font-size: 19px">关于我们</el-link>
+          </el-card>
+        </div>
+      </el-main>
+    </el-container>
   </div>
 <!--  栏目编辑弹框-->
   <el-drawer v-model="drawer" title="title" :with-header="false">
@@ -91,72 +132,8 @@
     </template>
   </el-dialog>
 <!--  新闻内容-->
-  <el-card class="container">
-    <template #header>
-      <div class="card-header">
-        <span class="contentTitle">{{nowTimeNewsData.title}}</span>
-        <el-card shadow="hover">
-          <div class="news-flex-container">
-            <p>发布人：{{ nowTimeNewsData.userId }}</p>
-            <p>阅读数量：{{ nowTimeNewsData.readingNumber }}</p>
-            <p>发布日期：{{ nowTimeNewsData.publishTime }}</p>
-            <p>更新时间：{{nowTimeNewsData.updateTime}}</p>
-          </div>
-        </el-card>
-      </div>
-    </template>
-    <div style="text-align: center">
-      <el-input
-          v-model="nowTimeNewsData.content"
-          style="width: 80%;font-size: 20px"
-          :rows="15"
-          type="textarea"
-          placeholder="Please input"
-      />
-    </div>
-    <template #footer>
-      <div style="text-align: center">
-        <el-link href="https://element-plus.org" target="_blank"  style="margin-right: 30px;font-size: 19px">关于我们</el-link>
-      </div>
-    </template>
-  </el-card>
 <!--  栏目内添加新闻-->
   <el-dialog v-model="addNewsDialogFormVisible" title="添加新闻" width="500px">
-    <el-form v-model="newsForm">
-      <el-form-item label="所属栏目id" label-width="140px">
-        <el-input v-model="newsForm.categoryId" autocomplete="off" readonly disabled/>
-      </el-form-item>
-      <el-form-item label="文章内容" label-width="140px">
-        <el-input v-model="newsForm.content" autocomplete="off" />
-      </el-form-item>
-<!--      <el-form-item label="文章文件" label-width="140px">-->
-<!--        <el-input v-model="newsForm.file" autocomplete="off" />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="文章id" label-width="140px">-->
-<!--        <el-input v-model="newsForm.id" autocomplete="off" />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="标题图片" label-width="140px">-->
-<!--        <el-input v-model="newsForm.pic" autocomplete="off" />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="发布时间" label-width="140px">-->
-<!--        <el-input v-model="newsForm.publishTime" autocomplete="off"  type="date"/>-->
-<!--      </el-form-item>-->
-      <el-form-item label="浏览次数" label-width="140px">
-        <el-input v-model="newsForm.readingNumber" autocomplete="off" />
-      </el-form-item>
-      <el-form-item label="发布状态" label-width="140px">
-        <el-input v-model="newsForm.status" placeholder="1:已发布 2:未发布" autocomplete="off" />
-      </el-form-item>
-      <el-form-item label="文章标题" label-width="140px">
-        <el-input v-model="newsForm.title" autocomplete="off" />
-      </el-form-item>
-<!--      <el-form-item label="更新时间" label-width="140px">-->
-<!--        <el-input v-model="newsForm.updateTime" autocomplete="off"  type="date"/>-->
-<!--      </el-form-item>-->
-      <el-form-item label="发布文章的用户id" label-width="140px">
-        <el-input v-model="newsForm.userId" autocomplete="off" readonly disabled/>
-      </el-form-item>
-    </el-form>
     <template #footer>
       <div class="dialog-footer">
         <el-button @click="addNewsDialogFormVisible = false">取消</el-button>
@@ -205,7 +182,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button @click="addNewsDialogFormVisible = false">取消</el-button>
+        <el-button @click="editNewsDialogFormVisible = false">取消</el-button>
         <el-button type="primary" @click="editNewsContentConfirm">
           提交
         </el-button>
@@ -224,9 +201,11 @@ import {
   deleteEssay,
   editEssay
 } from "@/api/user/news.js"
-import {ref,reactive,onMounted} from 'vue';
+import {ref,reactive,onMounted,mounted} from 'vue';
 import {ElButton,ElDrawer, ElMessageBox, ElMessage} from 'element-plus'
 import useUserStore from "@/store/modules/user";
+import {useRouter} from "vue-router";
+const router = useRouter();
 const userStore = useUserStore()
 const drawer = ref(false)
 const addFormVisible = ref(false)
@@ -240,15 +219,15 @@ const addNewsDialogFormVisible = ref(false)
 const editNewsDialogFormVisible = ref(false)
 //添加当前新闻栏目按钮
 const addNewsDialogFormVisibleButton = (id)=>{
-  addNewsDialogFormVisible.value = true
+  // addNewsDialogFormVisible.value = true
+  router.push(`/news/newsContentDetails?id=${id}`)
   columnId.value = id
 }
 const nowTimeNewsData = ref({})
 //新闻详细信息获取
 const newViews = (listObject)=> {
-  nowTimeNewsData.value = listObject
+  nowTimeNewsData.value = { ...listObject }
 }
-
 //栏目
 const form = ref({
       categoryName:'',
@@ -260,7 +239,6 @@ const form = ref({
       status:'',
       updateTime:''
     })
-
 //新闻
 const newsForm = ref({
       categoryId:columnId,
@@ -326,13 +304,16 @@ const deleteHandle = async (id)=>{
 }
 //新闻文章查询
 const EssayList = async (id)=>{
-  const ress = await queryEssay(id)
-  // console.log(ress.data,'ress')
-  essay.value = ress.data
+  const response = await queryEssay(id)
+  // console.log(response.data,'response')
+  essay.value = response.data
+  if (essay.value.length > 0) {
+    newViews(essay.value[0]); // 显示第一条新闻
+  }
   // console.log(essay.value,'essay')
 }
 //新闻文章添加
-const addNewsContentConfirm = async ()=>{
+const addNewsContentConfirm = async (id)=>{
   addNewsDialogFormVisible.value = false
   await addEssay({
     categoryId:newsForm.value.categoryId,
@@ -346,8 +327,17 @@ const addNewsContentConfirm = async ()=>{
     title:newsForm.value.title,
     updateTime:newsForm.value.updateTime,
     userId:newsForm.value.userId
+  }).then(()=>{
+    EssayList(id);
+    ElMessage({
+      message:'添加成功',
+      type:'success'
+    })
   })
 }
+// mounted((id)=>{
+//   EssayList(id);
+// })
 //新闻删除
 const deleteNewsList = async (id)=>{
 // console.log(id)
@@ -390,17 +380,23 @@ const editNewsContentConfirm = async ()=>{
   margin: auto;
   background-image: linear-gradient(60deg,honeydew,powderblue,honeydew);
 }
+.el-aside {
+  height: 100vh; /* 设置高度为视窗高度 */
+  overflow-y: auto; /* 当内容超出时显示滚动条 */
+}
 .header-flex-container {
   display: flex;
-  align-items: center; /* 垂直居中 */
+  /*align-items: center; !* 垂直居中 *!*/
   padding: 20px;
-  background: #4b81d7;
-  justify-content: space-between; /* 左边对齐和右边对齐 */
+  gap: 10px;
+  background: white;
+  margin-top: 20px;
+  height: 81vh;
 }
 .header-list {
-  display: flex; /* 使li元素水平排列 */
+  /*display: flex; !* 使li元素水平排列 *!*/
   flex-wrap: wrap; /* 如果需要换行 */
-  align-items: center; /* 如果需要，也可以使li元素垂直居中 */
+  /*align-items: center; !* 如果需要，也可以使li元素垂直居中 *!*/
   margin: 0; /* 移除默认外边距 */
   padding: 0; /* 移除默认内边距 */
 }
@@ -412,8 +408,16 @@ const editNewsContentConfirm = async ()=>{
   list-style: none;
   margin-right: 10px;
 }
-.el-dropdown {
-  margin-right: 30px;
+.header-column{
+  height:30px;
+  margin-top: 20px;
+  margin-right: 80px;
+  padding: 5px;
+  margin-bottom: 20px;
+  cursor: pointer; /* 鼠标悬停时显示手指形状，表示可点击 */
+}
+.header-column span{
+  color: #222222;
 }
 .add-news-button {
   margin-top: auto; /* 将按钮推到底部 */
@@ -426,8 +430,6 @@ const editNewsContentConfirm = async ()=>{
   text-align: center;
   display: block;
   width: 100%; /* 或者设置一个具体的宽度 */
-  line-height: 40px;
-  margin-bottom: 20px;
 }
 .flex-container {
   display: flex;
@@ -435,7 +437,15 @@ const editNewsContentConfirm = async ()=>{
   align-items: center;
   flex-direction: row;
 }
-
+/* 添加新的类来控制按钮的位置 */
+.button-container {
+  display: flex;
+  justify-content: flex-end; /* 按钮靠右 */
+  align-items: center; /* 垂直居中 */
+}
+.button-container_column{
+  position:absolute;
+}
 .news-flex-container {
   display: flex; /* 使用 Flexbox 布局 */
   justify-content: space-between; /* 平均分配空间 */
diff --git a/src/views/student/index.vue b/src/views/student/index.vue
index 4db07fb..cf1e546 100644
--- a/src/views/student/index.vue
+++ b/src/views/student/index.vue
@@ -11,8 +11,8 @@ import {
 } from '@/api/user/stud'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import useUserStore from '@/store/modules/user'
-import editStu from './components/editStu.vue'
-import { tryOnMounted } from '@vueuse/core'
+// import editStu from './components/editStu.vue'
+// import { tryOnMounted } from '@vueuse/core'
 const userStore = useUserStore()
 // console.log(userStore.data.id, 'icon') //用户信息
 const formLabelWidth = '60px'

From 3f51efd2f1c251c17f72d418f4a86328747f01da Mon Sep 17 00:00:00 2001
From: significative <163999932+significative@users.noreply.github.com>
Date: Tue, 27 Aug 2024 08:59:26 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E8=A1=A5=E5=85=85=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/configurationPage/index.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/views/configurationPage/index.vue b/src/views/configurationPage/index.vue
index a68c2bf..0759a07 100644
--- a/src/views/configurationPage/index.vue
+++ b/src/views/configurationPage/index.vue
@@ -7,7 +7,6 @@
             <el-form-item label="项目名称">
                 <el-input v-model="form.name" />
             </el-form-item>
-            <p>门户宣传图配置</p>
             <el-form-item label="门户头部宣传大图">
                 <my-update v-model="form.promotionalImages"></my-update>
             </el-form-item>
@@ -26,6 +25,9 @@
             <el-form-item label="备案号">
                 <el-input v-model="form.recordNumber" />
             </el-form-item>
+            <el-form-item label="备案号信息">
+                <el-input v-model="form.recordInformation" type="textarea" />
+            </el-form-item>
             <el-form-item label="qq">
                 <el-input v-model="form.qqNumber" />
             </el-form-item>
@@ -70,7 +72,8 @@ const form = reactive({
     recordNumber: '',
     title: '',
     mailbox: '',
-    home:''
+    home: '',
+    recordInformation: ''
 })
 
 const ran = ref(false)

From 01b0a2dccbbe6520cdf4e7af5b3e2f6949166a85 Mon Sep 17 00:00:00 2001
From: significative <163999932+significative@users.noreply.github.com>
Date: Wed, 28 Aug 2024 09:46:55 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=AD=A6=E4=B9=A0?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                            |  4 +-
 generated/core/OpenAPI.ts                   |  3 +-
 src/views/MyCourseStudy/learningProcess.vue | 91 ++++++++-------------
 3 files changed, 39 insertions(+), 59 deletions(-)

diff --git a/.env.development b/.env.development
index 600aee7..c8c89d1 100644
--- a/.env.development
+++ b/.env.development
@@ -1,5 +1,5 @@
 # 变量必须以 VITE_ 为前缀才能暴露给外部读取
 NODE_ENV = 'development'
 VITE_APP_TITLE = '无糖运营平台'
-VITE_APP_BASE_API = 'http://127.0.0.1:8080'
-# VITE_APP_BASE_API = 'http://39.106.16.162:8080'
+# VITE_APP_BASE_API = 'http://127.0.0.1:8080'
+VITE_APP_BASE_API = 'http://39.106.16.162:8080'
diff --git a/generated/core/OpenAPI.ts b/generated/core/OpenAPI.ts
index 685abe2..ea14d7e 100644
--- a/generated/core/OpenAPI.ts
+++ b/generated/core/OpenAPI.ts
@@ -22,7 +22,8 @@ export type OpenAPIConfig = {
 
 export const OpenAPI: OpenAPIConfig = {
     //BASE: 'http://39.106.16.162:8080',
-    BASE: 'http://127.0.0.1:8080',
+    // BASE: 'http://127.0.0.1:8080',
+    BASE: import.meta.env.VITE_APP_BASE_API,
     VERSION: '1.0.0',
     WITH_CREDENTIALS: false,
     CREDENTIALS: 'include',
diff --git a/src/views/MyCourseStudy/learningProcess.vue b/src/views/MyCourseStudy/learningProcess.vue
index fde2a54..4c58175 100644
--- a/src/views/MyCourseStudy/learningProcess.vue
+++ b/src/views/MyCourseStudy/learningProcess.vue
@@ -140,61 +140,29 @@ const goToAnotherPage = (address, courseId) => {
       <!-- 头部 -->
       <div class="header">
         <el-button type="primary" plain>浏览记录</el-button>
-        <el-button
-          type="danger"
-          plain
-          style="float: right"
-          @click="deleteSelected"
-        >
+        <el-button type="danger" plain style="float: right" @click="deleteSelected">
           批量删除
         </el-button>
-        <el-button
-          type="primary"
-          plain
-          @click="toggleCheckbox"
-          style="float: right"
-        >
+        <el-button type="primary" plain @click="toggleCheckbox" style="float: right">
           管理
         </el-button>
       </div>
       <!-- 中间 -->
       <div class="record-list">
         <ul v-if="recordList.length > 0">
-          <li
-            v-for="record in recordList"
-            :key="record.id"
-            v-loading="loading"
-            @click="
-              goToAnotherPage(
-                '/myCourseStudyManagement/learningProcess1',
-                record.courseId,
-              )
-            "
-          >
-            <input
-              style="display: flex"
-              type="checkbox"
-              :value="record.id"
-              @change="toggleSelection(record.id)"
-              v-if="showCheckbox"
-            />
+          <li v-for="record in recordList" :key="record.id" v-loading="loading">
+            <input style="display: flex" type="checkbox" :value="record.id" @change="toggleSelection(record.id)"
+              v-if="showCheckbox" />
 
-            <img
-              class="img"
-              :src="record.img"
-              @click="goToAnotherPage(record.address)"
-              style="margin-bottom: 10px"
-            />
+            <img class="img" :src="record.img" @click="goToAnotherPage(record.address)" style="margin-bottom: 10px" />
 
-            <div
-              style="
+            <div style="
                 display: flex;
                 justify-content: space-between;
                 flex-grow: 1;
                 margin-top: 10px;
                 margin-bottom: 10px;
-              "
-            >
+              ">
               <p>
                 {{ record.courseName }}
               </p>
@@ -202,17 +170,29 @@ const goToAnotherPage = (address, courseId) => {
                 <Delete />
               </el-icon>
             </div>
-            <div
-              style="
+            <div style="
                 display: flex;
                 justify-content: space-between;
                 flex-grow: 1;
                 margin-top: 10px;
-              "
-            >
+              ">
               <p>{{ record.time }}</p>
               <p>学习人数:{{ record.number }}</p>
             </div>
+            <div style="display: flex;margin: 10px 0;">
+              <el-button @click="
+                goToAnotherPage(
+                  '/myCourseStudyManagement/learningProcess1',
+                  record.courseId,
+                )
+                ">知识点学习记录</el-button>
+              <el-button @click="
+                goToAnotherPage(
+                  '/myCourseStudyManagement/learningProcess2',
+                  record.courseId,
+                )
+                ">资源学习记录</el-button>
+            </div>
           </li>
         </ul>
         <el-empty v-else description="暂时没有浏览记录" />
@@ -220,17 +200,10 @@ const goToAnotherPage = (address, courseId) => {
     </div>
     <!-- 分页 -->
     <div class="example-pagination-block">
-      <el-pagination
-        v-model:current-page="params.pagenum"
-        v-model:page-size="params.pagesize"
-        :page-sizes="[5, 10, 15, 20]"
-        :background="true"
-        layout="jumper,total, sizes, prev, pager, next "
-        :total="total"
-        @current-change="onCurrentChange"
-        @size-change="onSizeChange"
-        style="margin-top: 20px; justify-content: flex-end"
-      />
+      <el-pagination v-model:current-page="params.pagenum" v-model:page-size="params.pagesize"
+        :page-sizes="[5, 10, 15, 20]" :background="true" layout="jumper,total, sizes, prev, pager, next " :total="total"
+        @current-change="onCurrentChange" @size-change="onSizeChange"
+        style="margin-top: 20px; justify-content: flex-end" />
     </div>
   </div>
 </template>
@@ -241,9 +214,11 @@ const goToAnotherPage = (address, courseId) => {
   flex-direction: column;
   min-height: 100vh;
 }
+
 .content {
   flex: 1;
 }
+
 .example-pagination-block {
   position: sticky;
   bottom: 0;
@@ -254,6 +229,7 @@ const goToAnotherPage = (address, courseId) => {
 .record-list {
   margin: 10px 0;
 }
+
 ul {
   width: 100%;
   list-style-type: none;
@@ -268,9 +244,11 @@ ul {
   grid-template-columns: repeat(auto-fill, 272px);
   justify-content: space-around;
 }
+
 li {
   /* margin-bottom: 30px; */
-  transition: filter 0.3s; /* 添加过渡动画 */
+  transition: filter 0.3s;
+  /* 添加过渡动画 */
   /* flex: 1 0 20%; */
   width: calc(20% - 20px);
   width: 250px;
@@ -285,6 +263,7 @@ li {
   transition: box-shadow 0.3s;
   cursor: pointer;
 }
+
 li:hover {
   box-shadow: 0 2px 6px rgba(0, 0, 0, 0.2);
 }

From 167d151da4496a9c64f07809ded784e23b6d6b8c Mon Sep 17 00:00:00 2001
From: fwb <fwb>
Date: Wed, 28 Aug 2024 10:48:47 +0800
Subject: [PATCH 6/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

---
 .../message/components/messageContent.vue     | 82 +++++++++++--------
 src/views/message/components/sendMessage.vue  |  4 +-
 src/views/message/index.vue                   |  4 +-
 .../news/components/newsContentDetails.vue    | 14 ++--
 src/views/news/index.vue                      | 13 +--
 5 files changed, 62 insertions(+), 55 deletions(-)

diff --git a/src/views/message/components/messageContent.vue b/src/views/message/components/messageContent.vue
index 785a661..e30cf4d 100644
--- a/src/views/message/components/messageContent.vue
+++ b/src/views/message/components/messageContent.vue
@@ -17,8 +17,7 @@
           </template>
 <!--          输入框内容-->
             <el-input
-                v-model="inputPerson"
-
+                :model-value="inputPerson"
                 size="large"
                 placeholder="收件人id："
             >
@@ -28,6 +27,12 @@
               </el-button>
             </template>
             </el-input>
+          <el-input
+              :model-value="inputCourseId"
+              size="large"
+              placeholder="课程id："
+          >
+          </el-input>
             <el-input
               v-model="inputText"
               size="large"
@@ -50,34 +55,23 @@
             <el-divider/>
             <div class="content-container">
               <div class="left-panel" style="flex: 1; display: flex; align-items: center; justify-content: center;">
-<!--                <el-input-->
-<!--                    v-model="inputSearch"-->
-<!--                    style="max-width: 300px;-->
-<!--                    margin-bottom: 20px"-->
-<!--                    placeholder="搜索"-->
-<!--                >-->
-<!--                  <template #append>-->
-<!--                    <el-button :icon="Search" @click="editSearch"/>-->
-<!--                  </template>-->
-<!--                </el-input>-->
-<!--                组织架构-->
                 <div>
-                  组织框架:
-                  <el-tree-select
-                      v-model="inputPerson"
-                      :data="formattedData"
-                      multiple
-                      :render-after-expand="false"
-                      show-checkbox
-                      style="width: 240px"
+                  <p>组织框架</p><br/>
+                  <el-cascader
+                      v-model="abc"
+                      :options="formattedData"
+                      :props="props"
+                      clearable
                   />
                 </div>
               </div>
               <div class="right-panel" style="flex: 1;">
                 <p>已选人id:</p>
                 <el-divider/>
-                <li v-for="item in inputPerson">
-                  <p>{{item}}</p>
+                <li>
+                  <div>
+                    <p>{{inputPerson}}</p>
+                  </div>
                 </li>
               </div>
             </div>
@@ -96,17 +90,33 @@
   </div>
 </template>
 <script setup lang="ts">
-import { ref,onMounted,watch} from 'vue'
+import {ref, onMounted, watch, computed} from 'vue'
 import { useRouter } from 'vue-router';
 import { getUserInfByCourse } from '@/api/user/send.js'
 import useUserStore from '@/store/modules/user'
 import { ElMessageBox, ElMessage } from 'element-plus'
 import {SendMessageApi} from "@/api/user/messag";
+const abc = ref([])
+const inputPerson =computed(()=>{
+  if(props.multiple){
+    return abc.value.map(item=>item[1])
+  }else {
+    return abc.value[1]
+  }
+})
+const inputCourseId = computed(()=>{
+  if(props.multiple) return abc.value.map(item=>item[0])
+  else  return abc.value[0]
+})
 
-const inputPerson = ref('')
+//======
 const inputText = ref('')
 const textarea = ref('')
 const addPerson = ref(false)
+const props = {
+  multiple: true,
+  checkStrictly: true,
+};
 const router = useRouter()
 //获取当前用户下的学生姓名
 const userStore = useUserStore()
@@ -130,19 +140,20 @@ onMounted(async () => {
 // 数据格式化函数
 function formatData(data) {
   return data.map(course => ({
-    label: course.courseName,
-    children: course.usersInf.filter(student => !inputPerson.value.includes(student.id)).map(student => ({
-      label: student.receiverName,
-      value: student.id, // 这里使用学生的 id 作为值
+    value: course.courseId, // 第一级的值
+    label: course.courseName, // 第一级的标签
+    children: course.usersInf.map(student => ({
+      value: student.id, // 第二级的值
+      label: student.receiverName, // 第二级的标签
     })),
   }));
 }
 // 监听 selectedStudents 的变化
-watch(inputPerson, (newVal, oldVal) => {
-  inputPerson.value = newVal;
-  // 更新 formattedData 以反映最新的选择状态
-  formattedData.value = formatData(stuList.value);
-}, { deep: true });
+// watch(inputPerson, (newVal, oldVal) => {
+//   inputPerson.value = newVal;
+//   // 更新 formattedData 以反映最新的选择状态
+//   formattedData.value = formatData(stuList.value);
+// }, { deep: true });
 //返回
 const back= ()=>{
   router.push('/messageManagement/message')
@@ -165,7 +176,8 @@ const send = async () => {
   })
   // console.log(inputPerson,'ddddd')
   await SendMessageApi({
-    receiverId: inputPerson.value,
+    receiverId: inputPerson.value.toString(),
+    courseId:inputCourseId.value.toString(),
     title:inputText.value,
     content:textarea.value,
     senderId:userStore.data.id
diff --git a/src/views/message/components/sendMessage.vue b/src/views/message/components/sendMessage.vue
index fdc36ae..8de6aba 100644
--- a/src/views/message/components/sendMessage.vue
+++ b/src/views/message/components/sendMessage.vue
@@ -39,7 +39,7 @@
       <el-pagination
           v-model:current-page="params.pageNo"
           v-model:page-size="params.pageSize"
-          :page-sizes="[4,3, 5, 7, 10]"
+          :page-sizes="[ 5, 7, 10]"
           :background="true"
           layout="jumper,total, sizes, prev, pager, next "
           :total="total"
@@ -67,7 +67,7 @@ const params = ref({
   isSend:1,
   // messageId:false,
   pageNo:1,
-  pageSize:4,
+  pageSize:5,
   sortBy:false//排序字段
 })
 const total = ref(0)
diff --git a/src/views/message/index.vue b/src/views/message/index.vue
index 662d95c..64d1fae 100644
--- a/src/views/message/index.vue
+++ b/src/views/message/index.vue
@@ -49,7 +49,7 @@
       <el-pagination
           v-model:current-page="params.pageNo"
           v-model:page-size="params.pageSize"
-          :page-sizes="[2,4, 5, 7, 10]"
+          :page-sizes="[ 5, 7, 10]"
           :background="true"
           layout="jumper,total, sizes, prev, pager, next "
           :total="total"
@@ -76,7 +76,7 @@ const params = ref({
   isSend:1,
   // messageId:false,
   pageNo:1,
-  pageSize:4,
+  pageSize:5,
   sortBy:false,//排序字段
 })
 const total = ref(0)
diff --git a/src/views/news/components/newsContentDetails.vue b/src/views/news/components/newsContentDetails.vue
index 2a3e79b..2f2267d 100644
--- a/src/views/news/components/newsContentDetails.vue
+++ b/src/views/news/components/newsContentDetails.vue
@@ -12,12 +12,8 @@
           <el-input v-model="newsForm.categoryId" autocomplete="off" />
         </el-form-item>
         <el-form-item label="文章内容" label-width="140px">
-          <el-input
-            v-model="newsForm.content"
-            style="font-size: 20px"
-            :rows="5"
-            type="textarea"
-          />
+          <textarea style="width: 100%;height: 300px" v-model="newsForm.content"></textarea>
+          <!-- <el-input class="brief_text" type="textarea" /> -->
         </el-form-item>
         <!--      <el-form-item label="文章id" label-width="140px">-->
         <!--        <el-input v-model="newsForm.id" autocomplete="off" />-->
@@ -104,7 +100,11 @@ const addNewsContentConfirm = async (id)=>{
     ElMessage({
       message:'添加成功',
       type:'success'
-    })
+    });
+    // 使用 setTimeout 来延迟一秒后执行路由跳转
+    setTimeout(() => {
+      router.push('/news/newsContent');
+    }, 1000); // 1000 毫秒等于 1 秒
   })
 }
 </script>
diff --git a/src/views/news/index.vue b/src/views/news/index.vue
index 02bdb8b..06ca993 100644
--- a/src/views/news/index.vue
+++ b/src/views/news/index.vue
@@ -132,19 +132,14 @@
     </template>
   </el-dialog>
   <!--  修改新闻-->
-  <el-dialog v-model="editNewsDialogFormVisible" title="修改新闻" width="500px">
+  <el-drawer v-model="editNewsDialogFormVisible" title="修改新闻" width="500px">
     <el-form v-model="nowTimeNewsData">
       <el-form-item label="所属栏目id" label-width="140px">
         <el-input v-model="nowTimeNewsData.categoryId" autocomplete="off" readonly disabled/>
       </el-form-item>
       <el-form-item label="文章内容" label-width="140px">
-<!--        <el-input v-model="nowTimeNewsData.content" autocomplete="off" />-->
-        <el-input
-            v-model="nowTimeNewsData.content"
-            style="font-size: 13px"
-            :rows="5"
-            type="textarea"
-        />
+        <textarea style="width: 100%;height: 300px" v-model="nowTimeNewsData.content"></textarea>
+        <!-- <el-input class="brief_text" type="textarea" /> -->
       </el-form-item>
 <!--      <el-form-item label="文章文件" label-width="140px">-->
 <!--        <el-input v-model="nowTimeNewsData.file" autocomplete="off" />-->
@@ -182,7 +177,7 @@
         </el-button>
       </div>
     </template>
-  </el-dialog>
+  </el-drawer>
 </template>
 
 <script setup lang="ts">