Merge branch 'master-20251023-tag' into test1024

# Conflicts:
#	src/views/tag/TagManage.vue
This commit is contained in:
670788339
2025-11-07 15:19:37 +08:00

View File

@@ -214,7 +214,7 @@
v-if="courseTableTotal > 0"
:show-total="total => `${courseTableTotal}`"
:showSizeChanger="true"
:pageSizeOptions="['5','10', '15', '20']"
:pageSizeOptions="['10', '20', '30', '40']"
:showQuickJumper="true"
:hideOnSinglePage="false"
:pageSize="coursePageSize"
@@ -451,23 +451,18 @@ export default {
getTagList();
};
// 分页变化
const handleSizeChange = (page, pageSize) => {
console.log('handleSizeChange page :', page + " , pageSize = " + pageSize);
state.searchParam.pageNo = 1;
state.searchParam.pageSize = pageSize;
getTagList();
};
// 分页变化
const changePagination = (page, pageSize) => {
console.log('changePagination page :', page + " , pageSize = " + pageSize);
state.searchParam.pageNo = page;
state.searchParam.pageSize = pageSize;
getTagList();
};
// 表格排序变化
const handleTableChange = (pagination, filters, sorter) => {
if (sorter.field === 'useCount') {
@@ -524,7 +519,7 @@ export default {
console.log("修改热点 参数 : ",record);
changeTagHot(record.id).then ((res) => {
console.log("修改热点 结果 : ",res);
if (res.status === 200) {
if (res.status === 200 ) {
console.log("更新成功");
}else {
record.isHot = false;
@@ -585,15 +580,12 @@ export default {
state.courseDialogVisible = false;
};
const changeCoursePagination = (page, pageSize) => {
console.log('handleSizeChange page :'+ page + " , pageSize = " + pageSize);
state.courseSearchParam.pageNo = page;
state.courseSearchParam.pageSize = pageSize;
getCourseListByTag();
};
const changeCourseSizePagination = (page, pageSize) => {
console.log('changeCourseSizePagination page :'+page + " , pageSize = " + pageSize);
state.courseSearchParam.pageNo = 1;
state.courseSearchParam.pageSize = pageSize;
getCourseListByTag();
@@ -999,7 +991,7 @@ export default {
width: 100%;
word-break: break-all;
line-height: 1.4;
max-height: 2.8em;
max-height: 2.8em;
overflow: hidden;
display: -webkit-box;
-webkit-line-clamp: 2;
@@ -1059,8 +1051,8 @@ export default {
.ant-select-selection-item,
.ant-selectselection-placeholder {
line-height: 36px !important;
}
line-height: 36px !important;
}
}
}
}
@@ -1262,7 +1254,7 @@ export default {
font-size: 11px;
line-height: 1.2;
max-height: 2.4em;
}
}
.other-tags-cell {
max-width: 150px;
@@ -1289,12 +1281,12 @@ export default {
}
.course-dialog-content {
.course-table {
:deep(.ant-table) {
font-size: 14px;
.course-table {
:deep(.ant-table) {
font-size: 14px;
}
}
}
}
.course-id-cell,
.course-name-cell,
@@ -1343,8 +1335,8 @@ export default {
line-height: 44px;
.ant-modal-close-icon {
color: #fff !important;
}
color: #fff !important;
}
}
&:hover {
@@ -1373,11 +1365,11 @@ export default {
// 确认框样式优化
.ant-popconfirm {
.ant-popconfirm-message {
.ant-popconfirm-message-title {
font-size: 14px;
color: #333;
}
}
.ant-popconfirm-message-title {
font-size: 14px;
color: #333;
}
}
.ant-popconfirm-buttons {
button {
@@ -1450,7 +1442,7 @@ export default {
font-size: 12px;
}
}
}
}
}
@media (max-width: 480px) {
@@ -1458,13 +1450,13 @@ export default {
width: 95% !important;
max-width: none !important;
.ant-modal-content {
.ant-modal-body {
padding: 12px;
max-height: 50vh;
.ant-modal-content {
.ant-modal-body {
padding: 12px;
max-height: 50vh;
}
}
}
}
}
}