From 275622c4321d778b47f45d47c087236817a48f81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E6=B4=81?= <209192278@qq.com>
Date: Sat, 11 Nov 2023 18:12:40 +0800
Subject: [PATCH] =?UTF-8?q?=E9=82=93=E6=B4=81=20:=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=8F=B3=E4=B8=8A=E8=A7=92=E9=93=83=E9=93=9B=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/index.scss             |  5 ++-
 src/layout/navbar/BellSocket.vue         | 50 ++++++++++++++++++++----
 src/layout/tagsview/index.vue            |  9 +++++
 src/views/system/notice/inform/index.vue | 14 +------
 4 files changed, 57 insertions(+), 21 deletions(-)

diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index efac9c2..c65a1e2 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -86,8 +86,9 @@ html, body, #app, .el-container, .el-aside, .el-main {
   margin-left: 14px;
 
   .el-form-item {
-    display: flex;
-    align-items: center;
+    //display: flex;
+    //align-items: center;
+    margin-right: 18px;
   }
 
   .el-form-item__label {
diff --git a/src/layout/navbar/BellSocket.vue b/src/layout/navbar/BellSocket.vue
index 5fc0706..c547706 100644
--- a/src/layout/navbar/BellSocket.vue
+++ b/src/layout/navbar/BellSocket.vue
@@ -29,15 +29,29 @@
         </div>
       </template>
     </el-popover>
+    <el-dialog width="1200px" title="通知公告详情" v-model="visible" @close="visible=false">
+      <el-form :model="viewForm" label-width="100px">
+        <el-row>
+          <el-col :span="24" class="title-block">
+            <el-text class="title">{{ viewForm.noticeTitle }}</el-text>
+          </el-col>
+          <el-col :span="24">
+            <el-text v-if="viewForm.contentType == 'text'">{{ viewForm.noticeContent }}</el-text>
+            <span v-else v-html="viewForm.noticeContent"></span>
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-dialog>
   </div>
 </template>
 
 <script setup>
-import {getNotifyList,readAllNotify, readSingleNotify} from "@/api/notice/notify";
+import {getNotifyList,getNotifyDetail, readAllNotify, readSingleNotify} from "@/api/notice/notify";
 import {getToken} from '@/utils/auth'
 import {ElMessage} from "element-plus";
 import {useRouter} from "vue-router";
-import {defineExpose} from "vue";
+// import {defineExpose} from "vue";
+
 const router = useRouter()
 const pageInfo = reactive({
   pageNum: 1,
@@ -46,10 +60,18 @@ const pageInfo = reactive({
 let send = {
   type: "ping"
 }
-
+const viewForm = ref();
+const visible = ref(false);
 const showNotify = ref(false);
 const total = ref();
 const noticeList = ref();
+//查看详情
+const handleViewDetails = (noticeId) => {
+  getNotifyDetail(noticeId).then(res => {
+    visible.value = true
+    viewForm.value = res.data
+  })
+}
 const initWebSocket = () => {
   const socket = new WebSocket(import.meta.env.VITE_BASE_WSURL + '/notice-ws/notice')
   // 2. ws.send()给服务器发送信息
@@ -105,10 +127,15 @@ const searchNotifyList = () => {
 searchNotifyList()
 
 //点击名字跳转到详情页
-const handleToNotifyDetail = (notice,index) => {
-  noticeList.value.splice(index,1)
-  total.value-=1
-  router.push({path: `/system/notice/inform/index/${notice.noticeId}`})
+const handleToNotifyDetail = (notice, index) => {
+  noticeList.value.splice(index, 1)
+  total.value -= 1
+  viewForm.value={
+    noticeTitle:'',
+    noticeContent:''
+  }
+  // router.push({path: `/system/notice/inform/index/${notice.noticeId}`})
+  handleViewDetails(notice.noticeId)
 }
 
 //单个已读
@@ -167,6 +194,15 @@ const handleNext = () => {
 </script>
 
 <style lang="scss" scoped>
+.title-block {
+  text-align: center;
+  padding-bottom: 30px;
+
+  .title {
+    font-size: 28px;
+    font-weight: bold;
+  }
+}
 ul::-webkit-scrollbar {
   width: 6px;
 }
diff --git a/src/layout/tagsview/index.vue b/src/layout/tagsview/index.vue
index b354544..5fd735c 100644
--- a/src/layout/tagsview/index.vue
+++ b/src/layout/tagsview/index.vue
@@ -36,6 +36,15 @@ const tagPath = ref()
 watch(route, () => {
   init()
 })
+onMounted(() => {
+  document.addEventListener('click', nullBlockClick)
+})
+onBeforeUnmount(() => {
+  document.removeEventListener('click', nullBlockClick)
+})
+const nullBlockClick = () => {
+  visible.value = false
+}
 const init = () => {
   tagsViewStore.addVisitedViews(route)
 }
diff --git a/src/views/system/notice/inform/index.vue b/src/views/system/notice/inform/index.vue
index 9d352bb..00136d3 100644
--- a/src/views/system/notice/inform/index.vue
+++ b/src/views/system/notice/inform/index.vue
@@ -38,7 +38,6 @@
     </div>
     <paging :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize" :page-sizes="[10, 20, 30, 40,50]"
             :total="total" @changeSize="handleSizeChange" @goPage="handleCurrentChange"/>
-<!--    <bell-socket style="display: none" ref="bellSocket"/>-->
     <!--详情弹窗-->
     <el-dialog v-model="isViewVisited" title="通知公告详情" width="1200px" @close="handleCloseDialog">
       <el-form :model="viewForm" label-width="100px">
@@ -71,22 +70,16 @@ const queryParams = reactive({
   state: null
 })
 const router = useRouter()
-// const bellSocket = ref()
 const loading = ref(true)
 const list = ref([])
 const total = ref([]);
 const isViewVisited = ref(false);
 const viewForm = ref();
-const notifyId = reactive(router.currentRoute.value.params.queryId)
 const pageInfo = reactive({
   pageNum: 1,
   pageSize: 10
 });
-onMounted(()=>{
-  if(notifyId!==undefined){
-    handleViewDetails(notifyId)
-  }
-})
+
 //重置搜索
 const handleReset = () => {
   getList()
@@ -117,10 +110,7 @@ const handleViewDetails = (noticeId) => {
   })
 }
 //关闭详情弹窗
-const handleCloseDialog=()=>{
-  if(notifyId!==undefined){
-    router.push({path:'/system/notice/inform/index'})
-  }
+const handleCloseDialog = () => {
   isViewVisited.value = false
 }
 //删除单个消息