From 7fd4ac8cf936287df72aa3bd5cb2ef9dfe67449b Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Mon, 16 Jan 2023 18:25:34 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=9C=A8=E7=BA=BF?=
 =?UTF-8?q?=E8=AF=BE=E4=BC=A0=E9=80=92=E7=9A=84taskID=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/project/ProjectOnlineManage.vue | 2 +-
 src/components/drawers/router/RouterCommonManage.vue   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/drawers/project/ProjectOnlineManage.vue b/src/components/drawers/project/ProjectOnlineManage.vue
index 416557ff..450fefd5 100644
--- a/src/components/drawers/project/ProjectOnlineManage.vue
+++ b/src/components/drawers/project/ProjectOnlineManage.vue
@@ -385,7 +385,7 @@ export default {
           "status": state.projectName,
           "studentName": state.name,
           "targetId":props.datasource.projectId,
-          "taskId": props.datasource.projectTaskId,
+          "taskId": props.datasource.courseId,
           "thirdId": props.datasource.targetId,
           "type": 1
         });
diff --git a/src/components/drawers/router/RouterCommonManage.vue b/src/components/drawers/router/RouterCommonManage.vue
index dad2f39a..84f11ede 100644
--- a/src/components/drawers/router/RouterCommonManage.vue
+++ b/src/components/drawers/router/RouterCommonManage.vue
@@ -387,7 +387,7 @@ export default {
           "chapterId": props.datasource.chapterId,
           "status": state.projectName,
           "studentName": state.name,
-          "taskId": props.datasource.routerTaskId,
+          "taskId": props.datasource.courseId,
           "thirdId": props.datasource.targetId,
           "type": 1
         });

From a50a42e73c79b8ef43c2b024a43dd10edd49c430 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Mon, 16 Jan 2023 18:43:34 +0800
Subject: [PATCH 2/3] =?UTF-8?q?style:=E9=A1=B9=E7=9B=AE=E5=85=AC=E5=91=8A?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/NoticeHis.vue |  7 ++++---
 src/components/drawers/NoticePub.vue | 13 ++++---------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/components/drawers/NoticeHis.vue b/src/components/drawers/NoticeHis.vue
index 289f1834..7e02a166 100644
--- a/src/components/drawers/NoticeHis.vue
+++ b/src/components/drawers/NoticeHis.vue
@@ -9,14 +9,15 @@
   <div class="noticeContent">
     <div v-for="item in notice" :key="item.id" class="item">
       <!-- <div class="itemcontent">{{ item.content }}</div> -->
-      <a-textarea
+      <!-- <a-textarea
           class="itemcontent"
           disabled="true"
           v-model:value="item.content"
           :maxlength="150"
           placeholder="公告信息最多输入150个字"
           style="margin-top: -10px; height: 120px;background-color: #fff;"
-        />
+        /> -->
+      <pre style="text-align: left;padding-left: 20px">{{item.content}}</pre>
       <div class="itemtime">{{ item.pubtime }}</div>
     </div>
   </div>
@@ -138,7 +139,7 @@ export default {
   margin-top: 20px;
   margin-left: 32px;
   .item {
-    height: 66px;
+    // height: 66px;
     width: 74%;
     display: flex;
     justify-content: space-between;
diff --git a/src/components/drawers/NoticePub.vue b/src/components/drawers/NoticePub.vue
index 1f437cf8..6e5298ef 100644
--- a/src/components/drawers/NoticePub.vue
+++ b/src/components/drawers/NoticePub.vue
@@ -17,13 +17,14 @@
         <!-- <div class="txt-content">
           {{ noticeContent1 ? noticeContent1 : "暂无公告" }}
         </div> -->
-        <a-textarea
+        <!-- <a-textarea
           disabled="true"
           v-model:value="noticeContent1"
           :maxlength="150"
           placeholder="公告信息最多输入150个字"
           style="margin-top: -10px; height: 160px; resize: none;background-color: #fff;color:#666;"
-        />
+        /> -->
+        <pre>{{noticeContent1}}</pre>
         <div class="btn-content">
           <a-button type="primary" @click="handleEdit">编辑</a-button>
         </div>
@@ -33,13 +34,7 @@
         <!-- <div class="txt-content">
           {{ noticeContent1 ? noticeContent1 : "暂无公告" }}
         </div> -->
-        <a-textarea
-          disabled="true"
-          v-model:value="noticeContent1"
-          :maxlength="150"
-          placeholder="公告信息最多输入150个字"
-          style="margin-top: -10px; height:160px; resize: none;background-color: #fff;color:#666;"
-        />
+        <pre>{{noticeContent1}}</pre>
         <p>编辑新公告：</p>
         <a-textarea
           v-model:value="noticeContent"

From 32ba887c052eff85982a3e8e7665670c7106d3e6 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Mon, 16 Jan 2023 18:56:28 +0800
Subject: [PATCH 3/3] =?UTF-8?q?style:=E5=85=AC=E5=91=8A=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E6=A1=86=E5=AE=BD=E5=BA=A6=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/NoticePub.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/drawers/NoticePub.vue b/src/components/drawers/NoticePub.vue
index 6e5298ef..59d3deef 100644
--- a/src/components/drawers/NoticePub.vue
+++ b/src/components/drawers/NoticePub.vue
@@ -40,7 +40,7 @@
           v-model:value="noticeContent"
           :maxlength="150"
           placeholder="公告信息最多输入150个字"
-          style="margin-top: -10px; height: 160px"
+          style="margin-top: -10px; height: 160px; width:340px;"
         />
         <div class="btn-content">
           <a-button class="cancel" @click="handleCancel">取消</a-button>