diff --git a/src/api/api.js b/src/api/api.js index 657b967..167f637 100644 --- a/src/api/api.js +++ b/src/api/api.js @@ -2,7 +2,7 @@ * @Author: lixg lixg@dongwu-inc.com * @Date: 2022-12-11 16:57:58 * @LastEditors: lixg lixg@dongwu-inc.com - * @LastEditTime: 2022-12-15 10:56:54 + * @LastEditTime: 2022-12-17 14:59:41 * @FilePath: /fe-stu/src/api/api.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ diff --git a/src/api/request.js b/src/api/request.js index 97970b1..6c1d984 100644 --- a/src/api/request.js +++ b/src/api/request.js @@ -1,7 +1,7 @@ import router from "@/router"; -import {reactive, ref, toRefs, watch} from "vue"; +import { reactive, ref, toRefs, watch } from "vue"; import axios from 'axios'; -import {getCookie} from "@/api/utils"; +import { getCookie } from "@/api/utils"; export function usePage(_url, param) { @@ -11,11 +11,11 @@ export function usePage(_url, param) { total: 0, size: 10, current: 1, - params: {pageNo: 1, pageSize: 10, ...param} + params: { pageNo: 1, pageSize: 10, ...param } }) watch(param, () => { - state.params = {...state.params, ...param} + state.params = { ...state.params, ...param } fetchData() }) @@ -86,14 +86,14 @@ export async function request(_url, params) { method, headers: { 'token': getCookie('token'), - ...method !== 'get' ? {'Content-Type': 'application/json'} : {} + ...method !== 'get' ? { 'Content-Type': 'application/json' } : {} }, baseURL: import.meta.env.VITE_BASE_API, - ...method !== 'get' ? {data: JSON.stringify(body)} : {} + ...method !== 'get' ? { data: JSON.stringify(body) } : {} }).then(resp => resp.data).then(response => { if (response.code !== 200 && response.code !== 0) { if (response.code === 1000) { - import.meta.env.MODE === 'development' ? router.push({path: '/login'}) : window.open(import.meta.env.VITE_BASE_LOGIN_URL) + import.meta.env.MODE === 'development' ? router.push({ path: '/login' }) : window.open(import.meta.env.VITE_BASE_LOGIN_URL) } // if (import.meta.env.DEV && response.code === 1000) { // router.push({path: '/login'}) @@ -108,7 +108,7 @@ export async function request(_url, params) { } return response }).catch(e => { - console.log(e) + console.log('eeeee', e) // router.push({path: '/login'}) }) } @@ -135,10 +135,10 @@ export async function boeRequest(_url, params) { method, headers: { token: getCookie('token'), - ...method !== 'get' ? {'Content-Type': 'application/json'} : {} + ...method !== 'get' ? { 'Content-Type': 'application/json' } : {} }, baseURL: '', - ...method !== 'get' ? {data: JSON.stringify(body)} : {} + ...method !== 'get' ? { data: JSON.stringify(body) } : {} }).then(resp => resp.data).then(response => { return response }).catch(e => { diff --git a/src/views/faceteach/FaceTeach.vue b/src/views/faceteach/FaceTeach.vue index cc88043..57dabf0 100644 --- a/src/views/faceteach/FaceTeach.vue +++ b/src/views/faceteach/FaceTeach.vue @@ -14,25 +14,58 @@
【面授课】{{ data.planDto?.name }}
- {{ data.offcourseDto?.publishTime }} + {{ data.planDto?.beginTime + "至" + data.planDto?.endTime }}
{{ data.planDto?.address }}
- {{ data.isSurvery ? '已评估' : '评估' }} - +
+ 签到 + + {{ data.signFlag ? "已签到" : "签到" }} + + + 评估 + + {{ data.isSurvery ? "已评估" : "评估" }} + +
@@ -43,8 +76,8 @@
课程详情
@@ -58,16 +91,29 @@
+ 此课程无附件 +
+
-
下载
+
+ 下载 +
-
+
+ 此课程无作业 +
+
{{ data.workDto?.workName }}
@@ -94,11 +158,24 @@
- 提交 + 去作业
+
+ 此课程无考试 +
@@ -106,17 +183,17 @@
必修
考试
- - - +
+ 去考试 +
@@ -125,15 +202,15 @@
直播讲师
- +
{{ data.planDto?.teacher }} @@ -149,46 +226,127 @@ diff --git a/src/views/homework/HomeworkPage.vue b/src/views/homework/HomeworkPage.vue index e1518bd..438cea8 100644 --- a/src/views/homework/HomeworkPage.vue +++ b/src/views/homework/HomeworkPage.vue @@ -26,10 +26,9 @@
-
返回
- 【作业】管理者进阶腾飞班 - 中级管理者作业 + 【作业】 {{ data?.workName }}
@@ -284,6 +283,7 @@ const { } = useRoute(); const { data } = useRequest(TASK_WORK_DETAIL, { workId, taskId }); +console.log("data", data); const { data: submitList } = useRequest(TASK_WORK_SUBMIT_LIST, { workerId: workId, }); diff --git a/src/views/liveBroadcast/LiveBroadcast.vue b/src/views/liveBroadcast/LiveBroadcast.vue index f620bd8..eec3833 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 18b3721..b65e4b7 100644 --- a/src/views/project/ProjectDetails.vue +++ b/src/views/project/ProjectDetails.vue @@ -135,8 +135,9 @@ {{ data.remark || '暂无公告' }}
+ +
--> @@ -156,8 +157,8 @@ - - +
@@ -200,10 +201,13 @@
学习进度
+ + +
总进度
diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue index e30d1ae..32ad475 100644 --- a/src/views/roadmap/PathDetails.vue +++ b/src/views/roadmap/PathDetails.vue @@ -35,8 +35,8 @@ )" :key="index" > -
-
{{ value.name }}
+
+
{{ value.name }}
学习进度
+
总进度
@@ -338,7 +339,9 @@ const { query: { routerId, routerName }, } = useRoute(); const router = useRouter(); - +const returnclick = () => { + router.back(); +}; const { data } = useRequest(ROUTER_PROCESS, { routerId }); const userInfo = computed(() => store.state.userInfo); @@ -394,9 +397,9 @@ const types = ref({ ), //外联 8: "/discusspage", 9: "/moreactive", - 10: ({ evaTyp, targetId }) => + 10: ({ evaType, targetId }) => window.open( - (evaTyp === 1 + (evaType == 0 ? import.meta.env.VITE_BOE_TEST_DETAIL_URL : import.meta.env.VITE_BOE_TEST_OUT_DETAIL_URL) + targetId ), //测评 @@ -429,7 +432,9 @@ function toFinish(d, sName) { }, }); } else if (typeof types.value.path[d.type] === "function") { + console.log("ddddddd", d); types.value.path[d.type](d); + // console.log("types.value.path[d.type](d)", d); } } @@ -512,6 +517,9 @@ function whiteTypes(type) { font-weight: 500; color: #333330; line-height: 24px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } .coursetag { diff --git a/src/views/survey/SurveyDetail.vue b/src/views/survey/SurveyDetail.vue index 770f6c4..4a84ae3 100644 --- a/src/views/survey/SurveyDetail.vue +++ b/src/views/survey/SurveyDetail.vue @@ -2,16 +2,16 @@
{{ pName }}
/
{{ sName }}
/
-
调研详情
+
评估详情
-
-
- -
返回
+
+ +
返回
-
【调研】管理者进阶腾飞班 - 培训阶段性调研
+
【评估】管理者进阶腾飞班 - 培训阶段性调研
{{ value.assessmentScTitle }}
完全没用
{ - if(data.isSubmit){ - return + if (data.isSubmit) { + return; } value.selectAnswer = item; } @@ -88,21 +89,29 @@
-
{{ data.assessmentSingleChoiceDtoList[0]?.singleStemName }}
+
+ {{ data.assessmentSingleChoiceDtoList[0]?.singleStemName }} +
{{ value.singleOptionName }}
-
{{ data.assessmentMultipleChoiceDtoList[0]?.multipleStemName }}
+
+ {{ data.assessmentMultipleChoiceDtoList[0]?.multipleStemName }} +
{ + if (data.isSubmit) { + return; } - value.select = !value.select - }" + value.select = !value.select; + } + " >
{{ value.multipleOptionName }}
{{ item.assessmentQaTitle }}
{{ item.content?.length || 0 }}/200
-
-
提交
+
+
+ 提交 +
@@ -178,28 +207,33 @@