diff --git a/AES-front/src/api/user.js b/AES-front/src/api/user.js
index 7df3bcb..29e6929 100644
--- a/AES-front/src/api/user.js
+++ b/AES-front/src/api/user.js
@@ -32,4 +32,5 @@ export default {
 
   getClassRanks:(config) => request.get('/problem/getClassRanks', config),//获取当前报告班级排名
 
+  getProblemInfo:(config) => request.get('/problem/getProblemInfo', config)//获取当前报告布置信息
 }
diff --git a/AES-front/src/views/user/exam-list/index.vue b/AES-front/src/views/user/exam-list/index.vue
index 008e2fa..6ab4c90 100644
--- a/AES-front/src/views/user/exam-list/index.vue
+++ b/AES-front/src/views/user/exam-list/index.vue
@@ -39,13 +39,10 @@ const paginationReactive = reactive({
 })
 
 const onStartExam = async (exam) => {//鐐瑰嚮杩涘叆鎺т欢鐨勯�昏緫
-  const { id } = exam
-
     try {
-      // await api.addExamInfo({ id })
       const examId = exam.id
-        router.push({ name: 'ReportSubmit', params: { examId } })
-
+      const classId = exam.classId
+        router.push({ name: 'ReportSubmit', params: { examId,classId }, query: { fromclient: false } })
     } catch (err) {
       console.log(err)
     }
diff --git a/AES-front/src/views/user/report-submit/index.vue b/AES-front/src/views/user/report-submit/index.vue
index e7a1ac6..635ea8f 100644
--- a/AES-front/src/views/user/report-submit/index.vue
+++ b/AES-front/src/views/user/report-submit/index.vue
@@ -1,40 +1,42 @@
 <template>
-  <p>Basic link button</p>
-  <div class="mb-4">
-    <el-button
-        v-for="button in buttons"
-        :key="button.text"
-        :type="button.type"
-        link
-    >
-      {{ button.text }}
-    </el-button>
-  </div>
+  <CommonPage show-footer :show-header="false">
+
+    <div class="page-content">
+      <h2 class="title">
+      瀹為獙鍚嶇О锛歿{ title }}</h2>
+      <h3 class="subtitle">
+        褰撳墠浣滀笟鍓╀綑鏃堕棿锛歿{ countdown }}
+      </h3>
+    </div>
+
+    <div class="layout-container">
+      <Leftparts class="leftparts" />
+      <Rightparts class="rightparts" />
+
+    </div>
+    <ReportActions class="bottom" />
+  </CommonPage>
 
-  <p>Disabled link button</p>
-  <div>
-    <el-button
-        v-for="button in buttons"
-        :key="button.text"
-        :type="button.type"
-        link
-        disabled
-    >
-      {{ button.text }}
-    </el-button>
-  </div>
 </template>
 
 <script setup>
 import {  ref, reactive, onMounted } from 'vue'
 import api from '@/api/user';
 import {useRoute} from 'vue-router';
+import ReportActions from "@/views/user/report-submit/components/report-actions.vue";
+import Leftparts from "@/views/user/report-submit/components/leftparts.vue";
+import Rightparts from "@/views/user/report-submit/components/rightparts.vue";
+
 const route = useRoute()
-const { examId } = route.params
+const examId  = route.params.examId;
+const classId  = route.params.classId;
 const loading = ref(true);
+const title = ref(""); // 浠嶢PI鑾峰彇鐨勪綔涓氬悕绉�
 const examScores = ref([]);
 const examName = ref("");
