mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-student.git
synced 2025-12-12 04:16:50 +08:00
fix:修改参数传递
This commit is contained in:
@@ -26,7 +26,7 @@
|
|||||||
<div style="margin-left: 8px">
|
<div style="margin-left: 8px">
|
||||||
{{ dayjs(data.planDto?.beginTime).format('YYYY-MM-DD HH:MM') + " 至 " +
|
{{ dayjs(data.planDto?.beginTime).format('YYYY-MM-DD HH:MM') + " 至 " +
|
||||||
dayjs(data.planDto?.endTime).format('YYYY-MM-DD HH:MM')
|
dayjs(data.planDto?.endTime).format('YYYY-MM-DD HH:MM')
|
||||||
}}
|
}}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div v-if="data.planDto?.address" class="time" style="margin-top: 23px">
|
<div v-if="data.planDto?.address" class="time" style="margin-top: 23px">
|
||||||
@@ -38,14 +38,14 @@
|
|||||||
|
|
||||||
<botton class="btn" style="margin-right: 20px" :style="{
|
<botton class="btn" style="margin-right: 20px" :style="{
|
||||||
background: data.signFlag ? '#999' : 'rgb(57, 146, 249)',
|
background: data.signFlag ? '#999' : 'rgb(57, 146, 249)',
|
||||||
}" @click="signClick">{{ data.signFlag ? "已签到" : "签到" }}
|
}" @click="signClick">{{ data.signFlag ? "已签到" : "签到" }}
|
||||||
</botton>
|
</botton>
|
||||||
<botton style="background: #999" class="btn" @click="toSurvery" v-if="data.planDto?.evalFlag == 0">
|
<botton style="background: #999" class="btn" @click="toSurvery" v-if="data.planDto?.evalFlag == 0">
|
||||||
评估
|
评估
|
||||||
</botton>
|
</botton>
|
||||||
<botton :style="{
|
<botton :style="{
|
||||||
background: `${new Date(data.planDto?.beginTime).getTime() > new Date().getTime() ? '#999' : data.isSurvery ? '#999' : 'rgb(57, 146, 249)'}`,
|
background: `${new Date(data.planDto?.beginTime).getTime() > new Date().getTime() ? '#999' : data.isSurvery ? '#999' : 'rgb(57, 146, 249)'}`,
|
||||||
}" class="btn" @click="toSurvery" v-else>{{ data.isSurvery ? "已评估" : "评估" }}
|
}" class="btn" @click="toSurvery" v-else>{{ data.isSurvery ? "已评估" : "评估" }}
|
||||||
</botton>
|
</botton>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -82,7 +82,7 @@
|
|||||||
width: '22px',
|
width: '22px',
|
||||||
height: '26px',
|
height: '26px',
|
||||||
marginLeft: '10px',
|
marginLeft: '10px',
|
||||||
}"></FileTypeImg>
|
}"></FileTypeImg>
|
||||||
<div style="margin-left: 20px">{{ el.slice(el.indexOf('-') + 1) }}</div>
|
<div style="margin-left: 20px">{{ el.slice(el.indexOf('-') + 1) }}</div>
|
||||||
</div>
|
</div>
|
||||||
<div v-if="new Date(data.planDto.beginTime).getTime() > new Date().getTime()" class="download">
|
<div v-if="new Date(data.planDto.beginTime).getTime() > new Date().getTime()" class="download">
|
||||||
@@ -114,7 +114,7 @@
|
|||||||
|
|
||||||
<div
|
<div
|
||||||
:style="{ background: new Date(data.planDto?.beginTime).getTime() > new Date().getTime() ? '#999' : '' }"
|
:style="{ background: new Date(data.planDto?.beginTime).getTime() > new Date().getTime() ? '#999' : '' }"
|
||||||
class="submit" @click="toWork" >
|
class="submit" @click="toWork">
|
||||||
交作业
|
交作业
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -349,8 +349,7 @@ function toWork() {
|
|||||||
query: {
|
query: {
|
||||||
courseId: data.value.workDto.workId,
|
courseId: data.value.workDto.workId,
|
||||||
id: taskId,
|
id: taskId,
|
||||||
taskId: taskId,
|
infoId: taskId,
|
||||||
taskIds: taskId,
|
|
||||||
chapterOrStageId: 0,
|
chapterOrStageId: 0,
|
||||||
type,
|
type,
|
||||||
pName: "面授课",
|
pName: "面授课",
|
||||||
|
|||||||
@@ -48,20 +48,22 @@
|
|||||||
<div class="threeBtn">
|
<div class="threeBtn">
|
||||||
<botton class="btn" :style="{
|
<botton class="btn" :style="{
|
||||||
background: `${new Date(data.liveStartTime).getTime() > new Date().getTime() ? '#999' : 'rgb(59, 191, 252)'}`,
|
background: `${new Date(data.liveStartTime).getTime() > new Date().getTime() ? '#999' : 'rgb(59, 191, 252)'}`,
|
||||||
}" @click="showClick">观看
|
}" @click="showClick">观看
|
||||||
</botton>
|
</botton>
|
||||||
|
|
||||||
<botton class="btn" :style="{
|
<botton class="btn" :style="{
|
||||||
background: `${new Date(data.liveStartTime).getTime() > new Date().getTime() ? '#999' : data.signFlag ? '#999' : 'rgb(57, 146, 249)'}`,
|
background: `${new Date(data.liveStartTime).getTime() > new Date().getTime() ? '#999' : data.signFlag ? '#999' : 'rgb(57, 146, 249)'}`,
|
||||||
}" @click="signClick">{{ data.signFlag ? "已签到" : "签到" }}
|
}" @click="signClick">{{ data.signFlag ? "已签到" : "签到" }}
|
||||||
</botton>
|
</botton>
|
||||||
<botton style="background: #999" class="btn" @click="commitClick" v-if="data.isEvaluate == 0 ">
|
<botton style="background: #999" class="btn" @click="commitClick" v-if="data.isEvaluate == 0">
|
||||||
评估
|
评估
|
||||||
</botton>
|
</botton>
|
||||||
|
|
||||||
<botton :style="{
|
<botton :style="{
|
||||||
background: `${new Date(data.liveStartTime).getTime() > new Date().getTime() ? '#999' : data.isSurvery ? '#999' : 'rgb(57, 146, 249)'}`,
|
background: `${new Date(data.liveStartTime).getTime() > new Date().getTime() ? '#999' : data.isSurvery ? '#999' : 'rgb(57, 146, 249)'}`,
|
||||||
}" class="btn" @click="commitClick" v-if="data.isEvaluate && data.isEvaluate == 1">{{ data.isSurvery ? "已评估": "评估"}}
|
}" class="btn" @click="commitClick" v-if="data.isEvaluate && data.isEvaluate == 1">{{ data.isSurvery ? "已评估" :
|
||||||
|
"评估"
|
||||||
|
}}
|
||||||
</botton>
|
</botton>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -138,7 +140,7 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup>
|
<script setup>
|
||||||
import { computed, reactive, toRefs,onUnmounted } from "vue";
|
import { computed, reactive, toRefs, onUnmounted } from "vue";
|
||||||
import img from "@/assets/image/uploadimg.png";
|
import img from "@/assets/image/uploadimg.png";
|
||||||
import { request, useRequest } from "@/api/request";
|
import { request, useRequest } from "@/api/request";
|
||||||
import { TASK_BROADCAST_DETAIL, TASK_BROADCAST_SIGN } from "@/api/api";
|
import { TASK_BROADCAST_DETAIL, TASK_BROADCAST_SIGN } from "@/api/api";
|
||||||
@@ -264,8 +266,7 @@ const commitClick = () => {
|
|||||||
path: "/surveydetail",
|
path: "/surveydetail",
|
||||||
query: {
|
query: {
|
||||||
courseId: data.value.assessmentId,
|
courseId: data.value.assessmentId,
|
||||||
taskId: data.value.liveId,
|
infoId: data.value.liveId,
|
||||||
taskIds: data.value.liveId,
|
|
||||||
chapterOrStageId: 0,
|
chapterOrStageId: 0,
|
||||||
pName: "直播",
|
pName: "直播",
|
||||||
sName: data.value.liveName,
|
sName: data.value.liveName,
|
||||||
|
|||||||
@@ -4,7 +4,8 @@
|
|||||||
|
|
||||||
<div class="pdname">
|
<div class="pdname">
|
||||||
{{ data.name }}
|
{{ data.name }}
|
||||||
<el-popover v-if="data.remark" ref="popover" popper-class="jianjie" placement="right" trigger="hover" :width="300" :content="data.remark">
|
<el-popover v-if="data.remark" ref="popover" popper-class="jianjie" placement="right" trigger="hover" :width="300"
|
||||||
|
:content="data.remark">
|
||||||
<template #reference><span style="font-size: 16px;font-weight: 600;">简介></span></template>
|
<template #reference><span style="font-size: 16px;font-weight: 600;">简介></span></template>
|
||||||
</el-popover>
|
</el-popover>
|
||||||
</div>
|
</div>
|
||||||
@@ -30,7 +31,7 @@
|
|||||||
<div v-if="i.stageId == '0' && i.taskProcessList.length == 0"></div>
|
<div v-if="i.stageId == '0' && i.taskProcessList.length == 0"></div>
|
||||||
<div v-else class="course" v-for="(value, index) in i.taskProcessList.filter(
|
<div v-else class="course" v-for="(value, index) in i.taskProcessList.filter(
|
||||||
(e) => !whiteTypes(e.type)
|
(e) => !whiteTypes(e.type)
|
||||||
)" :key="index">
|
)" :key="index">
|
||||||
<div style="width: 70%">
|
<div style="width: 70%">
|
||||||
<div v-if="value.name.length > 50" class="coursename" :title="value.name">
|
<div v-if="value.name.length > 50" class="coursename" :title="value.name">
|
||||||
<el-popover ref="popover" placement="right" trigger="hover" :width="300" :content="value.name">
|
<el-popover ref="popover" placement="right" trigger="hover" :width="300" :content="value.name">
|
||||||
@@ -71,7 +72,7 @@
|
|||||||
4: 'rgba(57, 219, 183, 1)',
|
4: 'rgba(57, 219, 183, 1)',
|
||||||
5: 'rgba(57, 219, 183, 1)',
|
5: 'rgba(57, 219, 183, 1)',
|
||||||
}[parseInt(value.currentRatio / 20)]
|
}[parseInt(value.currentRatio / 20)]
|
||||||
" />
|
" />
|
||||||
</div>
|
</div>
|
||||||
<div style="font-size: 14px;font-weight: 500;color: #277aff;margin-left: 10px;color:#677d86;">
|
<div style="font-size: 14px;font-weight: 500;color: #277aff;margin-left: 10px;color:#677d86;">
|
||||||
{{ value.currentRatio }}%
|
{{ value.currentRatio }}%
|
||||||
@@ -86,7 +87,7 @@
|
|||||||
: types.path[value.type]
|
: types.path[value.type]
|
||||||
? types.toName[value.type]
|
? types.toName[value.type]
|
||||||
: "未开放"
|
: "未开放"
|
||||||
}}
|
}}
|
||||||
</div>
|
</div>
|
||||||
<!-- <div :style="{ display: value.status === 1 ? 'block' : 'none' }">-->
|
<!-- <div :style="{ display: value.status === 1 ? 'block' : 'none' }">-->
|
||||||
<!-- <div-->
|
<!-- <div-->
|
||||||
@@ -193,7 +194,7 @@
|
|||||||
4: 'rgba(57, 219, 183, 1)',
|
4: 'rgba(57, 219, 183, 1)',
|
||||||
5: 'rgba(57, 219, 183, 1)',
|
5: 'rgba(57, 219, 183, 1)',
|
||||||
}[parseInt((data.totalProgress * 100) / 20)]
|
}[parseInt((data.totalProgress * 100) / 20)]
|
||||||
" />
|
" />
|
||||||
</div>
|
</div>
|
||||||
<div style="font-size: 14px; font-weight: 500; margin-left: 10px;color:#677d86;">
|
<div style="font-size: 14px; font-weight: 500; margin-left: 10px;color:#677d86;">
|
||||||
{{ parseInt(data.totalProgress * 100) }}%
|
{{ parseInt(data.totalProgress * 100) }}%
|
||||||
@@ -216,7 +217,7 @@
|
|||||||
4: 'rgba(57, 219, 183, 1)',
|
4: 'rgba(57, 219, 183, 1)',
|
||||||
5: 'rgba(57, 219, 183, 1)',
|
5: 'rgba(57, 219, 183, 1)',
|
||||||
}[parseInt((data.compulsoryProgress * 100) / 20)]
|
}[parseInt((data.compulsoryProgress * 100) / 20)]
|
||||||
" />
|
" />
|
||||||
</div>
|
</div>
|
||||||
<div style="
|
<div style="
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
@@ -456,8 +457,7 @@ function toFinish(d, sName, chapterOrStageId) {
|
|||||||
query: {
|
query: {
|
||||||
id: d.projectTaskId,
|
id: d.projectTaskId,
|
||||||
type: 2,
|
type: 2,
|
||||||
taskId: data.value.projectId,
|
infoId: data.value.projectId,
|
||||||
taskIds: data.value.projectId,
|
|
||||||
courseId: d.courseId,
|
courseId: d.courseId,
|
||||||
pName: data.value.name,
|
pName: data.value.name,
|
||||||
sName,
|
sName,
|
||||||
@@ -477,6 +477,7 @@ function whiteTypes(type) {
|
|||||||
.example-showcase .el-loading-mask {
|
.example-showcase .el-loading-mask {
|
||||||
z-index: 9;
|
z-index: 9;
|
||||||
}
|
}
|
||||||
|
|
||||||
.pathdetails {
|
.pathdetails {
|
||||||
.el-dialog__header {
|
.el-dialog__header {
|
||||||
display: none;
|
display: none;
|
||||||
|
|||||||
@@ -6,7 +6,8 @@
|
|||||||
|
|
||||||
<div class="pdname">
|
<div class="pdname">
|
||||||
{{ data.name }}
|
{{ data.name }}
|
||||||
<el-popover v-if="data.remark" ref="popover" popper-class="jianjie" placement="right" trigger="hover" :width="300" :content="data.remark">
|
<el-popover v-if="data.remark" ref="popover" popper-class="jianjie" placement="right" trigger="hover" :width="300"
|
||||||
|
:content="data.remark">
|
||||||
<template #reference><span style="font-size: 16px;font-weight: 600;">简介></span></template>
|
<template #reference><span style="font-size: 16px;font-weight: 600;">简介></span></template>
|
||||||
</el-popover>
|
</el-popover>
|
||||||
</div>
|
</div>
|
||||||
@@ -18,22 +19,17 @@
|
|||||||
<div class="title">
|
<div class="title">
|
||||||
<div class="titleL">{{ data.currentStageName }}</div>
|
<div class="titleL">{{ data.currentStageName }}</div>
|
||||||
<div class="titleR" :style="{ display: 'flex' }">
|
<div class="titleR" :style="{ display: 'flex' }">
|
||||||
<img
|
<img :src="data.currentChapterCnt ? circle : circle2" />
|
||||||
:src="data.currentChapterCnt?circle:circle2"/>
|
<div class="titleRT" :style="{ color: data.currentChapterCnt ? '' : 'rgba(102, 102, 102, 1)' }">
|
||||||
<div class="titleRT" :style="{color:data.currentChapterCnt?'':'rgba(102, 102, 102, 1)'}">
|
|
||||||
{{ data.currentChapterCnt ? '进行中' : '未开始' }}
|
{{ data.currentChapterCnt ? '进行中' : '未开始' }}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div class="course" v-for="(value, index) in data.taskBoList?.filter(
|
||||||
class="course"
|
|
||||||
v-for="(value, index) in data.taskBoList?.filter(
|
|
||||||
(e) => !whiteTypes(e.type)
|
(e) => !whiteTypes(e.type)
|
||||||
)"
|
)" :key="index">
|
||||||
:key="index"
|
|
||||||
>
|
|
||||||
<div style="width: 70%">
|
<div style="width: 70%">
|
||||||
<div v-if="value.name.length >50" class="coursename" :title="value.name">
|
<div v-if="value.name.length > 50" class="coursename" :title="value.name">
|
||||||
<el-popover ref="popover" placement="right" trigger="hover" :width="300" :content="value.name">
|
<el-popover ref="popover" placement="right" trigger="hover" :width="300" :content="value.name">
|
||||||
<template #reference>{{ value.name }}</template>
|
<template #reference>{{ value.name }}</template>
|
||||||
</el-popover>
|
</el-popover>
|
||||||
@@ -43,18 +39,10 @@
|
|||||||
{{ value.name }}
|
{{ value.name }}
|
||||||
</div>
|
</div>
|
||||||
<div class="coursetag">
|
<div class="coursetag">
|
||||||
<div
|
<div class="tag1" style="margin-right: 11px; margin-top: 16px" v-if="value.flag">
|
||||||
class="tag1"
|
|
||||||
style="margin-right: 11px; margin-top: 16px"
|
|
||||||
v-if="value.flag"
|
|
||||||
>
|
|
||||||
必修
|
必修
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div class="tag2" style="margin-right: 11px; margin-top: 16px" v-if="!value.flag">
|
||||||
class="tag2"
|
|
||||||
style="margin-right: 11px; margin-top: 16px"
|
|
||||||
v-if="!value.flag"
|
|
||||||
>
|
|
||||||
选修
|
选修
|
||||||
</div>
|
</div>
|
||||||
<div class="tag3" style="margin-right: 11px; margin-top: 16px">
|
<div class="tag3" style="margin-right: 11px; margin-top: 16px">
|
||||||
@@ -83,10 +71,9 @@
|
|||||||
4: 'rgba(57, 219, 183, 1)',
|
4: 'rgba(57, 219, 183, 1)',
|
||||||
5: 'rgba(57, 219, 183, 1)',
|
5: 'rgba(57, 219, 183, 1)',
|
||||||
}[parseInt(value.currentRatio / 20)]
|
}[parseInt(value.currentRatio / 20)]
|
||||||
" />
|
" />
|
||||||
</div>
|
</div>
|
||||||
<div style="font-size: 14px;font-weight: 500;color: #277aff;margin-left: 10px;"
|
<div style="font-size: 14px;font-weight: 500;color: #277aff;margin-left: 10px;" :style="{
|
||||||
:style="{
|
|
||||||
color: {
|
color: {
|
||||||
0: 'rgba(238, 112, 108, 1)',
|
0: 'rgba(238, 112, 108, 1)',
|
||||||
1: 'rgba(255, 151, 38, 1)',
|
1: 'rgba(255, 151, 38, 1)',
|
||||||
@@ -95,7 +82,7 @@
|
|||||||
4: 'rgba(57, 219, 183, 1)',
|
4: 'rgba(57, 219, 183, 1)',
|
||||||
5: 'rgba(57, 219, 183, 1)',
|
5: 'rgba(57, 219, 183, 1)',
|
||||||
}[parseInt(value.currentRatio / 20)],
|
}[parseInt(value.currentRatio / 20)],
|
||||||
}">
|
}">
|
||||||
{{ value.currentRatio }}%
|
{{ value.currentRatio }}%
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -103,7 +90,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="goclass" :style="{
|
<div class="goclass" :style="{
|
||||||
background: `${types.path[value.type] ? '#2478ff' : '#999'}`,
|
background: `${types.path[value.type] ? '#2478ff' : '#999'}`,
|
||||||
}" @click="toFinish(value)">
|
}" @click="toFinish(value)">
|
||||||
{{ value.currentRatio === 100 ? "已完成" : types.path[value.type] ? types.toName[value.type] : "未开放" }}
|
{{ value.currentRatio === 100 ? "已完成" : types.path[value.type] ? types.toName[value.type] : "未开放" }}
|
||||||
</div>
|
</div>
|
||||||
<!-- <div :style="{ display: value.status === 1 ? 'block' : 'none' }">-->
|
<!-- <div :style="{ display: value.status === 1 ? 'block' : 'none' }">-->
|
||||||
@@ -211,7 +198,7 @@
|
|||||||
4: 'rgba(57, 219, 183, 1)',
|
4: 'rgba(57, 219, 183, 1)',
|
||||||
5: 'rgba(57, 219, 183, 1)',
|
5: 'rgba(57, 219, 183, 1)',
|
||||||
}[(parseInt(data.currentChapterCnt / data.totalChapterCnt) * 100) / 20]
|
}[(parseInt(data.currentChapterCnt / data.totalChapterCnt) * 100) / 20]
|
||||||
" />
|
" />
|
||||||
</div>
|
</div>
|
||||||
<div style="font-size: 14px; font-weight: 500; margin-left: 10px" :style="{
|
<div style="font-size: 14px; font-weight: 500; margin-left: 10px" :style="{
|
||||||
color: {
|
color: {
|
||||||
@@ -222,7 +209,7 @@
|
|||||||
4: 'rgba(57, 219, 183, 1)',
|
4: 'rgba(57, 219, 183, 1)',
|
||||||
5: 'rgba(57, 219, 183, 1)',
|
5: 'rgba(57, 219, 183, 1)',
|
||||||
}[parseInt((data.currentChapterCnt / data.totalChapterCnt * 100) / 20)],
|
}[parseInt((data.currentChapterCnt / data.totalChapterCnt * 100) / 20)],
|
||||||
}">
|
}">
|
||||||
{{ parseInt(data.currentChapterCnt / data.totalChapterCnt * 100) }}%
|
{{ parseInt(data.currentChapterCnt / data.totalChapterCnt * 100) }}%
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -243,7 +230,7 @@
|
|||||||
4: 'rgba(57, 219, 183, 1)',
|
4: 'rgba(57, 219, 183, 1)',
|
||||||
5: 'rgba(57, 219, 183, 1)',
|
5: 'rgba(57, 219, 183, 1)',
|
||||||
}[parseInt((data.currentReqCnt / data.totalReqCnt * 100) / 20)]
|
}[parseInt((data.currentReqCnt / data.totalReqCnt * 100) / 20)]
|
||||||
" />
|
" />
|
||||||
</div>
|
</div>
|
||||||
<div style="
|
<div style="
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
@@ -259,7 +246,7 @@
|
|||||||
4: 'rgba(57, 219, 183, 1)',
|
4: 'rgba(57, 219, 183, 1)',
|
||||||
5: 'rgba(57, 219, 183, 1)',
|
5: 'rgba(57, 219, 183, 1)',
|
||||||
}[parseInt((data.currentReqCnt / data.totalReqCnt * 100) / 20)],
|
}[parseInt((data.currentReqCnt / data.totalReqCnt * 100) / 20)],
|
||||||
}">
|
}">
|
||||||
{{ parseInt(data.currentReqCnt / data.totalReqCnt * 100) }}%
|
{{ parseInt(data.currentReqCnt / data.totalReqCnt * 100) }}%
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -463,11 +450,9 @@ function toFinish(d) {
|
|||||||
router.push({
|
router.push({
|
||||||
path: types.value.path[d.type],
|
path: types.value.path[d.type],
|
||||||
query: {
|
query: {
|
||||||
id: d.routerTaskId,
|
id: routerId,
|
||||||
// id: routerId,
|
|
||||||
type: 1,
|
type: 1,
|
||||||
taskId: routerId,
|
infoId: routerId,
|
||||||
taskIds: routerId,
|
|
||||||
courseId: d.courseId,
|
courseId: d.courseId,
|
||||||
pName: data.value.name,
|
pName: data.value.name,
|
||||||
sName: data.value.currentStageName,
|
sName: data.value.currentStageName,
|
||||||
@@ -508,6 +493,7 @@ function whiteTypes(type) {
|
|||||||
margin-top: 24px;
|
margin-top: 24px;
|
||||||
display: flex;
|
display: flex;
|
||||||
z-index: 2;
|
z-index: 2;
|
||||||
|
|
||||||
.detailL {
|
.detailL {
|
||||||
flex: 1;
|
flex: 1;
|
||||||
margin-right: 20px;
|
margin-right: 20px;
|
||||||
|
|||||||
@@ -47,7 +47,7 @@
|
|||||||
<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) => {
|
(value, index) in formateArr([data.assessmentEssayQuestionDtoList, data.assessmentMultipleChoiceDtoList, data.assessmentScoringQuestionDtoList, data.assessmentSingleChoiceDtoList]).sort((a, b) => {
|
||||||
return a[0].orderNumber - b[0].orderNumber
|
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 v-if="value[0].questionType == '4'">
|
||||||
<div class="question" v-for="(value, index) in data.assessmentScoringQuestionDtoList" :key="index"
|
<div class="question" v-for="(value, index) in data.assessmentScoringQuestionDtoList" :key="index"
|
||||||
:style="{ 'margin-top': index === 0 ? '57px' : '41px' }">
|
:style="{ 'margin-top': index === 0 ? '57px' : '41px' }">
|
||||||
@@ -58,7 +58,7 @@
|
|||||||
<div class="answerCitem" v-for="(item, key) in Array.from(
|
<div class="answerCitem" v-for="(item, key) in Array.from(
|
||||||
{ length: value.assessmentMaxScore },
|
{ length: value.assessmentMaxScore },
|
||||||
(k, i) => i
|
(k, i) => i
|
||||||
)" :key="key" :style="{
|
)" :key="key" :style="{
|
||||||
'margin-left': key === 0 ? '15px' : '10px',
|
'margin-left': key === 0 ? '15px' : '10px',
|
||||||
background:
|
background:
|
||||||
value.selectAnswer === item
|
value.selectAnswer === item
|
||||||
@@ -88,7 +88,7 @@
|
|||||||
<div class="question" style="margin-top: 41px" v-if="
|
<div class="question" style="margin-top: 41px" v-if="
|
||||||
data.assessmentSingleChoiceDtoList &&
|
data.assessmentSingleChoiceDtoList &&
|
||||||
data.assessmentSingleChoiceDtoList.length
|
data.assessmentSingleChoiceDtoList.length
|
||||||
">
|
">
|
||||||
<div class="text">
|
<div class="text">
|
||||||
{{ data.assessmentSingleChoiceDtoList[0]?.singleStemName }}
|
{{ data.assessmentSingleChoiceDtoList[0]?.singleStemName }}
|
||||||
</div>
|
</div>
|
||||||
@@ -96,7 +96,7 @@
|
|||||||
style="display: flex; align-items: center" :style="{
|
style="display: flex; align-items: center" :style="{
|
||||||
'margin-top': index === 0 ? '29px' : '22px',
|
'margin-top': index === 0 ? '29px' : '22px',
|
||||||
cursor: 'pointer',
|
cursor: 'pointer',
|
||||||
}" @click="
|
}" @click="
|
||||||
() => {
|
() => {
|
||||||
if (data.isSubmit) {
|
if (data.isSubmit) {
|
||||||
return;
|
return;
|
||||||
@@ -117,7 +117,7 @@
|
|||||||
<div class="question" style="margin-top: 41px" v-if="
|
<div class="question" style="margin-top: 41px" v-if="
|
||||||
data.assessmentMultipleChoiceDtoList &&
|
data.assessmentMultipleChoiceDtoList &&
|
||||||
data.assessmentMultipleChoiceDtoList.length
|
data.assessmentMultipleChoiceDtoList.length
|
||||||
">
|
">
|
||||||
<div class="text">
|
<div class="text">
|
||||||
{{ data.assessmentMultipleChoiceDtoList[0]?.multipleStemName }}
|
{{ data.assessmentMultipleChoiceDtoList[0]?.multipleStemName }}
|
||||||
</div>
|
</div>
|
||||||
@@ -125,7 +125,7 @@
|
|||||||
style="display: flex; align-items: center" :style="{
|
style="display: flex; align-items: center" :style="{
|
||||||
'margin-top': index === 0 ? '29px' : '22px',
|
'margin-top': index === 0 ? '29px' : '22px',
|
||||||
cursor: 'pointer',
|
cursor: 'pointer',
|
||||||
}" @click="
|
}" @click="
|
||||||
() => {
|
() => {
|
||||||
if (data.isSubmit) {
|
if (data.isSubmit) {
|
||||||
return;
|
return;
|
||||||
@@ -296,7 +296,7 @@
|
|||||||
data.assessmentMultipleChoiceDtoList?.length ||
|
data.assessmentMultipleChoiceDtoList?.length ||
|
||||||
data.assessmentSingleChoiceDtoList?.length ||
|
data.assessmentSingleChoiceDtoList?.length ||
|
||||||
data.assessmentScoringQuestionDtoList?.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>
|
||||||
@@ -334,7 +334,7 @@ import { ElMessage } from "element-plus";
|
|||||||
import { ref } from "vue";
|
import { ref } from "vue";
|
||||||
|
|
||||||
const {
|
const {
|
||||||
query: { courseId, id: taskId, taskIds, type, pName, sName, chapterOrStageId },
|
query: { courseId, id: taskId, infoId, type, pName, sName, chapterOrStageId },
|
||||||
} = useRoute();
|
} = useRoute();
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
const returnclick = () => {
|
const returnclick = () => {
|
||||||
@@ -353,8 +353,8 @@ function formateArr(arr1) {
|
|||||||
return newarr
|
return newarr
|
||||||
}
|
}
|
||||||
|
|
||||||
const { data } = useRequest(ASSESSMENT_QUERY(courseId), { id: courseId, type, chapterOrStageId, targetId: taskIds ? taskIds : 0 });
|
const { data } = useRequest(ASSESSMENT_QUERY(courseId), { id: courseId, type, chapterOrStageId, targetId: infoId ? infoId : 0 });
|
||||||
console.log('我是查询评估的参数', { id: courseId, type, chapterOrStageId, targetId: taskIds ? taskIds : 0 })
|
console.log('我是查询评估的参数', { id: courseId, type, chapterOrStageId, targetId: infoId ? infoId : 0 })
|
||||||
console.log('我是需要排序得题目', data)
|
console.log('我是需要排序得题目', data)
|
||||||
|
|
||||||
function goHome() {
|
function goHome() {
|
||||||
@@ -369,10 +369,10 @@ function submit() {
|
|||||||
if (1 > 0) {
|
if (1 > 0) {
|
||||||
console.log(data)
|
console.log(data)
|
||||||
console.log('我是提交的数据', {
|
console.log('我是提交的数据', {
|
||||||
targetId: taskId ? taskId : taskIds ? taskIds : 0, // 项目、路径图或开课的Id
|
targetId: infoId ? infoId : 0, // 项目、路径图或开课的Id
|
||||||
chapterOrStageId: chapterOrStageId ? chapterOrStageId : 0, // 关卡或者阶段Id 关卡Id不允许为空
|
chapterOrStageId: chapterOrStageId ? chapterOrStageId : 0, // 关卡或者阶段Id 关卡Id不允许为空
|
||||||
assessmentId: courseId,
|
assessmentId: courseId,
|
||||||
taskId: taskId ? taskId : taskIds ? taskIds : 0,
|
taskId: taskId ? taskId : 0,
|
||||||
type,
|
type,
|
||||||
result: JSON.stringify(data.value),
|
result: JSON.stringify(data.value),
|
||||||
})
|
})
|
||||||
@@ -424,10 +424,10 @@ function submit() {
|
|||||||
|
|
||||||
data.value.isSubmit = !data.value.isSubmit;
|
data.value.isSubmit = !data.value.isSubmit;
|
||||||
request(ASSESSMENT_SUBMIT, {
|
request(ASSESSMENT_SUBMIT, {
|
||||||
targetId: taskIds ? taskIds : 0, // 项目、路径图或开课的Id
|
targetId: infoId ? infoId : 0, // 项目、路径图或开课的Id
|
||||||
chapterOrStageId: chapterOrStageId ? chapterOrStageId : 0, // 关卡或者阶段Id 关卡Id不允许为空
|
chapterOrStageId: chapterOrStageId ? chapterOrStageId : 0, // 关卡或者阶段Id 关卡Id不允许为空
|
||||||
assessmentId: courseId,
|
assessmentId: courseId,
|
||||||
taskId: taskIds ? taskIds : 0,
|
taskId: taskId ? taskId : 0,
|
||||||
type,
|
type,
|
||||||
result: JSON.stringify(data.value),
|
result: JSON.stringify(data.value),
|
||||||
}).then(() => {
|
}).then(() => {
|
||||||
|
|||||||
Reference in New Issue
Block a user