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
.anyRequest()
.authenticated()
// .anonymous()
.and()
.logout()

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

@@ -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;
}

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

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

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

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

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

@@ -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()
}

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

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