FatttSnake/Pinnacle-OA
1
0
Fork 0
mirror of https://github.com/FatttSnake/Pinnacle-OA.git synced 2026-04-05 23:11:24 +08:00
Code Packages Releases Activity

delete tooltip in NoticeViewCard

Browse Source
This commit is contained in:
cccccyb
2023-05-19 19:10:32 +08:00
parent c43aae8c6c
commit a3fabc98c8
6 changed files with 45 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Pinnacle/src/main/java/com/cfive/pinnacle/config/SecurityConfig.java
View File

@@ -89,6 +89,7 @@ public class SecurityConfig {
// Authentication required // Authentication required
.anyRequest() .anyRequest()
.authenticated() .authenticated()
// .anonymous()
.and() .and()
.logout() .logout()

80
ui/src/components/notice/NoticeViewTable.vue → ui/src/components/notice/NoticeViewCard.vue
View File

@@ -13,47 +13,46 @@
<el-card <el-card
@click="showNoticeDetail(notice)" @click="showNoticeDetail(notice)"
@contextmenu.prevent="openMenu($event, notice)" @contextmenu.prevent="openMenu($event, notice)"
class="noticeCard"
> >
<template #header> <template #header>
<el-tooltip content="鼠标右击进行更多操作" placement="top" effect="light"> <div class="top">
<div class="top"> <el-icon :size="SIZE_ICON_MD()">
<el-icon :size="SIZE_ICON_MD()"> <icon-pinnacle-noticeItem />
<icon-pinnacle-noticeItem /> </el-icon>
</el-icon> <el-tag
<el-tag size="small"
size="small" :type="
:type=" notice.noticeType.name === '通知公告'
notice.noticeType.name === '通知公告' ? 'warning'
? 'warning' : notice.noticeType.name === '紧急公告'
: notice.noticeType.name === '紧急公告' ? 'danger'
? 'danger' : 'success'
: 'success' "
" disable-transitions
disable-transitions style="margin-right: 20px; margin-left: 10px"
style="margin-right: 20px; margin-left: 10px" >
> {{ notice.noticeType.name }}
{{ notice.noticeType.name }} </el-tag>
</el-tag> <h4>{{ notice.title }}</h4>
<h4>{{ notice.title }}</h4> <el-icon class="senderIcon">
<el-icon class="senderIcon"> <icon-pinnacle-user />
<icon-pinnacle-user /> </el-icon>
</el-icon> 发布者：
发布者： <span class="sender">{{ notice.sender.username }}</span>
<span class="sender">{{ notice.sender.username }}</span> <!-- <div class="check">-->
<!-- <div class="check">--> <!-- <el-button-->
<!-- <el-button--> <!-- type="info"-->
<!-- type="info"--> <!-- v-if="notice.isRead === 1"-->
<!-- v-if="notice.isRead === 1"--> <!-- @click.stop="changeIsRead"-->
<!-- @click.stop="changeIsRead"--> <!-- >-->
<!-- >--> <!-- <template #icon>-->
<!-- <template #icon>--> <!-- <input type="checkbox" :checked="isCheck" />-->
<!-- <input type="checkbox" :checked="isCheck" />--> <!-- </template>-->
<!-- </template>--> <!-- 标为未读-->
<!-- 标为未读--> <!-- </el-button>-->
<!-- </el-button>--> <!-- </div>-->
<!-- </div>--> </div>
</div>
</el-tooltip>
</template> </template>
<p class="content">{{ contentSubstr(notice.content) }}</p> <p class="content">{{ contentSubstr(notice.content) }}</p>
</el-card> </el-card>
@@ -233,7 +232,7 @@ export default {
font-weight: 600; font-weight: 600;
} }
:deep(.el-card) { .noticeCard {
--el-card-padding: 10px; --el-card-padding: 10px;
height: 120px; height: 120px;
} }
@@ -315,7 +314,6 @@ h4 {
padding: 7px 16px; padding: 7px 16px;
cursor: pointer; cursor: pointer;
} }
.contextmenu li:hover { .contextmenu li:hover {
background: #eee; background: #eee;
} }

2
ui/src/pages/notice/AlReadView.vue
View File

@@ -1,5 +1,5 @@
<template> <template>
<notice-view-table /> <notice-view-card />
</template> </template>
<script lang="ts"> <script lang="ts">
import { useNoticeStore } from '@/store/notice' import { useNoticeStore } from '@/store/notice'

2
ui/src/pages/notice/AllReceiveNoticeView.vue
View File

@@ -1,5 +1,5 @@
<template> <template>
<notice-view-table /> <notice-view-card />
</template> </template>
<script lang="ts"> <script lang="ts">
import { useNoticeStore } from '@/store/notice' import { useNoticeStore } from '@/store/notice'

14
ui/src/pages/notice/NoticeView.vue
View File

@@ -4,13 +4,7 @@
<notice-head></notice-head> <notice-head></notice-head>
</el-header> </el-header>
<el-main> <el-main>
<el-menu <el-menu :default-active="$route.path" class="el-menu-demo" mode="horizontal" router>
:default-active="$route.path"
class="el-menu-demo"
mode="horizontal"
@select="handleSelect"
router
>
<el-menu-item index="/notice/noticeView/all">所有公告</el-menu-item> <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/toRead">未读</el-menu-item>
<el-menu-item index="/notice/noticeView/alRead">已读</el-menu-item> <el-menu-item index="/notice/noticeView/alRead">已读</el-menu-item>
@@ -28,11 +22,7 @@ export default {
data() { data() {
return {} return {}
}, },
methods: { methods: {},
handleSelect(key, keyPath) {
console.log(key, keyPath)
}
},
mounted() { mounted() {
noticeStore.selectEnableNoticeType() noticeStore.selectEnableNoticeType()
} }

2
ui/src/pages/notice/ToReadView.vue
View File

@@ -1,5 +1,5 @@
<template> <template>
<notice-view-table /> <notice-view-card />
</template> </template>
<script lang="ts"> <script lang="ts">
import { useNoticeStore } from '@/store/notice' import { useNoticeStore } from '@/store/notice'