diff --git a/schoolNewsWeb/src/assets/imgs/article-default.png b/schoolNewsWeb/src/assets/imgs/article-default.png new file mode 100644 index 0000000..2224165 Binary files /dev/null and b/schoolNewsWeb/src/assets/imgs/article-default.png differ diff --git a/schoolNewsWeb/src/assets/imgs/resource-head-bg.jpg b/schoolNewsWeb/src/assets/imgs/resource-head-bg.jpg new file mode 100644 index 0000000..4d6859b Binary files /dev/null and b/schoolNewsWeb/src/assets/imgs/resource-head-bg.jpg differ diff --git a/schoolNewsWeb/src/assets/imgs/search-icon.svg b/schoolNewsWeb/src/assets/imgs/search-icon.svg index f09acb2..74f83c8 100644 --- a/schoolNewsWeb/src/assets/imgs/search-icon.svg +++ b/schoolNewsWeb/src/assets/imgs/search-icon.svg @@ -1,3 +1,4 @@ - - + + + \ No newline at end of file diff --git a/schoolNewsWeb/src/assets/imgs/star-icon.svg b/schoolNewsWeb/src/assets/imgs/star-icon.svg new file mode 100644 index 0000000..fe52e5e --- /dev/null +++ b/schoolNewsWeb/src/assets/imgs/star-icon.svg @@ -0,0 +1,3 @@ + + + diff --git a/schoolNewsWeb/src/components/base/FloatingSidebar.vue b/schoolNewsWeb/src/components/base/FloatingSidebar.vue index bd4d232..69c54d8 100644 --- a/schoolNewsWeb/src/components/base/FloatingSidebar.vue +++ b/schoolNewsWeb/src/components/base/FloatingSidebar.vue @@ -8,7 +8,10 @@ v-for="menu in menus" :key="menu.menuID || menu.url" class="sidebar-item" - :class="{ active: isActive(menu) }" + :class="{ + active: isActive(menu), + 'theme-resource': props.theme === 'resource' + }" @click="handleClick(menu)" >
@@ -28,9 +31,12 @@ import { useRouter, useRoute } from 'vue-router'; interface Props { menus: SysMenu[]; activePath?: string; + theme?: 'default' | 'resource'; // 新增主题属性 } -const props = withDefaults(defineProps(), {}); +const props = withDefaults(defineProps(), { + theme: 'default' +}); // Emits const emit = defineEmits<{ @@ -113,7 +119,7 @@ function handleClick(menu: SysMenu) { display: flex; align-items: center; cursor: pointer; - transition: all 0.2s; + transition: all 0.3s; &::before { content: ''; @@ -142,6 +148,42 @@ function handleClick(menu: SysMenu) { color: #C62828; } } + + // Resource theme - 红色背景高亮 + &.theme-resource { + padding: 0 10px; + + &:hover { + background: rgba(198, 40, 40, 0.05); + } + + &.active { + background: #C62828; + border-radius: 8px; + margin: 5px 10px; + height: 44px; + + &::before { + display: none; // 隐藏左侧指示条 + } + + .sidebar-link { + color: #FFFFFF; + } + + &::after { + content: ''; + position: absolute; + right: -103px; + top: 3px; + width: 48.53px; + height: 50.54px; + background: linear-gradient(134deg, rgba(255, 255, 255, 1) 26%, rgba(255, 255, 255, 0) 86%); + opacity: 0.23; + pointer-events: none; + } + } + } } .sidebar-link { @@ -156,12 +198,16 @@ function handleClick(menu: SysMenu) { font-weight: 500; font-family: 'PingFang SC', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif; line-height: 1.5; - transition: color 0.2s; + transition: color 0.3s; user-select: none; .link-text { text-align: center; } + + .theme-resource & { + margin-left: 32px; // Resource theme 文字左移 + } } /* 响应式设计 */ diff --git a/schoolNewsWeb/src/components/base/Search.vue b/schoolNewsWeb/src/components/base/Search.vue new file mode 100644 index 0000000..4583b6b --- /dev/null +++ b/schoolNewsWeb/src/components/base/Search.vue @@ -0,0 +1,90 @@ + + + + + \ No newline at end of file diff --git a/schoolNewsWeb/src/components/base/TopNavigation.vue b/schoolNewsWeb/src/components/base/TopNavigation.vue index acee6b3..13a1bfe 100644 --- a/schoolNewsWeb/src/components/base/TopNavigation.vue +++ b/schoolNewsWeb/src/components/base/TopNavigation.vue @@ -47,20 +47,7 @@
-
-
- -
- 搜索 -
-
-
+
@@ -74,7 +61,7 @@ import { useStore } from 'vuex'; import type { SysMenu } from '@/types'; import { MenuType } from '@/types/enums'; // @ts-ignore - Vue 3.5 组件导入兼容性 -import UserDropdown from './UserDropdown.vue'; +import {UserDropdown, Search} from '@/components/base'; const router = useRouter(); const route = useRoute(); @@ -475,6 +462,34 @@ function handleLogout() { margin-left: auto; display: flex; flex-shrink: 0; /* 防止右侧区域被压缩 */ + gap: 20px; + align-items: center; + + // 添加搜索框样式 + :deep(.resource-search) { + width: 221px; + height: 36px; + padding: 0; + + .search-box { + height: 36px; + } + + input { + font-size: 14px; + padding: 0 70px 0 20px; + } + + .search-button { + width: 48px; + height: 36px; + + img { + width: 17px; + height: 17px; + } + } + } } /* 响应式设计 */ diff --git a/schoolNewsWeb/src/components/base/index.ts b/schoolNewsWeb/src/components/base/index.ts index d924712..175cec2 100644 --- a/schoolNewsWeb/src/components/base/index.ts +++ b/schoolNewsWeb/src/components/base/index.ts @@ -3,4 +3,5 @@ export { default as FloatingSidebar } from './FloatingSidebar.vue'; export { default as MenuItem } from './MenuItem.vue'; export { default as MenuNav } from './MenuNav.vue'; export { default as TopNavigation } from './TopNavigation.vue'; -export { default as UserDropdown } from './UserDropdown.vue'; \ No newline at end of file +export { default as UserDropdown } from './UserDropdown.vue'; +export { default as Search } from './Search.vue'; \ No newline at end of file diff --git a/schoolNewsWeb/src/types/resource/index.ts b/schoolNewsWeb/src/types/resource/index.ts index 8b1f448..e6250fe 100644 --- a/schoolNewsWeb/src/types/resource/index.ts +++ b/schoolNewsWeb/src/types/resource/index.ts @@ -10,6 +10,8 @@ import { BaseDTO } from '../base'; * 资源实体 */ export interface Resource extends BaseDTO { + /** 资源ID */ + resourceID?: string; /** 资源标题 */ title?: string; /** 资源内容 */ diff --git a/schoolNewsWeb/src/views/article/ArticleShowView.vue b/schoolNewsWeb/src/views/article/ArticleShowView.vue index a11a511..39a3faf 100644 --- a/schoolNewsWeb/src/views/article/ArticleShowView.vue +++ b/schoolNewsWeb/src/views/article/ArticleShowView.vue @@ -12,26 +12,21 @@

{{ articleData.title }}

-
- - 分类：{{ getCategoryLabel(articleData.category) }} - - - 标签：{{ getTagsString(articleData.tags) }} - - - 作者：{{ articleData.author }} - - - 发布时间：{{ formatDate(articleData.createTime) }} - +
+
+ 发布时间：{{ formatDateSimple(articleData.publishTime || articleData.createTime || '') }} +
+
+ 浏览次数：{{ articleData.viewCount }} +
+
+ 来源：{{ articleData.source }} +
- -
- -
+ +
@@ -48,26 +43,21 @@

{{ articleData.title }}

-
- - 分类：{{ getCategoryLabel(articleData.category) }} - - - 标签：{{ getTagsString(articleData.tags) }} - - - 作者：{{ articleData.author }} - - - 发布时间：{{ formatDate(articleData.createTime) }} - +
+
+ 发布时间：{{ formatDateSimple(articleData.publishTime || articleData.createTime || '') }} +
+
+ 浏览次数：{{ articleData.viewCount }} +
+
+ 来源：{{ articleData.source }} +
- -
- -
+ +
@@ -77,25 +67,15 @@ - - - - \ No newline at end of file diff --git a/schoolNewsWeb/src/views/resource-center/PolicyInterpretationView.vue b/schoolNewsWeb/src/views/resource-center/PolicyInterpretationView.vue deleted file mode 100644 index 12c9f43..0000000 --- a/schoolNewsWeb/src/views/resource-center/PolicyInterpretationView.vue +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - diff --git a/schoolNewsWeb/src/views/resource-center/RedClassicView.vue b/schoolNewsWeb/src/views/resource-center/RedClassicView.vue deleted file mode 100644 index c68ac3a..0000000 --- a/schoolNewsWeb/src/views/resource-center/RedClassicView.vue +++ /dev/null @@ -1,119 +0,0 @@ - - - - - - diff --git a/schoolNewsWeb/src/views/resource-center/ResourceCenterView.vue b/schoolNewsWeb/src/views/resource-center/ResourceCenterView.vue index bbad257..c27dec0 100644 --- a/schoolNewsWeb/src/views/resource-center/ResourceCenterView.vue +++ b/schoolNewsWeb/src/views/resource-center/ResourceCenterView.vue @@ -1,104 +1,149 @@ - - diff --git a/schoolNewsWeb/src/views/resource-center/SpecialReportView.vue b/schoolNewsWeb/src/views/resource-center/SpecialReportView.vue deleted file mode 100644 index a8b05eb..0000000 --- a/schoolNewsWeb/src/views/resource-center/SpecialReportView.vue +++ /dev/null @@ -1,135 +0,0 @@ - - - - - - diff --git a/schoolNewsWeb/src/views/resource-center/WorldCaseView.vue b/schoolNewsWeb/src/views/resource-center/WorldCaseView.vue deleted file mode 100644 index 333e180..0000000 --- a/schoolNewsWeb/src/views/resource-center/WorldCaseView.vue +++ /dev/null @@ -1,181 +0,0 @@ - - - - - - diff --git a/schoolNewsWeb/src/views/resource-center/components/MediaArchive.vue b/schoolNewsWeb/src/views/resource-center/components/MediaArchive.vue deleted file mode 100644 index d421e72..0000000 --- a/schoolNewsWeb/src/views/resource-center/components/MediaArchive.vue +++ /dev/null @@ -1,119 +0,0 @@ - - - - - - diff --git a/schoolNewsWeb/src/views/resource-center/components/PolicySpeech.vue b/schoolNewsWeb/src/views/resource-center/components/PolicySpeech.vue deleted file mode 100644 index 5910f32..0000000 --- a/schoolNewsWeb/src/views/resource-center/components/PolicySpeech.vue +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - diff --git a/schoolNewsWeb/src/views/resource-center/components/ResouceBottom.vue b/schoolNewsWeb/src/views/resource-center/components/ResouceBottom.vue new file mode 100644 index 0000000..ad65bc1 --- /dev/null +++ b/schoolNewsWeb/src/views/resource-center/components/ResouceBottom.vue @@ -0,0 +1,87 @@ + + + + + + diff --git a/schoolNewsWeb/src/views/resource-center/components/ResouceCollect.vue b/schoolNewsWeb/src/views/resource-center/components/ResouceCollect.vue new file mode 100644 index 0000000..c5d8883 --- /dev/null +++ b/schoolNewsWeb/src/views/resource-center/components/ResouceCollect.vue @@ -0,0 +1,96 @@ + + + + + + diff --git a/schoolNewsWeb/src/views/resource-center/components/ResourceArticle.vue b/schoolNewsWeb/src/views/resource-center/components/ResourceArticle.vue new file mode 100644 index 0000000..51ed915 --- /dev/null +++ b/schoolNewsWeb/src/views/resource-center/components/ResourceArticle.vue @@ -0,0 +1,165 @@ + + + + + diff --git a/schoolNewsWeb/src/views/resource-center/components/ResourceHead.vue b/schoolNewsWeb/src/views/resource-center/components/ResourceHead.vue new file mode 100644 index 0000000..6952271 --- /dev/null +++ b/schoolNewsWeb/src/views/resource-center/components/ResourceHead.vue @@ -0,0 +1,90 @@ + + + + + + diff --git a/schoolNewsWeb/src/views/resource-center/components/ResourceList.vue b/schoolNewsWeb/src/views/resource-center/components/ResourceList.vue new file mode 100644 index 0000000..b50b1a8 --- /dev/null +++ b/schoolNewsWeb/src/views/resource-center/components/ResourceList.vue @@ -0,0 +1,286 @@ + + + + + + diff --git a/schoolNewsWeb/src/views/resource-center/components/ResourceSideBar.vue b/schoolNewsWeb/src/views/resource-center/components/ResourceSideBar.vue new file mode 100644 index 0000000..e534f0b --- /dev/null +++ b/schoolNewsWeb/src/views/resource-center/components/ResourceSideBar.vue @@ -0,0 +1,117 @@ + + + + + + diff --git a/schoolNewsWeb/src/views/resource-center/components/index.ts b/schoolNewsWeb/src/views/resource-center/components/index.ts new file mode 100644 index 0000000..ad6cc83 --- /dev/null +++ b/schoolNewsWeb/src/views/resource-center/components/index.ts @@ -0,0 +1,6 @@ +export { default as ResourceHead } from './ResourceHead.vue'; +export { default as ResourceSideBar } from './ResourceSideBar.vue'; +export { default as ResourceList } from './ResourceList.vue'; +export { default as ResourceArticle } from './ResourceArticle.vue'; +export { default as ResouceCollect } from './ResouceCollect.vue'; +export { default as ResouceBottom } from './ResouceBottom.vue';