From bc5f5c20180bee814b539d53f78eabcf4944cc12 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Fri, 8 May 2020 16:53:31 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=B9=A6=E8=AE=B0=E5=9C=A8=E7=BA=BF?=
 =?UTF-8?q?=E3=80=91-=E3=80=90=E6=9F=A5=E7=9C=8B=E6=97=B6=E5=B0=86?=
 =?UTF-8?q?=E5=BD=93=E5=89=8D=E4=BA=BA=E5=91=98=E6=9B=B4=E6=96=B0=E4=B8=BA?=
 =?UTF-8?q?=E5=B7=B2=E8=AF=BB=E7=8A=B6=E6=80=81=EF=BC=8C=E6=B5=8F=E8=A7=88?=
 =?UTF-8?q?=E9=87=8F=E5=8A=A0=E4=B8=80=E3=80=91-=EF=BC=88=E7=8E=8B?=
 =?UTF-8?q?=E5=85=AC=E5=B3=B0=EF=BC=89-2020/05/08?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/master/masternotice.vue     |  6 +++---
 .../modules/master/masternoticedetail.vue     | 20 +++++++++++++------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/views/modules/master/masternotice.vue b/src/views/modules/master/masternotice.vue
index 15ce6335..023ec644 100755
--- a/src/views/modules/master/masternotice.vue
+++ b/src/views/modules/master/masternotice.vue
@@ -62,7 +62,7 @@
             <el-button type="text" size="small" v-if="$hasPermission('cloudAnalysis:masternotice:toTop') && scope.row.state == 1"   @click="openToTopDialog($event, scope.row)" >置顶</el-button>
             <el-button type="text" size="small" v-if="$hasPermission('cloudAnalysis:masternotice:toTop') && scope.row.state == 2"  @click="openCancelToTopDialog($event, scope.row)">取消置顶</el-button>
             <el-button type="text" size="small" v-if="$hasPermission('cloudAnalysis:masternotice:close')"  @click="openCloseTopicDialog($event, scope.row)" :disabled="scope.row.state == 0">关闭</el-button>
-            <el-button type="text" size="small" @click="manageHandle(scope.row.id)">查看</el-button>          </template>
+            <el-button type="text" size="small" @click="manageHandle(scope.row.id, scope.row.browseNum)">查看</el-button>          </template>
         </el-table-column>
       </el-table>
       <el-pagination
@@ -241,9 +241,9 @@ export default {
       this.optionForm.id = row.id
       this.optionForm.state = 0
     },
-    manageHandle (noticeId) {
+    manageHandle (noticeId, browseNum) {
       this.$parent.selectComponent = 'Masternoticedetail'
-      this.$router.push({ path: '/master-masternoticeroute', query: { noticeId: noticeId } })
+      this.$router.push({ path: '/master-masternoticeroute', query: { noticeId: noticeId, browseNum: browseNum } })
     }
   }
 }
diff --git a/src/views/modules/master/masternoticedetail.vue b/src/views/modules/master/masternoticedetail.vue
index 7838e512..1341847f 100755
--- a/src/views/modules/master/masternoticedetail.vue
+++ b/src/views/modules/master/masternoticedetail.vue
@@ -71,6 +71,7 @@ export default {
   mounted () {
     this.dataForm.id = this.$route.query.noticeId
     this.readForm.id = this.$route.query.noticeId
+    this.dataForm.browseNum = this.$route.query.browseNum
     this.getInfo()
     this.getReadInfo(1)
   },
@@ -90,15 +91,22 @@ export default {
     },
     // 获取已读未读信息
     getReadInfo (readFlag) {
-      this.readForm.readFlag = readFlag
-      this.$http.post(`/cloudAnalysis/masternotice/getReadInfo`, this.readForm).then(({ data: res }) => {
+      // 将当前登录人改为已读
+      this.$http.post(`/cloudAnalysis/masternotice/addBrowNum`, this.dataForm).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
-        this.readFormList = res.data
-        this.loading = false
-        this.readFormList.tagIds = []
-      }).catch(() => { })
+        // 将当前登录人改为已读后，获取已读未读信息
+        this.readForm.readFlag = readFlag
+        this.$http.post(`/cloudAnalysis/masternotice/getReadInfo`, this.readForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.readFormList = res.data
+          this.loading = false
+          this.readFormList.tagIds = []
+        }).catch(() => { })
+      }).catch(() => {})
     },
     backToDeptList () {
       this.$emit('refreshDataList')