From 1528b39baeeff92436630e807de789da40479651 Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Mon, 1 Nov 2021 18:34:06 +0800
Subject: [PATCH] =?UTF-8?q?[bug]=20=E9=A6=96=E9=A1=B5=E5=B8=83=E5=B1=80?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/Analysis.vue | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/views/dashboard/Analysis.vue b/src/views/dashboard/Analysis.vue
index 3c4d969..b7d42ee 100644
--- a/src/views/dashboard/Analysis.vue
+++ b/src/views/dashboard/Analysis.vue
@@ -19,18 +19,22 @@
             <span class="query-list" @click="toUserAnnouncementList">查看更多></span>
           </div>
           <div>
-            <div class="message-list-item" v-for="item of dataMessageList" :key="item.id">
+<!--            v-for="item of dataMessageList" :key="item.id"-->
+            <div class="message-list-item" v-for="item of 16" :key="item">
               <div class="message-list-item-name">
-                <div class="message-list-item-name-title">【{{ item.titile_dictText }}】</div>
+<!--                <div class="message-list-item-name-title">【{{ item.titile_dictText }}】</div>-->
+                <div class="message-list-item-name-title">【会议通知】</div>
                 <a-tooltip>
                   <template slot="title">
                     <span v-html="item.msgContent" class="ellipsis-span"></span>
                   </template>
-                  <span v-html="myEllipsis(item.msgContent,38)" class="ellipsis-span"></span>
+<!--                  <span v-html="myEllipsis(item.msgContent,35)" class="ellipsis-span"></span>-->
+                  <span class="ellipsis-span">国际会议已经报名， 您需要上传缴费凭证信息，等待管理员审核通过后...</span>
                 </a-tooltip>
               </div>
               <!--              <span v-html="item.msgContent"></span>-->
-              <span class="message-list-item-time">{{ item.sendTime }}</span>
+<!--              <span class="message-list-item-time">{{ item.sendTime }}</span>-->
+              <span class="message-list-item-time">2021-10-29 17:20:11</span>
               <span class="operate">
                  <a @click="showAnnouncement(item)" style="margin-right: 8px">查看</a>
                  <a @click="haveRead(item)" v-if="item.readFlag === '0' ">已读</a>
@@ -90,7 +94,11 @@ export default {
     },
     // loadData
     loadData() {
-      getAction(this.url.list, { readFlag: '0' }).then(res => {
+      const param = {
+        readFlag: '0',
+        pageSize: 15
+      }
+      getAction(this.url.list, param).then(res => {
         this.dataMessageList = []
         if (res.success) {
           this.dataMessageList = [...res.result.records]
@@ -176,6 +184,7 @@ export default {
   width: 100%;
   min-width: 1100px;
   height: 100vh;
+  min-height: 617px;
 }
 
 .index-bgimg {
@@ -263,6 +272,7 @@ export default {
       font-size: 14px;
       color: #FFF;
       font-weight: 500;
+      margin-bottom: 1.5%;
     }
 
     &-item-name {
@@ -275,6 +285,12 @@ export default {
       flex-shrink: 0;
     }
 
+    .ellipsis-span {
+      /deep/ p {
+        margin-bottom: 0!important;
+      }
+    }
+
     &-item-time {
       width: 10rem;
     }