From 0b2a859dc9afd0de03370a32dcbfa7dc6d256408 Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Wed, 20 Oct 2021 09:11:44 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/MessagePage/ProjectDetailModal.vue  |  2 +-
 .../UploadMeetingCertificateModal.vue         |  4 +-
 src/views/dashboard/Analysis.vue              | 86 +++++++++++--------
 3 files changed, 54 insertions(+), 38 deletions(-)

diff --git a/src/views/MessagePage/ProjectDetailModal.vue b/src/views/MessagePage/ProjectDetailModal.vue
index 3f15248..9fb6d68 100644
--- a/src/views/MessagePage/ProjectDetailModal.vue
+++ b/src/views/MessagePage/ProjectDetailModal.vue
@@ -177,7 +177,7 @@ const columns = [
   {
     title: '邮寄人',
     align: 'center',
-    dataIndex: 'updateBy'
+    dataIndex: 'mailName'
   },
   {
     title: '快递',
diff --git a/src/views/MessagePage/UploadMeetingCertificateModal.vue b/src/views/MessagePage/UploadMeetingCertificateModal.vue
index 016c4ba..f4207c8 100644
--- a/src/views/MessagePage/UploadMeetingCertificateModal.vue
+++ b/src/views/MessagePage/UploadMeetingCertificateModal.vue
@@ -111,11 +111,11 @@ export default {
       model: {},
       labelCol: {
         xs: {span: 24},
-        sm: {span: 6}
+        sm: {span: 8}
       },
       wrapperCol: {
         xs: {span: 24},
-        sm: {span: 18}
+        sm: {span: 16}
       },
       validatorRules: {
         paymentRecord: {
diff --git a/src/views/dashboard/Analysis.vue b/src/views/dashboard/Analysis.vue
index b6b88ff..b65fc42 100644
--- a/src/views/dashboard/Analysis.vue
+++ b/src/views/dashboard/Analysis.vue
@@ -1,27 +1,27 @@
 <template>
   <div class="index-home">
-    <img class="index-bgimg" src="../../assets/indexImgs/index-bg.png" />
+    <img class="index-bgimg" src="../../assets/indexImgs/index-bg.png"/>
 
     <div class="content">
       <div class="router-list">
         <div @click="toRouterPath(item)" v-for="(item,index) of IndexRouter" :key="index" class="router-list-item">
-            <div class="center">
-              <img :src="item.meta.icon" />
-              <p class="router-list-title">{{item.meta.title}}</p>
-            </div>
+          <div class="center">
+            <img :src="item.meta.icon"/>
+            <p class="router-list-title">{{ item.meta.title }}</p>
+          </div>
         </div>
       </div>
       <div class="message-list">
         <div class="message-list-content">
           <div class="message-list-title" style="margin-bottom: 10px;">
-            <img src="../../assets/indexImgs/file.png" />
+            <img src="../../assets/indexImgs/file.png"/>
             <span class="my-notice">我的消息</span>
             <span class="query-list" @click="toUserAnnouncementList">查看更多></span>
           </div>
-          <div >
+          <div>
             <div class="message-list-item" v-for="item of dataMessageList" :key="item.id">
               <div class="message-list-item-name">
-                <div>【{{item.titile_dictText}}】</div>
+                <div class="message-list-item-name-title">【{{ item.titile_dictText }}】</div>
                 <a-tooltip>
                   <template slot="title">
                     <span v-html="item.msgContent" class="ellipsis-span"></span>
@@ -29,8 +29,8 @@
                   <span v-html="myEllipsis(item.msgContent,38)" class="ellipsis-span"></span>
                 </a-tooltip>
               </div>
-<!--              <span v-html="item.msgContent"></span>-->
-              <span class="message-list-item-time">{{item.sendTime}}</span>
+              <!--              <span v-html="item.msgContent"></span>-->
+              <span class="message-list-item-time">{{ item.sendTime }}</span>
               <span class="operate">
                  <a @click="showAnnouncement(item)" style="margin-right: 8px">查看</a>
                  <a @click="haveRead(item)" v-if="item.readFlag === '0' ">已读</a>
@@ -48,8 +48,8 @@
 
 <script>
 import IndexRouter from '@views/dashboard/indexRouter'
-import {getAction, putAction} from '@api/manage'
-import {Bus} from '@comp/tools/Bus'
+import { getAction, putAction } from '@api/manage'
+import { Bus } from '@comp/tools/Bus'
 import ShowAnnouncement from '@/components/tools/ShowAnnouncement'
 import DynamicNotice from '../../components/tools/DynamicNotice'
 
@@ -58,17 +58,17 @@ export default {
   name: 'Analysis',
   components: {
     DynamicNotice,
-    ShowAnnouncement,
+    ShowAnnouncement
   },
   data() {
     return {
       IndexRouter,
-      url:{
-        list:'/sys/sysAnnouncementSend/getCompanyMyAnnouncementSend',
-        editCementSend: 'sys/sysAnnouncementSend/editCompanyByAnntIdAndUserId',
+      url: {
+        list: '/sys/sysAnnouncementSend/getCompanyMyAnnouncementSend',
+        editCementSend: 'sys/sysAnnouncementSend/editCompanyByAnntIdAndUserId'
       },
       // 消息数据
-      dataMessageList:[],
+      dataMessageList: [],
       openPath: '',
       formData: ''
     }
@@ -83,16 +83,16 @@ export default {
     /*
     * 跳转相应的路径
     * */
-    toRouterPath(record){
+    toRouterPath(record) {
       this.$router.push({
-        path:record.path
+        path: record.path
       })
     },
     // loadData
-    loadData(){
-      getAction(this.url.list,{readFlag:'0'}).then(res => {
+    loadData() {
+      getAction(this.url.list, { readFlag: '0' }).then(res => {
         this.dataMessageList = []
-        if(res.success){
+        if (res.success) {
           this.dataMessageList = [...res.result.records]
         }
       })
@@ -100,9 +100,9 @@ export default {
     /*
     * 跳转我的消息
     * */
-    toUserAnnouncementList(){
+    toUserAnnouncementList() {
       this.$router.push({
-        path:'/system/userAnnouncementList'
+        path: '/system/userAnnouncementList'
       })
     },
     /*
@@ -118,7 +118,7 @@ export default {
       return value
     },
     showAnnouncement(record) {
-      putAction(this.url.editCementSend, {anntId: record.anntId}).then((res) => {
+      putAction(this.url.editCementSend, { anntId: record.anntId }).then((res) => {
         if (res.success) {
           this.loadData()
           this.syncHeadNotic(record.anntId)
@@ -131,24 +131,24 @@ export default {
         // 将参数传入
         this.formData = param
         this.$refs.showDynamNotice.detail()
-      } else if(record.openType === 'url') {
-        console.log(record.openPage,'url')
+      } else if (record.openType === 'url') {
+        console.log(record.openPage, 'url')
         const param = JSON.parse(record.busId)
         // 如果是url 跳转页面
         this.$router.push({
-          path:record.openPage,
-          query:param
+          path: record.openPage,
+          query: param
         })
-      }else if(record.openType === 'href'){
-        let url = `${record.openPage}=${param.id}`
+      } else if (record.openType === 'href') {
+        let url = `${ record.openPage }=${ param.id }`
         // 返回的是报名页面的链接 打开网址
-        window.open(url,'_blank')
+        window.open(url, '_blank')
       } else {
         this.$refs.ShowAnnouncement.detail(record)
       }
     },
     haveRead(record) {
-      putAction(this.url.editCementSend, {anntId: record.anntId}).then((res) => {
+      putAction(this.url.editCementSend, { anntId: record.anntId }).then((res) => {
         if (res.success) {
           this.loadData()
           this.syncHeadNotic(record.anntId)
@@ -157,7 +157,7 @@ export default {
       })
     },
     syncHeadNotic(anntId) {
-      getAction('sys/annountCement/syncNotic', {anntId: anntId})
+      getAction('sys/annountCement/syncNotic', { anntId: anntId })
     }
   }
 }
@@ -189,6 +189,7 @@ export default {
   min-width: 1028px;
   height: 80%;
   min-height: 617px;
+
   .router-list {
     display: flex;
     flex-direction: column;
@@ -196,6 +197,7 @@ export default {
     width: 14%;
     min-width: 140px;
     height: 100%;
+
     &-item {
       position: relative;
       display: flex;
@@ -209,6 +211,7 @@ export default {
       background-size: 100% 102%;
       cursor: pointer;
     }
+
     &-title {
       margin: 4px 0 0 0;
       font-size: 16px;
@@ -217,22 +220,26 @@ export default {
       cursor: pointer;
     }
   }
+
   .message-list {
     flex: 1;
     background-image: url("../../assets/indexImgs/index-message.png");
     background-repeat: no-repeat;
     background-position: center;
     background-size: 100% 102%;
+
     &-content {
       padding: 40px;
       width: 100%;
       height: 100%;
+
       .my-notice {
         margin-left: 8px;
         font-size: 16px;
         font-weight: 700;
         color: #eee;
       }
+
       .query-list {
         float: right;
         font-size: 14px;
@@ -242,7 +249,8 @@ export default {
         color: #eee;
       }
     }
-    &-item{
+
+    &-item {
       display: flex;
       justify-content: space-between;
       font-size: 14px;
@@ -255,18 +263,26 @@ export default {
       width: 35rem;
     }
 
+    //防止【】的内容换行
+    &-item-name-title {
+      flex-shrink: 0;
+    }
+
     &-item-time {
       width: 10rem;
     }
   }
 }
+
 .center {
   text-align: center;
 }
+
 .operate {
   a {
     color: #FFFFFF;
   }
+
   //width: 150px;
 }
 </style>