From 4ad53af42d153018f92f7190763d025e202e6ac0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Mon, 25 Apr 2022 18:35:28 +0800
Subject: [PATCH] =?UTF-8?q?navbar=E6=96=B0=E5=A2=9E=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                  |   2 +-
 src/components/Notice/Index.vue   | 107 ++++++++++++++++++++++++++++++
 src/layout/components/Navbar.vue  |  15 ++++-
 src/utils/signalR.js              |  31 ++++-----
 src/views/system/notice/index.vue |  13 +++-
 vite.config.js                    |   7 +-
 6 files changed, 154 insertions(+), 21 deletions(-)
 create mode 100644 src/components/Notice/Index.vue

diff --git a/.env.development b/.env.development
index 086d1fa..7346fda 100644
--- a/.env.development
+++ b/.env.development
@@ -12,4 +12,4 @@ VITE_APP_ROUTER_PREFIX = '/'
 VITE_APP_UPLOAD_URL = '/Common/UploadFile'
 
 #socket API
-VITE_APP_SOCKET_API = 'http://localhost:8888/msghub'
\ No newline at end of file
+VITE_APP_SOCKET_API = '/msghub'
\ No newline at end of file
diff --git a/src/components/Notice/Index.vue b/src/components/Notice/Index.vue
new file mode 100644
index 0000000..b67d8d2
--- /dev/null
+++ b/src/components/Notice/Index.vue
@@ -0,0 +1,107 @@
+<template>
+  <div class="layout-navbars-breadcrumb-user-news">
+    <div class="head-box">
+      <div class="head-box-title">通知</div>
+      <div class="head-box-btn" v-if="noticeList.length > 0" @click="onAllReadClick">全部已读</div>
+    </div>
+    <div class="content-box">
+      <template v-if="noticeList.length > 0">
+        <div class="content-box-item" v-for="(v, k) in noticeList" :key="k">
+          <div>{{ v.noticeTitle }}</div>
+          <div class="content-box-msg" v-html="v.noticeContent"></div>
+          <div class="content-box-time">{{ v.updateTime }}</div>
+        </div>
+      </template>
+      <div class="content-box-empty" v-else>
+        <div class="content-box-empty-margin">
+          <i class="el-icon-s-promotion"></i>
+          <div class="mt15">全部已读</div>
+        </div>
+      </div>
+    </div>
+    <div class="foot-box" @click="onGoToGiteeClick" v-if="noticeList.length > 0">前往通知中心</div>
+  </div>
+</template>
+
+<script setup name="noticeIndex">
+const { proxy } = getCurrentInstance()
+const noticeList = computed(() => {
+  return proxy.$store.getters.noticeList
+})
+// 全部已读点击
+function onAllReadClick() {
+  proxy.$modal.msg('敬请期待！！！')
+}
+// 前往通知中心点击
+function onGoToGiteeClick() {
+  window.open('https://gitee.com/izory/ZrAdminNetCore')
+}
+</script>
+
+<style lang="scss">
+.layout-navbars-breadcrumb-user-news {
+  .head-box {
+    display: flex;
+    border-bottom: 1px solid #ebeef5;
+    box-sizing: border-box;
+    color: #333333;
+    justify-content: space-between;
+    height: 35px;
+    align-items: center;
+    .head-box-btn {
+      color: #1890ff;
+      font-size: 13px;
+      cursor: pointer;
+      opacity: 0.8;
+      &:hover {
+        opacity: 1;
+      }
+    }
+  }
+  .content-box {
+    font-size: 13px;
+    .content-box-item {
+      padding-top: 12px;
+      &:last-of-type {
+        padding-bottom: 12px;
+      }
+      .content-box-msg {
+        color: #999999;
+        margin-top: 5px;
+        margin-bottom: 5px;
+      }
+      .content-box-time {
+        color: #999999;
+      }
+    }
+    .content-box-empty {
+      height: 260px;
+      display: flex;
+      .content-box-empty-margin {
+        margin: auto;
+        text-align: center;
+        i {
+          font-size: 60px;
+        }
+      }
+    }
+  }
+  .foot-box {
+    height: 35px;
+    color: #1890ff;
+    font-size: 13px;
+    cursor: pointer;
+    opacity: 0.8;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border-top: 1px solid #ebeef5;
+    &:hover {
+      opacity: 1;
+    }
+  }
+  :deep(.el-empty__description p) {
+    font-size: 13px;
+  }
+}
+</style>
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 315c1a0..434f4b1 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -22,6 +22,17 @@
           <size-select id="size-select" class="right-menu-item hover-effect" />
         </el-tooltip>
       </template>
+      <!-- 通知 -->
+      <div class="right-menu-item">
+        <el-popover placement="bottom" trigger="click" v-model:visible="isShowUserNewsPopover" width="300" popper-class="el-popover-pupop-user-news">
+          <template #reference>
+            <el-badge @click.stop="isShowUserNewsPopover = !isShowUserNewsPopover" :is-dot="true" slot="reference" style="line-height: 32px">
+              <el-icon><bell /></el-icon>
+            </el-badge>
+          </template>
+          <Notice v-show="isShowUserNewsPopover" />
+        </el-popover>
+      </div>
       <div class="avatar-container">
         <el-dropdown @command="handleCommand" class="right-menu-item hover-effect" trigger="click">
           <div class="avatar-wrapper">
