hz/fe-student
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-student.git synced 2025-12-14 21:36:47 +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-26 12:59:27 +08:00
parent 84a5231564 9635ff3ac0
commit 011723ed2c
5 changed files with 216 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,8 +25,8 @@
<img style="width: 15px; height: 17px" src="../../assets/image/time.png" />
<div style="margin-left: 8px">
{{ 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 v-if="data.planDto?.address" class="time" style="margin-top: 23px">
@@ -35,17 +35,17 @@
</div>
</div>
<div style="display: flex">
<botton class="btn" style="margin-right: 20px" :style="{
background: data.signFlag ? '#999' : 'rgb(57, 146, 249)',
}" @click="signClick">{{ data.signFlag ? "已签到" : "签到" }}
<botton class="btn" style="margin-right: 20px" :style="{
background: data.signFlag ? '#999' : 'rgb(57, 146, 249)',
}" @click="signClick">{{ data.signFlag ? "已签到" : "签到" }}
</botton>
<botton style="background: #999" class="btn" @click="toSurvery" v-if="data.planDto?.evalFlag == 0">
评估
</botton>
<botton :style="{
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 ? "已评估" : "评估" }}
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 ? "已评估" : "评估" }}
</botton>
</div>
</div>
@@ -79,10 +79,10 @@
:style="{ borderBottom: '1px solid rgba(56, 125, 247, 0.2)' }">
<div class="enclosureL">
<FileTypeImg :v-model="el.slice(el.indexOf('-') + 1)" :style="{
width: '22px',
height: '26px',
marginLeft: '10px',
}"></FileTypeImg>
width: '22px',
height: '26px',
marginLeft: '10px',
}"></FileTypeImg>
<div style="margin-left: 20px">{{ el.slice(el.indexOf('-') + 1) }}</div>
</div>
<div v-if="new Date(data.planDto.beginTime).getTime() > new Date().getTime()" class="download">
@@ -111,10 +111,10 @@
</div>
</div>
<div
:style="{ background: new Date(data.planDto?.beginTime).getTime() > new Date().getTime() ? '#999' : '' }"
class="submit" @click="toWork" >
class="submit" @click="toWork">
交作业
</div>
</div>
@@ -137,8 +137,8 @@
<div class="tag3" style="margin-left: 11px">考试</div>
</div>
</div>
<div
<div
:style="{ background: new Date(data.planDto?.beginTime).getTime() > new Date().getTime() ? '#999' : '' }"
class="submit" @click="toExamItem(data.examinationDto)">
去考试
@@ -322,10 +322,10 @@ function toSurvery() {
router.push({
path: "/surveydetail",
query: {
id: taskId,
courseId: data.value.planDto.evaluateId,
pName: "面授课",
taskId: data.value.planDto.offcoursePlanId,
taskIds: data.value.planDto.offcoursePlanId,
infoId: data.value.offcourseDto.offcourseId,
chapterOrStageId: 0,
sName: data.value.planDto.name,
type: 3
@@ -349,8 +349,7 @@ function toWork() {
query: {
courseId: data.value.workDto.workId,
id: taskId,
taskId: taskId,
taskIds: taskId,
infoId: data.value.offcourseDto.offcourseId,
chapterOrStageId: 0,
type,
pName: "面授课",
@@ -365,7 +364,7 @@ function toExamItem(obj) {
let date2 = new Date().getTime()
if (date1 > date2) {
ElMessage.warning("未到开始时间，请耐心等待！");
}
}
console.log("obj", obj.examinationTestId);