merge dev-shenjianbin into master

预警详情优化

Created-by: MaxShen
Commit-by: MaxShen
Merged-by: MaxShen
Description: 邀请列表标题优化
预警详情优化

See merge request: hk_openRepo/OpenRepo_Portal!35

src/views/Jyh/Home/index.vue

@@ -59,7 +59,7 @@
         <div class="info-title">
           <div class="sub-title">
             <img src="@/assets/imgs/home/informIcon@2x.png">
-            <span>信息公示</span>
+            <span>预警公告</span>
           </div>
           <a class="devui-link" @click="checkMore">更多 ></a>
         </div>
@@ -89,7 +89,7 @@
     </div>
   </div>
 
-  <d-modal class="warning-modal" v-model="warningModalVisable" title="主题：" style="width: 600px;">
+  <d-modal class="warning-modal" v-model="warningModalVisable" title="" style="width: 600px;">
     <EarlyWarningDetail :warningData="currentWarning" :type="'user'"></EarlyWarningDetail>
   </d-modal>
 </template>

src/views/Jyh/PersonalCenter/Detail/EarlyWarningDetail.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="warning-detail-container">
     <div class="warning-title">
-      <div>{{ warningData.subject }}</div>
+      <div style="padding-right: 20px;">{{ warningData.subject }}</div>
       <div class="sub-title mt-3">
         <div>
           <span>重要性</span>
@@ -20,7 +20,7 @@
         :toolbar-config="toolbarConfig"
       ></d-editor-md>
     </div>
-    <div :style="{'border-radius': propsData.type === 'user' ? '6px' : 0}" class="warning-from">{{warningData.group}} {{ warningData.pulishTime }}</div>
+    <div :style="{'border-radius': propsData.type === 'user' ? '6px' : 0}" class="warning-from">{{warningData.group}} {{ warningData.publishTime }}</div>
     <div v-if="propsData.type === 'system'" class="warning-operation">
       <d-button @click="confirm" variant="solid" class="mr-2">确定</d-button>
       <d-button @click="$emit('close')">取消</d-button>
@@ -40,7 +40,8 @@ const toolbarConfig = [
   ['ul', 'ol', 'checklist', 'code', 'link', 'image', 'table'],
 ];
 const mode = ref('readonly');
-warningData.value = JSON.parse(propsData.warningData.alertMsg ?? JSON.stringify({
+console.log(propsData.warningData)
+warningData.value = propsData.warningData ?? {
   subject: '【漏洞排查预警】ApacheIgnite远程代码执行漏洞排查（CVE-2024-52577)',
   importance: '高',
   group: '可信开源代码库运营团队',
@@ -49,7 +50,7 @@ warningData.value = JSON.parse(propsData.warningData.alertMsg ?? JSON.stringify(
 近日，安全中心发现Apache lgnite远程代码执行漏洞（CVE-2024-52577）。在 2.6.0<Apache Ignite< 2.17.0版本中，由于lgnite未能正确实施类序列化过滤器，攻击者能够利用恶意序列化对象绕过安全检查，从而在服务器端反序列化时触发任意代码的执行。经可信开源代码库运营团队评审漏洞技术定级2级/3级，若不满足利用条件可举证降为6级。请你按要求在XX时间内完成修复。
 ## 二、修复方案
 升级Apache Ignite至安全版本：2.17.0`
-}));
+};
 const confirm = () => {
   emit('close');
 };

src/views/Jyh/PersonalCenter/Detail/EarlyWarningOrganization.vue

@@ -68,7 +68,7 @@ const warningModalVisable = ref(false);
 const currentWarning = ref();
 const openWarningDetail = (row) => {
   warningModalVisable.value = true;
-  currentWarning.value = row;
+  currentWarning.value = JSON.parse(row.alertMsg ?? '{}');
 };
 const colseWarningDetail = () => {
   warningModalVisable.value = false;

src/views/Jyh/PersonalCenter/Detail/EarlyWarningPerson.vue

@@ -68,7 +68,7 @@ const warningModalVisable = ref(false);
 const currentWarning = ref();
 const openWarningDetail = (row) => {
   warningModalVisable.value = true;
-  currentWarning.value = row;
+  currentWarning.value = JSON.parse(row.alertMsg ?? '{}');
 };
 const colseWarningDetail = () => {
   warningModalVisable.value = false;

src/views/Jyh/PersonalCenter/Detail/InvitationNoticeList.vue

@@ -1,8 +1,7 @@
 <template>
   <div class="invitation-notice-container">
     <Card simple class="jyh-card mt-3">
-      <div class="card-title">邀请通知列表</div>
-      <div class="mb-3">
+      <div class="mt-3">
         <d-table
           class="jyh-table jyh-table-2"
           :header-bg="true"
@@ -87,12 +86,13 @@ const handleAccept = async (row, type) => {
   });
   if (data?.data?.data?.data) {
     Message({
-      type,
+      type: 'success',
       message: '成功接受',
     });
+    queryInviteListData();
   } else {
     Message({
-      type,
+      type: 'error',
       message: '接受失败',
     });
   }