@@ -59,9 +70,11 @@ import SizeSelect from '@/components/SizeSelect'
 import HeaderSearch from '@/components/HeaderSearch'
 import ZrGit from '@/components/Zr/Git'
 import ZrDoc from '@/components/Zr/Doc'
+import Notice from '@/components/Notice/Index'
 
 const store = useStore()
 const getters = computed(() => store.getters)
+const isShowUserNewsPopover = ref(false)
 
 function toggleSideBar() {
   store.dispatch('app/toggleSideBar')
@@ -100,7 +113,7 @@ function setLayout() {
 }
 </script>
 
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 .el-menu {
   // display: inline-table;
   line-height: 46px !important;
diff --git a/src/utils/signalR.js b/src/utils/signalR.js
index f105071..00d0d34 100644
--- a/src/utils/signalR.js
+++ b/src/utils/signalR.js
@@ -10,26 +10,27 @@ export default {
   // 失败连接重试次数
   failNum: 4,
   baseUrl: '',
-	init(url) {
-		console.log(url);
+  init(url) {
+    var socketUrl = window.location.origin + url
+    //console.log(socketUrl)
     const connection = new signalR.HubConnectionBuilder()
-      .withUrl(url, { accessTokenFactory: () => getToken() })
-      .withAutomaticReconnect()//自动重新连接
+      .withUrl(socketUrl, { accessTokenFactory: () => getToken() })
+      .withAutomaticReconnect() //自动重新连接
       .configureLogging(signalR.LogLevel.Information)
       .build();
-    this.SR = connection;
+    this.SR = connection
     // 断线重连
     connection.onclose(async () => {
       console.log('断开连接了')
-			console.assert(connection.state === signalR.HubConnectionState.Disconnected);
-			// 建议用户重新刷新浏览器
-      await this.start();
+      console.assert(connection.state === signalR.HubConnectionState.Disconnected);
+      // 建议用户重新刷新浏览器
+      await this.start()
     })
 
     connection.onreconnected(() => {
       console.log('断线重新连接成功')
     })
-    this.receiveMsg(connection);
+    this.receiveMsg(connection)
     // 启动
     // this.start();
   },
@@ -38,26 +39,26 @@ export default {
    * @returns 
    */
   async start() {
-    var that = this;
+    var that = this
 
     try {
       //使用async和await 或 promise的then 和catch 处理来自服务端的异常
-      await this.SR.start();
+      await this.SR.start()
       //console.assert(this.SR.state === signalR.HubConnectionState.Connected);
       console.log('signalR 连接成功了', this.SR.state);
-      return true;
+      return true
     } catch (error) {
       that.failNum--;
       console.log(`失败重试剩余次数${that.failNum}`, error)
       if (that.failNum > 0) {
         setTimeout(async () => {
           await this.SR.start()
-        }, 5000);
+        }, 5000)
       }
-      return false;
+      return false
     }
   },
-	// 接收消息处理
+  // 接收消息处理
   receiveMsg(connection) {
     connection.on("onlineNum", (data) => {
       store.dispatch("socket/changeOnlineNum", data);
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index 83bcf70..f87ad44 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -54,6 +54,7 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
+          <el-button type="text" icon="bell" @click="handleNotice(scope.row)" v-hasPermi="['system:notice:edit']">通知</el-button>
           <el-button type="text" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:notice:edit']">修改</el-button>
           <el-button type="text" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:notice:remove']">删除</el-button>
         </template>
@@ -105,8 +106,8 @@
 <script setup name="notice">
 // 富文本组件
 import Editor from '@/components/Editor'
-import { listNotice, getNotice, delNotice, addNotice, updateNotice } from '@/api/system/notice'
-import { getCurrentInstance } from 'vue';
+import { listNotice, getNotice, delNotice, addNotice, updateNotice, sendNotice } from '@/api/system/notice'
+import { getCurrentInstance } from 'vue'
 
 const { proxy } = getCurrentInstance()
 const noticeList = ref([])
@@ -236,6 +237,12 @@ function handleDelete(row) {
     })
     .catch(() => {})
 }
-
+// 发送通知
+function handleNotice(row) {
+  const noticeId = row.noticeId || ids.value
+  sendNotice(noticeId).then((res) => {
+    proxy.$modal.msgSuccess('发送通知成功')
+  })
+}
 getList()
 </script>
diff --git a/vite.config.js b/vite.config.js
index 70a3a4b..28632c0 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -39,7 +39,12 @@ export default defineConfig(({ mode, command }) => {
           target: 'http://localhost:8888',
           changeOrigin: true,
           rewrite: (path) => path.replace(/^\/dev-api/, '')
-        }
+				},
+				'/msghub': {
+					target: 'http://localhost:8888',
+					ws: true,
+					rewrite: (path) => path.replace(/^\/msgHub/, '')
+				}
       },
     },
   }