1期问题修改

This commit is contained in:
赵依梦
2025-12-18 11:58:36 +08:00
parent 2389b06f28
commit 4277f985b0
10 changed files with 99 additions and 50 deletions

View File

@@ -19,7 +19,7 @@ body {
font-family: "Menlo", "苹方-简" !important;
}
.el-message {
top: 15%!important
top: 15%;
}
.el-card.is-always-shadow, .el-card.is-hover-shadow:focus, .el-card.is-hover-shadow:hover{
box-shadow: none;

View File

@@ -438,7 +438,7 @@
min-width: 180px !important;
height: 52px !important;
border-radius: 12px !important;
top: 270px !important;
// top: 270px !important;
font-size: 16px !important;
font-weight: bold !important;
border: none !important;
@@ -454,7 +454,7 @@
min-width: 180px !important;
height: 52px !important;
border-radius: 12px !important;
top: 270px !important;
// top: 270px !important;
font-size: 16px !important;
border: none !important;
@@ -472,7 +472,7 @@
min-width: 180px !important;
height: 52px !important;
border-radius: 12px !important;
top: 270px !important;
// top: 270px !important;
font-size: 16px !important;
font-weight: bold !important;
@@ -491,7 +491,7 @@
min-width: 180px !important;
height: 52px !important;
border-radius: 12px !important;
top: 270px !important;
// top: 270px !important;
font-size: 16px !important;
font-weight: bold !important;
border: none !important;
@@ -1610,3 +1610,10 @@
}
}
}
.tooltip-multiline {
max-width: 400px; /* 设置最大宽度,超出则换行 */
white-space: normal; /* 允许换行 */
word-break: break-all; /* 断行规则 */
}

View File

