diff --git a/src/views/faceteach/FaceTeach.vue b/src/views/faceteach/FaceTeach.vue index cc88043..754e9f9 100644 --- a/src/views/faceteach/FaceTeach.vue +++ b/src/views/faceteach/FaceTeach.vue @@ -14,24 +14,37 @@
【面授课】{{ data.planDto?.name }}
- {{ data.offcourseDto?.publishTime }} + {{ data.planDto?.beginTime + "至" + data.planDto?.endTime }}
{{ data.planDto?.address }}
- {{ data.isSurvery ? '已评估' : '评估' }} + + 评估 + + {{ data.isSurvery ? "已评估" : "评估" }} @@ -43,8 +56,8 @@
课程详情
@@ -58,16 +71,29 @@
+ 此课程无附件 +
+
-
下载
+
+ 下载 +
-
+
+ 此课程无作业 +
+
{{ data.workDto?.workName }}
@@ -94,11 +138,24 @@
- 提交 + 去作业
+
+ 此课程无考试 +
@@ -106,17 +163,17 @@
必修
考试
- - - +
+ 去考试 +
@@ -125,15 +182,15 @@
直播讲师
- +
{{ data.planDto?.teacher }} @@ -149,32 +206,32 @@ diff --git a/src/views/homework/HomeworkPage.vue b/src/views/homework/HomeworkPage.vue index 8f279b7..30f5346 100644 --- a/src/views/homework/HomeworkPage.vue +++ b/src/views/homework/HomeworkPage.vue @@ -26,7 +26,6 @@
-
返回
【作业】管理者进阶腾飞班 - 中级管理者作业 diff --git a/src/views/liveBroadcast/LiveBroadcast.vue b/src/views/liveBroadcast/LiveBroadcast.vue index f620bd8..e1ac682 100644 --- a/src/views/liveBroadcast/LiveBroadcast.vue +++ b/src/views/liveBroadcast/LiveBroadcast.vue @@ -7,23 +7,24 @@
{{ sName }}
/
直播详情
- -
-
- -
返回
+
+ +
返回
-
+
@@ -33,11 +34,11 @@
【直播】{{ data?.liveName }}
- {{ data?.liveStartTime + "-" + data?.liveEndTime }} + {{ data?.liveStartTime + "至" + data?.liveEndTime }}
@@ -52,27 +53,36 @@
观看 + class="btn" + style="background: rgb(59, 191, 252)" + @click="showClick" + >观看 {{ data.signFlag ? "已签到" : "签到" }} + @click="signClick" + >{{ data.signFlag ? "已签到" : "签到" }} + 评估 + + + {{ data.isSurvery ? "已评估" : "评估" }} + class="btn" + @click="commitClick" + v-if="data.isEvaluate && data.isEvaluate == 1" + >{{ data.isSurvery ? "已评估" : "评估" }}
@@ -85,8 +95,8 @@
直播说明
@@ -122,8 +132,8 @@
直播公告
@@ -133,18 +143,18 @@
直播讲师
- +
{{ data.userInfoBo?.userName }} @@ -161,27 +171,27 @@ @@ -174,14 +177,14 @@ const signClick = (tab, event) => { line-height: 24px; position: relative; } - .return{ + .return { position: absolute; right: 10%; - .text{ + .text { text-align: center; - display: flex; - flex-direction: row; - align-items: center; + display: flex; + flex-direction: row; + align-items: center; } } .preNext { @@ -442,9 +445,9 @@ const signClick = (tab, event) => { background-color: rgba(255, 255, 255, 1); border-radius: 8px; background: linear-gradient( - 180deg, - rgba(36, 120, 255, 0.15) 0%, - rgba(255, 255, 255) 50% + 180deg, + rgba(36, 120, 255, 0.15) 0%, + rgba(255, 255, 255) 50% ); .title { diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue index 622eeb7..b65e4b7 100644 --- a/src/views/project/ProjectDetails.vue +++ b/src/views/project/ProjectDetails.vue @@ -382,7 +382,7 @@ const types = ref({ }, }); -function toFinish(d) { +function toFinish(d,sName) { if (!types.value.path[d.type]) { ElMessage.error("暂时未开放"); return; @@ -392,7 +392,7 @@ function toFinish(d) { types.value.path[d.type] && types.value.path[d.type].startsWith("http") && window.open(types.value.path[d.type] + d.targetId) types.value.path[d.type] && types.value.path[d.type].startsWith("/") && router.push({ path: types.value.path[d.type], - query: {id: d.routerTaskId, type: 1, courseId: d.courseId, pName: data.value.name, sName}, + query: {id: d.routerTaskId, type: 2, courseId: d.courseId, pName: data.value.name, sName}, }) } else if (typeof types.value.path[d.type] === 'function') { types.value.path[d.type](d) diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue index 77a605c..cc69615 100644 --- a/src/views/roadmap/PathDetails.vue +++ b/src/views/roadmap/PathDetails.vue @@ -35,8 +35,8 @@ )" :key="index" > -
-
{{ value.name }}
+
+
{{ value.name }}
{ + router.back(); +}; const { data } = useRequest(ROUTER_PROCESS, { routerId }); const userInfo = computed(() => store.state.userInfo); @@ -431,6 +433,7 @@ function toFinish(d, sName) { }); } else if (typeof types.value.path[d.type] === "function") { types.value.path[d.type](d); + // console.log("types.value.path[d.type](d)", d); } } @@ -513,6 +516,9 @@ function whiteTypes(type) { font-weight: 500; color: #333330; line-height: 24px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } .coursetag {