merge wsw into master

fix: bug

Created-by: yfzmpj
Commit-by: 汪少伟
Merged-by: yfzmpj
Description: fix: bug

See merge request: hk_openRepo/OpenRepo_Portal!51
This commit is contained in:
yfzmpj
2025-03-19 20:47:10 +08:00

View File

@@ -59,7 +59,7 @@
</d-dropdown-menu> </d-dropdown-menu>
<d-button color="primary" variant="solid" @click="search">搜索</d-button> <d-button color="primary" variant="solid" @click="search">搜索</d-button>
</div> </div>
<d-button v-if="isLogin" @click="check" ref="origin" icon="share" class="batch-btn">批量校验</d-button> <d-button @click="check" ref="origin" icon="share" class="batch-btn">批量校验</d-button>
<div class="home-information"> <div class="home-information">
<div class="info-title"> <div class="info-title">
<div class="sub-title"> <div class="sub-title">
@@ -87,11 +87,11 @@
@click="openWarningDetail(item, index)" @click="openWarningDetail(item, index)"
> >
<span>{{ item.subject }}</span> <span>{{ item.subject }}</span>
<d-tag v-if="item.importance" :color="tagMap[item.importance].color" size="sm">{{ tagMap[item.importance].text }}</d-tag> <d-tag :color="tagMap[item.importance]" size="sm">{{ item.importance }}</d-tag>
</div> </div>
<div class="time-container"> <div class="time-container">
<d-icon name="icon-time"></d-icon> <d-icon name="icon-time"></d-icon>
{{ item.publishTime }} {{ item.pulishTime }}
</div> </div>
</div> </div>
</template> </template>
@@ -117,7 +117,6 @@ import { useAccount } from '@/utils/hooks/useAccount';
import AdvanceSearch from '@/components/AdvanceSearch/index.vue'; import AdvanceSearch from '@/components/AdvanceSearch/index.vue';
import { getHomeNoticeList } from '@/api/jyh'; import { getHomeNoticeList } from '@/api/jyh';
import EarlyWarningDetail from '@/views/Jyh/PersonalCenter/Detail/EarlyWarningDetail.vue'; import EarlyWarningDetail from '@/views/Jyh/PersonalCenter/Detail/EarlyWarningDetail.vue';
import { useDiscussGetUserInfo } from '@/api/discussion/hook';
const { accountInfo } = useAccount(); const { accountInfo } = useAccount();
@@ -142,23 +141,10 @@ const homeSearch = ref(null);
const dropdownWidth = ref(0); const dropdownWidth = ref(0);
const selectedCate = ref('软件'); const selectedCate = ref('软件');
const tagMap = { const tagMap = {
'Critical': { : '#f66f6a',
text: '致命', : '#fac20a',
color: '#c7000b' : '#5e7ce0'
}, };
'High': {
text: '高',
color: '#f66f6a'
},
'Medium': {
text: '中',
color: '#fac20a'
},
'Low': {
text: '低',
color: '#5e7ce0'
}
}
const searchInput = ref(null); const searchInput = ref(null);
const openAdvancedSearch = () => { const openAdvancedSearch = () => {
@@ -267,6 +253,7 @@ getNoticeList();
.home-content { .home-content {
font-size: 14px; font-size: 14px;
height: 80%;
width: 50%; width: 50%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@@ -444,11 +431,8 @@ getNoticeList();
display: flex; display: flex;
align-items: center; align-items: center;
gap: 8px; gap: 8px;
width: 150px; width: 120px;
flex-shrink: 0; flex-shrink: 0;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
} }
:deep(.devui-timeline-item-data-right) { :deep(.devui-timeline-item-data-right) {