'gengxin'

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{

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({})

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([])

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'
     });
   })

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)=>{

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'

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}`);
+}