From 776a81ccf1ef69a68c9209d84c8615e6281397e8 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Wed, 11 Sep 2024 10:25:43 +0800
Subject: [PATCH 1/3] 'gengxin'

---
 .../message/components/messageContent.vue     | 73 ++++++++++++++-----
 .../views/message/components/sendMessage.vue  |  4 +-
 .../src/views/message/index.vue               |  4 +-
 .../news/components/newsContentManage.vue     | 20 ++---
 .../src/views/news/index.vue                  |  3 +-
 .../.env.development                          |  1 +
 .../src/api/news.ts                           | 26 +++++++
 7 files changed, 98 insertions(+), 33 deletions(-)
 create mode 100644 teaching_integration_platform_template/src/api/news.ts

diff --git a/teaching_integration_platform_admin_template/src/views/message/components/messageContent.vue b/teaching_integration_platform_admin_template/src/views/message/components/messageContent.vue
index 22a514f..89d1716 100644
--- a/teaching_integration_platform_admin_template/src/views/message/components/messageContent.vue
+++ b/teaching_integration_platform_admin_template/src/views/message/components/messageContent.vue
@@ -150,25 +150,62 @@ const disappoint = ()=>{
   addPerson.value = false
 }
 //发送信息
+// const send = async () => {
+//   await ElMessageBox.confirm('您确定发送这条信息吗', '温馨提示', {
+//     confirmButtonText: '确认',
+//     cancelButtonText: '取消',
+//     type: 'warning',
+//   })
+//   await SendMessageApi({
+//     receiverId: inputPerson.value.toString(),
+//     courseId:inputCourseId.value.toString(),
+//     title:inputText.value,
+//     content:textarea.value,
+//     senderId:userStore.data.id
+//   }).then(()=>{
+//     ElMessage({
+//       message:'发送成功',
+//       type:'success'
+//     })
+//   })
+// }
 const send = async () => {
-  await ElMessageBox.confirm('您确定发送这条信息吗', '温馨提示', {
-    confirmButtonText: '确认',
-    cancelButtonText: '取消',
-    type: 'warning',
-  })
-  await SendMessageApi({
-    receiverId: inputPerson.value.toString(),
-    courseId:inputCourseId.value.toString(),
-    title:inputText.value,
-    content:textarea.value,
-    senderId:userStore.data.id
-  }).then(()=>{
-    ElMessage({
-      message:'发送成功',
-      type:'success'
-    })
-  })
-}
+  try {
+    // 显示确认框
+    await ElMessageBox.confirm('您确定发送这条信息吗', '温馨提示', {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    });
+
+    // 发送消息
+    await SendMessageApi({
+      receiverId: inputPerson.value.toString(),
+      courseId: inputCourseId.value.toString(),
+      title: inputText.value,
+      content: textarea.value,
+      senderId: userStore.data.id,
+    }).then(() => {
+      ElMessage({
+        message: '发送成功',
+        type: 'success',
+      });
+    });
+  } catch (error) {
+    // 处理确认框取消的情况或其他错误
+    if (error.type === 'cancel') {
+      // 用户取消了发送
+      return;
+    }
+
+    // 发送失败时的提示
+    ElMessage.error({
+      message: '发送失败',
+      type: 'error',
+    });
+    console.error('发送失败:', error);
+  }
+};
 </script>
 <style scoped>
 .header{
diff --git a/teaching_integration_platform_admin_template/src/views/message/components/sendMessage.vue b/teaching_integration_platform_admin_template/src/views/message/components/sendMessage.vue
index 6ea0502..d66d6bf 100644
--- a/teaching_integration_platform_admin_template/src/views/message/components/sendMessage.vue
+++ b/teaching_integration_platform_admin_template/src/views/message/components/sendMessage.vue
@@ -61,14 +61,14 @@ const userStore = useUserStore()
 const params = ref({
   userId: userStore.data.id,
   // userId: 4,
-  isAsc:true,
+  isAsc:false,
   isDelete:0,
   isRead:'',
   isSend:1,
   // messageId:false,
   pageNo:1,
   pageSize:5,
-  sortBy:false//排序字段
+  //sortBy:false排序字段
 })
 const total = ref(0)
 const sendMessage = ref({})
diff --git a/teaching_integration_platform_admin_template/src/views/message/index.vue b/teaching_integration_platform_admin_template/src/views/message/index.vue
index 45334ba..393c3c9 100644
--- a/teaching_integration_platform_admin_template/src/views/message/index.vue
+++ b/teaching_integration_platform_admin_template/src/views/message/index.vue
@@ -70,14 +70,14 @@ const userStore = useUserStore()
 const params = ref({
   userId: userStore.data.id,
   // userId: 4,
-  isAsc:true,
+  isAsc:false,
   isDelete:0,
   isRead:'',
   isSend:1,
   // messageId:false,
   pageNo:1,
   pageSize:5,
-  sortBy:false,//排序字段
+  //sortBy:排序字段
 })
 const total = ref(0)
 const Message = ref([])
diff --git a/teaching_integration_platform_admin_template/src/views/news/components/newsContentManage.vue b/teaching_integration_platform_admin_template/src/views/news/components/newsContentManage.vue
index 1e66b61..efab5f0 100644
--- a/teaching_integration_platform_admin_template/src/views/news/components/newsContentManage.vue
+++ b/teaching_integration_platform_admin_template/src/views/news/components/newsContentManage.vue
@@ -60,7 +60,7 @@
             </el-form-item>
             <el-form-item label="文章内容" label-width="120px">
               <textarea style="width: 100%;
-                               height:320px;
+                               height:430px;
                                border: 2px solid #d3d3d3;"
                         v-model="newsForm.content"
               ></textarea>
@@ -71,9 +71,9 @@
             <!--      <el-form-item label="发布时间" label-width="140px">-->
             <!--        <el-input v-model="newsForm.publishTime" autocomplete="off"  type="date"/>-->
             <!--      </el-form-item>-->
-            <el-form-item label="所属栏目id" label-width="120px">
-              <el-input v-model="newsForm.categoryId" autocomplete="off" style="width: 200px" readonly/>
-            </el-form-item>
+<!--            <el-form-item label="所属栏目id" label-width="120px">-->
+<!--              <el-input v-model="newsForm.categoryId" autocomplete="off" style="width: 200px" readonly/>-->
+<!--            </el-form-item>-->
             <el-form-item label="浏览次数" label-width="120px">
               <el-input v-model="newsForm.readingNumber" autocomplete="off" style="width: 200px"/>
             </el-form-item>
@@ -83,9 +83,9 @@
                 <el-option label="未发布" value="2" />
               </el-select>
             </el-form-item>
-            <el-form-item label="当前用户id" label-width="120px">
-              <el-input v-model="newsForm.userId" autocomplete="off" style="width: 200px" readonly/>
-            </el-form-item>
+<!--            <el-form-item label="当前用户id" label-width="120px">-->
+<!--              <el-input v-model="newsForm.userId" autocomplete="off" style="width: 200px" readonly/>-->
+<!--            </el-form-item>-->
           </el-form>
           <template #footer>
             <div class="dialog-footer">
@@ -118,7 +118,7 @@
       </el-table>
     </div>
   </el-drawer>
-  <!--  栏目添加对话框-->
+  <!--  栏目添加-->
   <el-dialog v-model="addFormVisible" title="栏目添加" width="500">
     <el-form :model="form">
       <el-form-item label="栏目名称" label-width="140px">
@@ -241,7 +241,7 @@ console.log(userStore.data,'当前用户数据')
 //新闻详细信息获取
 const newViews = (listObject)=> {
   nowTimeNewsData.value = { ...listObject }
-  // console.log(nowTimeNewsData,'当前新闻数据')
+  console.log(nowTimeNewsData,'当前新闻数据')
 }
 //栏目
 const form = ref({
@@ -379,7 +379,7 @@ const addNewsContentConfirm = async (id)=>{
     userId:newsForm.value.userId
   }).then(()=>{
     ElMessage({
-      message:'添加成功',
+      message:'新闻添加成功',
       type:'success'
     });
   })
diff --git a/teaching_integration_platform_admin_template/src/views/news/index.vue b/teaching_integration_platform_admin_template/src/views/news/index.vue
index 576adfd..e791d7d 100644
--- a/teaching_integration_platform_admin_template/src/views/news/index.vue
+++ b/teaching_integration_platform_admin_template/src/views/news/index.vue
@@ -87,10 +87,11 @@ onMounted(() => {
 })
 const essay = ref([])
 const nowTimeNewsData = ref({})
-// console.log(nowTimeNewsData,'dsdsd')
+
 //新闻详细信息获取
 const newViews = (listObject)=> {
   nowTimeNewsData.value = { ...listObject }
+  console.log(nowTimeNewsData,'当前点击新闻详细内容')
 }
 //新闻文章查询
 const EssayList = async (id)=>{
diff --git a/teaching_integration_platform_template/.env.development b/teaching_integration_platform_template/.env.development
index fd75c90..6692c9c 100644
--- a/teaching_integration_platform_template/.env.development
+++ b/teaching_integration_platform_template/.env.development
@@ -1,4 +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'
\ No newline at end of file
diff --git a/teaching_integration_platform_template/src/api/news.ts b/teaching_integration_platform_template/src/api/news.ts
new file mode 100644
index 0000000..cc8b4a1
--- /dev/null
+++ b/teaching_integration_platform_template/src/api/news.ts
@@ -0,0 +1,26 @@
+import request from '@/utils/requset'
+//获取栏目
+/**
+ * queryCategory
+ * @returns
+ */
+export function queryCategory() {
+    return request.get(`/api/cms-category/query`);
+}
+//获取文章
+/**
+ * queryEssay
+ * @param {string} category_id category_id
+ * @returns
+ */
+export function queryEssay(category_id) {
+    return request.get(`/api/cms-essay/query?category_id=${category_id}`);
+}
+//修改新闻
+export function editEssay(params) {
+    return request.put(`/api/cms-essay/edit`, params);
+}
+//根据id查询关于我们文章
+export function queryEssayById(essay_id) {
+    return request.get(`/api/cms-essay/queryessaybyid?essay_id=${essay_id}`);
+}
\ No newline at end of file

From 2ff132d8f3fa4cd8ba5c4f911e0c79877ad27603 Mon Sep 17 00:00:00 2001
From: zhc077 <565291854@qq.com>
Date: Wed, 11 Sep 2024 16:48:43 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=9F=A5=E8=AF=86=E5=9B=BE=E8=B0=B1?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AEmysql=E3=80=81neo4j=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BA=93=E7=8E=AF=E5=A2=83=E6=90=AD=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application-local.yml  | 90 +++++++++++++++++++
 .../.env.development                          |  4 +-
 .../.env.development                          |  4 +-
 3 files changed, 94 insertions(+), 4 deletions(-)
 create mode 100644 backend/src/main/resources/application-local.yml

diff --git a/backend/src/main/resources/application-local.yml b/backend/src/main/resources/application-local.yml
new file mode 100644
index 0000000..6673294
--- /dev/null
+++ b/backend/src/main/resources/application-local.yml
@@ -0,0 +1,90 @@
+server:
+  port: 8080
+spring:
+  application:
+    name: teaching-backend
+  servlet:
+    multipart:
+      enabled: true
+      max-file-size: 10MB
+      max-request-size: 10MB
+  neo4j:
+    uri: bolt://10.100.200.177:7687
+    authentication:
+      username: neo4j  # 连接Neo4j数据P库的用户名
+      password: neo4j123456  # 连接Neo4j数据库的密码
+  mvc:
+    pathmatch:
+      matching-strategy: ant_path_matcher
+  datasource:
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://10.100.200.177:3306/teaching_db
+    username: root
+    password: root
+#    url: jdbc:mysql://rm-bp189rd5595301145do.mysql.rds.aliyuncs.com:3306/teaching_db
+#    username: root123
+#    password: Zjh@111111
+mybatis:
+  configuration:
+    map-underscore-to-camel-case: true
+  mapper-locations:
+    - classpath:mapper/*.xml
+    - classpath*:com/**/mapper/*.xml
+
+jwt:
+  tokenHeader: Authorization
+  secret: mySecret
+  expiration: 604800
+  tokenHead: Bearer
+
+knife4j:
+  enable: true
+  openapi:
+    title: 111
+    description: "123"
+    concat: zjh
+    version: v1.0.0
+    group:
+      default:
+        group-name: default
+        api-rule: package
+        api-rule-resources:
+          - com.teaching.backend.controller
+secure:
+  ignored:
+    urls:
+      #      - /swagger-ui/
+      #      - /swagger-resources/**
+      #      - /**/v2/api-docs
+      #      - /**/*.html
+      #      - /**/*.js
+      #      - /**/*.css
+      #      - /**/*.png
+      #      - /**/*.map
+      #      - /favicon.ico
+      #      - /actuator/**
+      #      - /druid/**
+      #      - /user/**
+      #      - /user/login
+      #      - /user/register
+      #      - /user/info
+      #      - /user/logout
+      #      - /minio/upload
+      - /**
+
+
+aliyun:
+  oss:
+    endpoint: oss-cn-wuhan-lr.aliyuncs.com
+    accessKeyId: LTAI5tFkdu3y5WddxbjgaG2F
+    accessKeySecret: 1xUchxUTlmUBoTV5JQIrKsVjSkmsLF
+    bucketName: ceshi132132
+
+minio:
+  endpoint: http://39.106.16.162:9090 #MinIO服务所在地址
+  bucketName: teaching # 存储桶名称
+  accessKey: minioadmin # 访问的key
+  secretKey: minioadmin # 访问的秘钥
+
+filename:
+  maxlength: 10
diff --git a/teaching_integration_platform_admin_template/.env.development b/teaching_integration_platform_admin_template/.env.development
index 98dfa78..c3ff64a 100644
--- a/teaching_integration_platform_admin_template/.env.development
+++ b/teaching_integration_platform_admin_template/.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'
\ No newline at end of file
+ VITE_APP_BASE_API = 'http://127.0.0.1:8080'
+#VITE_APP_BASE_API = 'http://39.106.16.162:8080'
diff --git a/teaching_integration_platform_template/.env.development b/teaching_integration_platform_template/.env.development
index 6692c9c..817502a 100644
--- a/teaching_integration_platform_template/.env.development
+++ b/teaching_integration_platform_template/.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'
\ No newline at end of file
+VITE_APP_BASE_API = 'http://127.0.0.1:8080'
+# VITE_APP_BASE_API = 'http://39.106.16.162:8080'
\ No newline at end of file

From df6fb3010ca0ca1eb05c96f88058d1ae9f318d53 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Wed, 11 Sep 2024 18:25:32 +0800
Subject: [PATCH 3/3] 'gengxin'

---
 .../service/impl/cms/CmsEssayServiceImpl.java |   3 +
 .../.env.development                          |   4 +-
 .../src/api/user/news.js                      |   3 +-
 .../src/views/message/index.vue               |  21 ++--
 .../src/views/myMessage/index.vue             |   4 +-
 .../news/components/newsContentManage.vue     | 107 +++++++++++++++---
 .../src/views/news/index.vue                  |  26 +++--
 .../src/views/pedagogicalReform/index.vue     |  27 ++---
 .../src/views/scientificResearch/index.vue    |   4 -
 9 files changed, 135 insertions(+), 64 deletions(-)

diff --git a/backend/src/main/java/com/teaching/backend/service/impl/cms/CmsEssayServiceImpl.java b/backend/src/main/java/com/teaching/backend/service/impl/cms/CmsEssayServiceImpl.java
index aeea607..5fbb48c 100644
--- a/backend/src/main/java/com/teaching/backend/service/impl/cms/CmsEssayServiceImpl.java
+++ b/backend/src/main/java/com/teaching/backend/service/impl/cms/CmsEssayServiceImpl.java
@@ -27,6 +27,9 @@ public class CmsEssayServiceImpl extends ServiceImpl<CmsEssayMapper, CmsEssay> i
     public BaseResponse<String> addEssay(CmsEssay cmsEssay) {
         //设置文章发布时间
         cmsEssay.setPublishTime(LocalDate.now());
+        //设置发布人姓名
+//        String nickName = userService.getById(cmsEssay.getUserId()).getNickName();
+//        cmsEssay.setUsername(nickName);
         //如果数据库里没有文章,文章id设为2
         Long count = query().count();
         if (count == 0){
diff --git a/teaching_integration_platform_admin_template/.env.development b/teaching_integration_platform_admin_template/.env.development
index 98dfa78..9eff337 100644
--- a/teaching_integration_platform_admin_template/.env.development
+++ b/teaching_integration_platform_admin_template/.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'
\ No newline at end of file
+VITE_APP_BASE_API = 'http://127.0.0.1:8080'
+# VITE_APP_BASE_API = 'http://39.106.16.162:8080'
\ No newline at end of file
diff --git a/teaching_integration_platform_admin_template/src/api/user/news.js b/teaching_integration_platform_admin_template/src/api/user/news.js
index 5c8a527..9d00b05 100644
--- a/teaching_integration_platform_admin_template/src/api/user/news.js
+++ b/teaching_integration_platform_admin_template/src/api/user/news.js
@@ -9,7 +9,7 @@ export function deleteCategory(ids) {
 }
 //编辑栏目
 export function editStatus(params) {
-    return request.put(`/api/cms-category/edit/status`, params);
+    return request.put(`/api/cms-category/edit/status`, {},{params});
 }
 //添加栏目
 function parseParams(params){
@@ -26,6 +26,7 @@ function parseParams(params){
 export function addCategory(params) {
     const str =  parseParams(params)
     return request.post(`/api/cms-category/add${str}`);
+    // return request.post(`/api/cms-category/add`,{},{params});
 }
 //查询新闻文章
 export function queryEssay(category_id) {
diff --git a/teaching_integration_platform_admin_template/src/views/message/index.vue b/teaching_integration_platform_admin_template/src/views/message/index.vue
index 393c3c9..aa9b714 100644
--- a/teaching_integration_platform_admin_template/src/views/message/index.vue
+++ b/teaching_integration_platform_admin_template/src/views/message/index.vue
@@ -158,15 +158,7 @@ const deleteMessage = async (id: any) => {
 
   await getMessageList()
 }
-//一键已读
-const readMessage = async (id:any) =>{
-  // console.log(id,userStore.data.id,'dddddd')
-  await readMessagesBatch({
-    messageIds:id,
-    userId:userStore.data.id
-  })
-  await getMessageList()
-}
+
 // 分页
 const handleSizeChange = (size: any) => {
   // loading.value = true
@@ -191,8 +183,15 @@ const editContent =()=>{
 const sendContent = ()=>{
   router.push('/messageManagement/sendMessage')
 }
-
-// 消息事件点击
+//已读
+const readMessage = async (id:any) =>{
+  await readMessagesBatch({
+    messageIds:id,
+    userId:userStore.data.id
+  })
+  await getMessageList()
+}
+// 消息事件点击已读
 const handleClick = (item)=> {
   //查看消息切换已读状态
   if(!item.isRead){
diff --git a/teaching_integration_platform_admin_template/src/views/myMessage/index.vue b/teaching_integration_platform_admin_template/src/views/myMessage/index.vue
index ef746e7..b1b51ab 100644
--- a/teaching_integration_platform_admin_template/src/views/myMessage/index.vue
+++ b/teaching_integration_platform_admin_template/src/views/myMessage/index.vue
@@ -70,14 +70,14 @@ const userStore = useUserStore()
 const params = ref({
   userId: userStore.data.id,
   // userId: 4,
-  isAsc:true,
+  isAsc:false,
   isDelete:0,
   isRead:'',
   isSend:1,
   // messageId:false,
   pageNo:1,
   pageSize:5,
-  sortBy:false,//排序字段
+  //sortBy:false,排序字段
 })
 const total = ref(0)
 const Message = ref([])
diff --git a/teaching_integration_platform_admin_template/src/views/news/components/newsContentManage.vue b/teaching_integration_platform_admin_template/src/views/news/components/newsContentManage.vue
index efab5f0..7484686 100644
--- a/teaching_integration_platform_admin_template/src/views/news/components/newsContentManage.vue
+++ b/teaching_integration_platform_admin_template/src/views/news/components/newsContentManage.vue
@@ -5,7 +5,6 @@
   <div class="common-layout">
     <el-container>
       <el-aside>
-
         <div class="header-flex-container">
           <div>
             <el-button class="button-container_column" @click="editHandle" type="primary" plain round>栏目管理</el-button>
@@ -60,7 +59,7 @@
             </el-form-item>
             <el-form-item label="文章内容" label-width="120px">
               <textarea style="width: 100%;
-                               height:430px;
+                               height:425px;
                                border: 2px solid #d3d3d3;"
                         v-model="newsForm.content"
               ></textarea>
@@ -79,8 +78,8 @@
             </el-form-item>
             <el-form-item label="发布状态" label-width="120px">
               <el-select v-model="newsForm.status" placeholder="请选择发布状态" style="width: 200px">
-                <el-option label="已发布" value="1" />
-                <el-option label="未发布" value="2" />
+                <el-option label="直接发布" value="1" />
+                <el-option label="暂不发布" value="0" />
               </el-select>
             </el-form-item>
 <!--            <el-form-item label="当前用户id" label-width="120px">-->
@@ -102,17 +101,18 @@
   <!--  栏目编辑弹框-->
   <el-drawer v-model="drawer" title="栏目编辑" :with-header="false">
     <span>栏目编辑</span><br/>
-    <el-button type="success" round style="margin: 30px" @click="addFormVisible = true">添加新闻栏目</el-button>
+    <el-button type="success"  style="margin: 30px" @click="addFormVisible = true">添加新闻栏目</el-button>
     <div>
-      <el-table :data="column" style="width: 100%">
-        <el-table-column prop="categoryName" label="名称" width="200" />
-        <el-table-column width="200" >
+      <el-table :data="column" style="width: 100%;">
+        <el-table-column prop="categoryName" label="名称" width="200"/>
+        <el-table-column width="400" >
           <template #header>
             操作
           </template>
           <template #default="{row}">
             <!-- 删除按钮 -->
-            <el-button size="default" type="danger" @click="deleteHandle(row.id)">删除</el-button>
+            <el-button size="default" type="danger" @click="deleteHandle(row.id)">栏目删除</el-button>
+            <el-button size="default" type="warning" @click="editStatusHandle(row)">栏目编辑</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -130,11 +130,14 @@
       <el-form-item label="创建该栏目的用户id" label-width="140px">
         <el-input v-model="form.creatorId" autocomplete="off" readonly disabled/>
       </el-form-item>
-      <el-form-item label="排序" label-width="140px">
-        <el-input v-model="form.sort" autocomplete="off" />
-      </el-form-item>
-      <el-form-item label="是否显示" label-width="140px">
-        <el-input v-model="form.status" autocomplete="off" />
+<!--      <el-form-item label="排序" label-width="140px">-->
+<!--        <el-input v-model="form.sort" autocomplete="off" />-->
+<!--      </el-form-item>-->
+      <el-form-item label="发布状态" label-width="140px">
+        <el-select v-model="form.status" placeholder="请选择显示状态" style="width: 200px">
+          <el-option label="显示" value="1" />
+          <el-option label="不显示" value="0" />
+        </el-select>
       </el-form-item>
     </el-form>
     <template #footer>
@@ -146,6 +149,40 @@
       </div>
     </template>
   </el-dialog>
+  <!--  栏目编辑-->
+  <el-dialog v-model="editStatusVisible" title="栏目添加" width="500">
+    <el-form :model="editForm">
+      <el-form-item label="栏目id" label-width="140px">
+        <el-input v-model="editForm.id" autocomplete="off" />
+      </el-form-item>
+      <el-form-item label="栏目名称" label-width="140px">
+        <el-input v-model="editForm.categoryName" autocomplete="off" />
+      </el-form-item>
+      <el-form-item label="栏目父id" label-width="140px">
+        <el-input v-model="editForm.categoryPid" autocomplete="off" readonly/>
+      </el-form-item>
+      <el-form-item label="创建该栏目的用户id" label-width="140px">
+        <el-input v-model="editForm.creatorId" autocomplete="off" readonly disabled/>
+      </el-form-item>
+      <!--      <el-form-item label="排序" label-width="140px">-->
+      <!--        <el-input v-model="" autocomplete="off" />-->
+      <!--      </el-form-item>-->
+      <el-form-item label="发布状态" label-width="140px">
+        <el-select v-model="editForm.status" placeholder="请选择显示状态" style="width: 200px">
+          <el-option label="显示" value="1" />
+          <el-option label="不显示" value="0" />
+        </el-select>
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="editStatusVisible = false">取消</el-button>
+        <el-button type="primary" @click="confirmEdit">
+          确定
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
   <!--  修改新闻-->
   <el-drawer v-model="editNewsDialogFormVisible" title="修改新闻" width="500px">
     <el-form v-model="nowTimeNewsData">
@@ -171,7 +208,7 @@
       <el-form-item label="发布状态" label-width="140px">
         <el-select v-model="nowTimeNewsData.status" placeholder="请选择发布状态" style="width: 200px">
           <el-option label="已发布" value="1" />
-          <el-option label="未发布" value="2" />
+          <el-option label="未发布" value="0" />
         </el-select>
       </el-form-item>
       <el-form-item label="发布文章的用户id" label-width="140px">
@@ -225,6 +262,7 @@ const drawer = ref(false)
 const nowColumnId = ref()
 const nowCategoryName = ref('')
 const addFormVisible = ref(false)
+const editStatusVisible = ref(false)
 const aboutContentDrawer = ref(false)
 //存取栏目信息
 const column  =ref([])
@@ -237,11 +275,10 @@ const addNewsButton = (item)=>{
   nowCategoryName.value = item.categoryName
 }
 const nowTimeNewsData = ref({})
-console.log(userStore.data,'当前用户数据')
 //新闻详细信息获取
 const newViews = (listObject)=> {
   nowTimeNewsData.value = { ...listObject }
-  console.log(nowTimeNewsData,'当前新闻数据')
+  // console.log(nowTimeNewsData,'当前新闻数据')
 }
 //栏目
 const form = ref({
@@ -254,7 +291,14 @@ const form = ref({
   status:'',
   updateTime:''
 })
-
+//编辑栏目信息
+const editForm = ref({
+  id: '',
+  categoryName: '',
+  categoryPid: '',
+  creatorId: '',
+  status: ''
+});
 //获取栏目信息
 const CategoryList = async () => {
   const res = await queryCategory()
@@ -304,6 +348,33 @@ const deleteHandle = async (id)=>{
   })
   await CategoryList()
 }
+//栏目状态编辑
+const editStatusHandle = (row) => {
+  editForm.value = {
+    id: row.id,
+    categoryName: row.categoryName,
+    categoryPid: row.categoryPid,
+    creatorId: row.creatorId,
+    status: row.status
+  };
+  editStatusVisible.value = true;
+};
+//栏目内容编辑后提交
+const confirmEdit = async ()=>{
+  await editStatus({
+    id:editForm.value.id,
+    categoryName:editForm.value.categoryName,
+    categoryPid: editForm.value.categoryPid,
+    creatorId: editForm.value.creatorId,
+    status: editForm.value.status
+  }).then(()=>{
+    CategoryList()
+    ElMessage({
+      message:'修改成功',
+      type:'success'
+    })
+  })
+}
 //新闻文章查询
 const EssayList = async (id)=>{
   const response = await queryEssay(id)
diff --git a/teaching_integration_platform_admin_template/src/views/news/index.vue b/teaching_integration_platform_admin_template/src/views/news/index.vue
index e791d7d..d4f6361 100644
--- a/teaching_integration_platform_admin_template/src/views/news/index.vue
+++ b/teaching_integration_platform_admin_template/src/views/news/index.vue
@@ -49,7 +49,6 @@
           </div>
           <div style="text-align: center">
             <el-scrollbar class="scrollbarContent">
-<!--              <span>{{ nowTimeNewsData.content }}</span>-->
               <textarea v-model="nowTimeNewsData.content" style="width: 100%;height: 65vh;border: none;" readonly></textarea>
             </el-scrollbar>
         </div>
@@ -73,7 +72,9 @@ const column  =ref([])
 //获取栏目信息
 const CategoryList = async () => {
   const res = await queryCategory()
-  column.value = res.data
+  // 过滤状态为 1 的栏目
+  const showColumns = res.data.filter(column => column.status === 1);
+  column.value = showColumns;
   // 初始化时加载第一个栏目的第一条新闻
   if (column.value.length > 0) {
     await EssayList(column.value[0].id);
@@ -93,12 +94,21 @@ const newViews = (listObject)=> {
   nowTimeNewsData.value = { ...listObject }
   console.log(nowTimeNewsData,'当前点击新闻详细内容')
 }
-//新闻文章查询
-const EssayList = async (id)=>{
-  const response = await queryEssay(id)
-  essay.value = response.data
-  if (essay.value.length > 0) {
-    newViews(essay.value[0]); // 显示第一条新闻
+// 新闻文章查询
+const EssayList = async (id) => {
+  try {
+    const response = await queryEssay(id);
+    // 过滤状态为1的新闻条目
+    const filteredEssays = response.data.filter((item) => item.status === 1);
+    essay.value = filteredEssays;
+    // 如果过滤后的列表有内容，则显示第一条新闻
+    if (essay.value.length > 0) {
+      newViews(essay.value[0]); // 显示第一条新闻
+    } else {
+      ElMessage.warning('此栏目下没有可用的新闻！');
+    }
+  } catch (error) {
+    ElMessage.error('获取新闻列表失败，请稍后再试！');
   }
 }
 </script>
diff --git a/teaching_integration_platform_template/src/views/pedagogicalReform/index.vue b/teaching_integration_platform_template/src/views/pedagogicalReform/index.vue
index 6cc5eed..a7df07d 100644
--- a/teaching_integration_platform_template/src/views/pedagogicalReform/index.vue
+++ b/teaching_integration_platform_template/src/views/pedagogicalReform/index.vue
@@ -30,36 +30,27 @@
 <script lang='ts' setup>
 import { onMounted, reactive, ref, toRefs, watch } from 'vue'
 import {queryCategory,queryEssay} from '@/api/news'
+import {ElMessage} from 'element-plus'
 const column = ref([])
-const essayContent = ref({})
-//获取栏目信息
+// 获取栏目信息和对应的文章标题
 const CategoryList = async () => {
-  const res = await queryCategory()
-  column.value = res.data
-  // console.log(column.value,'栏目信息')
-}
-const selectEssay =async (essay)=>{
-  essayContent.value = essay
-  // console.log(essayContent,'所选文章')
-};
-// 异步获取栏目信息和对应的文章标题
-const fetchCategoriesAndEssays = async () => {
   try {
     const categoriesResponse = await queryCategory();
-    column.value = categoriesResponse.data;
-    // 对于每个栏目，获取其文章列表
+    const showColumns = categoriesResponse.data.filter(column => column.status === 1);
+    column.value = showColumns;
+    // 对于每个栏目，获取其文章列表并过滤状态为1的文章
     for (const category of column.value) {
       const essaysResponse = await queryEssay(category.id);
-      category.essays = essaysResponse.data || [];
-      console.log(category.essays,'s')
+      // 过滤状态为1的文章
+      category.essays = essaysResponse.data.filter(article => article.status === 1);
     }
   } catch (error) {
-    console.error('查找信息失败', error);
+    // console.error('查找信息失败', error);
+    ElMessage.error('查找信息失败，请稍后再试！');
   }
 }
 onMounted(() => {
   CategoryList()
-  fetchCategoriesAndEssays()
 })
 </script>
 
diff --git a/teaching_integration_platform_template/src/views/scientificResearch/index.vue b/teaching_integration_platform_template/src/views/scientificResearch/index.vue
index b6ecef6..51f839f 100644
--- a/teaching_integration_platform_template/src/views/scientificResearch/index.vue
+++ b/teaching_integration_platform_template/src/views/scientificResearch/index.vue
@@ -7,12 +7,8 @@
         </div>
       </template>
       <div class="news_main">
-<!--        {{ aboutEssay.content }}-->
         <textarea v-model="aboutEssay.content" class="textSty"></textarea>
       </div>
-<!--      <template #footer>-->
-<!--        <span>...</span>-->
-<!--      </template>-->
     </el-card>
   </div>
 </template>