hz/fe-student
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-student.git synced 2025-12-15 13:56:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	src/views/project/ProjectDetails.vue
This commit is contained in:
yuping
2022-12-30 16:18:26 +08:00
parent 76588c05a1 4d9b51b3ce
commit 6eb6bacc9c
8 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/App.vue
View File

@@ -36,7 +36,7 @@ import { useStore } from "vuex";
import { onMounted } from "vue"; import { onMounted } from "vue";
import router from "@/router"; import router from "@/router";
console.log("版本1.0.9------------"); console.log("版本1.12------------");
const store = useStore(); const store = useStore();
onMounted(() => { onMounted(() => {
getUserInfo(); getUserInfo();

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

@@ -35,7 +35,7 @@
</div> </div>
</div> </div>
<div v-if="projectStatus && projectEndTime"> <div v-if="projectStatus && projectEndTime">
<div v-if="projectStatus !==3 && new Date(projectEndTime).getTime() > new Date().getTime()" style="display: flex"> <div v-if="projectStatus !=='3' && new Date(projectEndTime).getTime() > new Date().getTime()" style="display: flex">
<botton class="btn" style="margin-right: 20px" :style="{ <botton class="btn" style="margin-right: 20px" :style="{
background: isAllowSign? data.signFlag ? '#999' : 'rgb(57, 146, 249)':'#999', background: isAllowSign? data.signFlag ? '#999' : 'rgb(57, 146, 249)':'#999',
@@ -96,10 +96,10 @@
<div v-for="(el, index) in formateArr(data.planDto?.attach)" :key="index" class="enclosure" <div v-for="(el, index) in formateArr(data.planDto?.attach)" :key="index" class="enclosure"
:style="{ borderBottom: '1px solid rgba(56, 125, 247, 0.2)' }"> :style="{ borderBottom: '1px solid rgba(56, 125, 247, 0.2)' }">
<div class="enclosureL"> <div class="enclosureL">
<FileTypeImg :v-model="el.slice(el.indexOf('-') + 1)" :style="{width: '22px',height: '26px',marginLeft: '10px',}"></FileTypeImg> <FileTypeImg :v-model="el.slice(el.lastIndexOf('/')+1,el.indexOf('-')) + el.slice(el.lastIndexOf('.'))" :style="{width: '22px',height: '26px',marginLeft: '10px',}"></FileTypeImg>
<div style="margin-left: 20px">{{ el.slice(el.indexOf('-') + 1) }}</div> <div style="margin-left: 20px">{{ el.slice(el.lastIndexOf('/')+1,el.indexOf('-')) + el.slice(el.lastIndexOf('.')) }}</div>
</div> </div>
<div v-if="projectStatus !==3 && new Date(projectEndTime).getTime() > new Date().getTime()" > <div v-if="projectStatus !=='3' && new Date(projectEndTime).getTime() > new Date().getTime()" >
<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">
<img style="width: 16px; height: 15px" src="../../assets/image/download.png" /> <img style="width: 16px; height: 15px" src="../../assets/image/download.png" />
<div style="margin-left: 5px;color:#999;" @click="downloads(el)"> <div style="margin-left: 5px;color:#999;" @click="downloads(el)">
@@ -129,7 +129,7 @@
<div <div
v-if="projectStatus !==3 && new Date(projectEndTime).getTime() > new Date().getTime()" v-if="projectStatus !=='3' && new Date(projectEndTime).getTime() > new Date().getTime()"
: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">
交作业 交作业
@@ -156,7 +156,7 @@
</div> </div>
<div <div
v-if="projectStatus !==3 && new Date(projectEndTime).getTime() > new Date().getTime()" v-if="projectStatus !=='3' && new Date(projectEndTime).getTime() > new Date().getTime()"
: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="toExamItem(data.examinationDto)"> class="submit" @click="toExamItem(data.examinationDto)">
去考试 去考试

4
src/views/faceteach/FaceTeachSignUp.vue
View File

@@ -75,12 +75,12 @@
<div v-for="(el, index) in formateArr(data.offcourseDto.attach)" :key="index" class="enclosure" <div v-for="(el, index) in formateArr(data.offcourseDto.attach)" :key="index" class="enclosure"
:style="{ borderBottom: '1px solid rgba(56, 125, 247, 0.2)' }"> :style="{ borderBottom: '1px solid rgba(56, 125, 247, 0.2)' }">
<div class="enclosureL"> <div class="enclosureL">
<FileTypeImg :v-model="el.slice(el.indexOf('-') + 1)" :style="{ <FileTypeImg :v-model="el.slice(el.lastIndexOf('/')+1,el.indexOf('-')) + el.slice(el.lastIndexOf('.'))" :style="{
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.lastIndexOf('/')+1,el.indexOf('-')) + el.slice(el.lastIndexOf('.')) }}</div>
</div> </div>
<div class="download"> <div class="download">
<img style="width: 16px; height: 15px" src="../../assets/image/download.png"/> <img style="width: 16px; height: 15px" src="../../assets/image/download.png"/>

4
src/views/homework/HomeworkPage.vue
View File

@@ -49,7 +49,7 @@
</div> </div>
</div> </div>
<div v-if="projectStatus && projectEndTime"> <div v-if="projectStatus && projectEndTime">
<div v-if="projectStatus !==3 && new Date(projectEndTime).getTime() > new Date().getTime()" > <div v-if="projectStatus !=='3' && new Date(projectEndTime).getTime() > new Date().getTime()" >
<div v-if="dayjs().isBefore(dayjs(data?.submitEndTime)) && dayjs(data?.submitStartTime).isBefore(dayjs())"> <div v-if="dayjs().isBefore(dayjs(data?.submitEndTime)) && dayjs(data?.submitStartTime).isBefore(dayjs())">
<UploadImg v-model:value="fileList" ref="uploadRef"> <UploadImg v-model:value="fileList" ref="uploadRef">
<button class="shangchuan" style="cursor: pointer"> <button class="shangchuan" style="cursor: pointer">
@@ -134,7 +134,7 @@
type="textarea" /> type="textarea" />
</div> </div>
<div v-if="projectStatus && projectEndTime"> <div v-if="projectStatus && projectEndTime">
<div v-if="projectStatus !==3 && new Date(projectEndTime).getTime() > new Date().getTime()" > <div v-if="projectStatus !=='3' && new Date(projectEndTime).getTime() > new Date().getTime()" >
<div v-if="dayjs().isBefore(dayjs(data?.submitEndTime)) && dayjs(data?.submitStartTime).isBefore(dayjs())"> <div v-if="dayjs().isBefore(dayjs(data?.submitEndTime)) && dayjs(data?.submitStartTime).isBefore(dayjs())">
<div style="display: flex; justify-content: center"> <div style="display: flex; justify-content: center">
<button class="tijiao" @click="handleClick">{{ submitList && submitList.length > 0 ? "再次" : "" <button class="tijiao" @click="handleClick">{{ submitList && submitList.length > 0 ? "再次" : ""

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

@@ -46,7 +46,7 @@
</div> --> </div> -->
</div> </div>
<div v-if="projectStatus && projectEndTime"> <div v-if="projectStatus && projectEndTime">
<div v-if="projectStatus !==3 && new Date(projectEndTime).getTime() > new Date().getTime()" class="threeBtn"> <div v-if="projectStatus !=='3' && new Date(projectEndTime).getTime() > new Date().getTime()" 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">观看

2
src/views/moreActive/MoreActive.vue
View File

@@ -46,7 +46,7 @@
</div> </div>
</div> </div>
<div v-if="projectStatus && projectEndTime"> <div v-if="projectStatus && projectEndTime">
<div v-if="projectStatus !==3 && new Date(projectEndTime).getTime() > new Date().getTime()" > <div v-if="projectStatus !=='3' && new Date(projectEndTime).getTime() > new Date().getTime()" >
<botton v-if="isAllowSign" class="btn" :style="{background: data.signFlag ? '#999' : 'rgb(57, 146, 249)' }" @click="signClick" >{{ data.signFlag ? "已签到" : "签到" }} <botton v-if="isAllowSign" class="btn" :style="{background: data.signFlag ? '#999' : 'rgb(57, 146, 249)' }" @click="signClick" >{{ data.signFlag ? "已签到" : "签到" }}
</botton> </botton>
<botton v-else class="btn" :style="{background: '#999' }" @click="signClick" >{{ data.signFlag ? "已签到" : "签到" }} <botton v-else class="btn" :style="{background: '#999' }" @click="signClick" >{{ data.signFlag ? "已签到" : "签到" }}

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

@@ -401,6 +401,7 @@ function judgeTaskIsEnd(type, endTimes, status) {
function toFinish(d, sName, chapterOrStageId) { function toFinish(d, sName, chapterOrStageId) {
console.log("dddddd", d, sName, chapterOrStageId); console.log("dddddd", d, sName, chapterOrStageId);
if(judgeTaskIsEnd(d.type ,data.value.endTime, data.value.status)){ if(judgeTaskIsEnd(d.type ,data.value.endTime, data.value.status)){
ElMessage.error("当前任务已结束") ElMessage.error("当前任务已结束")
return return
@@ -496,6 +497,7 @@ function toFinish(d, sName, chapterOrStageId) {
taskId: d.projectTaskId, taskId: d.projectTaskId,
}); });
} }
if (typeof types.value.path[d.type] === "string") { if (typeof types.value.path[d.type] === "string") {
types.value.path[d.type] && types.value.path[d.type] &&
types.value.path[d.type].startsWith("http") && types.value.path[d.type].startsWith("http") &&

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

@@ -297,7 +297,7 @@
data.assessmentSingleChoiceDtoList?.length || data.assessmentSingleChoiceDtoList?.length ||
data.assessmentScoringQuestionDtoList?.length data.assessmentScoringQuestionDtoList?.length
"> <div v-if="projectStatus && projectEndTime"> "> <div v-if="projectStatus && projectEndTime">
<div v-if="projectStatus !==3 && new Date(projectEndTime).getTime() > new Date().getTime()" class="submit" @click="submit" :style="{ background: data.isSubmit ? '#999' : '#2478ff' }"> <div v-if="projectStatus !=='3' && new Date(projectEndTime).getTime() > new Date().getTime()" class="submit" @click="submit" :style="{ background: data.isSubmit ? '#999' : '#2478ff' }">
提交 提交
</div> </div>
</div> </div>