hz/fe-student
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-student.git synced 2025-12-15 05:46: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-15 13:22:52 +08:00
parent 6a909c9452 8828f668f8
commit 2add4b2a6d
10 changed files with 271 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env
View File

@@ -7,5 +7,7 @@ VITE_PROXY_URL=http://111.231.196.214:30001
VITE_BOE_ONLINE_CLASS_URL=https://u-pre.boe.com/pc/course/studyindex?id=
VITE_BOE_CASS_DETAIL_URL=https://u-pre.boe.com/pc/case/detail?id=
VITE_BOE_TEST_DETAIL_URL=https://u-pre.boe.com/web/quizsummary?detailId=
VITE_BOE_TEST_OUT_DETAIL_URL=https://u-pre.boe.com/api/b1/tale/do-quiz?quizKid=
VITE_BOE_EXAM_DETAIL_URL=https://u-pre.boe.com/pc/exam/test?id=
VITE_BOE_API_URL=https://u-pre.boe.com

2
.env.boe
View File

@@ -4,5 +4,7 @@ VITE_BASE_API=/manageApi
VITE_BOE_ONLINE_CLASS_URL=https://u-pre.boe.com/pc/course/studyindex?id=
VITE_BOE_CASS_DETAIL_URL=https://u-pre.boe.com/pc/case/detail?id=
VITE_BOE_TEST_DETAIL_URL=https://u-pre.boe.com/web/quizsummary?detailId=
VITE_BOE_TEST_OUT_DETAIL_URL=https://u-pre.boe.com/api/b1/tale/do-quiz?quizKid=
VITE_BOE_EXAM_DETAIL_URL=https://u-pre.boe.com/pc/exam/test?id=
VITE_BOE_API_URL=https://u-pre.boe.com

2
.env.prod
View File

@@ -4,5 +4,7 @@ VITE_BASE_API=/manageApi-release
VITE_BOE_ONLINE_CLASS_URL=https://u.boe.com/pc-release/course/studyindex?id=
VITE_BOE_CASS_DETAIL_URL=https://u.boe.com/pc-release/case/detail?id=
VITE_BOE_TEST_DETAIL_URL=https://u.boe.com/web/quizsummary?detailId=
VITE_BOE_TEST_OUT_DETAIL_URL=https://u.boe.com/api/b1/tale/do-quiz?quizKid=
VITE_BOE_EXAM_DETAIL_URL=https://u.boe.com/pc-release/exam/test?id=
VITE_BOE_API_URL=https://u.boe.com

2
.env.release
View File

@@ -5,5 +5,7 @@ VITE_BASE_LOGIN_URL=https://u.boe.com/web/
VITE_BOE_ONLINE_CLASS_URL=https://u.boe.com/pc-release/course/studyindex?id=
VITE_BOE_CASS_DETAIL_URL=https://u.boe.com/pc-release/case/detail?id=
VITE_BOE_TEST_DETAIL_URL=https://u.boe.com/web/quizsummary?detailId=
VITE_BOE_TEST_OUT_DETAIL_URL=https://u.boe.com/api/b1/tale/do-quiz?quizKid=
VITE_BOE_EXAM_DETAIL_URL=https://u.boe.com/pc-release/exam/test?id=
VITE_BOE_API_URL=https://u.boe.com

12
src/App.vue
View File

@@ -2,7 +2,7 @@
* @Author: lixg lixg@dongwu-inc.com
* @Date: 2022-11-21 17:28:10
* @LastEditors: lixg lixg@dongwu-inc.com
* @LastEditTime: 2022-12-13 22:10:22
* @LastEditTime: 2022-12-15 11:54:03
* @FilePath: /fe-stu/src/App.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -27,7 +27,6 @@
</div>
</template>
<script setup>
import { boeRequest } from "@/api/request";
import { GET_USER_INFO } from "@/api/ThirdApi";
import { useStore } from "vuex";
@@ -36,14 +35,13 @@
const store = useStore();
onMounted(() => {
getUserInfo()
})
getUserInfo();
});
function getUserInfo() {
boeRequest(GET_USER_INFO).then(res=>{
boeRequest(GET_USER_INFO).then((res) => {
store.commit("SET_USER", res.result);
})
});
}
</script>
<style lang="scss">
#app {

3
src/api/api.js
View File

@@ -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-12 17:05:42
* @LastEditTime: 2022-12-15 10:56:54
* @FilePath: /fe-stu/src/api/api.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
@@ -13,6 +13,7 @@ export const COMMON_TOKEN = 'https://upload-z2.qiniup.com'
export const ROUTER_CHAPTER_LIST = '/stu/router/chapterList'
export const ROUTER_LIST = '/stu/router/list post'
export const ROUTER_PROCESS = '/stu/router/process'
export const LINK_DETAILS = linkId => `/link/getOne?linkId=${linkId} post`
export const PROJECT_PROCESS = '/stu/project/process'
export const ROUTER_UNCOMPLETE_LIST = '/stu/router/unCompleteTaskList post'
export const TAS_ACTIVITY_DETAIL = '/activity'

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

