From b5fdd7338dbef1d49a65d3722ba4210f18fc8aac Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Fri, 13 Jan 2023 11:28:38 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=85=AC=E5=91=8A=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/components/drawers/NoticeHis.vue b/src/components/drawers/NoticeHis.vue
index 07f391d6..289f1834 100644
--- a/src/components/drawers/NoticeHis.vue
+++ b/src/components/drawers/NoticeHis.vue
@@ -8,7 +8,15 @@
   </div>
   <div class="noticeContent">
     <div v-for="item in notice" :key="item.id" class="item">
-      <div class="itemcontent">{{ item.content }}</div>
+      <!-- <div class="itemcontent">{{ item.content }}</div> -->
+      <a-textarea
+          class="itemcontent"
+          disabled="true"
+          v-model:value="item.content"
+          :maxlength="150"
+          placeholder="公告信息最多输入150个字"
+          style="margin-top: -10px; height: 120px;background-color: #fff;"
+        />
       <div class="itemtime">{{ item.pubtime }}</div>
     </div>
   </div>
@@ -136,7 +144,7 @@ export default {
     justify-content: space-between;
     margin-bottom: 66px;
     .itemcontent {
-      width: 500px;
+      width: 700px;
       word-break: break-all;
       word-wrap: break-word;
       // overflow: hidden;
@@ -146,6 +154,7 @@ export default {
       font-weight: 400;
       color: #666666;
       line-height: 22px;
+      resize: none;
     }
     .itemtime {
       font-size: 14px;
diff --git a/src/components/drawers/NoticePub.vue b/src/components/drawers/NoticePub.vue
index a19a2293..1f437cf8 100644
--- a/src/components/drawers/NoticePub.vue
+++ b/src/components/drawers/NoticePub.vue
@@ -14,24 +14,38 @@
       <p>当前公告内容：</p>
       <!-- 预览 -->
       <template v-if="!editOn">
-        <div class="txt-content">
+        <!-- <div class="txt-content">
           {{ noticeContent1 ? noticeContent1 : "暂无公告" }}
-        </div>
+        </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;"
+        />
         <div class="btn-content">
           <a-button type="primary" @click="handleEdit">编辑</a-button>
         </div>
       </template>
       <!-- 编辑 -->
       <template v-if="editOn">
-        <div class="txt-content">
+        <!-- <div class="txt-content">
           {{ noticeContent1 ? noticeContent1 : "暂无公告" }}
-        </div>
+        </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;"
+        />
         <p>编辑新公告：</p>
         <a-textarea
           v-model:value="noticeContent"
           :maxlength="150"
           placeholder="公告信息最多输入150个字"
-          style="margin-top: -10px; height: 120px"
+          style="margin-top: -10px; height: 160px"
         />
         <div class="btn-content">
           <a-button class="cancel" @click="handleCancel">取消</a-button>
@@ -62,7 +76,7 @@ export default {
     const state = reactive({
       noticeChecked: false,
       projectInfo: {},
-      noticeContent1: "",
+      noticeContent1: "暂无公告",
       noticeContent: "",
       editOn: false,
     });