diff --git a/schoolNewsServ/news/src/main/resources/mapper/ResourceMapper.xml b/schoolNewsServ/news/src/main/resources/mapper/ResourceMapper.xml index 9181742..99f489f 100644 --- a/schoolNewsServ/news/src/main/resources/mapper/ResourceMapper.xml +++ b/schoolNewsServ/news/src/main/resources/mapper/ResourceMapper.xml @@ -121,7 +121,7 @@ AND r.is_banner = #{filter.isBanner} - ORDER BY r.publish_time DESC, r.create_time DESC + ORDER BY r.create_time DESC, r.publish_time DESC @@ -138,7 +138,7 @@ FROM tb_resource r WHERE r.tag_id = #{tagId} AND r.deleted = 0 - ORDER BY r.publish_time DESC, r.create_time DESC + ORDER BY r.create_time DESC, r.publish_time DESC @@ -147,7 +147,7 @@ FROM tb_resource r WHERE r.status = #{status} AND r.deleted = 0 - ORDER BY r.publish_time DESC, r.create_time DESC + ORDER BY r.create_time DESC, r.publish_time DESC @@ -156,7 +156,7 @@ FROM tb_resource r WHERE r.tag_id = #{type} AND r.deleted = 0 - ORDER BY r.publish_time DESC, r.create_time DESC + ORDER BY r.create_time DESC, r.publish_time DESC @@ -177,7 +177,7 @@ FROM tb_resource r WHERE r.status = 1 AND r.deleted = 0 - ORDER BY r.publish_time DESC, r.create_time DESC + ORDER BY r.create_time DESC, r.publish_time DESC LIMIT #{limit} @@ -192,7 +192,7 @@ OR content LIKE CONCAT('%', #{keyword}, '%') OR summary LIKE CONCAT('%', #{keyword}, '%')) AND r.status = 1 AND r.deleted = 0 - ORDER BY r.publish_time DESC, r.create_time DESC + ORDER BY r.create_time DESC, r.publish_time DESC @@ -353,7 +353,7 @@ AND r.is_banner = #{filter.isBanner} - ORDER BY r.publish_time DESC, r.create_time DESC + ORDER BY r.create_time DESC, r.publish_time DESC LIMIT #{pageParam.pageSize} OFFSET #{pageParam.offset} @@ -431,7 +431,7 @@ - ORDER BY r.view_count DESC, r.publish_time DESC, r.create_time DESC + ORDER BY r.view_count DESC, r.create_time DESC, r.publish_time DESC LIMIT #{pageParam.pageSize} OFFSET #{pageParam.offset} diff --git a/schoolNewsWeb/src/types/resource/index.ts b/schoolNewsWeb/src/types/resource/index.ts index 116ec5f..d775946 100644 --- a/schoolNewsWeb/src/types/resource/index.ts +++ b/schoolNewsWeb/src/types/resource/index.ts @@ -299,7 +299,7 @@ export interface DataCollectionLog extends BaseDTO { */ export interface ResourceSearchParams { /** 关键词 */ - keyword?: string; + title?: string; /** 标签ID(文章分类标签,tagType=1) */ tagID?: string; /** 状态 */ diff --git a/schoolNewsWeb/src/views/admin/manage/resource/ArticleManagementView.vue b/schoolNewsWeb/src/views/admin/manage/resource/ArticleManagementView.vue index 60287a5..5c9ab5c 100644 --- a/schoolNewsWeb/src/views/admin/manage/resource/ArticleManagementView.vue +++ b/schoolNewsWeb/src/views/admin/manage/resource/ArticleManagementView.vue @@ -10,9 +10,16 @@ v-model="searchKeyword" placeholder="搜索文章..." style="width: 300px" - onkeydown="" clearable - /> + @keyup.enter="handleSearch" + @clear="handleSearch" + > + + @@ -94,7 +101,8 @@ defineOptions({ name: 'ArticleManagementView' }); import { ref, onMounted } from 'vue'; -import { ElButton, ElInput, ElTable, ElTableColumn, ElTag, ElPagination, ElMessage, ElMessageBox } from 'element-plus'; +import { ElButton, ElInput, ElTable, ElTableColumn, ElTag, ElPagination, ElMessage, ElMessageBox, ElIcon } from 'element-plus'; +import { Search } from '@element-plus/icons-vue'; import { useRouter } from 'vue-router'; import { resourceApi, resourceTagApi } from '@/apis/resource' import type { PageParam, ResourceSearchParams, Resource, Tag } from '@/types'; @@ -108,7 +116,7 @@ const pageParam = ref({ pageSize: 10 }); const filter = ref({ - keyword: searchKeyword.value + title: searchKeyword.value }); const total = ref(0); const articles = ref([]); @@ -135,6 +143,7 @@ async function loadCategories() { } async function loadArticles() { + filter.value.title = searchKeyword.value; const res = await resourceApi.getResourcePage(pageParam.value, filter.value); if (res.success) { articles.value = res.pageDomain?.dataList || []; @@ -142,6 +151,11 @@ async function loadArticles() { } } +function handleSearch() { + pageParam.value.pageNumber = 1; // 搜索时重置到第一页 + loadArticles(); +} + function showCreateDialog() { // 尝试跳转 router.push('/article/add') diff --git a/schoolNewsWeb/src/views/admin/manage/system/SystemConfigView.vue b/schoolNewsWeb/src/views/admin/manage/system/SystemConfigView.vue index 7198aad..394a973 100644 --- a/schoolNewsWeb/src/views/admin/manage/system/SystemConfigView.vue +++ b/schoolNewsWeb/src/views/admin/manage/system/SystemConfigView.vue @@ -145,9 +145,9 @@ type="primary" link size="small" - @click="previewAgreementFile(configData[group.groupKey][item.configKey])" + @click="downloadAgreementFile(configData[group.groupKey][item.configKey])" > - 预览文件 + 下载文件