-const notifyMsg = ref("");
+const countdown = ref(""); // 鐢ㄤ簬鏄剧ず鍊掕鏃�
+// 灏嗙粨鏉熸椂闂磋浆鎹负Date瀵硅薄
+let endTime = null; // 缁撴潫鏃堕棿鍒濆鍖栦负null
 
 const paginationReactive = reactive({
   page: 1,
@@ -60,11 +62,59 @@ const columns = [
   // ... 鍒楅厤缃�
 ];
 
-// 鏌ヨ鎴愮哗鐨勫嚱鏁�
+
 const queryExamScores = async () => {
-  // ... 鏌ヨ閫昏緫
+  //鏌ヨ浣滀笟鍚嶇О淇℃伅锛堢洿鎺ュ鐢ㄦ煡璇㈡帓鍚嶏級
+  try {
+    //鏌ヨ浣滀笟鍚嶇О淇℃伅锛堢洿鎺ュ鐢ㄦ煡璇㈡帓鍚嶏級
+    const res1 = await api.getStudentRank({ params: { examId } });
+    //鏌ヨ浣滀笟鏃堕棿绛変俊鎭�
+    const res = await api.getProblemInfo({ params: { classId, examId } });
+
+    title.value = res1.data.title; // 鏇存柊浣滀笟鍚嶇О
+    // 灏嗙粨鏉熸椂闂磋浆鎹负Date瀵硅薄
+    endTime = new Date(res.data.endTime[0], res.data.endTime[1] - 1, res.data.endTime[2], res.data.endTime[3], res.data.endTime[4]);
+  } catch (error) {
+    console.error("Failed to fetch exam scores or problem info:", error);
+  }
 };
 
+// 鏇存柊鍊掕鏃剁殑鍑芥暟
+const updateCountdown = () => {
+  const now = new Date();
+  const timeleft = endTime - now; // 璁＄畻鍓╀綑鏃堕棿
+
+  if (timeleft >= 0) {
+    // 灏嗘绉掕浆鎹负澶┿�佹椂銆佸垎銆佺
+    const days = Math.floor(timeleft / (1000 * 60 * 60 * 24));
+    const hours = Math.floor((timeleft % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60));
+    const minutes = Math.floor((timeleft % (1000 * 60 * 60)) / (1000 * 60));
+    const seconds = Math.floor((timeleft % (1000 * 60)) / 1000);
+
+    // 鏍煎紡鍖栧�掕鏃跺瓧绗︿覆
+    countdown.value = `${days}澶�${hours}灏忔椂 ${minutes}鍒嗛挓${seconds}绉抈;
+  } else {
+    countdown.value = "浣滀笟宸茬粨鏉�";
+    clearInterval(intervalId); // 娓呴櫎瀹氭椂鍣�
+  }
+};
+
+// 浣跨敤setInterval鏉ユ瘡绉掓洿鏂板�掕鏃�
+let intervalId = null;
+onMounted(async () => {
+  await queryExamScores(); // 纭繚鍦ㄦ寕杞芥椂鏌ヨ鏁版嵁
+  if (endTime) {
+    updateCountdown(); // 鍒濆鏇存柊
+    intervalId = setInterval(updateCountdown, 1000); // 璁剧疆瀹氭椂鍣�
+  }
+});
+
+onUnmounted(() => {
+  if (intervalId) {
+    clearInterval(intervalId); // 缁勪欢鍗歌浇鏃舵竻闄ゅ畾鏃跺櫒
+  }
+});
+
 // 琛岄敭鍑芥暟
 const rowKey = (rowData) => {
   return rowData.id;
@@ -72,21 +122,50 @@ const rowKey = (rowData) => {
 
 // 鐢熷懡鍛ㄦ湡閽╁瓙
 onMounted(() => {
-  console.log('Received examId:', examId); // 杈撳嚭鎺ユ敹鍒扮殑 examId
-  // ... 鎸傝浇閫昏緫
+  queryExamScores(); // 鎸傝浇鏃舵煡璇綔涓氬悕
 });
 
-
-const buttons = [
-  { type: '', text: 'plain' },
-  { type: 'primary', text: 'primary' },
-  { type: 'success', text: 'success' },
-  { type: 'info', text: 'info' },
-  { type: 'warning', text: 'warning' },
-  { type: 'danger', text: 'danger' },
-]
 </script>
 
 <style scoped>
-/* 鏍峰紡鍙互鏍规嵁闇�瑕佹坊鍔� */
+.page-content {
+  width: 40%;
+  margin-left: 0px;
+}
+
+.title {
+  padding-left: 0px;
+  font-size: 22px;
+  font-weight: normal;
+  color: #333;
+  margin-bottom: 20px;
+}
+.subtitle {
+  font-size: 14px;
+  color: #363434;
+  margin-bottom: 10px;
+}
+.layout-container {
+  display: flex; /* 浣跨敤 Flexbox 甯冨眬 */
+  justify-content: space-between; /* 宸﹀彸妯″潡鍒嗗竷鍦ㄥ鍣ㄤ袱渚� */
+  height: auto; /* 楂樺害鑷�傚簲鍐呭 */
+}
+
+.leftparts {
+  flex: 0 0 70%;
+}
+
+.rightparts {
+  flex: 0 0 30%;
+}
+
+.bottom {
+  position: fixed; /* 浣跨敤鍥哄畾瀹氫綅 */
+  left: 50%; /* 姘村钩灞呬腑 */
+  transform: translateX(-50%); /* 浣跨敤transform璋冩暣瀹為檯浣嶇疆 */
+  bottom: 0; /* 瀹氫綅鍒伴〉闈㈠簳閮� */
+  width: 100%; /* 瀹藉害鍗犳弧鏁翠釜瀹瑰櫒 */
+  text-align: center; /* 鏂囨湰灞呬腑 */
+}
+
 </style>
diff --git a/AES-front/src/views/user/route.js b/AES-front/src/views/user/route.js
index d252591..5849aef 100644
--- a/AES-front/src/views/user/route.js
+++ b/AES-front/src/views/user/route.js
@@ -114,7 +114,7 @@ export default {
     },
     {
       name: 'ReportSubmit',
-      path: 'report-submit',
+      path: 'report-submit/:examId/:classId',
       component: () => import('./report-submit/index.vue'),
       meta: {
         title: '浣滀笟璇︽儏',
diff --git a/AES-front/src/views/user/score-rank/components/personal-rank.vue b/AES-front/src/views/user/score-rank/components/personal-rank.vue
index 3019195..96bc2cf 100644
--- a/AES-front/src/views/user/score-rank/components/personal-rank.vue
+++ b/AES-front/src/views/user/score-rank/components/personal-rank.vue
@@ -61,7 +61,6 @@ const queryExamScores = async () => {
   title.value = res.data.title; // 鏇存柊浣滀笟鍚嶇О
   score.value = res.data.score; // 鏇存柊涓汉寰楀垎
   rank.value = res.data.rank; // 鏇存柊涓汉鎺掑悕
-  console.log(res1);
   totalStudents.value = res1.data;// 鏇存柊鐝骇鎬讳汉鏁�
 };
 
diff --git a/AES-front/src/views/user/score-rank/index.vue b/AES-front/src/views/user/score-rank/index.vue
index b51109d..c49dfe0 100644
--- a/AES-front/src/views/user/score-rank/index.vue
+++ b/AES-front/src/views/user/score-rank/index.vue
@@ -19,12 +19,12 @@ import ClassScore from '@/views/user/score-rank/components/class-score.vue'
 }
 
 .personal-rank {
-  flex: 0 0 20%; /* UserPersonalRank 鍗犳嵁 40% 鐨勭┖闂� */
+  flex: 0 0 20%; /* UserPersonalRank 鍗犳嵁 20% 鐨勭┖闂� */
   /* 鍏朵粬鏍峰紡锛屼緥濡� padding, margin 绛� */
 }
 
 .class-score {
-  flex: 0 0 80%; /* ClassScore 鍗犳嵁 60% 鐨勭┖闂� */
+  flex: 0 0 80%; /* ClassScore 鍗犳嵁 80% 鐨勭┖闂� */
   /* 鍏朵粬鏍峰紡锛屼緥濡� padding, margin 绛� */
 }
 </style>
\ No newline at end of file
diff --git a/AES/src/main/java/com/example/aes/problem/controller/ProblemController.java b/AES/src/main/java/com/example/aes/problem/controller/ProblemController.java
index be30da7..bb6e01f 100644
--- a/AES/src/main/java/com/example/aes/problem/controller/ProblemController.java
+++ b/AES/src/main/java/com/example/aes/problem/controller/ProblemController.java
@@ -27,32 +27,35 @@ public class ProblemController {
 
     @Autowired
     private ProblemServiceI problemServiceI;
+
     @PostMapping("/addScoringRubric")
     public RespBean addScoringRubric(@RequestBody PMScoringRubric scoringRubric) {
         problemServiceI.addScoringRubric(scoringRubric);
         return RespBean.ok("娣诲姞璇勫垎缁嗗垯鎴愬姛");
     }
+
     @PostMapping("/addScoringStandard")
     public RespBean addScoringStandard(@RequestBody PMScoringStandard pmScoringStandard) {
-                problemServiceI.addScoringStandard(pmScoringStandard);
-                List<ScoringStandard> scoringStandardList=problemServiceI.findStandardIdNoProblemId();
-                if(scoringStandardList.size()>1) {
-                    problemServiceI.updateStandardId(scoringStandardList.get(0).getId());
-                }
-               else{
-                   for(ScoringStandard scoringStandard:scoringStandardList){
-                        problemServiceI.updateStandardId(scoringStandard.getId());
-                    }
-                 }    return RespBean.ok("娣诲姞璇勫垎鏍囧噯鎴愬姛");
+        problemServiceI.addScoringStandard(pmScoringStandard);
+        List<ScoringStandard> scoringStandardList = problemServiceI.findStandardIdNoProblemId();
+        if (scoringStandardList.size() > 1) {
+            problemServiceI.updateStandardId(scoringStandardList.get(0).getId());
+        } else {
+            for (ScoringStandard scoringStandard : scoringStandardList) {
+                problemServiceI.updateStandardId(scoringStandard.getId());
+            }
+        }
+        return RespBean.ok("娣诲姞璇勫垎鏍囧噯鎴愬姛");
 
     }
+
     @PostMapping("/addProblem")
     public RespBean addProblem(@RequestBody Problem problem, HttpServletRequest request) {
-                String title= problem.getTitle();
-                //浣滀笟鍚嶇О涓嶈兘閲嶅
-            String result=
-                    problemServiceI.findProblemByTitle(title);
-        if(result.equals("true"))
+        String title = problem.getTitle();
+        //浣滀笟鍚嶇О涓嶈兘閲嶅
+        String result =
+                problemServiceI.findProblemByTitle(title);
+        if (result.equals("true"))
             return RespBean.error(
                     "涓嶈兘閲嶅娣诲姞鐩稿悓鏍囬鐨勪綔涓�");
         //娣诲姞浣滀笟
@@ -61,20 +64,21 @@ public class ProblemController {
         problem.setAdminuserId(Integer.parseInt(userId));
         problemServiceI.addProblem(problem);
         //鏇存柊璇勫垎鏍囧噯鏍囦腑鐨刾roblemId
-       List<Problem> problems=
-               problemServiceI.findProblemIdByTitle(title);
-       if(problems.size()>1){
-           problemServiceI.updateProblemId(problems.get(0).getId());
-       }else{
-         for(Problem problem1:problems){
-             problemServiceI.updateProblemId(problem1.getId());
-         }
-       }
+        List<Problem> problems =
+                problemServiceI.findProblemIdByTitle(title);
+        if (problems.size() > 1) {
+            problemServiceI.updateProblemId(problems.get(0).getId());
+        } else {
+            for (Problem problem1 : problems) {
+                problemServiceI.updateProblemId(problem1.getId());
+            }
+        }
         return RespBean.ok("娣诲姞浣滀笟鎴愬姛");
     }
+
     @PostMapping("/findScoringRubricNoStandardId")
     public RespBean findScoringRubricNoStandardId() {
-        List<UScoringRubric> uScoringRubricList=
+        List<UScoringRubric> uScoringRubricList =
                 problemServiceI.findScoringRubricNoStandardId();
         if (uScoringRubricList != null) {
             return RespBean.ok("鑾峰彇璇勫垎缁嗗垯鍒楄〃鎴愬姛锛�",
@@ -84,9 +88,10 @@ public class ProblemController {
         }
 
     }
+
     @PostMapping("/findScoringStandardNoProblemId")
     public RespBean findScoringStandardNoProblemId() {
-        List<UScoringStandard> uScoringStandardList=
+        List<UScoringStandard> uScoringStandardList =
                 problemServiceI.findScoringStandardNoProblemId();
         if (uScoringStandardList != null) {
             return RespBean.ok("鑾峰彇璇勫垎鏍囧噯鍒楄〃鎴愬姛锛�",
@@ -96,10 +101,11 @@ public class ProblemController {
         }
 
     }
+
     @PostMapping(
             "/findScoringStandardByProblemId")
     public RespBean findScoringStandardByProblemId(@RequestBody PMProblem pmProblem) {
-        List<UScoringStandard> uScoringStandardList=
+        List<UScoringStandard> uScoringStandardList =
                 problemServiceI.findScoringStandardByProblemId(pmProblem.getId());
         if (uScoringStandardList != null) {
             return RespBean.ok("鑾峰彇璇勫垎鏍囧噯鍒楄〃鎴愬姛锛�",
@@ -109,17 +115,18 @@ public class ProblemController {
         }
 
     }
+
     @PostMapping("/editProblem")
     public RespBean editProblem(@RequestBody PMProblem pmProblem) {
-        Integer id= pmProblem.getId();
-        String title= pmProblem.getTitle();
-        String description= pmProblem.getDescription();
-        if(problemServiceI.findProblemByTitle(title,id)=="true"){
+        Integer id = pmProblem.getId();
+        String title = pmProblem.getTitle();
+        String description = pmProblem.getDescription();
+        if (problemServiceI.findProblemByTitle(title, id) == "true") {
             return RespBean.ok("浣滀笟鍚嶇О閲嶅");
         }
         boolean result =
-               problemServiceI.editProblem(title,
-                        description,id);
+                problemServiceI.editProblem(title,
+                        description, id);
         if (result == true) {
             return RespBean.ok("缂栬緫浣滀笟鎴愬姛", result);
         } else {
@@ -128,69 +135,77 @@ public class ProblemController {
         }
 
     }
+
     @PostMapping("/deleteProblem")
     public RespBean deleteCourse(@RequestBody PMProblem pmProblem) {
-     problemServiceI.deleteProblem(pmProblem.getId());
-     problemServiceI.deleteScoringStandard(pmProblem.getId());
-     //鍒犻櫎浣滀笟鏃惰鎶婂彂甯冧綔涓氱殑璁板綍涔熷垹闄�
+        problemServiceI.deleteProblem(pmProblem.getId());
+        problemServiceI.deleteScoringStandard(pmProblem.getId());
+        //鍒犻櫎浣滀笟鏃惰鎶婂彂甯冧綔涓氱殑璁板綍涔熷垹闄�
         //閭ｄ箞瀛︾敓鎻愪氦璇ヤ綔涓氱殑璁板綍涔熻鍒犻櫎
         return RespBean.ok("鍒犻櫎鎴愬姛");
     }
+
     @PostMapping("/deleteScoringRubric")
-    public RespBean deleteScoringRubric(){
+    public RespBean deleteScoringRubric() {
         problemServiceI.deleteScoringRubric();
         return RespBean.ok("鍒犻櫎璇勫垎缁嗗垯鎴愬姛");
     }
+
     @PostMapping("/deleteScoringStandard")
-    public RespBean deleteScoringStandrd(){
+    public RespBean deleteScoringStandrd() {
         problemServiceI.deleteScoringStandard();
         return RespBean.ok("鍒犻櫎璇勫垎鏍囧噯鎴愬姛");
     }
+
     @PostMapping("/findAllProblemByCourseId")
-    public RespBean findAllProblemByCourseId(@RequestBody PMProblem pmProblem){
+    public RespBean findAllProblemByCourseId(@RequestBody PMProblem pmProblem) {
 //        if (pmProblem.getPageNum() < 1 || pmProblem.getPageSize() < 1)
 //            return RespBean.error("鍙傛暟閿欒锛�");
-   DataGrid dataGrid= problemServiceI.findProblemByCourseId(pmProblem);
-        return RespBean.ok("鏌ヨ浣滀笟搴撴垚鍔�",dataGrid);
+        DataGrid dataGrid = problemServiceI.findProblemByCourseId(pmProblem);
+        return RespBean.ok("鏌ヨ浣滀笟搴撴垚鍔�", dataGrid);
 
     }
+
     @PostMapping(
             "/findAllProblemByCourseIdAndClassId")
-    public RespBean findAllProblemByCourseIdAndClassId(@RequestBody PMProblem pmProblem){
-        DataGrid dataGrid=
+    public RespBean findAllProblemByCourseIdAndClassId(@RequestBody PMProblem pmProblem) {
+        DataGrid dataGrid =
                 problemServiceI.findProblemByCourseIdAndClassId(pmProblem);
-        return RespBean.ok("鏌ヨ浣滀笟鍒楄〃鎴愬姛",dataGrid);
+        return RespBean.ok("鏌ヨ浣滀笟鍒楄〃鎴愬姛", dataGrid);
 
     }
+
     @PostMapping(
             "/addTime")
-    public RespBean addTime(@RequestBody PMPostProblem pmPostProblem){
+    public RespBean addTime(@RequestBody PMPostProblem pmPostProblem) {
         int num =
-                problemServiceI.editSubmitReport(pmPostProblem.getEndTime(),pmPostProblem.getProblemId(),pmPostProblem.getStudentId());
-        if(num == 1)
+                problemServiceI.editSubmitReport(pmPostProblem.getEndTime(), pmPostProblem.getProblemId(), pmPostProblem.getStudentId());
+        if (num == 1)
             return RespBean.ok("鍔犳椂鎴愬姛");
         else
             return RespBean.error("鍔犳椂澶辫触");
 
     }
+
     @PostMapping("/findProblemById")
-    public RespBean findProblemById(@RequestBody PMProblem pmProblem){
-       List<Problem> problems=
+    public RespBean findProblemById(@RequestBody PMProblem pmProblem) {
+        List<Problem> problems =
                 problemServiceI.findProblemById(pmProblem.getId());
         return RespBean.ok("鏌ヨ浣滀笟鏍囬鎴愬姛",
                 problems.get(0));
 
     }
+
     @PostMapping("/findPostProblem")
-    public RespBean findPostProblem(@RequestBody PMPostProblem pmPostProblem){
-        List<PostProblem> postProblems=problemServiceI.findPostProblem(pmPostProblem.getProblemId(),pmPostProblem.getClassId());
-       List<PMPostProblem>pmPostProblems=
-               new ArrayList<>();
-        for(PostProblem postProblem:postProblems){
-            PMPostProblem pmPostProblem1=
+    public RespBean findPostProblem(@RequestBody PMPostProblem pmPostProblem) {
+        List<PostProblem> postProblems = problemServiceI.findPostProblem(pmPostProblem.getProblemId(), pmPostProblem.getClassId());
+        List<PMPostProblem> pmPostProblems =
+                new ArrayList<>();
+        for (PostProblem postProblem : postProblems) {
+            PMPostProblem pmPostProblem1 =
                     new PMPostProblem();
-            if(postProblem.getAllow()==0)
-            pmPostProblem1.setAllow(false);
+            if (postProblem.getAllow() == 0)
+                pmPostProblem1.setAllow(false);
             else pmPostProblem1.setAllow(true);
             pmPostProblem1.setStartTime(postProblem.getStartTime());
             pmPostProblem1.setEndTime(postProblem.getEndTime());
@@ -198,31 +213,34 @@ public class ProblemController {
         }
 
         return RespBean.ok("鏌ヨ浣滀笟鏍囬鎴愬姛",
-              pmPostProblems.get(0));
+                pmPostProblems.get(0));
 
     }
+
     @PostMapping("/postProblem")
-    public RespBean postProblem(@RequestBody PMPostProblem pmPostProblem){
-        List<Integer> classList=
+    public RespBean postProblem(@RequestBody PMPostProblem pmPostProblem) {
+        List<Integer> classList =
                 pmPostProblem.getClassList();
-        for(Integer classId:classList){
-            problemServiceI.postProblem(pmPostProblem,classId);
+        for (Integer classId : classList) {
+            problemServiceI.postProblem(pmPostProblem, classId);
         }
         return RespBean.ok("鍙戝竷浣滀笟鎴愬姛");
 
     }
+
     @PostMapping("/updateSetup")
-    public RespBean updateSetup(@RequestBody PMPostProblem pmPostProblem){
+    public RespBean updateSetup(@RequestBody PMPostProblem pmPostProblem) {
         int num =
-                problemServiceI.editPostProblem(pmPostProblem.getClassId(),pmPostProblem.getProblemId(),pmPostProblem.getStartTime(),pmPostProblem.getEndTime(),pmPostProblem.getAllow());
-        if(num == 1)
+                problemServiceI.editPostProblem(pmPostProblem.getClassId(), pmPostProblem.getProblemId(), pmPostProblem.getStartTime(), pmPostProblem.getEndTime(), pmPostProblem.getAllow());
+        if (num == 1)
             return RespBean.ok("淇敼浣滀笟璁剧疆鎴愬姛");
         else
             return RespBean.error("淇敼浣滀笟璁剧疆澶辫触");
     }
+
     //鑾峰彇浣滀笟鍒楄〃
     @GetMapping("/getExamList")
-    public RespBean getExamList(Integer pageNum,Integer pageSize, HttpServletRequest request) {
+    public RespBean getExamList(Integer pageNum, Integer pageSize, HttpServletRequest request) {
         if (pageNum < 1 || pageSize < 1)
             return RespBean.error("鍙傛暟閿欒锛�");
         PMProblem pMproblem = new PMProblem();
@@ -246,37 +264,38 @@ public class ProblemController {
         problemServiceI.findStatusByStudentIdAndProblems(Integer.parseInt(userId), pMproblems);
 
         //鍒嗛〉澶勭悊
-        DataGrid dataGrid = problemServiceI.dataGrid(pMproblems,pMproblem);
+        DataGrid dataGrid = problemServiceI.dataGrid(pMproblems, pMproblem);
 
         if (dataGrid != null) {
-            return RespBean.ok("鑾峰彇浣滀笟鍒楄〃鎴愬姛锛�",dataGrid);
+            return RespBean.ok("鑾峰彇浣滀笟鍒楄〃鎴愬姛锛�", dataGrid);
         } else {
             return RespBean.error("鑾峰彇浣滀笟鍒楄〃澶辫触锛�");
         }
     }
-@PostMapping("findStudentSubmit")
-public RespBean findStudentSubmit(@RequestBody PMStudentSubmit pmStudentSubmit){
-    DataGrid dataGrid;
-    if(pmStudentSubmit.getSelectedStatus().equals("weijiao"))
-      dataGrid=
-           problemServiceI.findWeijiaoList(pmStudentSubmit);
-        else dataGrid=
-            problemServiceI.findYijiaoList(pmStudentSubmit);
-    return RespBean.ok("鑾峰彇瀛︾敓鎻愪氦鎶ュ憡鍒楄〃鎴愬姛锛�",
-            dataGrid);
-}
+
+    @PostMapping("findStudentSubmit")
+    public RespBean findStudentSubmit(@RequestBody PMStudentSubmit pmStudentSubmit) {
+        DataGrid dataGrid;
+        if (pmStudentSubmit.getSelectedStatus().equals("weijiao"))
+            dataGrid =
+                    problemServiceI.findWeijiaoList(pmStudentSubmit);
+        else dataGrid =
+                problemServiceI.findYijiaoList(pmStudentSubmit);
+        return RespBean.ok("鑾峰彇瀛︾敓鎻愪氦鎶ュ憡鍒楄〃鎴愬姛锛�",
+                dataGrid);
+    }
 
 
     //鏍规嵁浣滀笟id鍜屽鐢焛d鑾峰彇瀛︾敓褰撳墠鎶ュ憡鎴愮哗鎺掑悕
     @GetMapping("/getStudentRank")
-    public RespBean getStudentRank(Integer examId,HttpServletRequest request){
+    public RespBean getStudentRank(Integer examId, HttpServletRequest request) {
         DecodeToken decodeToken = new DecodeToken(request);
         String UserId = decodeToken.getUserId();
-        int userId=Integer.parseInt(UserId);
-        UReportSubmitted ureportsubmitted=
-                problemServiceI.findScoreAndRankByIds(examId,userId);
+        int userId = Integer.parseInt(UserId);
+        UReportSubmitted ureportsubmitted =
+                problemServiceI.findScoreAndRankByIds(examId, userId);
         if (ureportsubmitted != null) {
-            return RespBean.ok("鏌ヨ鎴愮哗鎺掑悕鎴愬姛锛�",ureportsubmitted);
+            return RespBean.ok("鏌ヨ鎴愮哗鎺掑悕鎴愬姛锛�", ureportsubmitted);
         } else {
             return RespBean.error("鏌ヨ鎴愮哗鎺掑悕澶辫触锛�");
         }
@@ -284,28 +303,25 @@ public RespBean findStudentSubmit(@RequestBody PMStudentSubmit pmStudentSubmit){
 
     //鑾峰彇褰撳墠浣滀笟鐝骇鎺掑悕淇℃伅
     @GetMapping("/getClassRanks")
-    public RespBean getClassRanks(Integer pageNum,Integer pageSize,Integer classId,Integer examId){
-        if (pageNum < 1 || pageSize < 1)
-            return RespBean.error("鍙傛暟閿欒锛�");
-        UReportSubmitted uReportSubmitted=new UReportSubmitted();
-        uReportSubmitted.setPageNum(pageNum);
-        uReportSubmitted.setPageSize(pageSize);
-
-        List<UReportSubmitted> uReportsSubmitted=problemServiceI.findClassRankByIds(examId,classId);
-
-
-
-//        //鍒嗛〉澶勭悊
-//        DataGrid dataGrid = problemServiceI.dataGrid(pMproblems,pMproblem);
-//
+    public RespBean getClassRanks(Integer pageNum, Integer pageSize, Integer classId, Integer examId) {
+        List<UReportSubmitted> uReportsSubmitted = problemServiceI.findClassRankByIds(examId, classId);
         if (uReportsSubmitted != null) {
-            return RespBean.ok("鑾峰彇鐝骇鎺掑悕鍒楄〃鎴愬姛锛�",uReportsSubmitted);
+            return RespBean.ok("鑾峰彇鐝骇鎺掑悕鍒楄〃鎴愬姛锛�", uReportsSubmitted);
         } else {
             return RespBean.error("鑾峰彇鐝骇鎺掑悕鍒楄〃澶辫触锛�");
         }
-
-
-
     }
 
-}
+    //鑾峰彇褰撳墠浣滀笟鐝骇鎺掑悕淇℃伅
+    @GetMapping("/getProblemInfo")
+    public RespBean getProblemInfo(Integer classId, Integer examId) {
+        List<PostProblem> PostProblem = problemServiceI.findPostProblem(examId,classId);
+        if (!PostProblem.isEmpty()) {
+            // 鐩存帴鑾峰彇鍒楄〃涓殑绗竴涓厓绱�
+            PostProblem postProblem = PostProblem.get(0);
+            return RespBean.ok("鑾峰彇瀹為獙鍏蜂綋淇℃伅鎴愬姛锛�", postProblem);
+        } else {
+            return RespBean.error("鑾峰彇瀹為獙鍏蜂綋淇℃伅澶辫触锛�");
+        }
+    }
+}
\ No newline at end of file
diff --git a/AES/src/main/java/com/example/aes/problem/dao/ProblemDaoI.java b/AES/src/main/java/com/example/aes/problem/dao/ProblemDaoI.java
index cf99860..08c4913 100644
--- a/AES/src/main/java/com/example/aes/problem/dao/ProblemDaoI.java
+++ b/AES/src/main/java/com/example/aes/problem/dao/ProblemDaoI.java
@@ -17,21 +17,31 @@ public interface ProblemDaoI extends BaseDaoI<Problem> {
     List<ReportSubmitted> findPMProblemStatusesByStudentIdAndProblemsIds(List<Integer> problemIds, Integer studentId);
 
     UReportSubmitted getScoreAndRankByIds(int problemId, int userId);
+
     List<UReportSubmitted> getClassRankByIds(int problemId, int classId);
 
     public String findProblemByTitle(String title);
-    public String findProblemByTitle(String title,Integer id);
+
+    public String findProblemByTitle(String title, Integer id);
+
     public List<Problem> findProblemIdByTitle(String title);
+
     public void addProblem(Problem problem);
+
     public long getAllProblemsNum(int courseId);
+
     List<Object[]> getProblemsByPage(Integer courseId,
-                                     Integer classId,String selectedStatus,
+                                     Integer classId, String selectedStatus,
                                      int page, int rows);
 
-    List<Problem> getProblemsByPage(Integer courseId,String title,
-                                   int page, int rows);
+    List<Problem> getProblemsByPage(Integer courseId, String title,
+                                    int page, int rows);
+
     public List<Problem> findProblemById(int id);
+
     public boolean editProblem(String title,
-                               String description,Integer id);
+                               String description, Integer id);
+
     public void deleteProblem(Integer id);
 }
+
diff --git a/AES/src/main/java/com/example/aes/problem/dao/impl/ProblemDaoImpl.java b/AES/src/main/java/com/example/aes/problem/dao/impl/ProblemDaoImpl.java
index b938241..5d88223 100644
--- a/AES/src/main/java/com/example/aes/problem/dao/impl/ProblemDaoImpl.java
+++ b/AES/src/main/java/com/example/aes/problem/dao/impl/ProblemDaoImpl.java
@@ -289,6 +289,7 @@ public class ProblemDaoImpl extends BaseDaoImpl<Problem> implements ProblemDaoI{
                 "delete from Problem where id=" + id;
         this.executeHql(hql);
     }
+
     @Override
     public void addProblem(Problem problem) {
         // TODO Auto-generated method stub
diff --git a/AES/src/main/java/com/example/aes/problem/service/Impl/ProblemServiceImpl.java b/AES/src/main/java/com/example/aes/problem/service/Impl/ProblemServiceImpl.java
index c341f2e..6bd07fc 100644
--- a/AES/src/main/java/com/example/aes/problem/service/Impl/ProblemServiceImpl.java
+++ b/AES/src/main/java/com/example/aes/problem/service/Impl/ProblemServiceImpl.java
@@ -319,6 +319,8 @@ public class ProblemServiceImpl implements ProblemServiceI {
     public int editSubmitReport(LocalDateTime addTime,int problemId,int studentId){
         return studentSubmitDao.updateAddTime(addTime,problemId,studentId);
     }
+
+
     @Override
     public DataGrid findProblemByCourseIdAndClassId(PMProblem pmProblem){
         DataGrid dg = new DataGrid();