From a3fabc98c8a2792b38735d4b4c524a6e684bff9c Mon Sep 17 00:00:00 2001
From: cccccyb <995134776@qq.com>
Date: Fri, 19 May 2023 19:10:32 +0800
Subject: [PATCH] delete tooltip in NoticeViewCard

---
 .../cfive/pinnacle/config/SecurityConfig.java |  1 +
 ...NoticeViewTable.vue => NoticeViewCard.vue} | 80 +++++++++----------
 ui/src/pages/notice/AlReadView.vue            |  2 +-
 ui/src/pages/notice/AllReceiveNoticeView.vue  |  2 +-
 ui/src/pages/notice/NoticeView.vue            | 14 +---
 ui/src/pages/notice/ToReadView.vue            |  2 +-
 6 files changed, 45 insertions(+), 56 deletions(-)
 rename ui/src/components/notice/{NoticeViewTable.vue => NoticeViewCard.vue} (73%)

diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/config/SecurityConfig.java b/Pinnacle/src/main/java/com/cfive/pinnacle/config/SecurityConfig.java
index 1aaa7d1..44b0ec7 100644
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/config/SecurityConfig.java
+++ b/Pinnacle/src/main/java/com/cfive/pinnacle/config/SecurityConfig.java
@@ -89,6 +89,7 @@ public class SecurityConfig {
                 // Authentication required
                 .anyRequest()
                 .authenticated()
+//                .anonymous()
                 .and()
 
                 .logout()
diff --git a/ui/src/components/notice/NoticeViewTable.vue b/ui/src/components/notice/NoticeViewCard.vue
similarity index 73%
rename from ui/src/components/notice/NoticeViewTable.vue
rename to ui/src/components/notice/NoticeViewCard.vue
index 554f57d..aae2bfe 100644
--- a/ui/src/components/notice/NoticeViewTable.vue
+++ b/ui/src/components/notice/NoticeViewCard.vue
@@ -13,47 +13,46 @@
                 <el-card
                     @click="showNoticeDetail(notice)"
                     @contextmenu.prevent="openMenu($event, notice)"
+                    class="noticeCard"
                 >
                     <template #header>
-                        <el-tooltip content="鼠标右击进行更多操作" placement="top" effect="light">
-                            <div class="top">
-                                <el-icon :size="SIZE_ICON_MD()">
-                                    <icon-pinnacle-noticeItem />
-                                </el-icon>
-                                <el-tag
-                                    size="small"
-                                    :type="
-                                        notice.noticeType.name === '通知公告'
-                                            ? 'warning'
-                                            : notice.noticeType.name === '紧急公告'
-                                            ? 'danger'
-                                            : 'success'
-                                    "
-                                    disable-transitions
-                                    style="margin-right: 20px; margin-left: 10px"
-                                >
-                                    {{ notice.noticeType.name }}
-                                </el-tag>
-                                <h4>{{ notice.title }}</h4>
-                                <el-icon class="senderIcon">
-                                    <icon-pinnacle-user />
-                                </el-icon>
-                                发布者：
-                                <span class="sender">{{ notice.sender.username }}</span>
-                                <!--                            <div class="check">-->
-                                <!--                                <el-button-->
-                                <!--                                    type="info"-->
-                                <!--                                    v-if="notice.isRead === 1"-->
-                                <!--                                    @click.stop="changeIsRead"-->
-                                <!--                                >-->
-                                <!--                                    <template #icon>-->
-                                <!--                                        <input type="checkbox" :checked="isCheck" />-->
-                                <!--                                    </template>-->
-                                <!--                                    标为未读-->
-                                <!--                                </el-button>-->
-                                <!--                            </div>-->
-                            </div>
-                        </el-tooltip>
+                        <div class="top">
+                            <el-icon :size="SIZE_ICON_MD()">
+                                <icon-pinnacle-noticeItem />
+                            </el-icon>
+                            <el-tag
+                                size="small"
+                                :type="
+                                    notice.noticeType.name === '通知公告'
+                                        ? 'warning'
+                                        : notice.noticeType.name === '紧急公告'
+                                        ? 'danger'
+                                        : 'success'
+                                "
+                                disable-transitions
+                                style="margin-right: 20px; margin-left: 10px"
+                            >
+                                {{ notice.noticeType.name }}
+                            </el-tag>
+                            <h4>{{ notice.title }}</h4>
+                            <el-icon class="senderIcon">
+                                <icon-pinnacle-user />
+                            </el-icon>
+                            发布者：
+                            <span class="sender">{{ notice.sender.username }}</span>
+                            <!--                            <div class="check">-->
+                            <!--                                <el-button-->
+                            <!--                                    type="info"-->
+                            <!--                                    v-if="notice.isRead === 1"-->
+                            <!--                                    @click.stop="changeIsRead"-->
+                            <!--                                >-->
+                            <!--                                    <template #icon>-->
+                            <!--                                        <input type="checkbox" :checked="isCheck" />-->
+                            <!--                                    </template>-->
+                            <!--                                    标为未读-->
+                            <!--                                </el-button>-->
+                            <!--                            </div>-->
+                        </div>
                     </template>
                     <p class="content">{{ contentSubstr(notice.content) }}</p>
                 </el-card>
@@ -233,7 +232,7 @@ export default {
     font-weight: 600;
 }
 
-:deep(.el-card) {
+.noticeCard {
     --el-card-padding: 10px;
     height: 120px;
 }
@@ -315,7 +314,6 @@ h4 {
     padding: 7px 16px;
     cursor: pointer;
 }
-
 .contextmenu li:hover {
     background: #eee;
 }
diff --git a/ui/src/pages/notice/AlReadView.vue b/ui/src/pages/notice/AlReadView.vue
index f334975..d7d4dc4 100644
--- a/ui/src/pages/notice/AlReadView.vue
+++ b/ui/src/pages/notice/AlReadView.vue
@@ -1,5 +1,5 @@
 <template>
-    <notice-view-table />
+    <notice-view-card />
 </template>
 <script lang="ts">
 import { useNoticeStore } from '@/store/notice'
diff --git a/ui/src/pages/notice/AllReceiveNoticeView.vue b/ui/src/pages/notice/AllReceiveNoticeView.vue
index 027ca91..ad561a7 100644
--- a/ui/src/pages/notice/AllReceiveNoticeView.vue
+++ b/ui/src/pages/notice/AllReceiveNoticeView.vue
@@ -1,5 +1,5 @@
 <template>
-    <notice-view-table />
+    <notice-view-card />
 </template>
 <script lang="ts">
 import { useNoticeStore } from '@/store/notice'
diff --git a/ui/src/pages/notice/NoticeView.vue b/ui/src/pages/notice/NoticeView.vue
index d1e9054..9141442 100644
--- a/ui/src/pages/notice/NoticeView.vue
+++ b/ui/src/pages/notice/NoticeView.vue
@@ -4,13 +4,7 @@
             <notice-head></notice-head>
         </el-header>
         <el-main>
-            <el-menu
-                :default-active="$route.path"
-                class="el-menu-demo"
-                mode="horizontal"
-                @select="handleSelect"
-                router
-            >
+            <el-menu :default-active="$route.path" class="el-menu-demo" mode="horizontal" router>
                 <el-menu-item index="/notice/noticeView/all">所有公告</el-menu-item>
                 <el-menu-item index="/notice/noticeView/toRead">未读</el-menu-item>
                 <el-menu-item index="/notice/noticeView/alRead">已读</el-menu-item>
@@ -28,11 +22,7 @@ export default {
     data() {
         return {}
     },
-    methods: {
-        handleSelect(key, keyPath) {
-            console.log(key, keyPath)
-        }
-    },
+    methods: {},
     mounted() {
         noticeStore.selectEnableNoticeType()
     }
diff --git a/ui/src/pages/notice/ToReadView.vue b/ui/src/pages/notice/ToReadView.vue
index d7db3af..a4b7885 100644
--- a/ui/src/pages/notice/ToReadView.vue
+++ b/ui/src/pages/notice/ToReadView.vue
@@ -1,5 +1,5 @@
 <template>
-    <notice-view-table />
+    <notice-view-card />
 </template>
 <script lang="ts">
 import { useNoticeStore } from '@/store/notice'