hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-11 03:46: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-26 19:10:16 +08:00
parent 8307259dcb 5371914b02
commit c3750e6f87
3 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/drawers/CheckAnsware.vue
View File

@@ -147,6 +147,7 @@ export default {
console.log(bool); console.log(bool);
if(bool == true) { if(bool == true) {
console.log(props.datasource) console.log(props.datasource)
console.log(props.answerId?props.answerId:props.datasource.answerId)
} }
} }
const getQue = () => { const getQue = () => {

9
src/components/drawers/project/ProjectFaceTaskManage.vue
View File

@@ -121,7 +121,7 @@
</div> </div>
</div> </div>
</a-drawer> </a-drawer>
<CheckAnsware v-model:CAvisible="CAvisible" :datasource="answerDatasource" :answerId="answerId"/> <CheckAnsware v-model:CAvisible="CAvisible" :datasource="datasource" :answerId="answerId"/>
<!-- 查看作业抽屉 --> <!-- 查看作业抽屉 -->
<CKWork <CKWork
v-model:CWvisible="CWvisible" v-model:CWvisible="CWvisible"
@@ -339,12 +339,9 @@ const batchFinish = () => {
}); });
}; };
const answerDatasource = ref(props.datasource);
const answerId = ref(''); const answerId = ref('');
const showExamAnswer = (answerId) => { const showExamAnswer = (id) => {
console.log(answerDatasource.value,answerId) answerId.value = id;
answerDatasource.value.answerId = answerId;
answerId.value = answerId;
CAvisible.value = true; CAvisible.value = true;
}; };

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

@@ -4296,7 +4296,6 @@ export default defineComponent({
// ] // ]
// commonExport(heads,list,"课程导出") // commonExport(heads,list,"课程导出")
// }) // })
window.open( window.open(
`${process.env.VUE_APP_BASE_API}/admin/offcourse/export?pageNo=${ `${process.env.VUE_APP_BASE_API}/admin/offcourse/export?pageNo=${
state.currentPage1 state.currentPage1
@@ -4306,8 +4305,8 @@ export default defineComponent({
state.projectName ? state.projectName : "" state.projectName ? state.projectName : ""
}&name=${state.name ? state.name : ""}&createName=${ }&name=${state.name ? state.name : ""}&createName=${
state.createName ? state.createName : "" state.createName ? state.createName : ""
}&endTime=${endTime ? endTime : ""}&beginTime=${ }&endTime=${endTime ? dayjs(new Date(state.projectTime[1].$d)).format('YYYY-MM-DD') : ""}&beginTime=${
startTime ? startTime : "" startTime ? dayjs(new Date(state.projectTime[0].$d)).format('YYYY-MM-DD') : ""
}&type=3` }&type=3`
); );