This commit is contained in:
yuping
2022-12-13 13:13:09 +08:00
parent 44375c4965
commit c3c1f48479
6 changed files with 26 additions and 29 deletions

View File

@@ -8,19 +8,19 @@
--> -->
<template> <template>
<div id="container"> <div id="container">
<div id="nav"> <!-- <div id="nav">-->
<router-link <!-- <router-link-->
v-for="item in routes" <!-- v-for="item in routes"-->
:key="item.path" <!-- :key="item.path"-->
:to="item.path" <!-- :to="item.path"-->
:class="{ <!-- :class="{-->
link: true, <!-- link: true,-->
active: name === item.name, <!-- active: name === item.name,-->
}" <!-- }"-->
> <!-- >-->
{{ item.name }} <!-- {{ item.name }}-->
</router-link> <!-- </router-link>-->
</div> <!-- </div>-->
<main> <main>
<router-view /> <router-view />
</main> </main>

View File

@@ -39,7 +39,7 @@
<div class="title"> <div class="title">
{{ disDetail.projectName }} {{ disDetail.projectName }}
</div> </div>
<button class="btn">回复</button> <!-- <button class="btn">回复</button>-->
</div> </div>
<div class="line clearfix"> <div class="line clearfix">

View File

@@ -236,13 +236,13 @@ const state = reactive({
const {textarea1} = toRefs(state); const {textarea1} = toRefs(state);
const router = useRouter() const router = useRouter()
const {query: {courseId:workId,type}} = useRoute() const {query: {courseId:workId,type,id:taskId}} = useRoute()
const {data} = useRequest(TASK_WORK_DETAIL, {workId}) const {data} = useRequest(TASK_WORK_DETAIL, {workId})
const {data: submitList} = useRequest(TASK_WORK_SUBMIT_LIST, {workId}) const {data: submitList} = useRequest(TASK_WORK_SUBMIT_LIST, {workId})
const handleClick = () => { const handleClick = () => {
request(TASK_WORK_COMMIT, {projectOrRouterLogo: type, workUploadContent: textarea1.value, workId}).then(res => { request(TASK_WORK_COMMIT, {projectOrRouterLogo: type, workUploadContent: textarea1.value, workId,taskId}).then(res => {
submitList.value.unshift(res.data) submitList.value.unshift(res.data)
}) })
textarea1.value='' textarea1.value=''

View File

@@ -36,9 +36,9 @@
</div> </div>
</div> </div>
<div class="threeBtn"> <div class="threeBtn">
<botton class="btn" style="background: rgb(59, 191, 252)" @click="commitClick">观看</botton> <botton class="btn" style="background: rgb(59, 191, 252)" @click="ShowClick">观看</botton>
<botton class="btn" style="background: rgb(57, 146, 249)" @click="signClick" v-if="!data.signFlag">签到</botton> <botton class="btn" style="background: rgb(57, 146, 249)" @click="signClick" v-if="!data.signFlag">签到</botton>
<botton class="btn" @click="commitClick" v-if="!data.evalFlag">评估</botton> <botton class="btn" @click="commitClick" v-if="data.isEvaluate && data.isEvaluate!=='0'">评估</botton>
</div> </div>
</div> </div>
<!-- 基本信息 --> <!-- 基本信息 -->
@@ -147,8 +147,10 @@ import img from '@/assets/image/uploadimg.png'
import {request, useRequest} from "@/api/request"; import {request, useRequest} from "@/api/request";
import {TASK_BROADCAST_COMMIT, TASK_BROADCAST_DETAIL, TASK_BROADCAST_SIGN} from "@/api/api"; import {TASK_BROADCAST_COMMIT, TASK_BROADCAST_DETAIL, TASK_BROADCAST_SIGN} from "@/api/api";
import {useRoute} from "vue-router/dist/vue-router"; import {useRoute} from "vue-router/dist/vue-router";
import {useRouter} from "vue-router";
const {query: {courseId: liveId}} = useRoute() const {query: {courseId: liveId}} = useRoute()
const router = useRouter()
const {data} = useRequest(TASK_BROADCAST_DETAIL, {liveId}) const {data} = useRequest(TASK_BROADCAST_DETAIL, {liveId})
const state = reactive({ const state = reactive({
@@ -166,18 +168,15 @@ const state = reactive({
const {activeName, teacher} = toRefs(state) const {activeName, teacher} = toRefs(state)
const signClick = (id) => { const signClick = (id) => {
request(TASK_BROADCAST_SIGN, {id}).then(() => { request(TASK_BROADCAST_SIGN, {id}).then(() => {
console.log(data.value)
data.value.signFlag = 1 data.value.signFlag = 1
}) })
}; };
const commitClick = (id) => { const commitClick = () => {
request(TASK_BROADCAST_COMMIT, {id}).then(() => { router.push({path: '/surveydetail', query: {courseId: data.value.assessmentId}})
data.value.evalFlag = 1
})
}; };
function showClick() { function showClick() {
window.open(data.value.liveLink)
} }
</script> </script>

View File

@@ -54,10 +54,8 @@ const form = ref({
async function loginUser() { async function loginUser() {
const {data:token} = await request(LOGIN, form.value); const {data:token} = await request(LOGIN, form.value);
console.log(2222222222)
console.log(token)
setCookie("token", token, 10); setCookie("token", token, 10);
await router.push({path: "/BallotPage"}); await router.push({path: "/learnpath"});
// location.reload(); // location.reload();
} }

View File

@@ -540,7 +540,7 @@ const types = ref({
6: '去签到', 6: '去签到',
7: '外链', 7: '外链',
8: '去讨论', 8: '去讨论',
9: '去完成', 9: '去签到',
10: '去完成', 10: '去完成',
11: '去完成', 11: '去完成',
12: '去投票', 12: '去投票',
@@ -556,7 +556,7 @@ const types = ref({
7: '', 7: '',
8: '/discusspage', 8: '/discusspage',
9: '/moreactive', 9: '/moreactive',
10: '/starttest', 10: '/surveydetail',
11: '/surveydetail', 11: '/surveydetail',
12: '/ballotpage', 12: '/ballotpage',
13: '去完成' 13: '去完成'