From a760d4eca8e35637b0a2fbc5fffdbe85a6371b65 Mon Sep 17 00:00:00 2001
From: daizeyao <daizeyao@MacBook-Pro-5.local>
Date: Wed, 30 Oct 2024 15:10:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=99=E5=B8=88=E6=9F=A5=E7=9C=8B=E5=AD=A6?=
 =?UTF-8?q?=E7=94=9F=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/OJ/student_daily_detail.php               | 11 +++----
 web/OJ/template/hznu/student_daily_detail.php | 29 +++++++++++--------
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/web/OJ/student_daily_detail.php b/web/OJ/student_daily_detail.php
index a90b543a..50129624 100644
--- a/web/OJ/student_daily_detail.php
+++ b/web/OJ/student_daily_detail.php
@@ -38,11 +38,12 @@
 
 $filter_sql = "";
 
-$order_by = "submit, reg_time";
+$order_by = "user_id, reg_time";
 if (isset($_GET['order_by'])) {
   $first_order_by = $_GET['order_by'];
-  if ($order_by == 'user_id') $order_by = $first_order_by . ", strength DESC, " . $order_by;
-  else $order_by = $first_order_by." DESC , " . $order_by;
+  if ($first_order_by !== 'user_id') {
+    $order_by = $first_order_by . " DESC , " . $order_by;
+  }
 }
 
 $page_size = 100;
@@ -168,7 +169,7 @@ function getColor($value)
   $view_rank[$i][1] = "<div class='am-text-center'><a href='userinfo.php?user=" . $row['user_id'] . "'>" . $row['user_id'] . "</a>" . "</div>";
   $view_rank[$i][2] = "<div class='am-text-center'>" . htmlentities($row['real_name']) . "</div>";
   $view_rank[$i][3] = "<div class='am-text-center'><a href='status.php?user_id=" . $row['user_id'] . "&jresult=4'>" . $row['solved'] . "</a>" . "</div>";
-  $view_rank[$i][4] = "<div class='am-text-center' style='dispaly:flex;flex-warp:wrap;position:relative;'>";
+  $view_rank[$i][4] = "<div class='am-text-center' style='dispaly:flex;height:24px;flex-warp:wrap;position:relative;'>";
 
   $previous_month = null;
   foreach ($filtered_data as $record) {
@@ -176,7 +177,7 @@ function getColor($value)
     if ($i == 0) {
       $current_month = date('Y-m', strtotime($record[0]));
       if ($current_month !== $previous_month) {
-        $view_rank[$i][4] .= "<span style='position:absolute;top:-32px;transform:translateX(-50%);'>$current_month</span>";
+        $view_rank[$i][4] .= "<span style='position:absolute;top:-32px;transform:translateX(-50%);white-space:nowrap;'>$current_month</span>";
         $previous_month = $current_month;
       }
     }
diff --git a/web/OJ/template/hznu/student_daily_detail.php b/web/OJ/template/hznu/student_daily_detail.php
index 4a692f81..018ccd09 100644
--- a/web/OJ/template/hznu/student_daily_detail.php
+++ b/web/OJ/template/hznu/student_daily_detail.php
@@ -2,13 +2,17 @@
 <?php
 require_once("header.php");
 ?>
-
+<style>
+    .am-selected {
+        width: 12vw;
+    }
+</style>
 <div class="am-avg-md-1" style="width: 90%; margin:5vh auto">
     <form class="am-form am-form-inline" action='student_daily_detail.php'>
         <input type="hidden" name="csrf_token" value="f31605cce38e27bcb4e8a76188e92b3b">
-        <div class='am-form-group' style="margin-right: 40px;">
+        <div class='am-form-group' style="margin-right: 20px;">
             <label for="class" style="margin-right: 10px;">班级:</label>
-            <select data-am-selected=" {searchBox: 1, maxHeight: 400}" id='class' name='class' style='width:110px'>
+            <select data-am-selected=" {searchBox: 1, maxHeight: 400}" id='class' name='class'>
                 <option value='all' <?php if (isset($_GET['class']) && $_GET['class'] == "" || !isset($_GET['class'])) echo "selected"; ?>>全部</option>
                 <?php
                 foreach ($classSet as $class) {
@@ -20,18 +24,19 @@
                 ?>
             </select>
         </div>
-        <div class="am-form-group" style="margin-right: 40px;">
+        <div class="am-form-group" style="margin-right: 20px;">
             <label for="start_date" style="margin-right:10px;">开始日期:</label>
-            <input type="date" id="start_date" style="display:inline-block;width:200px;" name="start_date" value="<?php echo $start_date; ?>">
+            <input type="date" id="start_date" style="display:inline-block;width:10vw;" name="start_date" value="<?php echo $start_date; ?>">
         </div>
-        <div class="am-form-group" style="margin-right: 40px;">
+        <div class="am-form-group" style="margin-right: 20px;">
             <label for="end_date" style="margin-right: 10px;">结束日期:</label>
-            <input type="date" style="display:inline-block;width:200px;" name="end_date" value="<?php echo $end_date; ?>">
+            <input type="date" style="display:inline-block;width:10vw;" name="end_date" value="<?php echo $end_date; ?>">
         </div>
-        <div class="am-form-group" style="margin-right: 40px;">
+        <div class="am-form-group" style="margin-right: 20px;">
             <label for="order_by" style="margin-right: 10px;">排序:</label>
             <select data-am-selected="{searchBox: 1, maxHeight: 400}" name='order_by'>
                 <option value="solved" <?php echo ($first_order_by == "solved") ? 'selected' : ''; ?>>过题数</option>
+                <option value="submit" <?php echo ($first_order_by == "submit") ? 'selected' : ''; ?>>提交数</option>
                 <option value="user_id" <?php echo ($first_order_by == "user_id") ? 'selected' : ''; ?>>学号</option>
                 <option value="strength" <?php echo ($first_order_by == "strength") ? 'selected' : ''; ?>>能力值</option>
             </select>
@@ -42,10 +47,10 @@
     <table class="am-table am-table-striped am-margin-top">
         <thead>
             <tr>
-                <th class='am-text-center' style='width:4%;'>Rank</th>
+                <th class='am-text-center' style='width:1%;'>Rank</th>
                 <th class='am-text-center' style='width:10%;'>User</th>
-                <th class='am-text-center' style='width:10%;'>Name</th>
-                <th class='am-text-center' style='width:4%;'>Solved</th>
+                <th class='am-text-center' style='width:8%;'>Name</th>
+                <th class='am-text-center' style='width:2%;'>Solved</th>
                 <th class='am-text-center'>Daily</th>
             </tr>
         </thead>
@@ -54,7 +59,7 @@
             foreach ($view_rank as $row) {
                 echo "<tr>";
                 foreach ($row as $table_cell) {
-                    echo "<td align='center'>";
+                    echo "<td align='center' style='padding:3px'>";
                     echo $table_cell;
                     echo "</td>";
                 }