@@ -9,10 +9,11 @@
<div style="font-weight: 700; font-size: 16px">直播详情</div>
<div class="preNext">
<button class="btn btn01"></button>
<!-- 2022-12-15注释 李晓鸽 后面打开 -->
<!-- <button class="btn btn01"></button>
<span class="content" style="margin-left: 6px">上一个</span>
<span class="content" style="margin-left: 31px">下一个</span>
<button class="btn btn02" style="margin-left: 6px"></button>
<button class="btn btn02" style="margin-left: 6px"></button> -->
</div>
</div>
<!-- 面包屑导航 -->
@@ -26,16 +27,19 @@
style="width: 15px; height: 17px"
src="../../assets/image/time.png"
/>
<div style="margin-left: 8px">{{ data?.liveStartTime }}</div>
<div style="margin-left: 8px">
{{ data?.liveStartTime + "-" + data?.liveEndTime }}
</div>
<div class="time" style="margin-top: 23px">
</div>
<!-- todo #直播详情 没有位置字段-->
<!-- <div class="time" style="margin-top: 23px">
<img
style="width: 16px; height: 18px"
src="../../assets/image/position.png"
/>
<!-- todo #直播详情 没有位置字段-->
<div style="margin-left: 8px">大族广场</div>
</div>
<div style="margin-left: 8px">{{ data?.activityAddress }}</div>
</div> -->
</div>
<div class="threeBtn">
<botton
@@ -46,12 +50,19 @@
</botton>
<botton
class="btn"
:style="{background:`${data.signFlag?'#999':'rgb(57, 146, 249)'}`}"
:style="{
background: `${data.signFlag ? '#999' : 'rgb(57, 146, 249)'}`,
}"
@click="signClick"
>{{ data.signFlag ? '已签到' : '签到' }}
>{{ data.signFlag ? "已签到" : "签到" }}
</botton>
<botton :style="{background:`${data.isSurvery?'#999':'rgb(57, 146, 249)'}`}" class="btn" @click="commitClick"
>{{ data.isSurvery ? '已评估' : '评估' }}
<botton
:style="{
background: `${data.isSurvery ? '#999' : 'rgb(57, 146, 249)'}`,
}"
class="btn"
@click="commitClick"
>{{ data.isSurvery ? "已评估" : "评估" }}
</botton>
</div>
</div>
@@ -107,7 +118,7 @@
<div class="text">直播公告</div>
<div class="box"></div>
</div>
<div class="content" v-html="data?.liveExplain"></div>
<div class="content" v-html="data?.liveNotice"></div>
</div>
<div class="teacher">
<div class="title">
@@ -175,7 +186,7 @@ const state = reactive({
const { activeName, teacher } = toRefs(state);
const signClick = () => {
if (data.value.signFlag) {
return
return;
}
data.value.signFlag = 1;
ElMessage.info("签到成功");
@@ -183,7 +194,7 @@ const signClick = () => {
};
const commitClick = () => {
if (data.value.isSurvery) {
return
return;
}
router.push({
path: "/surveydetail",

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

@@ -306,15 +306,16 @@ import medal1 from "@/assets/image/medal/medal1.png";
import medal2 from "@/assets/image/medal/medal2.png";
import medal3 from "@/assets/image/medal/medal3.png";
import img from "@/assets/image/uploadimg.png";
import { useRequest } from "@/api/request";
import { PROJECT_PROCESS, ROUTER_PROCESS } from "@/api/api";
import { useRequest, request } from "@/api/request";
import { PROJECT_PROCESS, ROUTER_PROCESS, LINK_DETAILS } from "@/api/api";
import { useRoute, useRouter } from "vue-router";
const {
query: { projectId },
query: { courseId },
} = useRoute();
const router = useRouter();
const { data } = useRequest(PROJECT_PROCESS, { projectId });
const { data } = useRequest(PROJECT_PROCESS, { projectId: courseId });
console.log("data", data);
const state = reactive({
course: [
{
@@ -535,16 +536,19 @@ const types = ref({
13: "去完成",
},
path: {
1: "去上课",
1: import.meta.env.VITE_BOE_ONLINE_CLASS_URL, //在线
2: "/faceteach",
3: "案例",
3: import.meta.env.VITE_BOE_CASS_DETAIL_URL, //案例
4: "/homeworkpage",
5: "去完成",
5: import.meta.env.VITE_BOE_EXAM_DETAIL_URL, //考试
6: "/livebroadcast",
7: "外链",
7: " ",
8: "/discusspage",
9: "/moreactive",
10: "/starttest",
10: [
import.meta.env.VITE_BOE_TEST_DETAIL_URL,
import.meta.env.VITE_BOE_TEST_OUT_DETAIL_URL,
], //测评
11: "/surveydetail",
12: "/ballotpage",
13: "去完成",
@@ -552,6 +556,43 @@ const types = ref({
});
function toFinish(d) {
if (!types.value.path[d.type]) {
ElMessage.error("暂时未开放");
return;
}
if (d.type == 10) {
let url = "";
if (d.evaTyp == 1) {
url = types.value.path[d.type][1] + d.targetId;
} else {
url = types.value.path[d.type][0] + d.targetId;
}
import.meta.env.DEV
? (window.location.href = url)
: (window.parent.location.href = url);
return;
}
if (types.value.path[d.type] && types.value.path[d.type].startsWith("http")) {
//配置文件
const url = types.value.path[d.type] + d.targetId;
import.meta.env.DEV
? (window.location.href = url)
: (window.parent.location.href = url);
return;
}
if (d.type === 7) {
// console.log("url", d, url);
request(LINK_DETAILS(d.courseId), {}).then((res) => {
console.log("resssss", res);
if (res.code === 200) {
const url = res.data.linkAddress;
import.meta.env.DEV
? (window.location.href = url)
: (window.parent.location.href = url);
}
});
return;
}
router.push({
path: types.value.path[d.type],
query: { id: d.projectTaskId, type: 2, courseId: d.courseId },

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

@@ -116,7 +116,13 @@
}"
@click="toFinish(value)"
>
{{ value.status === 1 ? '已完成' : types.path[value.type] ? types.toName[value.type] : "未开放" }}
{{
value.status === 1
? "已完成"
: types.path[value.type]
? types.toName[value.type]
: "未开放"
}}
</div>
<!-- <div :style="{ display: value.status === 1 ? 'block' : 'none' }">-->
<!-- <div-->
@@ -341,8 +347,8 @@ import medal1 from "@/assets/image/medal/medal1.png";
import medal2 from "@/assets/image/medal/medal2.png";
import medal3 from "@/assets/image/medal/medal3.png";
import img from "@/assets/image/uploadimg.png";
import {boeRequest, useRequest} from "@/api/request";
import {ROUTER_PROCESS} from "@/api/api";
import { boeRequest, useRequest, request } from "@/api/request";
import { ROUTER_PROCESS, LINK_DETAILS } from "@/api/api";
import { useRoute, useRouter } from "vue-router";
import { ElMessage } from "element-plus";
import { useUserInfo } from "@/api/utils";
@@ -576,35 +582,64 @@ const types = ref({
13: "去完成",
},
path: {
1: import.meta.env.VITE_BOE_ONLINE_CLASS_URL,
1: import.meta.env.VITE_BOE_ONLINE_CLASS_URL, //在线
2: "/faceteach",
3: import.meta.env.VITE_BOE_CASS_DETAIL_URL,
3: import.meta.env.VITE_BOE_CASS_DETAIL_URL, //案例
4: "/homeworkpage",
5: import.meta.env.VITE_BOE_TEST_DETAIL_URL,
5: import.meta.env.VITE_BOE_EXAM_DETAIL_URL, //考试
6: "/livebroadcast",
7: " ",
8: "/discusspage",
9: "/moreactive",
10: "/surveydetail",
10: [
import.meta.env.VITE_BOE_TEST_DETAIL_URL,
import.meta.env.VITE_BOE_TEST_OUT_DETAIL_URL,
], //测评
11: "/surveydetail",
12: "/ballotpage",
13: "去完成",
13: "/projectdetails",
},
});
function toFinish(d) {
console.log("ddd", d);
if (!types.value.path[d.type]) {
ElMessage.error("暂时未开放");
return;
}
if (types.value.path[d.type] && types.value.path[d.type].startsWith("http")) {
//配置文件
const url = types.value.path[d.type] + d.courseId;
if (d.type == 10) {
let url = "";
if (d.evaTyp == 1) {
url = types.value.path[d.type][1] + d.targetId;
} else {
url = types.value.path[d.type][0] + d.targetId;
}
import.meta.env.DEV
? (window.location.href = url)
: (window.parent.location.href = url);
return;
}
if (types.value.path[d.type] && types.value.path[d.type].startsWith("http")) {
//配置文件
const url = types.value.path[d.type] + d.targetId;
import.meta.env.DEV
? (window.location.href = url)
: (window.parent.location.href = url);
return;
}
if (d.type === 7) {
// console.log("url", d, url);
request(LINK_DETAILS(d.courseId), {}).then((res) => {
console.log("resssss", res);
if (res.code === 200) {
const url = res.data.linkAddress;
import.meta.env.DEV
? (window.location.href = url)
: (window.parent.location.href = url);
}
});
return;
}
router.push({
path: types.value.path[d.type],
query: { id: d.routerTaskId, type: 1, courseId: d.courseId },

5
vite.config.js
View File

@@ -2,7 +2,7 @@
* @Author: lixg lixg@dongwu-inc.com
* @Date: 2022-11-21 17:28:10
* @LastEditors: lixg lixg@dongwu-inc.com
* @LastEditTime: 2022-12-13 20:49:00
* @LastEditTime: 2022-12-15 11:51:59
* @FilePath: /fe-stu/vite.config.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
@@ -87,6 +87,9 @@ export default defineConfig(({ command,mode }) =>
}, '/userbasic': {
target: 'https://u-pre.boe.com',
changeOrigin: true,
}, '/link': {
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
changeOrigin: true,
},
}
}