From e846a7575ea667faa2b5a21c5a33f9310f8c1a2b Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Tue, 13 Dec 2022 03:55:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E4=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/api.js                      |  5 +++--
 src/views/homework/HomeworkPage.vue | 28 +++++++++++++++-------------
 src/views/roadmap/PathDetails.vue   |  2 +-
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/src/api/api.js b/src/api/api.js
index 7b93d7e..4ff4e0f 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -22,8 +22,9 @@ export const TASK_BROADCAST_DETAIL = '/liveBroadcast'
 export const TASK_BROADCAST_SIGN = '/stu/task/broadcast/sign'
 export const TASK_VOTE_COMMIT = '/stu/task/vote/commit'
 export const TASK_VOTE_DETAIL = '/stu/task/vote/detail'
-export const TASK_WORK_COMMIT = '/stu/task/work/commit'
-export const TASK_WORK_DETAIL = '/stu/task/work/detail'
+export const TASK_WORK_COMMIT = '/workSubmit/submitStudentWorkDetail post'
+export const TASK_WORK_DETAIL = '/workSubmit/getWorkDetailByTaskId'
+export const TASK_WORK_SUBMIT_LIST = '/workSubmit/queryWorkSubmitDetailById'
 export const VOTE_DETAIL = '/queryVoteSubmitDetailById'
 export const TASK_VOTE_LIST = '/queryVoteSubmitDetailListByTaskId'
 
diff --git a/src/views/homework/HomeworkPage.vue b/src/views/homework/HomeworkPage.vue
index 6ef65c8..c526b72 100644
--- a/src/views/homework/HomeworkPage.vue
+++ b/src/views/homework/HomeworkPage.vue
@@ -43,7 +43,7 @@
             <div class="shapan">
               <div style="flex: 1; width: 0">
                 <div class="shapanexplain">
-                  {{ data.detail?.workName }}
+                  {{ data?.workName }}
                 </div>
               </div>
             </div>
@@ -149,12 +149,12 @@
                 <div class="content2">作业内容</div>
               </div>
               <div
-                  v-for="(value, index) in data.workSubmitList"
+                  v-for="(value, index) in submitList"
                   :key="index"
                   class="historytitle2"
                   :style="{
                   'border-bottom':
-                    index === data.workSubmitList.length - 1
+                    index === submitList.length - 1
                       ? '1px solid rgba(215, 229, 253, 0)'
                       : '1px solid rgba(215, 229, 253, 1)',
                 }"
@@ -186,16 +186,16 @@
         <div class="timebox clearfix">
           <div class="innertime">
             {{
-              data.detail?.submitStartTime
-            }}&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;&nbsp;{{ data.detail?.submitEndTime }}
+              data?.submitStartTime
+            }}&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;&nbsp;{{ data?.submitEndTime }}
           </div>
           <div class="endtime clearfix">
             <div class="endtimetext">
               距离结束还有&nbsp;&nbsp;
-              <span class="te">{{ parseInt(dayjs(data.detail?.submitEndTime).diff(dayjs(), 'minute') / 60) }}</span>&nbsp;&nbsp;
+              <span class="te">{{ parseInt(dayjs(data?.submitEndTime).diff(dayjs(), 'minute') / 60) }}</span>&nbsp;&nbsp;
               小时&nbsp;&nbsp;<span
                 class="te"
-            >{{ dayjs(data.detail?.submitEndTime).diff(dayjs(), 'minute') % 60 }}</span
+            >{{ dayjs(data?.submitEndTime).diff(dayjs(), 'minute') % 60 }}</span
             >&nbsp;&nbsp;分钟
             </div>
           </div>
@@ -208,7 +208,7 @@
         </div>
         <div class="explain clearfix">
           <!-- todo #作业任务详情 作业说明是作业要求字段么？-->
-          <div class="explain1" style="margin-top: 26px" v-html="data.detail?.workRequirement"></div>
+          <div class="explain1" style="margin-top: 26px" v-html="data?.workRequirement"></div>
         </div>
       </div>
     </div>
@@ -219,7 +219,7 @@
 <script setup>
 import {reactive, ref, toRefs} from "vue";
 import {request, useRequest} from "@/api/request";
-import {TASK_WORK_COMMIT, TASK_WORK_DETAIL, WORK_HISTROY} from "@/api/api";
+import {TASK_WORK_COMMIT, TASK_WORK_DETAIL, TASK_WORK_SUBMIT_LIST, WORK_HISTROY} from "@/api/api";
 import dayjs from "dayjs";
 import {useRouter} from "vue-router";
 import UploadImg from '@/components/img/UploadImg.vue'
@@ -236,14 +236,16 @@ const state = reactive({
 const {textarea1} = toRefs(state);
 const router = useRouter()
 
-const {query: {id: workId}} = useRoute()
+const {query: {id: taskId, type}} = useRoute()
 
-const {data} = useRequest(TASK_WORK_DETAIL, {workId})
+const {data} = useRequest(TASK_WORK_DETAIL, {taskId, type})
+const {data: submitList} = useRequest(TASK_WORK_SUBMIT_LIST, {taskId, type})
 
 const handleClick = () => {
-  request(TASK_WORK_COMMIT, {workSubmitDto: {workId,workUploadContent: state.textarea1}}).then(() => {
-    router.back()
+  request(TASK_WORK_COMMIT, {projectOrRouterLogo: type, workUploadContent: textarea1.value, taskId}).then(res => {
+    submitList.value.unshift(res.data)
   })
+  textarea1.value=''
 };
 const textareaInput = (e) => {
   state.textarea1 = e;
diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue
index ea3c0e7..c7d85c2 100644
--- a/src/views/roadmap/PathDetails.vue
+++ b/src/views/roadmap/PathDetails.vue
@@ -549,7 +549,7 @@ const types = ref({
     1: '去上课',
     2: '/faceteach',
     3: '案例',
-    4: '去完成',
+    4: '/homeworkpage',
     5: '去完成',
     6: '去签到',
     7: '外链',