From c3c1f484794e07b32eae0961da2a9536124ecfb1 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Tue, 13 Dec 2022 13:13:09 +0800
Subject: [PATCH] init

---
 src/App.vue                               | 26 +++++++++++------------
 src/views/discussdetail/DiscussDetail.vue |  2 +-
 src/views/homework/HomeworkPage.vue       |  4 ++--
 src/views/liveBroadcast/LiveBroadcast.vue | 15 ++++++-------
 src/views/login/login.vue                 |  4 +---
 src/views/roadmap/PathDetails.vue         |  4 ++--
 6 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index ac98fc0..548368d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -8,19 +8,19 @@
 -->
 <template>
   <div id="container">
-    <div id="nav">
-      <router-link
-        v-for="item in routes"
-        :key="item.path"
-        :to="item.path"
-        :class="{
-          link: true,
-          active: name === item.name,
-        }"
-      >
-        {{ item.name }}
-      </router-link>
-    </div>
+<!--    <div id="nav">-->
+<!--      <router-link-->
+<!--        v-for="item in routes"-->
+<!--        :key="item.path"-->
+<!--        :to="item.path"-->
+<!--        :class="{-->
+<!--          link: true,-->
+<!--          active: name === item.name,-->
+<!--        }"-->
+<!--      >-->
+<!--        {{ item.name }}-->
+<!--      </router-link>-->
+<!--    </div>-->
     <main>
       <router-view />
     </main>
diff --git a/src/views/discussdetail/DiscussDetail.vue b/src/views/discussdetail/DiscussDetail.vue
index c72f80d..01442f8 100644
--- a/src/views/discussdetail/DiscussDetail.vue
+++ b/src/views/discussdetail/DiscussDetail.vue
@@ -39,7 +39,7 @@
         <div class="title">
           {{ disDetail.projectName }}
         </div>
-        <button class="btn">回复</button>
+<!--        <button class="btn">回复</button>-->
       </div>
 
       <div class="line clearfix">
diff --git a/src/views/homework/HomeworkPage.vue b/src/views/homework/HomeworkPage.vue
index 7add0d2..4ed2519 100644
--- a/src/views/homework/HomeworkPage.vue
+++ b/src/views/homework/HomeworkPage.vue
@@ -236,13 +236,13 @@ const state = reactive({
 const {textarea1} = toRefs(state);
 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: submitList} = useRequest(TASK_WORK_SUBMIT_LIST, {workId})
 
 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)
   })
   textarea1.value=''
diff --git a/src/views/liveBroadcast/LiveBroadcast.vue b/src/views/liveBroadcast/LiveBroadcast.vue
index be4c8a2..3d24f31 100644
--- a/src/views/liveBroadcast/LiveBroadcast.vue
+++ b/src/views/liveBroadcast/LiveBroadcast.vue
@@ -36,9 +36,9 @@
         </div>
       </div>
       <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" @click="commitClick" v-if="!data.evalFlag">评估</botton>
+        <botton class="btn" @click="commitClick" v-if="data.isEvaluate && data.isEvaluate!=='0'">评估</botton>
       </div>
     </div>
     <!-- 基本信息 -->
@@ -147,8 +147,10 @@ import img from '@/assets/image/uploadimg.png'
 import {request, useRequest} from "@/api/request";
 import {TASK_BROADCAST_COMMIT, TASK_BROADCAST_DETAIL, TASK_BROADCAST_SIGN} from "@/api/api";
 import {useRoute} from "vue-router/dist/vue-router";
+import {useRouter} from "vue-router";
 
 const {query: {courseId: liveId}} = useRoute()
+const router = useRouter()
 
 const {data} = useRequest(TASK_BROADCAST_DETAIL, {liveId})
 const state = reactive({
@@ -166,18 +168,15 @@ const state = reactive({
 const {activeName, teacher} = toRefs(state)
 const signClick = (id) => {
   request(TASK_BROADCAST_SIGN, {id}).then(() => {
-    console.log(data.value)
     data.value.signFlag = 1
   })
 };
-const commitClick = (id) => {
-  request(TASK_BROADCAST_COMMIT, {id}).then(() => {
-    data.value.evalFlag = 1
-  })
+const commitClick = () => {
+  router.push({path: '/surveydetail', query: {courseId: data.value.assessmentId}})
 };
 
 function showClick() {
-
+  window.open(data.value.liveLink)
 }
 </script>
 
diff --git a/src/views/login/login.vue b/src/views/login/login.vue
index 6fd8bcd..804192e 100644
--- a/src/views/login/login.vue
+++ b/src/views/login/login.vue
@@ -54,10 +54,8 @@ const form = ref({
 
 async function loginUser() {
   const {data:token} = await request(LOGIN, form.value);
-  console.log(2222222222)
-  console.log(token)
   setCookie("token", token, 10);
-  await router.push({path: "/BallotPage"});
+  await router.push({path: "/learnpath"});
   // location.reload();
 }
 
diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue
index ee2cdff..b2a8020 100644
--- a/src/views/roadmap/PathDetails.vue
+++ b/src/views/roadmap/PathDetails.vue
@@ -540,7 +540,7 @@ const types = ref({
     6: '去签到',
     7: '外链',
     8: '去讨论',
-    9: '去完成',
+    9: '去签到',
     10: '去完成',
     11: '去完成',
     12: '去投票',
@@ -556,7 +556,7 @@ const types = ref({
     7: '',
     8: '/discusspage',
     9: '/moreactive',
-    10: '/starttest',
+    10: '/surveydetail',
     11: '/surveydetail',
     12: '/ballotpage',
     13: '去完成'