diff --git a/HomeWork-java/src/com/wetoband/template/action/ToolTemplateAction.java b/HomeWork-java/src/com/wetoband/template/action/ToolTemplateAction.java
index 01690e3911e10a61c96a6c38c71b7200cd61c49b..2d72b19fe839a18204d545a98ee3387d8b5af5c7 100644
--- a/HomeWork-java/src/com/wetoband/template/action/ToolTemplateAction.java
+++ b/HomeWork-java/src/com/wetoband/template/action/ToolTemplateAction.java
@@ -142,6 +142,7 @@ public class ToolTemplateAction extends ActionToolBase {
     //文件上传miniIo
     @Action
     public R fileUploadService(@RequestParam(value = "file") MultipartFile multipartFile) {//前端要传一个名字叫 file 的参数
+
         String fileUrl = fileUploadService.fileUpload(multipartFile) ;
         return R.ok().put("data",fileUrl);//返回一个fileurl给前端
     }
diff --git a/HomeWork-vite/src/router/index.js b/HomeWork-vite/src/router/index.js
index f3706e7886e833762a750ddfd5a1d998c4df92be..dd35113e6cec5c4488a83f3bce8d39efb7c62de1 100644
--- a/HomeWork-vite/src/router/index.js
+++ b/HomeWork-vite/src/router/index.js
@@ -31,11 +31,11 @@ const routes = [
     name: 'MultipleChoiceQuestions',
     component: MultipleChoiceQuestions
   },
-  // {
-  //   path: '/:pathMatch(.*)*',
-  //   name: 'NotFound',
-  //   // component: () => import('@/views/NotFound.vue')
-  // }
+  {
+    path: '/:pathMatch(.*)*',
+    name: 'NotFound',
+    // component: () => import('@/views/NotFound.vue')
+  }
 ];
 
 const router = createRouter({
diff --git a/HomeWork-vite/src/views/HomeWorkManager/MultipleChoiceQuestions.vue b/HomeWork-vite/src/views/HomeWorkManager/MultipleChoiceQuestions.vue
index 447024d05369dd6775a64cbe968e74863f6958db..61716311fa44278e127381c2d49347f426af0c3d 100644
--- a/HomeWork-vite/src/views/HomeWorkManager/MultipleChoiceQuestions.vue
+++ b/HomeWork-vite/src/views/HomeWorkManager/MultipleChoiceQuestions.vue
@@ -1,73 +1,148 @@
 <template>
-    <div class="question-container">
-
-        <div>
-            <span class="homework-details">
-                作业信息。。。。。。。。
-
-            </span>
-
-        </div>
+    <div class="container">
+        <el-card style="max-height: 750px;overflow-y: scroll;height: 100%;">
+            <h2 style="margin-bottom: 25px;">知识问答测试</h2>
+            <div class="record"><span style="font-size: 18px;color: #606266;">已作答：{{ answered }}</span><span
+                    style="font-size: 25px;">/{{ questions.length }}</span></div>
+            <div v-for="(question, index) in questions" :key="question.id" class="question-item">
+                <div class="question-title">
+                    {{ index + 1 }}. {{ question.title }}
+                    <span v-if="question.type === 'multiple'" style="color: #666; font-size: 0.9em">
+                        (多选题)
+                    </span>
+                </div>
+
+                <el-radio-group v-if="question.type === 'single'" v-model="userAnswers[question.id]">
+                    <el-radio v-for="(option, index) in question.options" :key="option.value" :label="option.value"
+                        class="option-item">
+                        <span style="margin-right: 8px; font-weight: bold;">
+                            {{ String.fromCharCode(65 + index) }}.
+                        </span>
+                        {{ option.label }}
+                    </el-radio>
+                </el-radio-group>
 
-        <div class="question-details">
-            <p>1.请选择正确答案</p>
-            <div class="question-choice">
-                <el-radio-group v-model="radio">
 
+                <el-checkbox-group v-if="question.type === 'multiple'" v-model="userAnswers[question.id]">
+                    <el-checkbox v-for="(option, index) in question.options" :key="option.value" :value="option.value">
 
-                    <!-- <el-radio :value="9">Option C</el-radio> -->
-                </el-radio-group>
-                <el-row :gutter="20">
-                    <el-col :span="10">
-                        <div class="grid-content">
-                            <el-radio :value="3" style="margin: 0;">A:</el-radio>
-                            <p style="display: inline;"></p>
-                        </div>
-
-                    </el-col>
-                    <el-col :span="10">
-                        <div>
-                            <el-radio :value="6">B</el-radio>
-                        </div>
-
-                    </el-col>
-
-                </el-row>
+                        <span style="margin-right: 8px; font-weight: bold;">
+                            {{ String.fromCharCode(65 + index) }}.
+                        </span>
+                        {{ option.label }}
+                    </el-checkbox>
+                </el-checkbox-group>
             </div>
-        </div>
+
+            <el-button type="primary" @click="submitAnswers" class="submit-btn">
+                提交答案
+            </el-button>
+        </el-card>
 
     </div>
 </template>
 <script setup>
-
+import { reactive, ref, watch } from 'vue';
+const questions = reactive([
+    {
+        id: 1,
+        type: 'single',
+        title: 'Vue3 的 Composition API 中，用于响应式数据的方法是？',
+        options: [
+            { value: 'A', label: 'ref' },
+            { value: 'B', label: 'reactive' },
+            { value: 'C', label: 'both' },
+            { value: 'D', label: 'watch' }
+        ],
+        correct: ['C']
+    },
+    {
+        id: 2,
+        type: 'multiple',
+        title: '下列哪些属于 Element Plus 的组件？',
+        options: [
+            { value: 'A', label: 'el-button' },
+            { value: 'B', label: 'el-table' },
+            { value: 'C', label: 'el-space' },
+            { value: 'D', label: 'el-calendar' }
+        ],
+        correct: ['A', 'B', 'C', 'D']
+    },
+    {
+        id: 3,
+        type: 'single',
+        title: '下列哪些属于 Element Plus 的组件？',
+        options: [
+            { value: 'A', label: 'el-button' },
+            { value: 'B', label: 'el-table' },
+            { value: 'C', label: 'el-space' },
+            { value: 'D', label: 'el-calendar' }
+        ],
+        correct: ['A', 'B', 'C', 'D']
+    }
+]);
+
+const userAnswers = reactive({});
+
+const submitAnswers = () => {
+
+    if (Object.keys(userAnswers).length !== questions.length) {
+        alert('还有题目未作答！');
+        return;
+    }
+};
+
+const answered = ref(0);
+watch(() => {
+    answered.value = Object.keys(userAnswers).length
+});
 </script>
-<style lang="scss" scoped>
-.question-container {
-    margin-top: 3%;
+<style scoped>
+.container {
+    margin-top: 2%;
+    height: 80vh;
+    padding: 20px;
+    max-width: 1200px;
     margin-left: auto;
     margin-right: auto;
-    border: 1px solid red;
-    width: 95%;
+}
+
+.record {
     display: flex;
-    flex-direction: column;
+    justify-content: flex-end;
 }
 
-.question-details {}
+.question-item {
+
+    padding: 15px;
+}
 
-.question-choice {}
+.question-title {
+    font-size: 20px;
+    font-weight: bold;
+    margin-bottom: 15px;
+    color: #303133;
+}
+
+.option-item {
+
+    display: block;
+    margin: 8px 15px;
+    color: #606266;
+}
 
-.grid-content {
-    width: 500px;
+.submit-btn {
+    display: block;
+    margin: 20px auto;
+    width: 200px;
 }
 
-.homework-details {
-    margin-left: 1%;
-    margin-bottom: 2%;
-    float: left;
+.result-alert {
+    margin-top: 20px;
 }
 
-p {
-    text-align: left;
-    margin-left: 3%;
+:deep(.el-radio__label),
+:deep(.el-checkbox__label) {
+    font-size: 17px;
 }
 </style>
\ No newline at end of file
diff --git a/HomeWork-vite/src/views/HomeWorkManager/uploadHomeWork.vue b/HomeWork-vite/src/views/HomeWorkManager/uploadHomeWork.vue
index 902b23a1266dc387f6ead6232914b3ba802b5b17..b793455b70db9d4dfe5a4ffbce0b4230de593367 100644
--- a/HomeWork-vite/src/views/HomeWorkManager/uploadHomeWork.vue
+++ b/HomeWork-vite/src/views/HomeWorkManager/uploadHomeWork.vue
@@ -2,7 +2,6 @@
   <div class="container">
 
     <el-card style="max-height: 950px;overflow-y: scroll;">
-
       <div class="head">
         <el-button @click="question = true" type="primary"><el-icon>
             <ChatLineRound />
@@ -47,8 +46,8 @@
       </div>
 
       <el-dialog v-model="options" width="700" style="margin-top: 25%;">
-        <el-upload ref="uploadRef" class="upload-demo" drag
-          action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15" multiple>
+        <el-upload ref="uploadRef" class="upload-demo" drag :http-request="customUpload" multiple :auto-upload="false"
+          :onchange="handleChange" v-model:file-list="files">
           <el-icon class="el-icon--upload"><upload-filled /></el-icon>
           <div class="el-upload__text">
             拖曳文件到此处<em>点击上传</em>
@@ -57,6 +56,9 @@
             <div class="el-upload__tip">
               大小小于500kb的 jpg/png 文件
             </div>
+            <div>
+              <button type='submit' style="margin-top: 10px;" @click="uploadRef.submit()">确定</button>
+            </div>
           </template>
         </el-upload>
       </el-dialog>
@@ -88,7 +90,15 @@ const options = ref(false)
 const router = useRouter()
 const question = ref(false)
 const message = ref('')
+const uploadRef = ref()
+const files = ref([])
+const formData = new FormData();
+const customUpload = () => {
+  upload()
+
 
+
+}
 const last = () => {
   router.push('/HomeWorkManager')
 }
@@ -138,6 +148,15 @@ const submitQuestions = async () => {
     console.log(err)
   })
 }
+const upload = async () => {
+  await HttpClient.post('fileUploadService', {
+    file: formData,
+  }).then(res => {
+    console.log(res)
+  }).catch(err => {
+    console.log(err)
+  })
+}
 </script>
 
 <style scoped>