From b4af936409d60264ac016beb41a20019cab0d070 Mon Sep 17 00:00:00 2001
From: monkeyhouyi <m19382021374@163.com>
Date: Tue, 30 Jul 2024 10:27:42 +0800
Subject: [PATCH] 消息管理修改

---
 src/api/system/message.js                         |  3 ++-
 src/utils/define.js                               |  5 +++--
 src/views/homePage/components/news/NewsDialog.vue | 25 ++++++++++++++++++++-----
 src/views/homePage/components/news/index.vue      |  2 ++
 vue.config.js                                     |  7 ++++---
 5 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/src/api/system/message.js b/src/api/system/message.js
index 113a979..c1997a5 100644
--- a/src/api/system/message.js
+++ b/src/api/system/message.js
@@ -19,9 +19,10 @@ export function MessageAllRead() {
 export function ReadInfo(id) {
   return request({
     url: `/message/ReadInfo/${id}`,
-    method: 'get'
+    method: 'GET'
   })
 }
+
 // 删除消息
 export function MessageDeleteRecord(data) {
   return request({
diff --git a/src/utils/define.js b/src/utils/define.js
index 92295f6..b2ff517 100644
--- a/src/utils/define.js
+++ b/src/utils/define.js
@@ -1,12 +1,13 @@
 // 开发环境接口配置
 // JAVA Boot版本对应后端接口地址
 // JAVA Cloud对应网关地址
-const APIURl = 'http://8.130.38.56:8043'
+const APIURl = 'http://localhost:8080'
 
 module.exports = {
   APIURl: APIURl,
   timeout: process.env.NODE_ENV === 'development' ? 10000 : 1000000,
-  WebSocketUrl: process.env.NODE_ENV === 'development' ? APIURl.replace('http', 'ws') + '/api/message/websocket' : process.env.VUE_APP_BASE_WSS,
+  WebSocketUrl: process.env.NODE_ENV === 'development' ? APIURl.replace('http', 'ws') + '/websocket' : process.env.VUE_APP_BASE_WSS,
+  // WebSocketUrl: process.env.NODE_ENV === 'development' ? APIURl.replace('http', 'ws') + '/api/message/websocket' : process.env.VUE_APP_BASE_WSS,
   comUploadUrl: process.env.VUE_APP_BASE_API + '/api/file/Uploader',
   comUrl: process.env.VUE_APP_BASE_API,
   // 本地文件预览
diff --git a/src/views/homePage/components/news/NewsDialog.vue b/src/views/homePage/components/news/NewsDialog.vue
index 24c9203..9545774 100644
--- a/src/views/homePage/components/news/NewsDialog.vue
+++ b/src/views/homePage/components/news/NewsDialog.vue
@@ -15,16 +15,19 @@
         infinite-scroll-disabled="disabled"
         infinite-scroll-immediate
       >
-        <li class="list-item" v-for="v in messageList" :key="v.id">
+        <li class="list-item" v-for="(v, i) in messageList" :key="v.id">
           <div class="item-title">{{ v.title }}</div>
           <!-- <p>这个应用应该归属到青羊区，不在金牛区的管辖范围内。</p> -->
           <div class="item-info">
             <div class="left">发送人：{{ v.creatorUser }}</div>
           </div>
           <div class="item-info">
-            <div class="right">
+            <div class="left">
               时间：{{ ncc.dateFormat(v.lastModifyTime) }}
             </div>
+            <div class="right">
+              <el-button type="text" size="mini" @click="toReadInfo(v.id, i)">标记已读</el-button>
+            </div>
           </div>
         </li>
       </ul>
@@ -35,7 +38,8 @@
 </template>
 
 <script>
-import { getMessageList } from "@/api/system/message";
+import { getMessageList, ReadInfo } from "@/api/system/message";
+import { message } from '@/utils/message';
 export default {
   name: "NewsDialog",
   data() {
@@ -81,9 +85,19 @@ export default {
     },
     toReadAll() {
       MessageAllRead().then(() => {
-        this.load();
+        this.init();
       });
     },
+    toReadInfo(id, index) {
+      ReadInfo(id).then(() => {
+        this.$message({
+          showClose: true,
+          message: '已读成功！',
+          type: 'success'
+        });
+        this.init();
+      });
+    }
   },
 };
 </script>
@@ -114,7 +128,7 @@ export default {
       padding: 8px;
       border-radius: 5px;
       background-color: rgb(243, 244, 246);
-      cursor: pointer;
+      // cursor: pointer;
       .item-title {
         color: #000;
         font-weight: 600;
@@ -146,6 +160,7 @@ export default {
         align-items: center;
         color: #ccc;
         font-size: 12px;
+        line-height: 30px;
       }
     }
   }
diff --git a/src/views/homePage/components/news/index.vue b/src/views/homePage/components/news/index.vue
index cb63407..97e6214 100644
--- a/src/views/homePage/components/news/index.vue
+++ b/src/views/homePage/components/news/index.vue
@@ -50,12 +50,14 @@ export default {
       this.socket = this.$store.getters.socket || null;
       if ("WebSocket" in window) {
         if (!this.socket) {
+          console.log(this.define.WebSocketUrl, 'this.define.WebSocketUrl');
           this.socket = new ReconnectingWebSocket(this.define.WebSocketUrl);
           this.$store.commit("SET_SOCKET", this.socket);
         }
         //添加事件监听
         let socket = this.socket;
         socket.onopen = () => {
+          console.log('连接成功')
           var onConnection = {
             method: "OnConnection",
             token: this.$store.getters.token,
diff --git a/vue.config.js b/vue.config.js
index 3da7707..d784c57 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -25,9 +25,10 @@ module.exports = defineConfig({
         }
       }
     },
-    client: {
-      overlay: false
-    },
+    // client: {
+    //   webSocketURL: "http://localhost:8080"
+    //   // overlay: false
+    // },
   },
   configureWebpack: {
     name: '属地',
--
libgit2 0.21.4