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-25 20:00:52 +08:00
parent bbc4502527 dd9eebcfb9
commit fea125935a
4 changed files with 12 additions and 22 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.4------------"); console.log("版本1.0.5------------");
const store = useStore(); const store = useStore();
onMounted(() => { onMounted(() => {
getUserInfo(); getUserInfo();

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

@@ -35,9 +35,8 @@
</div> </div>
</div> </div>
<div style="display: flex"> <div style="display: flex">
<botton v-if="!isAllowSign" class="btn" style="margin-right: 20px; background: #999" @click="signClick">签到
</botton> <botton class="btn" style="margin-right: 20px" :style="{
<botton v-if="isAllowSign" 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>
@@ -112,13 +111,10 @@
</div> </div>
</div> </div>
<div v-if="dayjs(data.workDto.submitEndTime).isBefore(dayjs())" @click="toWork" class="submit"
style="background: #999">已结束</div>
<div v-if="dayjs().isBefore(dayjs(data.workDto.submitStartTime))" @click="toWork" class="submit"
style="background: #999">未开始</div>
<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" v-else> class="submit" @click="toWork" >
交作业 交作业
</div> </div>
</div> </div>
@@ -141,11 +137,8 @@
<div class="tag3" style="margin-left: 11px">考试</div> <div class="tag3" style="margin-left: 11px">考试</div>
</div> </div>
</div> </div>
<div v-if="dayjs(data.value.workDto.examinationEndTime).isBefore(dayjs())" class="submit"
style="background: #999" @click="toExamItem(data.examinationDto)">已结束</div> <div
<div v-if="dayjs().isBefore(dayjs(data.value.workDto.examinationStartTime))" class="submit"
style="background: #999">未开始</div>
<div v-else
: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)">
去考试 去考试
@@ -348,7 +341,7 @@ function toWork() {
let date2 = new Date().getTime() let date2 = new Date().getTime()
if (date1 > date2) { if (date1 > date2) {
ElMessage.warning("未到开始时间，请耐心等待！"); ElMessage.warning("未到开始时间，请耐心等待！");
return;
} }
} }
router.push({ router.push({
@@ -372,7 +365,7 @@ function toExamItem(obj) {
let date2 = new Date().getTime() let date2 = new Date().getTime()
if (date1 > date2) { if (date1 > date2) {
ElMessage.warning("未到开始时间，请耐心等待！"); ElMessage.warning("未到开始时间，请耐心等待！");
return;
} }
} }
console.log("obj", obj.examinationTestId); console.log("obj", obj.examinationTestId);

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

@@ -50,9 +50,8 @@
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 v-if="!isAllowSign" class="btn" style="margin-right: 20px; background: #999" @click="signClick">签到
</botton> <botton class="btn" :style="{
<botton v-else 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>

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

@@ -45,8 +45,6 @@
<div style="margin-left: 8px">{{ data?.activityAddress }}</div> <div style="margin-left: 8px">{{ data?.activityAddress }}</div>
</div> </div>
</div> </div>
<botton v-if="!isAllowSign" class="btn" style="margin-right: 20px; background: #999" @click="signClick">签到
</botton>
<botton class="btn" :style="{background: `${data.signFlag ? '#999' : 'rgb(57, 146, 249)'}`, }" @click="signClick" >{{ data.signFlag ? "已签到" : "签到" }} <botton class="btn" :style="{background: `${data.signFlag ? '#999' : 'rgb(57, 146, 249)'}`, }" @click="signClick" >{{ data.signFlag ? "已签到" : "签到" }}
</botton> </botton>
</div> </div>