diff --git a/src/api/api.js b/src/api/api.js
index d63c73b..b9860fe 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -30,8 +30,8 @@ export const TASK_VOTE_LIST = '/queryVoteSubmitDetailListByTaskId'
 export const STU_OFFCOURSE_DETAIL = '/stu/offcourse/detail'
 export const WORK_QUERYWORKDETAILBYID = '/work/queryWorkDetailById'
 export const WORK_HISTROY = '/workSubmit/queryWorkDetailListByStuId'
-export const EXAMINATION_QUERYEXAMINATIONDETAILBYID = '/examination/queryExaminationDetailById'
-export const DISCUSS_COLLECTION = '/discussSubmit/clickDiscussCollectionCountOr post'
+export const EXAMINATION_QUERY = examinationId => `/examination/queryExaminationDetailById?examinationId=${examinationId} post`
+
 export const DISCUSS_LIKE = '/discussSubmit/clickDiscussLikeCountOr post'
 export const DISCUSS_LIST = '/discussSubmit/list'
 export const DISCUSS_DETAIL = '/discussSubmit/detail'
diff --git a/src/views/examination/ExamPage.vue b/src/views/examination/ExamPage.vue
index 2c75e8e..6c79b13 100644
--- a/src/views/examination/ExamPage.vue
+++ b/src/views/examination/ExamPage.vue
@@ -2,7 +2,7 @@
   <div class="surveydetail">
     <!-- 面包屑导航 -->
     <div
-      style="display: flex; align-items: center; justify-content: space-between"
+        style="display: flex; align-items: center; justify-content: space-between"
     >
       <div class="crumb">
         <div>混合制项目</div>
@@ -14,16 +14,16 @@
       <div class="prevnext">
         <div class="prev">
           <img
-            style="width: 23px; height: 23px"
-            src="../../assets/image/prev.png"
+              style="width: 23px; height: 23px"
+              src="../../assets/image/prev.png"
           />
           <div style="margin-left: 7px">上一个</div>
         </div>
         <div class="prev" style="margin-left: 31px">
           <div style="margin-right: 7px">下一个</div>
           <img
-            style="width: 23px; height: 23px"
-            src="../../assets/image/next.png"
+              style="width: 23px; height: 23px"
+              src="../../assets/image/next.png"
           />
         </div>
       </div>
@@ -37,20 +37,20 @@
       <!-- 中间盒子 -->
       <div class="centercontent">
         <div class="righttitle">
-          <img width="20px" height="20px" src="../../assets/image/yuan.png" />
+          <img width="20px" height="20px" src="../../assets/image/yuan.png"/>
 
-          <div class="text">考试测试</div>
+          <div class="text">{{ data.examinationName }}</div>
           <div class="box"></div>
         </div>
         <!-- 考试测试的盒子 -->
         <div class="test clearfix">
           <div class="detail">
-            <span style="margin-right: 43px">考试时间：30分钟</span>
-            <span>及格线：60</span>
+            <span style="margin-right: 43px">考试时间：{{ data.examinationDuration }}分钟</span>
+            <span>及格线：{{data.passLine || 60}}</span>
           </div>
           <div class="testtime clearfix">
             <div class="timedetail">
-              考试时间：2022-7-20 00:00 至 2022-8-29 23:59:59
+              考试时间：{{ data.examinationStartTime }} 至 {{ data.examinationEndTime }}
             </div>
           </div>
         </div>
@@ -60,7 +60,7 @@
         <button class="starttest" style="cursor: pointer">开始考试</button>
         <!-- 开始考试按钮 -->
         <div class="righttitleE">
-          <img width="20px" height="20px" src="../../assets/image/yuan.png" />
+          <img width="20px" height="20px" src="../../assets/image/yuan.png"/>
 
           <div class="text">历史纪录</div>
           <div class="box"></div>
@@ -88,8 +88,8 @@
           </div>
           <div class="fenge"></div>
           <div
-            class="historytitle2 clearfix tongyi"
-            style="border-radius: 0px 0px 8px 8px"
+              class="historytitle2 clearfix tongyi"
+              style="border-radius: 0px 0px 8px 8px"
           >
             <div class="content1">2022-7-14&nbsp;00:00</div>
             <div class="content2">10分</div>
@@ -101,13 +101,19 @@
     </div>
     <!-- 详细内容 -->
   </div>
-<!--  todo #考试接口 暂时没有-->
+  <!--  todo #考试接口 暂时没有-->
 </template>
 
