hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-10 11:26:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
yuping
2023-03-05 02:40:29 +08:00
parent c2c7e6a5c3 2636f5cbcd
commit 940f17d7ec
5 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/drawers/AddTest.vue
View File

@@ -211,8 +211,9 @@
<span style="margin-right: 3px">数据来源：</span> <span style="margin-right: 3px">数据来源：</span>
</div> </div>
<div class="btnbox"> <div class="btnbox">
<a-input v-model:value="formData.source" style="width: 400px; height: 40px; border-radius: 8px" :disabled="taskIndex >= 0" <a-input v-model:value="formData.source"
placeholder="请输入数据来源" :maxlength="120" /> style="width: 400px; height: 40px; border-radius: 8px" :disabled="taskIndex >= 0"
placeholder="请输入数据来源" show-count :maxlength="420" />
</div> </div>
</div> </div>
<div class="main_item2"> <div class="main_item2">

2
src/components/drawers/CommonTest.vue
View File

@@ -287,7 +287,7 @@
v-model:value="formData.source" v-model:value="formData.source"
style="width: 400px; height: 40px; border-radius: 8px" style="width: 400px; height: 40px; border-radius: 8px"
placeholder="请输入数据来源" placeholder="请输入数据来源"
:maxlength="120" show-count :maxlength="420"
/> />
</div> </div>
</div> </div>

3
src/components/drawers/router/RouterCommonManage.vue
View File

@@ -500,6 +500,7 @@ export default {
// 导出数据 // 导出数据
function exportTaskStu() { function exportTaskStu() {
debugger
if(props.datasource.type==1){ if(props.datasource.type==1){
{/* 在线课导出 */} {/* 在线课导出 */}
window.open(`${process.env.VUE_APP_BASE_API}/admin/online/manage/exportOnline?chapterId=${props.datasource.chapterId}&type=${2}&targetId=${props.datasource.routerId}&taskId=${props.datasource.courseId}`) window.open(`${process.env.VUE_APP_BASE_API}/admin/online/manage/exportOnline?chapterId=${props.datasource.chapterId}&type=${2}&targetId=${props.datasource.routerId}&taskId=${props.datasource.courseId}`)
@@ -507,7 +508,7 @@ export default {
{/* 评估导出 */} {/* 评估导出 */}
window.open(`${process.env.VUE_APP_BASE_API}/admin/assessment/manage/exportAssessmentMessage?chapterId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&courseId=${props.datasource.courseId}&taskId=${props.datasource.id}&taskType=${props.datasource.type}`) window.open(`${process.env.VUE_APP_BASE_API}/admin/assessment/manage/exportAssessmentMessage?chapterId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&courseId=${props.datasource.courseId}&taskId=${props.datasource.id}&taskType=${props.datasource.type}`)
}else{ }else{
window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&taskId=${props.datasource.id}&taskType=${props.datasource.type}`) window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportDiscussStudent?currentStageId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&taskId=${props.datasource.id}&taskType=${props.datasource.type}`)
} }
} }

1
src/components/drawers/router/RouterExaminationExternalManage.vue
View File

@@ -398,6 +398,7 @@
// 获取数据 // 获取数据
function getData() { function getData() {
state.loadingData = true; state.loadingData = true;
console.log(JSON.stringify(props.datasource))
api.QueryExternalExamManageDetail({ api.QueryExternalExamManageDetail({
chapterId: props.outchapter, chapterId: props.outchapter,
pageNo: state.currentPage, pageNo: state.currentPage,

14
src/views/courselibrary/CoursewareManage.vue
View File

@@ -3465,7 +3465,7 @@ export default defineComponent({
const options4CurId = ref(""); const options4CurId = ref("");
const options4CurName = ref("张"); const options4CurName = ref("张");
const of_hShow = () => { const of_hShow = () => {
state.offcourseId = ''; state.offcourseId = "";
getTea(); getTea();
if (state.of_hs == false) { if (state.of_hs == false) {
state.of_hs = true; state.of_hs = true;
@@ -3839,7 +3839,11 @@ export default defineComponent({
key: "8", key: "8",
align: "center", align: "center",
customRender: ({ record }) => customRender: ({ record }) =>
record.assessmentStatus ? "已评估" : "未评估", itm.courseScore === -1
? "-"
: record.assessmentStatus
? "已评估"
: "未评估",
}, },
{ {
title: "评分", title: "评分",
@@ -5245,8 +5249,8 @@ export default defineComponent({
} }
} }
.btn3:active { .btn3:active {
background: #0982ff; background: #0982ff;
} }
.btn3 { .btn3 {
.search { .search {
width: 17px; width: 17px;
@@ -6877,7 +6881,7 @@ export default defineComponent({
background: #4ea6ff; background: #4ea6ff;
border-radius: 8px; border-radius: 8px;
border: 1px solid rgba(64, 158, 255, 1); border: 1px solid rgba(64, 158, 255, 1);
color:#fff; color: #fff;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;