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

Merge branch 'zcwy_0812_pingu' into dev0731

Browse Source
This commit is contained in:
nisen
2024-08-22 11:55:02 +08:00
parent 9e6d461013 64db7e768d
commit c5c4a3724e
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/useCommon.js
View File

@@ -36,9 +36,9 @@ export function useTaskPage() {
query: {
id: d.id,
type: type,
infoId: info.id,
infoId: info.value.projectId,
courseId: d.courseId,
pName: info.name,
pName: info.value.name,
sName: d.stageName,
chapterOrStageId: d.stageId,
btype: type

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

@@ -72,14 +72,14 @@
new Date(data.planDto?.beginTime).getTime() >
new Date().getTime()
? '#999'
: data.isSurvery
: data.isSurvery && data.status == 1
? '#999'
: 'rgb(57, 146, 249)'
}`,
}"
class="btn"
@click="toSurvery"
>{{ data.isSurvery ? "已评估" : "评估" }}
>{{ data.isSurvery && data.status == 1 ? "已评估" : "评估" }}
</botton>
</div>
</div>

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

@@ -72,14 +72,14 @@
new Date(data.planDto?.beginTime).getTime() >
new Date().getTime()
? '#999'
: data.isSurvery
: data.isSurvery && data.status == 1
? '#999'
: 'rgb(57, 146, 249)'
}`,
}"
class="btn"
@click="toSurvery"
>{{ data.isSurvery ? "已评估" : "评估" }}
>{{ data.isSurvery && data.status == 1 ? "已评估" : "评估" }}
</botton>
</div>
</div>

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

@@ -71,18 +71,18 @@
</botton> -->
<botton :style="{
background: `${new Date(data.liveStartTime).getTime() > new Date().getTime() ? '#999' : data.isSurvery ? '#999' : 'rgb(59, 191, 252)'}`,
background: `${new Date(data.liveStartTime).getTime() > new Date().getTime() ? '#999' : data.isSurvery && data.status == 1 ? '#999' : 'rgb(59, 191, 252)'}`,
}" class="btn" @click="commitClick" v-if="data.isEvaluate && data.isEvaluate == 1">{{
data.isSurvery ? "已评估" :
data.isSurvery && data.status == 1 ? "已评估" :
"评估"
}}
</botton>
</div>
<div v-else class="threeBtn">
<botton :style="{
background: `${new Date(data.liveStartTime).getTime() > new Date().getTime() ? '#999' : data.isSurvery ? '#999' : 'rgb(59, 191, 252)'}`,
}" class="btn" @click="commitClick" v-if="data.isEvaluate && data.isEvaluate == 1&&data.isSurvery">{{
data.isSurvery ? "已评估" :
background: `${new Date(data.liveStartTime).getTime() > new Date().getTime() ? '#999' : data.isSurvery && data.status == 1 ? '#999' : 'rgb(59, 191, 252)'}`,
}" class="btn" @click="commitClick" v-if="data.isEvaluate && data.isEvaluate == 1&&data.isSurvery && data.status == 1">{{
data.isSurvery && data.status == 1 ? "已评估" :
"评估"
}}
</botton>
@@ -109,9 +109,9 @@
</botton> -->
<botton :style="{
background: `${new Date(data.liveStartTime).getTime() > new Date().getTime() ? '#999' : data.isSurvery ? '#999' : 'rgb(59, 191, 252)'}`,
background: `${new Date(data.liveStartTime).getTime() > new Date().getTime() ? '#999' : data.isSurvery && data.status == 1 ? '#999' : 'rgb(59, 191, 252)'}`,
}" class="btn" @click="commitClick" v-if="data.isEvaluate && data.isEvaluate == 1">{{
data.isSurvery ? "已评估" :
data.isSurvery && data.status == 1 ? "已评估" :
"评估"
}}
</botton>