页面传参

work/src/assets/main.css

@@ -1,9 +1,7 @@
-<<<<<<< HEAD
 
 body {
     font-family: -apple-system, BlinkMacSystemFont, 'Helvetica Neue', Helvetica, Segoe UI, Arial, Roboto, 'PingFang SC', miui, 'Hiragino Sans GB', 'Microsoft Yahei', sans-serif;
-=======
+}
 *{
     margin: 0;
->>>>>>> 6bb4fa11ad521daab009a817457da00ebd73d42d
 }

work/src/router/index.js

@@ -29,7 +29,7 @@ const router = createRouter({
       component: WorksShowView
     },
     {
-      path:'/doWork',
+      path:'/doWork/:id?/:sub?',
       name:'doWork',
       component: DoHomeworkView
     }

work/src/views/DoHomeworkView.vue

@@ -81,7 +81,7 @@
         </div>
         <!-- 提交次数 -->
         <div class="submit-times">
-          <span>您已提交0次，每个作业可以提交3次</span>
+          <span>您已提交{{sub}}次，每个作业可以提交{{2-sub}}次</span>
         </div>
       </div>
     </div>
@@ -97,7 +97,12 @@ import { ElMessage } from "element-plus";
 import '@wangeditor/editor/dist/css/style.css' // 引入 css
 import { onBeforeUnmount } from 'vue'
 import { Editor, Toolbar } from '@wangeditor/editor-for-vue'
+import {useRoute, useRouter} from "vue-router";
 
+const router = useRouter();
+const route = useRoute();
+let groupId = route.params.id;
+let sub = route.params.sub;
 // 编辑器实例，必须用 shallowRef
 const editorRefs = ref([]);
 
@@ -157,8 +162,9 @@ const handleCreated = (editor, questionIndex) => {
 
 const questionList = ref([]);
 
-function getQuestionList(id) {
-  homeworkApi.getHomeworkQuestion(id).then(resp => {
+function getQuestionList() {
+  console.log("ljghasjkhdjksahjkhsajkhjkasd",groupId);
+  homeworkApi.getHomeworkQuestion(groupId).then(resp => {
     if (resp.code == 200) {
       questionList.value = resp.data;
       for (let i = 0; i < questionList.value.length; i++) {
@@ -174,7 +180,7 @@ function getQuestionList(id) {
     }
   });
 }
-getQuestionList(1377);
+getQuestionList();
 
 // 提交作业
 const homework = ref([]);
@@ -185,8 +191,7 @@ questionList.value.forEach(() => {
 });
 
 // 上一个页面传递的参数 groupId
-const groupId = 1379;
-function submit(groupId) {
+function submit() {
   homework.value = [];
   for (let i = 0; i < questionList.value.length; i++) {
     if (questionList.value[i].type == 1 || questionList.value[i].type == 2) {
@@ -205,9 +210,12 @@ function submit(groupId) {
       });
     }
   }
-  homeworkApi.submitHomework(homework.value, 1379).then(resp => {
+  let groupId = route.params.id;
+  homeworkApi.submitHomework(homework.value, groupId).then(resp => {
     if (resp.code == 200) {
       ElMessage.success("提交成功");
+      homework.value = [];
+      router.push("/show");
     } else {
       ElMessage.error("未知错误，请联系管理员");
     }

work/src/views/WorksShowView.vue

@@ -2,8 +2,9 @@
 import { ref } from 'vue';
 import ShowApi from '../api/ShowApi';
 import { format } from 'date-fns';
-import router from "@/router/index.js";
+import {useRouter} from "vue-router";
 
+const router = useRouter()
 
 //作业展示列表
 const works = ref([]);
@@ -23,12 +24,10 @@ function loadWorks() {
 }
 loadWorks();
 //跳转写作业页面
-function writeWorks(id){
+function writeWorks(id,sub){
+  console.log("ID是什么",id)
   router.push({
-        path:'/doWork',
-        query:{
-            id:id,
-        }
+    path:`/doWork/${id}/${sub}`
   })
 }
 </script>
@@ -51,10 +50,11 @@ function writeWorks(id){
                             <div class="work-time">
                                     <span class="deadline">截止时间：{{ work.endData }}</span>
                               <!-- 作业提价状态 -->
-                                <div class="work-status">未提交</div>
+                              <div v-if="work.submit == 0" class="work-status">未提交</div>
+                              <div v-else class="work-status2">已提交</div>
                             </div>
                             <div class="work-bottem">
-                                <span class="write" @click="writeWorks(work.id)">写作业</span>
+                                <span class="write" @click="writeWorks(work.groupId,work.submit)">写作业</span>
                             </div>
                         </div>
                     </div>
@@ -213,8 +213,20 @@ body{
     opacity: 2;
     margin-left: 5px;
 }
+  .work-status2 {
+    font-size: 3.8vw;
+    display: inline-block;
+    background: #ffe1ae;
+    padding: 1% 3.5%;
+    text-align: center;
+    color: #353870;
+    border-radius: 5px;
+    opacity: 2;
+    margin-left: 5px;
+  }
 
 .work-bottem {
+  cursor: pointer;
     display: flex;
     position: absolute;
     width: 28%;
@@ -298,7 +310,7 @@ body{
     .work-name {
         opacity: 1;
         /** 文本1 */
-        font-size: 1.875rem;
+        font-size: 1.6rem;
         font-weight: 700;
         letter-spacing: 0px;
         color: rgba(53, 56, 112, 1);
@@ -347,8 +359,20 @@ body{
     opacity: 2;
     margin-left: 5px;
 }
+  .work-status2 {
+    display: inline-block;
+    background: #ffe1ae;
+    padding: 0.5% 2%;
+    text-align: center;
+    color: #353870;
+    font-size: 1rem;
+    border-radius: 5px;
+    opacity: 2;
+    margin-left: 5px;
+  }
 
 .work-bottem {
+  cursor: pointer;
     display: flex;
     position: absolute;
     width: 25%;
@@ -398,7 +422,7 @@ body{
 .work-name {
         opacity: 1;
         /** 文本1 */
-        font-size: 1.5vw;
+        font-size: 1.4vw;
         font-weight: 700;
         letter-spacing: 0px;
         color: rgba(53, 56, 112, 1);
@@ -480,7 +504,17 @@ body{
     opacity: 2;
     margin-left: 5px;
 }
-
+  .work-status2 {
+    display: inline-block;
+    background: #ffe1ae;
+    padding: 0.5% 2%;
+    text-align: center;
+    color: #353870;
+    font-size: 1rem;
+    border-radius: 5px;
+    opacity: 2;
+    margin-left: 5px;
+  }
 .work-bottem {
     cursor: pointer;
     display: flex;