From 1e9c7a02ec2b8caf7dda6000d7f0f79849df6b45 Mon Sep 17 00:00:00 2001
From: 朱佳吉 <1527963051@qq.com>
Date: 星期四, 09 五月 2024 14:15:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/components/view/notice-detail.vue |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/components/view/notice-detail.vue b/src/components/view/notice-detail.vue
index 65e5518..c4661e0 100644
--- a/src/components/view/notice-detail.vue
+++ b/src/components/view/notice-detail.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="notice-detail-page">
     <div class="notice-detail-head">
-      <h4 style="margin-bottom: 16px;">{{ noticeInfo.theme }}</h4>
+      <h4 style="margin-bottom: 16px;">{{ noticeInfo.theme }} <el-tag style="margin-left: 10px;" :type="options.find(m=>m.value==noticeInfo.messageType).type" v-if="options.find(m=>m.value==noticeInfo.messageType)">{{ options.find(m=>m.value==noticeInfo.messageType).label }}</el-tag></h4>
       <p style="font-size: 12px;color: #999;margin-bottom: 20px;">
         <!-- <span>娑堟伅绫诲瀷锛氬鎵�&nbsp; </span> -->
         <span>鍙戦�佷汉锛歿{ noticeInfo.createUser }} </span>
@@ -16,8 +16,8 @@
       </div>
     </div>
     <div class="info-box" v-if="noticeInfo.jumpPath">
-      <component class="notice-content" :is="noticeInfo.jumpPath" style="height: 500px;" >
-		  </component>
+      <!-- <component class="notice-content" :is="noticeInfo.jumpPath" style="height: 500px;" >
+		  </component> -->
     </div>
   </div>
 </template>
@@ -38,6 +38,7 @@
   data() {
     return{
       noticeInfo:{},
+      options:[]
     }
   },
   created(){
@@ -47,9 +48,21 @@
     this.noticeInfo = JSON.parse(sessionStorage.getItem("noticeInfo"));
     this.$bus.$on("change", (msg) => {
       this.noticeInfo = JSON.parse(msg);
+      console.log(this.noticeInfo);
       sessionStorage.setItem("noticeInfo", msg);
     });
+    this.getTypeDicts()
   },
+  methods:{
+    getTypeDicts() {
+      this.$axios.post(this.$api.enums.selectEnumByCategory, {
+        category: "娑堟伅绫诲瀷"
+      }).then(res => {
+        let data = res.data
+        this.options = data;
+      })
+    },
+  }
 }
 </script>
 

--
Gitblit v1.9.3