From 71c4ece010f68a74eeff5e986caecb9a0bb2e36c Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期四, 25 四月 2024 17:37:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/components/view/notice-detail.vue |   33 +++++++++++++++++++++------------
 1 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/components/view/notice-detail.vue b/src/components/view/notice-detail.vue
index 8b11683..bcea964 100644
--- a/src/components/view/notice-detail.vue
+++ b/src/components/view/notice-detail.vue
@@ -1,23 +1,23 @@
 <template>
   <div class="notice-detail-page">
     <div class="notice-detail-head">
-      <h4 style="margin-bottom: 16px;">娑堟伅涓婚</h4>
+      <h4 style="margin-bottom: 16px;">{{ noticeInfo.theme }}</h4>
       <p style="font-size: 12px;color: #999;margin-bottom: 20px;">
         <!-- <span>娑堟伅绫诲瀷锛氬鎵�&nbsp; </span> -->
-        <span>鍙戦�佷汉锛�111 </span>
+        <span>鍙戦�佷汉锛歿{ noticeInfo.createUser }} </span>
         <span>&nbsp;&nbsp;</span>
-        <span>鏀朵欢浜猴細111</span>
+        <span>鏀朵欢浜猴細{{ noticeInfo.consigneeUser }}</span>
         <span>&nbsp;&nbsp;</span>
-        <span>鍙戜欢鏃堕棿锛�111</span>
+        <span>鍙戜欢鏃堕棿锛歿{ noticeInfo.createTime }}</span>
       </p>
       <div class="notice-detail-head-content">
         <label>鍐呭锛�</label>
-        <div></div>
+        <div>{{ noticeInfo.content }}</div>
       </div>
     </div>
-    <div class="info-box">
-      <component class="notice-content" :is="noticeInfo.u" style="height: 500px;">
-		  </component>
+    <div class="info-box" v-if="noticeInfo.jumpPath">
+      <!-- <component class="notice-content" :is="noticeInfo.jumpPath" style="height: 500px;" >
+		  </component> -->
     </div>
   </div>
 </template>
@@ -37,11 +37,20 @@
   components: comObj,
   data() {
     return{
-      noticeInfo:{
-        u:'b1-report-preparation'
-      },
+      noticeInfo:{},
     }
-  }
+  },
+  created(){
+    this.noticeInfo = JSON.parse(sessionStorage.getItem("noticeInfo"));
+  },
+  mounted(){
+    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);
+    });
+  },
 }
 </script>
 

--
Gitblit v1.9.3