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

Merge branch 'develop' into manage-release

Browse Source
This commit is contained in:
yuping
2022-12-26 21:55:19 +08:00
parent 2269cf0ced a50c337153
commit b5744b7da2
7 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/request.js
View File

@@ -94,7 +94,7 @@ export async function request(_url, params) {
}).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,'_self')
import.meta.env.MODE === 'development' ? router.push({ path: '/login' }) : window.open(import.meta.env.VITE_BASE_LOGIN_URL,'_top')
}
// if (import.meta.env.DEV && response.code === 1000) {
// router.push({path: '/login'})

2
src/components/PathDetailImage.vue
View File

@@ -64,7 +64,7 @@ function toDetail(i) {
`${import.meta.env.VITE_BOE_PATH_DETAIL_URL}/pathdetails&params=${encodeURIComponent(
`routerId=${props.detail.routerId}&routerName=${props.detail.routerName}`
)}`
,'_self');
,'_top');
}
function close() {

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

@@ -367,7 +367,7 @@ function toExamItem(obj) {
}
}
console.log("obj", obj.examinationTestId);
window.open(import.meta.env.VITE_BOE_EXAM_DETAIL_URL + obj.examinationTestId,'_self'); //测评
window.open(import.meta.env.VITE_BOE_EXAM_DETAIL_URL + obj.examinationTestId,'_top'); //测评
// router.push({ path: import.meta.env.VITE_BOE_EXAM_DETAIL_URL+ obj.examinationTestId });
}

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

@@ -284,7 +284,7 @@ function showClick() {
return;
}
}
window.open(data.value.liveLink,'_self');
window.open(data.value.liveLink,'_top');
}
onUnmounted(() => {
if (timer) {

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

@@ -13,7 +13,8 @@
<!-- 详细信息 -->
<div class="detailinfo">
<div class="detailL">
<div v-for="(i, k) in data.stageProcessList" :key="k">
<div v-if="data.stageProcessList" v-for="(i, k) in data.stageProcessList" :key="k">
{{ loading.close() }}
<div v-if="i.stageId == '0' && i.taskProcessList.length == 0"></div>
<div v-else class="title">
<div class="titleL">{{ i.stageName }}</div>
@@ -102,6 +103,9 @@
<!-- </div>-->
</div>
</div>
<!-- <div ref="contentLoadingDom" id="loadings" v-else style="width:100%;height:400px;background:red;">
</div> -->
<!-- <div class="tag1">必修</div>
<div class="tag2">选修</div>
<div class="tag3">测评</div>
@@ -249,6 +253,7 @@
</template>
<script setup>
import { computed, reactive, ref } from "vue";
import { ElLoading } from 'element-plus'
import word from "@/assets/image/file/word.png";
import ppt from "@/assets/image/file/ppt.png";
import pdf from "@/assets/image/file/pdf.png";
@@ -280,6 +285,13 @@ const { data } = useRequest(PROJECT_PROCESS, {
console.log("datadata", data);
const loading = ref(false);
loading.value = ElLoading.service({
lock: true,
text: 'Loading',
background: 'rgba(0, 0, 0, 0.7)'
})
// const { onlinedata } = useRequest(ONLINE_PROCESS, {
// addView: false,
// cid:"1042123882713739264"
@@ -343,7 +355,7 @@ const types = ref({
6: "/livebroadcast",
7: ({ courseId }) =>
request(LINK_DETAILS(courseId), {}).then(({ data: { linkAddress } }) =>
window.open(linkAddress,'_self')
window.open(linkAddress,'_top')
), //外联
8: "/discusspage",
9: "/moreactive",
@@ -352,7 +364,7 @@ const types = ref({
(evaType == 0
? import.meta.env.VITE_BOE_TEST_DETAIL_URL
: import.meta.env.VITE_BOE_TEST_OUT_DETAIL_URL) + targetId
,'_self'), //测评
,'_top'), //测评
11: "/surveydetail",
12: "/ballotpage",
13: "/projectdetails",
@@ -449,7 +461,7 @@ function toFinish(d, sName, chapterOrStageId) {
if (typeof types.value.path[d.type] === "string") {
types.value.path[d.type] &&
types.value.path[d.type].startsWith("http") &&
window.open(types.value.path[d.type] + d.targetId,'_self');
window.open(types.value.path[d.type] + d.targetId,'_top');
types.value.path[d.type] &&
types.value.path[d.type].startsWith("/") &&
router.push({

2
src/views/project/ProjectManage.vue
View File

@@ -187,7 +187,7 @@ const goProjectDetails = (value) => {
: window.open(
`${import.meta.env.VITE_BOE_PATH_DETAIL_URL}/projectdetails&params=${encodeURIComponent(
`projectId=${value.projectId}`
,'_self')}`
,'_top')}`
);
};
</script>

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

@@ -343,7 +343,7 @@ const types = ref({
6: "/livebroadcast",
7: ({ courseId }) =>
request(LINK_DETAILS(courseId), {}).then(({ data: { linkAddress } }) =>
window.open(linkAddress, '_self')
window.open(linkAddress, '_top')
), //外联
8: "/discusspage",
9: "/moreactive",
@@ -352,7 +352,7 @@ const types = ref({
(evaType == 0
? import.meta.env.VITE_BOE_TEST_DETAIL_URL
: import.meta.env.VITE_BOE_TEST_OUT_DETAIL_URL) + targetId
,'_self'), //测评
,'_top'), //测评
11: "/surveydetail",
12: "/ballotpage",
13: "/projectdetails",
@@ -444,7 +444,7 @@ function toFinish(d) {
if (typeof types.value.path[d.type] === "string") {
types.value.path[d.type] &&
types.value.path[d.type].startsWith("http") &&
window.open(types.value.path[d.type] + d.targetId,'_self');
window.open(types.value.path[d.type] + d.targetId,'_top');
types.value.path[d.type] &&
types.value.path[d.type].startsWith("/") &&
router.push({