From dabfdcc2b2a59638a3defbabda5981e922b10c81 Mon Sep 17 00:00:00 2001
From: x_ying <2438792676@qq.com>
Date: Wed, 24 Aug 2022 17:22:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E8=AF=BB=E6=B6=88=E6=81=AF=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5/=E6=B6=88=E6=81=AF=E5=88=A0=E9=99=A4=E4=BA=8C?=
 =?UTF-8?q?=E6=AC=A1=E7=A1=AE=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   | 23 ++++++++++--
 src/layout/components/Navbar.vue              |  5 +--
 src/views/system/notifyManage/index.vue       | 11 +++---
 src/views/system/user/messageCenter/index.vue | 35 ++++++++++++++-----
 4 files changed, 58 insertions(+), 16 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index ec9032c..025cd8e 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,11 +1,30 @@
 <template>
   <div id="app">
-    <router-view />
+    <router-view v-if="isRouterAlive" />
   </div>
 </template>
 
 <script>
 export default {
-  name: 'App'
+  name: 'App',
+  // 实现页面强刷新
+  provide() {
+    return {
+      reload: this.reload
+    }
+  },
+  data() {
+    return {
+      isRouterAlive: true
+    }
+  },
+  methods: {
+    reload() {
+      this.isRouterAlive = false
+      this.$nextTick(() => {
+        this.isRouterAlive = true
+      })
+    }
+  }
 }
 </script>
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 6660fc9..27b93d4 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -110,6 +110,7 @@ import Avatar from '@/assets/images/avatar.png'
 import { getUserNotice, isread } from '@/api/system/logs'
 
 export default {
+  inject: ['reload'],
   components: {
     // Breadcrumb,
     // Hamburger,
@@ -167,13 +168,11 @@ export default {
       }
       const list = []
       const allList = await this.getAllNoRead(params, list)
-      console.log(allList, 'allList')
       allList.forEach(item => {
         item.pushUserName = item.noticeUsers[0].pushUserName
         item.isRead = item.noticeUsers[0].isRead
       })
       const arr = allList.filter(item => { return !item.isRead })
-      console.log(arr, 'msg')
       if (arr.length > 20) {
         this.msgList = arr.slice(0, 20)
       } else {
@@ -199,6 +198,8 @@ export default {
       isread(ids).then(res => {
         if (res) {
           this.msgList = []
+          // this.$router.go(0)
+          this.reload()
         }
       })
     },
diff --git a/src/views/system/notifyManage/index.vue b/src/views/system/notifyManage/index.vue
index 50cdd7e..d6c46c8 100644
--- a/src/views/system/notifyManage/index.vue
+++ b/src/views/system/notifyManage/index.vue
@@ -107,6 +107,7 @@
 import { noticeCreate, getAllDev, getAllUser, getNoticeList, noticeDel } from '@/api/system/logs'
 export default {
   name: 'NotifyManage',
+  inject: ['reload'],
   data() {
     return {
       tableData: [],
@@ -337,13 +338,14 @@ export default {
       console.log(params, '参数')
       return params
     },
-    // 发布接口
+    // 调用发布接口
     noticeSend(params) {
       noticeCreate(params).then(res => {
         if (res === 'SUCCESS') {
           this.btnloading = false
           this.sendVisible = false
-          this.getTableData()
+          // this.getTableData()
+          this.reload()
           this.$message({
             message: '发布成功',
             type: 'success'
@@ -372,7 +374,9 @@ export default {
       const params = this.selections.map(item => { return item.id })
       noticeDel(params).then(res => {
         if (res === 'SUCCESS') {
-          this.getTableData()
+          // this.getTableData()
+          this.delVisible = false
+          this.reload()
           this.$message({
             message: '删除成功',
             type: 'success'
@@ -381,7 +385,6 @@ export default {
           this.$message.error('删除失败')
         }
       })
-      this.delVisible = false
     },
     // 选择器 推送对象
     handelChange(val) {
diff --git a/src/views/system/user/messageCenter/index.vue b/src/views/system/user/messageCenter/index.vue
index ff65aef..aa11c1e 100644
--- a/src/views/system/user/messageCenter/index.vue
+++ b/src/views/system/user/messageCenter/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="head-container">
-      <el-button icon="el-icon-delete" :disabled="!(selections.length)" size="mini" @click="handleDel">删除</el-button>
+      <el-button icon="el-icon-delete" :disabled="!(selections.length)" size="mini" @click="delVisible=true">删除</el-button>
       <el-button class="iconfont icon-biaojiyidu-fanbai" :disabled="!(selections.length)" size="mini" @click="handleRead">标记已读</el-button>
       <el-button class="iconfont icon-biaojiyidu-fanbai" size="mini" @click="handleAllRead">全部标记已读</el-button>
       <date-range-picker v-model="query.createTime" class="date-item" />
@@ -41,6 +41,17 @@
       @size-change="sizeChangeHandler($event)"
       @current-change="pageChangeHandler"
     />
+    <!-- 删除 -->
+    <el-dialog :visible.sync="delVisible" title="提示">
+      <span class="dialog-right-top" />
+      <span class="dialog-left-bottom" />
+      <div class="setting-dialog">
+        <p class="delMsg">确定删除所选消息吗？</p>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="handleDelConfirm">确定</el-button>
+        </div>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -51,6 +62,7 @@ import CRUD, { presenter, header, crud } from '@crud/crud'
 
 export default {
   name: 'MessageCenter',
+  inject: ['reload'],
   components: { DateRangePicker },
   mixins: [presenter(), crud(), header()],
   cruds() {
@@ -72,7 +84,8 @@ export default {
         size: 10,
         page: 1
       },
-      isLoading: false
+      isLoading: false,
+      delVisible: false
     }
   },
   created() {
@@ -82,7 +95,6 @@ export default {
     getTableData() {
       this.isLoading = true
       getUserNotice(this.getParams()).then(res => {
-        console.log(res, 'list')
         this.page.total = res.totalElements
         const table = res.content
         table.forEach(item => {
@@ -115,7 +127,8 @@ export default {
     handleRead() {
       isread(this.getUserMsgId(this.selections)).then(res => {
         if (res) {
-          this.getTableData()
+          // this.getTableData()
+          this.reload()
         }
       })
     },
@@ -131,7 +144,8 @@ export default {
       const allList = await this.getAllNoRead(params, list)
       isread(this.getUserMsgId(allList)).then(res => {
         if (res) {
-          this.getTableData()
+          this.reload()
+          // this.getTableData()
         }
       })
     },
@@ -149,11 +163,12 @@ export default {
       return allList
     },
     // 删除
-    handleDel() {
+    handleDelConfirm() {
       userMsgDel(this.getUserMsgId(this.selections)).then(res => {
-        console.log(res, '删除')
         if (res) {
-          this.getTableData()
+          // this.getTableData()
+          this.delVisible = false
+          this.reload()
           this.$message({
             message: '删除成功',
             type: 'success'
@@ -211,4 +226,8 @@ export default {
 ::v-deep .read-color td{
   color: #999 !important;
 }
+.delMsg{
+  color: #fff;
+  font-size: 16px;
+}
 </style>