@@ -236,7 +236,7 @@ export default {
handleConfirm() {
const targetId = this.courseDetail?.id;
if(!this.selectedRows.length) {
this.$showMessage('请添加学员', 'error');
this.$showManageMessage('请添加学员', 'error');
return
}
saveStu({
@@ -246,7 +246,7 @@ export default {
groupIds: [],
studentList: this.selectedRows.map((e) => ({ id: e.userId })),
}).then(() => {
this.$showMessage("添加成功", 'success');
this.$showManageMessage("添加成功", 'success');
this.$emit("confirm", this.selectedRows);
this.handleClose();
});

View File

@@ -615,7 +615,7 @@ export default {
this.groupMemberNumber &&
this.groupMemberCount < this.groupMemberNumber + this.projectSelectRows.length + this.stuSelectRows.length
) {
return this.$showMessage("添加小组学员超过最大值", 'error');
return this.$showManageMessage("添加小组学员超过最大值", 'error');
}
saveStu({
targetId: this.courseDetail?.id || this.id,
@@ -625,7 +625,7 @@ export default {
studentList: this.stuSelectRows.map((e) => ({id: e.id})),
}).then((res) => {
console.log('res', res);
this.$showMessage("添加成功", 'success');
this.$showManageMessage("添加成功", 'success');
this.$emit("confirm");
this.handleClose();
});

View File

@@ -59,7 +59,7 @@ import 'swiper/dist/css/swiper.css';
Vue.use(VueAwesomeSwiper)
import watermark from './utils/warterMark.js'
import Bus from './utils/bus.js'
import {showMessage} from './utils/index.js'
import {showMessage, showManageMessage} from './utils/index.js'
import MessageBoxService from './utils/simpleMessageBox.js'
@@ -68,6 +68,8 @@ Vue.use(MessageBoxService)
Vue.prototype.$showMessage = showMessage
Vue.prototype.$showManageMessage = showManageMessage
Vue.prototype.$bus = Bus
Vue.prototype.$watermark = watermark

View File

@@ -462,6 +462,17 @@ export function showMessage(message, status) {
message: message,
type: status,
duration: 5000,
customClass: 'new-message'
customClass: 'new-message',
offset: 270
});
}
export function showManageMessage(message, status) {
this.$message({
message: message,
type: status,
duration: 5000,
customClass: 'new-message',
offset: 80
});
}

View File

@@ -736,14 +736,14 @@ export default {
})
.then((res) => {
if (res && res.status === 200) {
this.$showMessage("删除成功", 'success');
this.$showManageMessage("删除成功", 'success');
this.getSignupList();
} else if (res) {
this.$showMessage(res.message || "删除失败", 'error');
this.$showManageMessage(res.message || "删除失败", 'error');
}
})
.catch((err) => {
this.$showMessage("删除失败", 'error');
this.$showManageMessage("删除失败", 'error');
});
})
.catch((err) => {

View File

@@ -973,7 +973,7 @@ export default {
const hasStart = !!this.params.learningTimeStart;
const hasEnd = !!this.params.learningTimeEnd;
if ((hasStart && !hasEnd) || (!hasStart && hasEnd)) {
this.$showMessage('请选择完整的培训时间范围', 'warning');
this.$showManageMessage('请选择完整的培训时间范围', 'warning');
return false;
}
return true;
@@ -1160,7 +1160,7 @@ export default {
document.body.removeChild(link);
window.URL.revokeObjectURL(url);
} catch (error) {
this.$showMessage(error.message || '导出失败', 'error');
this.$showManageMessage(error.message || '导出失败', 'error');
} finally {
this.exportLoading = false;
}
@@ -1188,7 +1188,7 @@ export default {
// console.log('fa')
apiCourse.setTop(params).then(res => {
if (res.status === 200 && res.result === true) {
this.$showMessage('置顶成功!', 'success')
this.$showManageMessage('置顶成功!', 'success')
this.searchData();
} else if (res.status === 500) {
const confirmText = `<i class="el-icon-warning-outline"></i>已置顶10条课程若需继续置顶请对部分课程执行取消置顶操作`;
@@ -1200,16 +1200,16 @@ export default {
customClass: 'custom-confirm-dialog'
}).then(() => {}).catch(() => { });
} else {
this.$showMessage(res.message, 'error');
this.$showManageMessage(res.message, 'error');
}
})
} else if (row.isTop == true) {
apiCourse.setTop(params).then(res => {
if (res.status === 200 && res.result === true) {
this.$showMessage('取消成功!', 'success')
this.$showManageMessage('取消成功!', 'success')
this.searchData();
} else {
this.$showMessage(res.message, 'error');
this.$showManageMessage(res.message, 'error');
}
})
}
@@ -1231,13 +1231,13 @@ export default {
};
apiCourse.copyCourse(reqdata).then(rs => {
if (rs.status === 200) {
this.$showMessage('复制成功', 'success');
this.$showManageMessage('复制成功', 'success');
this.searchData();
} else {
this.$showMessage(rs.message || '复制失败', 'error');
this.$showManageMessage(rs.message || '复制失败', 'error');
}
}).catch(() => {
this.$showMessage('复制失败', 'error');
this.$showManageMessage('复制失败', 'error');
});
}).catch(() => { });
},
@@ -1251,13 +1251,13 @@ export default {
}).then(() => {
apiCourse.revokeSubmit(row.id).then((res) => {
if (res.status === 200 && res.result) {
this.$showMessage('撤回成功', 'success');
this.$showManageMessage('撤回成功', 'success');
this.searchData();
} else {
this.$showMessage(res.message || '撤回失败', 'error');
this.$showManageMessage(res.message || '撤回失败', 'error');
}
}).catch(() => {
this.$showMessage('撤回失败', 'error');
this.$showManageMessage('撤回失败', 'error');
});
}).catch(() => { });
},
@@ -1312,15 +1312,15 @@ export default {
}
apiCourse.audit(params).then(res => {
if (res.status === 200) {
this.$showMessage('操作成功!', 'success');
this.$showManageMessage('操作成功!', 'success');
this.dialogVisible = false;
this.searchData();
} else {
this.$showMessage(res.message, 'error');
this.$showManageMessage(res.message, 'error');
}
})
} else {
this.$showMessage('暂未开放!', 'warning');
this.$showManageMessage('暂未开放!', 'warning');
}
},
@@ -1353,13 +1353,13 @@ export default {
try {
const { status } = await apiCourse.setEnabled(params);
if (status === 200) {
this.$showMessage(`${actionText}成功`, 'success');
this.$showManageMessage(`${actionText}成功`, 'success');
row.enabled = nextEnabled;
} else {
this.$showMessage(`${actionText}失败`, 'error');
this.$showManageMessage(`${actionText}失败`, 'error');
}
} catch (error) {
this.$showMessage(`${actionText}失败`, 'error');
this.$showManageMessage(`${actionText}失败`, 'error');
}
},
// 课程查询
@@ -1379,11 +1379,11 @@ export default {
this.page.count = rs.result.count;
this.page.pageSize = rs.result.pageSize;
} else {
return this.$showMessage(rs.message, 'error');
return this.$showManageMessage(rs.message, 'error');
}
}).catch(err => {
console.error('查询课程列表失败:', err);
this.$showMessage('查询失败,请稍后重试', 'error');
this.$showManageMessage('查询失败,请稍后重试', 'error');
});
},
@@ -1407,7 +1407,7 @@ export default {
},
viewTopic(row) {
if (row.status == 1) {
return this.$showMessage('请提交课程再预览!', 'warning')
return this.$showManageMessage('请提交课程再预览!', 'warning')
}
this.examin = {};
this.examin.detailType = row.type;
@@ -1465,7 +1465,7 @@ export default {
if (!ele) return;
ele.select();
document.execCommand('Copy');
this.$showMessage('复制成功', 'success');
this.$showManageMessage('复制成功', 'success');
},
downloadQrcode() {
const container = document.getElementById('qrcode');
@@ -1639,10 +1639,10 @@ export default {
// } else {
// item.isTop = true;
// }
// this.$showMessage('xxx', 'success');
// this.$showManageMessage('xxx', 'success');
// },
delItem(row) {
// this.$showMessage('删除成功', 'success');
// this.$showManageMessage('删除成功', 'success');
// return false
this.$confirm(`<i class="el-icon-warning-outline"></i>确认删除${row.name}吗?`, '删除确认', {
confirmButtonText: '确定',
@@ -1660,7 +1660,7 @@ export default {
// {id:课程id,多个使用逗号分隔,Boolean erasable 是否物理删除,title:课程的名称, remark 备注}
const { status } = await apiCourse.del(params);
if (status === 200) {
this.$showMessage('删除成功', 'success'); //只是之前发布过的课程删除才可
this.$showManageMessage('删除成功', 'success'); //只是之前发布过的课程删除才可
// if(!row.erasable){
// let event = {
// key: "CourseDelete",//被管理员删除
@@ -1680,11 +1680,11 @@ export default {
this.searchData();
}
} catch (error) {
this.$showMessage('删除失败', 'error');
this.$showManageMessage('删除失败', 'error');
}
})
.catch((err) => {
// this.$showMessage('已取消删除', 'info');
// this.$showManageMessage('已取消删除', 'info');
});
},
showAddCatalogZhang(bal) {

View File

@@ -144,20 +144,31 @@
<el-table :header-cell-style="{textAlign: 'center', background: 'rgba(66, 132, 247, 0.1)',
color: '#60769D'}"
:cell-style="{ textAlign: 'center' }" max-height="500" border :data="inviteTeacher" style="width: 100%;">
<el-table-column prop="type" label="审核类型">
<el-table-column prop="auditType" width="80" label="审核类型">
<template slot-scope="scope">
{{ scope.row.auditState ? '通过' : '不通过' }}
{{ auditTypeEnum[scope.row.auditType] }}
</template>
</el-table-column>
<el-table-column prop="type" label="审核状态">
<el-table-column prop="status" width="80" label="审核状态">
<template slot-scope="scope">
{{ auditEnum[scope.row.status] }}
</template>
</el-table-column>
<el-table-column prop="auditUser" label="审核人"></el-table-column>
<el-table-column prop="auditTime" label="审核结果"></el-table-column>
<el-table-column prop="auditTime" label="审核时间"></el-table-column>
<el-table-column prop="auditRemark" label="审核意见"></el-table-column>
<el-table-column prop="auditUser" width="80" label="审核人"></el-table-column>
<el-table-column prop="auditResult" width="80" label="审核结果">
<template slot-scope="scope">
{{ auditResultEnum[scope.row.auditResult] }}
</template>
</el-table-column>
<el-table-column prop="auditTime" width="220" label="审核时间"></el-table-column>
<el-table-column prop="auditRemark" label="审核意见">
<template slot-scope="scope">
<el-tooltip class="item" popper-class="tooltip-multiline" effect="dark" :content="scope.row.auditRemark" placement="top-start">
<p class="no-wrap">
{{scope.row.auditRemark}}</p>
</el-tooltip>
</template>
</el-table-column>
</el-table>
</div>
<span slot="footer" class="dialog-footer"><el-button @click="dialogVisible = false"> </el-button></span>
@@ -278,9 +289,19 @@ export default {
loading: false,
noMore: false,
auditEnum: {
1: "审核",
1: "审核",
2: "审核不通过",
9: "审核通过",
},
auditTypeEnum: {
1: "新建",
2: "编辑",
3: "停用",
4: "启用",
},
auditResultEnum: {
0: "驳回",
1: "通过",
},
hoverStates: {},
};
@@ -621,6 +642,14 @@ export default {
</script>
<style scoped lang="scss">
.no-wrap {
overflow: hidden;
text-overflow: ellipsis;
-webkit-box-orient: vertical;
-webkit-line-clamp: 1;
word-break: break-all;
white-space: nowrap;
}
.page-tip {
margin: 20px auto;
text-align: center;

View File

@@ -131,7 +131,7 @@
</div> -->
<div v-if="!canScore" style="display: flex;align-items: center;">
<p style="margin-right:10px">课程评分</p>
<el-rate v-model="scoreInfo.score" :disabled="!canScore" :allow-half="true"></el-rate>
<el-rate v-model="courseInfo.score" :disabled="!canScore" :allow-half="true"></el-rate>
<span class="score-text">{{ newToScore(courseInfo.score) }}</span>
<span style="font-size: 18px;"></span>