hz/fe-student
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-student.git synced 2025-12-12 12:26:49 +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
2022-12-23 19:03:08 +08:00
parent 968ad0c769 b171871d6f
commit ea82b689d2
5 changed files with 379 additions and 413 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/views/faceteach/FaceTeach.vue
View File

@@ -333,6 +333,7 @@ function toSurvery() {
courseId: data.value.planDto.evaluateId,
pName: "面授课",
sName: data.value.planDto.name,
type: 3
},
});
}

1
src/views/liveBroadcast/LiveBroadcast.vue
View File

@@ -213,6 +213,7 @@ const commitClick = () => {
courseId: data.value.assessmentId,
pName: "直播",
sName: data.value.liveName,
type: 4
},
});
};

5
src/views/project/ProjectDetails.vue
View File

@@ -375,8 +375,8 @@ function introductionPro() {
dialogVisible.value = true;
}
function toFinish(d, sName, chapterId) {
console.log("dddddd", d, sName);
function toFinish(d, sName, chapterOrStageId) {
console.log("dddddd", d, sName, chapterOrStageId);
// 作业过期判断
if (d.type == 4) {
let date1 = new Date(d.endTime).getTime();
@@ -472,6 +472,7 @@ function toFinish(d, sName, chapterId) {
courseId: d.courseId,
pName: data.value.name,
sName,
chapterOrStageId
},
});
} else if (typeof types.value.path[d.type] === "function") {

6
src/views/roadmap/PathDetails.vue
View File

@@ -368,6 +368,8 @@ const types = ref({
});
function toFinish(d) {
console.log(d)
console.log(data.value.currentStageId, routerId)
if (!types.value.path[d.type]) {
ElMessage.error("暂时未开放");
return;
@@ -390,11 +392,13 @@ function toFinish(d) {
router.push({
path: types.value.path[d.type],
query: {
id: d.routerTaskId,
// id: d.routerTaskId,
id: routerId,
type: 1,
courseId: d.courseId,
pName: data.value.name,
sName: data.value.currentStageName,
chapterOrStageId: data.value.currentStageId
},
});
} else if (typeof types.value.path[d.type] === "function") {

151
src/views/survey/SurveyDetail.vue
View File

@@ -1,9 +1,7 @@
<template>
<div class="surveydetail" style="padding: 30px">
<!-- 面包屑导航 -->
<div
style="display: flex; align-items: center; justify-content: space-between"
>
<div style="display: flex; align-items: center; justify-content: space-between">
<div class="crumb">
<div>{{ pName }}</div>
<div style="margin-left: 6px; margin-right: 6px">/</div>
@@ -29,11 +27,7 @@
</div>-->
<div class="return">
<div style="display: flex" @click="returnclick">
<img
class="img2"
style="margin-right: 22px"
src="../../assets/image/return.png"
/>
<img class="img2" style="margin-right: 22px" src="../../assets/image/return.png" />
<div class="text" style="color: #fff">返回</div>
</div>
</div>
@@ -49,34 +43,21 @@
return a[0].orderNumber - b[0].orderNumber
}) }} -->
<div
class="question"
v-for="
<div class="question" v-for="
(value, index) in formateArr([data.assessmentEssayQuestionDtoList, data.assessmentMultipleChoiceDtoList, data.assessmentScoringQuestionDtoList, data.assessmentSingleChoiceDtoList]).sort((a, b) => {
return a[0].orderNumber - b[0].orderNumber
}) "
:key="index"
:style="{ 'margin-top': index === 0 ? '57px' : '41px' }"
>
}) " :key="index" :style="{ 'margin-top': index === 0 ? '57px' : '41px' }">
<div v-if="value[0].questionType == '4'">
<div
class="question"
v-for="(value, index) in data.assessmentScoringQuestionDtoList"
:key="index"
:style="{ 'margin-top': index === 0 ? '57px' : '41px' }"
>
<div class="question" v-for="(value, index) in data.assessmentScoringQuestionDtoList" :key="index"
:style="{ 'margin-top': index === 0 ? '57px' : '41px' }">
<div class="text">{{ value.assessmentScTitle }}</div>
<div class="answer">
<div class="answerL">完全没用</div>
<div class="answerC">
<div
class="answerCitem"
v-for="(item, key) in Array.from(
<div class="answerCitem" v-for="(item, key) in Array.from(
{ length: value.assessmentMaxScore },
(k, i) => i
)"
:key="key"
:style="{
)" :key="key" :style="{
'margin-left': key === 0 ? '15px' : '10px',
background:
value.selectAnswer === item
@@ -86,16 +67,14 @@
value.selectAnswer === item
? '#fff'
: 'rgba(86, 163, 249, 1)',
}"
@click="
}" @click="
() => {
if (data.isSubmit) {
return;
}
value.selectAnswer = item;
}
"
>
">
<div>{{ item + 1 }}</div>
</div>
</div>
@@ -105,26 +84,18 @@
</div>
<div v-else-if="value[0].questionType == '1'">
<div
class="question"
style="margin-top: 41px"
v-if="
<div class="question" style="margin-top: 41px" v-if="
data.assessmentSingleChoiceDtoList &&
data.assessmentSingleChoiceDtoList.length
"
>
">
<div class="text">
{{ data.assessmentSingleChoiceDtoList[0]?.singleStemName }}
</div>
<div
v-for="(value, index) in data.assessmentSingleChoiceDtoList"
:key="index"
style="display: flex; align-items: center"
:style="{
<div v-for="(value, index) in data.assessmentSingleChoiceDtoList" :key="index"
style="display: flex; align-items: center" :style="{
'margin-top': index === 0 ? '29px' : '22px',
cursor: 'pointer',
}"
@click="
}" @click="
() => {
if (data.isSubmit) {
return;
@@ -134,72 +105,46 @@
});
value.select = true;
}
"
>
<img
style="width: 19px; height: 18px; cursor: pointer"
:src="value.select ? checkbox : checkbox2"
/>
">
<img style="width: 19px; height: 18px; cursor: pointer" :src="value.select ? checkbox : checkbox2" />
<div class="people">{{ value.singleOptionName }}</div>
</div>
</div>
</div>
<div v-else-if="value[0].questionType == '2'">
<div
class="question"
style="margin-top: 41px"
v-if="
<div class="question" style="margin-top: 41px" v-if="
data.assessmentMultipleChoiceDtoList &&
data.assessmentMultipleChoiceDtoList.length
"
>
">
<div class="text">
{{ data.assessmentMultipleChoiceDtoList[0]?.multipleStemName }}
</div>
<div
v-for="(value, index) in data.assessmentMultipleChoiceDtoList"
:key="index"
style="display: flex; align-items: center"
:style="{
<div v-for="(value, index) in data.assessmentMultipleChoiceDtoList" :key="index"
style="display: flex; align-items: center" :style="{
'margin-top': index === 0 ? '29px' : '22px',
cursor: 'pointer',
}"
@click="
}" @click="
() => {
if (data.isSubmit) {
return;
}
value.select = !value.select;
}
"
>
<img
style="width: 19px; height: 18px; cursor: pointer"
:src="value.select ? checkbox : checkbox2"
/>
">
<img style="width: 19px; height: 18px; cursor: pointer" :src="value.select ? checkbox : checkbox2" />
<div class="people">{{ value.multipleOptionName }}</div>
</div>
</div>
</div>
<div v-else-if="value[0].questionType == '3'">
<div
class="question"
style="margin-top: 41px"
v-for="(item, i) in data.assessmentEssayQuestionDtoList"
:key="i"
>
<div class="question" style="margin-top: 41px" v-for="(item, i) in data.assessmentEssayQuestionDtoList"
:key="i">
<div class="text">{{ item.assessmentQaTitle }}</div>
<div style="width: 713px; margin-top: 31px; position: relative">
<el-input
v-model="item.content"
:autosize="{ minRows: 5, maxRows: 5 }"
resize="none"
maxlength="200"
type="textarea"
:readonly="!!data.isSubmit"
/>
<el-input v-model="item.content" :autosize="{ minRows: 5, maxRows: 5 }" resize="none" maxlength="200"
type="textarea" :readonly="!!data.isSubmit" />
<div class="words">{{ item.content?.length || 0 }}/200</div>
</div>
</div>
@@ -345,20 +290,13 @@
</div>
</div> -->
<div
style="display: flex; justify-content: center"
v-if="
<div style="display: flex; justify-content: center" v-if="
data.assessmentEssayQuestionDtoList?.length ||
data.assessmentMultipleChoiceDtoList?.length ||
data.assessmentSingleChoiceDtoList?.length ||
data.assessmentScoringQuestionDtoList?.length
"
>
<div
class="submit"
@click="submit"
:style="{ background: data.isSubmit ? '#999' : '#2478ff' }"
>
">
<div class="submit" @click="submit" :style="{ background: data.isSubmit ? '#999' : '#2478ff' }">
提交
</div>
</div>
@@ -373,8 +311,12 @@
</span></div>
<template #footer>
<span class="dialog-footer">
<el-button class="cancel" style="color: #387DF7; border: 1px solid #387DF7;padding: 8px 32px; border-radius: 4px;" @click="centerDialogVisible = false">取消</el-button>
<el-button class="back" style="background: #387DF7;box-shadow: 1px 2px 15px 1px rgba(56,125,247,0.34);border: 0px;padding: 8px 32px;" type="primary" @click="returnclick">
<el-button class="cancel"
style="color: #387DF7; border: 1px solid #387DF7;padding: 8px 32px; border-radius: 4px;"
@click="centerDialogVisible = false">取消</el-button>
<el-button class="back"
style="background: #387DF7;box-shadow: 1px 2px 15px 1px rgba(56,125,247,0.34);border: 0px;padding: 8px 32px;"
type="primary" @click="returnclick">
返回
</el-button>
</span>
@@ -391,7 +333,7 @@ import { ElMessage } from "element-plus";
import { ref } from "vue";
const {
query: { courseId, id: taskId, type, pName, sName },
query: { courseId, id: taskId, type, pName, sName, chapterOrStageId },
} = useRoute();
const router = useRouter();
const returnclick = () => {
@@ -422,6 +364,17 @@ const open=()=>{
centerDialogVisible.value = true
};
function submit() {
if (1 > 0) {
console.log(data)
console.log('我是提交的数据', {
targetId: taskId, // 项目、路径图或开课的Id
chapterOrStageId: chapterOrStageId, // 关卡或者阶段Id 关卡Id不允许为空
assessmentId: courseId,
taskId,
type,
result: JSON.stringify(data.value),
})
}
if (data.value.isSubmit) {
return;
}
@@ -468,6 +421,8 @@ function submit() {
}
data.value.isSubmit = !data.value.isSubmit;
request(ASSESSMENT_SUBMIT, {
targetId: taskId, // 项目、路径图或开课的Id
chapterOrStageId: chapterOrStageId, // 关卡或者阶段Id 关卡Id不允许为空
assessmentId: courseId,
taskId,
type,
@@ -486,9 +441,11 @@ function submit() {
font-size: 14px;
line-height: 24px;
}
.return {
position: absolute;
right: 10%;
.text {
text-align: center;
display: flex;
@@ -496,6 +453,7 @@ function submit() {
align-items: center;
}
}
.prevnext {
display: flex;
align-items: center;
@@ -553,6 +511,7 @@ function submit() {
align-items: center;
margin-left: 11px;
margin-right: 11px;
// justify-content: center;
.answerCitem {
width: 40px;