-<script>
-export default {
-  name: "ExamPage",
-};
+<script setup>
+
+import {useRoute} from "vue-router/dist/vue-router";
+import {usePage, useRequest} from "@/api/request";
+import {COMMENT_LIST, DISCUSS_DETAIL, EXAMINATION_QUERY} from "@/api/api";
+
+const {query: {id, discussSubmitId}} = useRoute()
+
+const {data} = useRequest(EXAMINATION_QUERY(159), {})
+
 </script>
 
 <style scoped lang="scss">
@@ -118,18 +124,21 @@ export default {
     font-size: 14px;
     line-height: 24px;
   }
+
   .prevnext {
     display: flex;
     align-items: center;
     font-size: 14px;
     font-weight: 500;
     color: #ffffff;
+
     .prev {
       display: flex;
       align-items: center;
       cursor: pointer;
     }
   }
+
   .title {
     font-size: 20px;
     font-weight: 800;
@@ -138,6 +147,7 @@ export default {
     margin-top: 17px;
     margin-left: -11px;
   }
+
   .bascinfo {
     min-height: 800px;
     width: 100%;
@@ -147,24 +157,29 @@ export default {
     display: flex;
     flex-direction: column;
     align-items: center;
+
     .clearfix:before,
     .clearfix:after {
       content: "";
       display: table;
       clear: both;
     }
+
     .centercontent {
       position: relative;
+
       .righttitle {
         display: flex;
         padding-top: 30px;
         position: relative;
+
         .text {
           margin-left: 8px;
           font-size: 16px;
           color: rgba(51, 51, 51, 1);
           font-weight: 800;
         }
+
         .box {
           width: 75px;
           height: 10px;
@@ -174,6 +189,7 @@ export default {
           top: 44px;
         }
       }
+
       .test {
         margin-top: 16px;
         margin-bottom: 26px;
@@ -181,6 +197,7 @@ export default {
         height: 158px;
         background: #f2f5f7;
         border-radius: 8px;
+
         .detail {
           margin-top: 29px;
           margin-left: 44px;
@@ -189,6 +206,7 @@ export default {
           font-weight: 500;
           color: #56a3f9;
         }
+
         .testtime {
           margin-top: 20px;
           margin-left: 10px;
@@ -196,6 +214,7 @@ export default {
           height: 81px;
           background: #ffffff;
           border-radius: 0px 8px 0px 8px;
+
           .timedetail {
             font-size: 14px;
             font-weight: 500;
@@ -205,6 +224,7 @@ export default {
           }
         }
       }
+
       .starttest {
         position: absolute;
         width: 146px;
@@ -219,17 +239,20 @@ export default {
         left: calc(50% - 73px);
         cursor: pointer;
       }
+
       .righttitleE {
         display: flex;
         margin-top: 110px;
         // padding-top: 30px;
         position: relative;
+
         .text {
           margin-left: 8px;
           font-size: 16px;
           color: rgba(51, 51, 51, 1);
           font-weight: 800;
         }
+
         .box {
           width: 75px;
           height: 10px;
@@ -239,6 +262,7 @@ export default {
           top: 14px;
         }
       }
+
       .history {
         position: relative;
         margin-top: 32px;
@@ -246,38 +270,46 @@ export default {
         height: 200px;
         border: 1px solid #d7e5fd;
         border-radius: 8px;
+
         .clearfix:before,
         .clearfix:after {
           content: "";
           display: table;
           clear: both;
         }
+
         .fenge {
           width: 841px;
           border-top: 1px solid #d7e5fd;
         }
+
         .tongyi {
           display: flex;
         }
+
         .content1 {
           margin-top: 14px;
           margin-left: 77px;
         }
+
         .content2 {
           position: absolute;
           margin-top: 14px;
           left: 328px;
         }
+
         .content3 {
           position: absolute;
           margin-top: 14px;
           left: 512px;
         }
+
         .content4 {
           position: absolute;
           margin-top: 14px;
           left: 700px;
         }
+
         .contentbtn {
           position: absolute;
           margin-top: 14px;
@@ -291,6 +323,7 @@ export default {
           border: 0;
           cursor: pointer;
         }
+
         .historycontent {
           width: 59px;
           height: 14px;
@@ -300,12 +333,14 @@ export default {
           color: #333330;
           line-height: 38px;
         }
+
         .historytitle {
           width: 842px;
           height: 50px;
           background: #f2f5f7;
           border-radius: 8px 8px 0px 0px;
         }
+
         .historytitle2 {
           width: 842px;
           height: 48px;
diff --git a/vite.config.js b/vite.config.js
index 738747b..1164b38 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -2,73 +2,86 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-21 17:28:10
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-12-11 21:11:35
+ * @LastEditTime: 2022-11-22 12:45:57
  * @FilePath: /fe-stu/vite.config.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
-import { defineConfig } from 'vite'
+import {defineConfig} from 'vite'
 import vue from '@vitejs/plugin-vue'
 import legacy from '@vitejs/plugin-legacy'
-import { viteMockServe } from 'vite-plugin-mock'
+import {viteMockServe} from 'vite-plugin-mock'
 import topLevelAwait from "vite-plugin-top-level-await";
 
 const path = require('path')
 
-export default defineConfig(({ command }) =>
-({
-    base: '/fe-student',
-    plugins: [
-        vue(),
-        // legacy({
-        //     targets: ['chrome 64', 'defaults', 'not IE 11']
-        // }),
-        topLevelAwait({
-            promiseExportName: '__tla',
-            promiseImportName: i => `__tla_${i}`
-        }),
-        // viteMockServe({
-        //     mockPath: './src/mock/mocks',
-        // })
-    ],
-    resolve: {
-        alias: [
-            { find: '@', replacement: path.resolve(__dirname, 'src') }
-        ]
-    }, server: {
-        proxy: {
-            '/file/upload': {
-                target: 'http://111.231.196.214:30001',
-                changeOrigin: true,
-            },
-            '/stu': {
-                target: 'http://localhost:30001',
-                changeOrigin: true,
-            },
-            '/queryVoteSubmitDetailById': {
-                target: 'http://localhost:30001',
-                changeOrigin: true,
-            },
-            '/work': {
-                target: 'http://localhost:30001',
-                changeOrigin: true,
-            },
-            '/discuss': {
-                target: 'http://localhost:30001',
-                changeOrigin: true,
-            },
-            '/discussSubmit': {
-                target: 'http://localhost:30001',
-                changeOrigin: true,
-            },
-            '/comment': {
-                target: 'http://localhost:30001',
-                changeOrigin: true,
-            },
-            '/vote': {
-                target: 'http://111.231.196.214:12013/manageApi',
-                changeOrigin: true,
-            },
+export default defineConfig(({command}) =>
+    ({
+        base: '/fe-student',
+        plugins: [
+            vue(),
+            // legacy({
+            //     targets: ['chrome 64', 'defaults', 'not IE 11']
+            // }),
+            topLevelAwait({
+                promiseExportName: '__tla',
+                promiseImportName: i => `__tla_${i}`
+            }),
+            // viteMockServe({
+            //     mockPath: './src/mock/mocks',
+            // })
+        ],
+        resolve: {
+            alias: [
+                {find: '@', replacement: path.resolve(__dirname, 'src')}
+            ]
+        }, server: {
+            proxy: {
+                '/file/upload': {
+                    target: 'http://111.231.196.214:30001',
+                    changeOrigin: true,
+                },
+                '/stu': {
+                    target: 'http://localhost:30001',
+                    changeOrigin: true,
+                },
+                '/queryVoteSubmitDetailById': {
+                    target: 'http://localhost:30001',
+                    changeOrigin: true,
+                },
+                '/work': {
+                    target: 'http://localhost:30001',
+                    changeOrigin: true,
+                },
+                '/discuss': {
+                    target: 'http://localhost:30001',
+                    changeOrigin: true,
+                },
+                '/discussSubmit': {
+                    target: 'http://localhost:30001',
+                    changeOrigin: true,
+                },
+                '/comment': {
+                    target: 'http://localhost:30001',
+                    changeOrigin: true,
+                },
+                '/vote': {
+                    target: 'http://localhost:30001',
+                    changeOrigin: true,
+                },
+                '/admin': {
+                    target: 'http://localhost:30001',
+                    changeOrigin: true,
+                },'/activity': {
+                    target: 'http://localhost:30001',
+                    changeOrigin: true,
+                },'/liveBroadcast': {
+                    target: 'http://localhost:30001',
+                    changeOrigin: true,
+                },'/examination': {
+                    target: 'http://localhost:30001',
+                    changeOrigin: true,
+                },
+            }
         }
-    }
-})
+    })
 )