From 2cc2cc4e00541ff3c82933362328f61823dea7de Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Thu, 21 Jul 2022 17:10:13 +0800
Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9=20=20=E4=BB=A5=E5=8F=8A?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E4=B8=AD=E5=BF=83=E8=87=AA=E5=8A=A8=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/App.vue                                      |  8 +++++++-
 .../LayerService/LayerServicePresentation.vue          |  7 ++++++-
 front/src/views/mynoticeView/components/NoticeList.vue | 10 ++++++++--
 .../personalCenter/components/AbilityApplication.vue   |  9 ++++++---
 4 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/front/src/App.vue b/front/src/App.vue
index d945ce28..245c68e0 100644
--- a/front/src/App.vue
+++ b/front/src/App.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.wuhongjian
  * @Date: 2022-05-06 11:12:00
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-21 16:00:17
+ * @LastEditTime: 2022-07-21 17:09:10
  * @Description: 告诉大家这是什么
 -->
 <template>
@@ -16,7 +16,9 @@
   import zhCN from 'ant-design-vue/es/locale/zh_CN'
   import Cookies from 'js-cookie'
   import { onBeforeUnmount } from 'vue'
+  import { useRouter } from 'vue-router'
   import mybus from '@/myplugins/mybus'
+  const router = useRouter()
 
   // export default {
   //   name: 'App',
@@ -37,6 +39,10 @@
   ws.onmessage = function (e) {
     console.log('服务器返回的信息: ' + e.data)
     mybus.emit('getMynotice')
+    // 判断当前路由是否是消息中心
+    if (router.currentRoute.value.name === 'mynoticeView') {
+      mybus.emit('noticeListInit')
+    }
   }
   onBeforeUnmount(() => {
     // 4.卸载前, 关闭链接
diff --git a/front/src/views/detailsAll/components/LayerService/LayerServicePresentation.vue b/front/src/views/detailsAll/components/LayerService/LayerServicePresentation.vue
index 690695d8..08d1d285 100644
--- a/front/src/views/detailsAll/components/LayerService/LayerServicePresentation.vue
+++ b/front/src/views/detailsAll/components/LayerService/LayerServicePresentation.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-08 15:25:33
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-06-14 11:30:52
+ * @LastEditTime: 2022-07-21 17:02:03
  * @Description: 图层展示  视频播放
 -->
 <template>
@@ -78,4 +78,9 @@
       }
     }
   }
+  img {
+    width: 100%;
+    height: 100%;
+    object-fit: contain;
+  }
 </style>
diff --git a/front/src/views/mynoticeView/components/NoticeList.vue b/front/src/views/mynoticeView/components/NoticeList.vue
index e6029fb4..2003708d 100644
--- a/front/src/views/mynoticeView/components/NoticeList.vue
+++ b/front/src/views/mynoticeView/components/NoticeList.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-21 11:55:07
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-01 17:03:24
+ * @LastEditTime: 2022-07-21 17:05:11
  * @Description: 告诉大家这是什么
 -->
 <template>
@@ -111,7 +111,7 @@
 </template>
 <script setup>
   // import { SearchOutlined } from '@ant-design/icons-vue'
-  import { ref, reactive } from 'vue'
+  import { ref, reactive, onBeforeUnmount } from 'vue'
   import mybus from '@/myplugins/mybus'
   import { message } from 'ant-design-vue'
   import { mynotice, mynoticeRead } from '@/api/home'
@@ -283,6 +283,12 @@
     }
   })
   init()
+  mybus.on('noticeListInit', () => {
+    init()
+  })
+  onBeforeUnmount(() => {
+    mybus.off('noticeListInit')
+  })
 </script>
 <style lang="less" scoped>
   .notice-list {
diff --git a/front/src/views/personalCenter/components/AbilityApplication.vue b/front/src/views/personalCenter/components/AbilityApplication.vue
index 6489cc2f..aa8b52a3 100644
--- a/front/src/views/personalCenter/components/AbilityApplication.vue
+++ b/front/src/views/personalCenter/components/AbilityApplication.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-07-12 09:42:44
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-21 14:58:34
+ * @LastEditTime: 2022-07-21 16:54:05
  * @Description:我的申请 能力申请 查看详情
 -->
 <template>
@@ -13,14 +13,17 @@
         <p class="item">
           <span>申请标题：{{ props.refObj.title }}</span>
           <span>申请单号：{{ props.refObj.applyNumber || '--' }}</span>
-          <span>应用系统：{{ props.refObj.applicationSystem }}</span>
+          <span v-if="props.refObj.applicationSystem">
+            应用系统：{{ props.refObj.applicationSystem }}
+          </span>
+          <span v-else></span>
         </p>
         <p class="item">
           <span>申请人信息：{{ props.refObj.user }}</span>
           <span>电话：{{ props.refObj.phone }}</span>
           <span>单位：{{ props.refObj.unit }}</span>
         </p>
-        <p>
+        <p v-if="props.refObj.applicationScene.length > 0">
           <span>应用场景：{{ props.refObj.applicationScene.join('；') }}</span>
         </p>
         <p>