hz/fe-student
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-student.git synced 2025-12-08 18:36:48 +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 11:42:34 +08:00
parent 71894c4142 ebe1c19f29
commit 4067128227
3 changed files with 8 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,7 +44,7 @@
评估
</botton>
<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 ? "已评估" : "评估" }}
</botton>
</div>
@@ -139,7 +139,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="toExamItem(data.examinationDto)">
去考试
</div>

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

@@ -1,23 +1,9 @@
<template>
<div style=" background: #0078fc;height: 150px;width: 100%;position: absolute;top: 0;z-index:-9999;"></div>
<div class="pathdetails" style="padding: 30px">
<!-- 面包屑导航 -->
<div class="crumb">
<div>{{ data.name }}</div>
<div style="margin-left: 6px; margin-right: 6px">/</div>
<div style="font-weight: 700">项目详情</div>
<!--
<div class="return">
<div style="display: flex" @click="returnclick">
<el-button style="color:#0073FB"> <img class="img2" style="margin-right:11px;cursor: pointer;"
src="../../assets/image/return.png" />返回</el-button>
</div>
</div>
-->
</div>
<!-- 面包屑导航 -->
<div class="pdname">
{{ userInfo.bandDesc }}
{{ data.name }}
<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>
</el-popover>
@@ -95,7 +81,7 @@
</div>
<div class="goclass" @click="toFinish(value, i.stageName, i.stageId)">
{{
value.status === 1
value.status === 100
? "已完成"
: types.path[value.type]
? types.toName[value.type]

20
src/views/roadmap/PathDetails.vue
View File

@@ -1,25 +1,11 @@
<template>
<div style=" background: #0078fc;height: 150px;width: 100%;position: absolute;top: 0;z-index:-9999;"></div>
<div class="pathdetails" style="padding: 30px">
<!-- 面包屑导航 -->
<div class="crumb">
<div>{{ data.name }}</div>
<div style="margin-left: 6px; margin-right: 6px">/</div>
<div style="font-weight: 700">路径图详情</div>
<!--
<div class="return">
<div style="display: flex" @click="returnclick">
<el-button style="color:#0073FB"> <img class="img2" style="margin-right:11px;cursor: pointer;"
src="../../assets/image/return.png" />返回</el-button>
</div>
</div>
-->
</div>
<!-- 面包屑导航 -->
<div class="pdname">
{{ userInfo.bandDesc }}
{{ data.name }}
<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>
</el-popover>
@@ -118,7 +104,7 @@
<div class="goclass" :style="{
background: `${types.path[value.type] ? '#2478ff' : '#999'}`,
}" @click="toFinish(value)">
{{ value.status === 1 ? "已完成" : types.path[value.type] ? types.toName[value.type] : "未开放" }}
{{ value.currentRatio === 100 ? "已完成" : types.path[value.type] ? types.toName[value.type] : "未开放" }}
</div>
<!-- <div :style="{ display: value.status === 1 ? 'block' : 'none' }">-->
<!-- <div-->